chore: Update SongodaCore to v3.5.0-SNAPSHOT

This commit is contained in:
Christian Koop 2024-10-02 16:09:07 +02:00
parent cb9df7244b
commit 3def09481b
No known key found for this signature in database
GPG Key ID: 6A4A09E8ED946113
14 changed files with 85 additions and 42 deletions

View File

@ -139,7 +139,7 @@
<dependency>
<groupId>com.craftaro</groupId>
<artifactId>CraftaroCore</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>

View File

@ -26,6 +26,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
public class GuiCoop extends Gui {
private final SkyBlock plugin;
@ -158,7 +159,11 @@ public class GuiCoop extends Gui {
if (targetPlayerTexture.length >= 1 && targetPlayerTexture[0] != null) {
phead = SkullItemCreator.byTextureValue(targetPlayerTexture[0]);
} else {
phead = SkullItemCreator.byUuid(uuid);
try {
phead = SkullItemCreator.byUuid(uuid).get();
} catch (InterruptedException | ExecutionException ex) {
throw new RuntimeException(ex);
}
}
ItemMeta pheadmeta = phead.getItemMeta();

View File

@ -21,6 +21,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
public class GuiBans extends Gui {
private final PlayerDataManager playerDataManager;
@ -121,7 +122,11 @@ public class GuiBans extends Gui {
if (targetPlayerTexture.length >= 1 && targetPlayerTexture[0] != null) {
is = SkullItemCreator.byTextureValue(targetPlayerTexture[0]);
} else {
is = SkullItemCreator.byUuid(uuid);
try {
is = SkullItemCreator.byUuid(uuid).get();
} catch (InterruptedException | ExecutionException ex) {
throw new RuntimeException(ex);
}
}
ItemMeta im = is.getItemMeta();

View File

@ -26,6 +26,7 @@ import org.bukkit.inventory.meta.SkullMeta;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
public class Bans {
private static Bans instance;
@ -164,13 +165,13 @@ public class Bans {
int playerMenuPage = playerData.getPage(MenuType.BANS), nextEndIndex = islandBans.size() - playerMenuPage * 36;
if (playerMenuPage != 1) {
ItemStack Lhead = SkullItemCreator.byTextureHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
ItemStack Lhead = SkullItemCreator.byTextureUrlHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
nInv.addItem(nInv.createItem(Lhead,
configLoad.getString("Menu.Bans.Item.Previous.Displayname"), null, null, null, null), 1);
}
if (!(nextEndIndex == 0 || nextEndIndex < 0)) {
ItemStack Rhead = SkullItemCreator.byTextureHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
ItemStack Rhead = SkullItemCreator.byTextureUrlHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
nInv.addItem(nInv.createItem(Rhead,
configLoad.getString("Menu.Bans.Item.Next.Displayname"), null, null, null, null), 7);
}
@ -212,7 +213,11 @@ public class Bans {
if (targetPlayerTexture.length >= 1 && targetPlayerTexture[0] != null) {
phead = SkullItemCreator.byTextureValue(targetPlayerTexture[0]);
} else {
phead = SkullItemCreator.byUuid(targetPlayerUUID);
try {
phead = SkullItemCreator.byUuid(targetPlayerUUID).get();
} catch (InterruptedException | ExecutionException ex) {
throw new RuntimeException(ex);
}
}
nInv.addItem(

View File

@ -28,6 +28,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
public class Information {
private static Information instance;
@ -341,14 +342,14 @@ public class Information {
nextEndIndex = displayedMembers.size() - playerMenuPage * 36;
if (playerMenuPage != 1) {
ItemStack Lhead = SkullItemCreator.byTextureHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
ItemStack Lhead = SkullItemCreator.byTextureUrlHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
nInv.addItem(nInv.createItem(Lhead,
configLoad.getString("Menu.Information.Members.Item.Previous.Displayname"), null, null,
null, null), 1);
}
if (!(nextEndIndex == 0 || nextEndIndex < 0)) {
ItemStack Rhead = SkullItemCreator.byTextureHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
ItemStack Rhead = SkullItemCreator.byTextureUrlHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
nInv.addItem(nInv.createItem(Rhead,
configLoad.getString("Menu.Information.Members.Item.Next.Displayname"), null, null,
null, null), 7);
@ -391,7 +392,11 @@ public class Information {
if (playerTexture.length >= 1 && playerTexture[0] != null) {
phead = SkullItemCreator.byTextureValue(playerTexture[0]);
} else {
phead = SkullItemCreator.byUuid(playerUUID);
try {
phead = SkullItemCreator.byUuid(playerUUID).get();
} catch (InterruptedException | ExecutionException ex) {
throw new RuntimeException(ex);
}
}
nInv.addItem(
@ -489,14 +494,14 @@ public class Information {
nextEndIndex = displayedVisitors.size() - playerMenuPage * 36;
if (playerMenuPage != 1) {
ItemStack Lhead = SkullItemCreator.byTextureHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
ItemStack Lhead = SkullItemCreator.byTextureUrlHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
nInv.addItem(nInv.createItem(Lhead,
configLoad.getString("Menu.Information.Visitors.Item.Previous.Displayname"), null, null,
null, null), 1);
}
if (!(nextEndIndex == 0 || nextEndIndex < 0)) {
ItemStack Rhead = SkullItemCreator.byTextureHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
ItemStack Rhead = SkullItemCreator.byTextureUrlHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
nInv.addItem(nInv.createItem(Rhead,
configLoad.getString("Menu.Information.Visitors.Item.Next.Displayname"), null, null,
null, null), 7);
@ -532,7 +537,11 @@ public class Information {
if (playerTexture.length >= 1 && playerTexture[0] != null) {
phead = SkullItemCreator.byTextureValue(playerTexture[0]);
} else {
phead = SkullItemCreator.byUuid(playerUUID);
try {
phead = SkullItemCreator.byUuid(playerUUID).get();
} catch (InterruptedException | ExecutionException ex) {
throw new RuntimeException(ex);
}
}
nInv.addItem(

View File

@ -1,6 +1,5 @@
package com.craftaro.skyblock.menus;
import com.craftaro.core.utils.ItemUtils;
import com.craftaro.core.utils.NumberUtils;
import com.craftaro.core.utils.SkullItemCreator;
import com.craftaro.skyblock.SkyBlock;
@ -12,12 +11,9 @@ import com.craftaro.skyblock.utils.player.OfflinePlayer;
import com.craftaro.skyblock.visit.Visit;
import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
import com.craftaro.third_party.com.cryptomorin.xseries.XSound;
import com.craftaro.third_party.com.cryptomorin.xseries.profiles.builder.XSkull;
import com.craftaro.third_party.com.cryptomorin.xseries.profiles.objects.Profileable;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.block.Skull;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
@ -25,6 +21,7 @@ import org.bukkit.inventory.ItemStack;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
public class Leaderboard {
private static Leaderboard instance;
@ -294,9 +291,13 @@ public class Leaderboard {
ItemStack phead;
if (playerTexture.length >= 1 && playerTexture[0] != null) {
phead = XSkull.createItem().profile(new Profileable.PlayerProfileable(player)).apply();
phead = SkullItemCreator.byTextureValue(playerTexture[0]);
} else {
phead = XSkull.createItem().profile(new Profileable.PlayerProfileable(player)).apply();
try {
phead = SkullItemCreator.byUuid(visit.getOwnerUUID()).get();
} catch (InterruptedException | ExecutionException ex) {
throw new RuntimeException(ex);
}
}
nInv.addItem(
@ -321,7 +322,7 @@ public class Leaderboard {
for (int i = 0; i < itemSlots.length; i++) {
if (!nInv.getItems().containsKey(itemSlots[i])) {
ItemStack qhead = SkullItemCreator.byTextureHash("d34e063cafb467a5c8de43ec78619399f369f4a52434da8017a983cdd92516a0");
ItemStack qhead = SkullItemCreator.byTextureUrlHash("d34e063cafb467a5c8de43ec78619399f369f4a52434da8017a983cdd92516a0");
nInv.addItem(nInv.createItem(qhead,
configLoad.getString("Menu.Leaderboard.Leaderboard.Item.Empty.Displayname")
.replace("%position", "" + (i + 1)),

View File

@ -226,13 +226,13 @@ public class Levelling {
nInv.addItem(nInv.createItem(XMaterial.BLACK_STAINED_GLASS_PANE.parseItem(), configLoad.getString("Menu.Levelling.Item.Barrier.Displayname"), null, null, null, null), 9, 10, 11, 12, 13, 14, 15, 16, 17);
if (playerMenuPage != 1) {
ItemStack Lhead = SkullItemCreator.byTextureHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
ItemStack Lhead = SkullItemCreator.byTextureUrlHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
nInv.addItem(nInv.createItem(Lhead,
configLoad.getString("Menu.Levelling.Item.Previous.Displayname"), null, null, null, null), 1);
}
if (!(nextEndIndex == 0 || nextEndIndex < 0)) {
ItemStack Rhead = SkullItemCreator.byTextureHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
ItemStack Rhead = SkullItemCreator.byTextureUrlHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
nInv.addItem(nInv.createItem(Rhead,
configLoad.getString("Menu.Levelling.Item.Next.Displayname"), null, null, null, null), 7);
}

View File

@ -1,8 +1,6 @@
package com.craftaro.skyblock.menus;
import com.craftaro.core.utils.SkullItemCreator;
import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
import com.craftaro.third_party.com.cryptomorin.xseries.XSound;
import com.craftaro.skyblock.SkyBlock;
import com.craftaro.skyblock.config.FileManager;
import com.craftaro.skyblock.island.Island;
@ -17,6 +15,8 @@ import com.craftaro.skyblock.utils.NumberUtil;
import com.craftaro.skyblock.utils.StringUtil;
import com.craftaro.skyblock.utils.item.nInventoryUtil;
import com.craftaro.skyblock.utils.player.OfflinePlayer;
import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
import com.craftaro.third_party.com.cryptomorin.xseries.XSound;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
@ -36,6 +36,7 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
public class Members {
private static Members instance;
@ -351,13 +352,13 @@ public class Members {
9, 10, 11, 12, 13, 14, 15, 16, 17);
if (playerMenuPage != 1) {
ItemStack Lhead = SkullItemCreator.byTextureHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
ItemStack Lhead = SkullItemCreator.byTextureUrlHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
nInv.addItem(nInv.createItem(Lhead,
configLoad.getString("Menu.Members.Item.Previous.Displayname"), null, null, null, null), 1);
}
if (!(nextEndIndex == 0 || nextEndIndex < 0)) {
ItemStack Rhead = SkullItemCreator.byTextureHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
ItemStack Rhead = SkullItemCreator.byTextureUrlHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
nInv.addItem(nInv.createItem(Rhead,
configLoad.getString("Menu.Members.Item.Next.Displayname"), null, null, null, null), 7);
}
@ -560,7 +561,12 @@ public class Members {
}
}
ItemStack phead = SkullItemCreator.byUsername(playerName);
ItemStack phead;
try {
phead = SkullItemCreator.byUuid(playerUUID).get();
} catch (InterruptedException | ExecutionException ex) {
throw new RuntimeException(ex);
}
nInv.addItem(
nInv.createItem(phead,
configLoad.getString("Menu.Members.Item.Member.Displayname").replace("%player",

View File

@ -15,8 +15,6 @@ import com.craftaro.skyblock.playerdata.PlayerDataManager;
import com.craftaro.skyblock.sound.SoundManager;
import com.craftaro.skyblock.utils.item.nInventoryUtil;
import com.craftaro.skyblock.utils.player.OfflinePlayer;
import com.craftaro.third_party.com.cryptomorin.xseries.profiles.builder.XSkull;
import com.craftaro.third_party.com.cryptomorin.xseries.profiles.objects.Profileable;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
@ -28,6 +26,7 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
public class Ownership {
private static Ownership instance;
@ -230,9 +229,13 @@ public class Ownership {
ItemStack phead;
if (playerTexture.length >= 1 && playerTexture[0] != null) {
phead = XSkull.createItem().profile(new Profileable.PlayerProfileable(player)).apply();
phead = SkullItemCreator.byTextureValue(playerTexture[0]);
} else {
phead = XSkull.createItem().profile(new Profileable.PlayerProfileable(player)).apply();
try {
phead = SkullItemCreator.byUuid(originalOwnerUUID).get();
} catch (InterruptedException | ExecutionException ex) {
throw new RuntimeException(ex);
}
}
nInv.addItem(nInv.createItem(XMaterial.OAK_FENCE_GATE.parseItem(),

View File

@ -32,6 +32,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
public class Visit {
private static Visit instance;
@ -353,13 +354,13 @@ public class Visit {
9, 10, 11, 12, 13, 14, 15, 16, 17);
if (playerMenuPage != 1) {
ItemStack Lhead = SkullItemCreator.byTextureHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
ItemStack Lhead = SkullItemCreator.byTextureUrlHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
nInv.addItem(nInv.createItem(Lhead,
configLoad.getString("Menu.Visit.Item.Previous.Displayname"), null, null, null, null), 1);
}
if (!(nextEndIndex == 0 || nextEndIndex < 0)) {
ItemStack Rhead = SkullItemCreator.byTextureHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
ItemStack Rhead = SkullItemCreator.byTextureUrlHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
nInv.addItem(nInv.createItem(Rhead,
configLoad.getString("Menu.Visit.Item.Next.Displayname"), null, null, null, null), 7);
}
@ -470,7 +471,11 @@ public class Visit {
if (targetPlayerTexture.length >= 1 && targetPlayerTexture[0] != null) {
phead = SkullItemCreator.byTextureValue(targetPlayerTexture[0]);
} else {
phead = SkullItemCreator.byUuid(visit.getOwnerUUID());
try {
phead = SkullItemCreator.byUuid(visit.getOwnerUUID()).get();
} catch (InterruptedException | ExecutionException ex) {
throw new RuntimeException(ex);
}
}
nInv.addItem(nInv.createItem(phead,
@ -513,7 +518,11 @@ public class Visit {
if (targetPlayerTexture.length >= 1 && targetPlayerTexture[0] != null) {
phead = SkullItemCreator.byTextureValue(targetPlayerTexture[0]);
} else {
phead = SkullItemCreator.byUuid(visit.getOwnerUUID());
try {
phead = SkullItemCreator.byUuid(visit.getOwnerUUID()).get();
} catch (InterruptedException | ExecutionException ex) {
throw new RuntimeException(ex);
}
}
nInv.addItem(nInv.createItem(phead,

View File

@ -186,13 +186,13 @@ public class Visitors {
int playerMenuPage = playerData.getPage(MenuType.VISITORS), nextEndIndex = sortedIslandVisitors.size() - playerMenuPage * 36;
if (playerMenuPage != 1) {
ItemStack Lhead = SkullItemCreator.byTextureHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
ItemStack Lhead = SkullItemCreator.byTextureUrlHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
nInv.addItem(nInv.createItem(Lhead,
configLoad.getString("Menu.Visitors.Item.Previous.Displayname"), null, null, null, null), 1);
}
if (!(nextEndIndex == 0 || nextEndIndex < 0)) {
ItemStack Rhead = SkullItemCreator.byTextureHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
ItemStack Rhead = SkullItemCreator.byTextureUrlHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
nInv.addItem(nInv.createItem(Rhead,
configLoad.getString("Menu.Visitors.Item.Next.Displayname"), null, null, null, null), 7);
}

View File

@ -79,14 +79,14 @@ public class Creator implements Listener {
int playerMenuPage = playerData.getPage(MenuType.ADMIN_CREATOR), nextEndIndex = structures.size() - playerMenuPage * 36;
if (playerMenuPage != 1) {
ItemStack Lhead = SkullItemCreator.byTextureHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
ItemStack Lhead = SkullItemCreator.byTextureUrlHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
nInv.addItem(nInv.createItem(Lhead,
configLoad.getString("Menu.Admin.Creator.Browse.Item.Previous.Displayname"), null, null, null,
null), 1);
}
if (!(nextEndIndex == 0 || nextEndIndex < 0)) {
ItemStack Rhead = SkullItemCreator.byTextureHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
ItemStack Rhead = SkullItemCreator.byTextureUrlHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
nInv.addItem(nInv.createItem(Rhead,
configLoad.getString("Menu.Admin.Creator.Browse.Item.Next.Displayname"), null, null, null,
null), 7);

View File

@ -79,14 +79,14 @@ public class Generator implements Listener {
int playerMenuPage = playerData.getPage(MenuType.ADMIN_GENERATOR), nextEndIndex = generators.size() - playerMenuPage * 36;
if (playerMenuPage != 1) {
ItemStack Lhead = SkullItemCreator.byTextureHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
ItemStack Lhead = SkullItemCreator.byTextureUrlHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
nInv.addItem(nInv.createItem(Lhead,
configLoad.getString("Menu.Admin.Generator.Browse.Item.Previous.Displayname"), null, null, null,
null), 1);
}
if (!(nextEndIndex == 0 || nextEndIndex < 0)) {
ItemStack Rhead = SkullItemCreator.byTextureHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
ItemStack Rhead = SkullItemCreator.byTextureUrlHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
nInv.addItem(nInv.createItem(Rhead,
configLoad.getString("Menu.Admin.Generator.Browse.Item.Next.Displayname"), null, null, null,
null), 7);

View File

@ -104,13 +104,13 @@ public class Levelling implements Listener {
int playerMenuPage = playerData.getPage(MenuType.ADMIN_LEVELLING), nextEndIndex = levellingMaterials.size() - playerMenuPage * 36;
if (playerMenuPage != 1) {
ItemStack Lhead = SkullItemCreator.byTextureHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
ItemStack Lhead = SkullItemCreator.byTextureUrlHash("3ebf907494a935e955bfcadab81beafb90fb9be49c7026ba97d798d5f1a23");
nInv.addItem(nInv.createItem(Lhead,
configLoad.getString("Menu.Admin.Levelling.Item.Previous.Displayname"), null, null, null, null), 1);
}
if (!(nextEndIndex == 0 || nextEndIndex < 0)) {
ItemStack Rhead = SkullItemCreator.byTextureHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
ItemStack Rhead = SkullItemCreator.byTextureUrlHash("1b6f1a25b6bc199946472aedb370522584ff6f4e83221e5946bd2e41b5ca13b");
nInv.addItem(nInv.createItem(Rhead,
configLoad.getString("Menu.Admin.Levelling.Item.Next.Displayname"), null, null, null, null), 7);
}