From 609d3b00343b6da703124da3407abc9347e0c580 Mon Sep 17 00:00:00 2001 From: Brett K <47841184+captainbboy@users.noreply.github.com> Date: Fri, 10 Jan 2025 11:21:41 -0600 Subject: [PATCH] Makes Networks compatible with Slimefun's 1.21 update Does not use CustomItemStack initialization --- pom.xml | 2 +- .../networks/slimefun/NetworksItemGroups.java | 12 +++++------ .../slimefun/network/NetworkAutoCrafter.java | 4 ++-- .../slimefun/network/NetworkControlV.java | 4 ++-- .../slimefun/network/NetworkControlX.java | 4 ++-- .../slimefun/network/NetworkDirectional.java | 8 ++++---- .../slimefun/network/NetworkEncoder.java | 4 ++-- .../slimefun/network/NetworkExport.java | 4 ++-- .../slimefun/network/NetworkGreedyBlock.java | 4 ++-- .../slimefun/network/NetworkPowerDisplay.java | 6 +++--- .../slimefun/network/NetworkPurger.java | 2 +- .../slimefun/network/NetworkPusher.java | 4 ++-- .../network/NetworkQuantumStorage.java | 10 +++++----- .../network/NetworkQuantumWorkbench.java | 2 +- .../network/NetworkWirelessReceiver.java | 2 +- .../network/NetworkWirelessTransmitter.java | 2 +- .../slimefun/network/grid/AbstractGrid.java | 20 +++++++++---------- .../network/grid/NetworkCraftingGrid.java | 2 +- .../slimefun/tools/NetworkConfigurator.java | 1 - .../github/sefiraat/networks/utils/Theme.java | 2 +- 20 files changed, 49 insertions(+), 50 deletions(-) diff --git a/pom.xml b/pom.xml index bb5c24540..586021a48 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ com.github.Slimefun Slimefun4 - 0a7fea8 + walshy~mc-1.21-RC-7-g47092df-5828 provided diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/NetworksItemGroups.java b/src/main/java/io/github/sefiraat/networks/slimefun/NetworksItemGroups.java index 86debd9e5..3eccdf28d 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/NetworksItemGroups.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/NetworksItemGroups.java @@ -20,7 +20,7 @@ public final class NetworksItemGroups { public static final MainFlexGroup MAIN = new MainFlexGroup( Keys.newKey("main"), - new CustomItemStack( + CustomItemStack.create( new ItemStack(Material.BLACK_STAINED_GLASS), Theme.MAIN.getColor() + "Networks" ) @@ -28,7 +28,7 @@ public final class NetworksItemGroups { public static final DummyItemGroup MATERIALS = new DummyItemGroup( Keys.newKey("materials"), - new CustomItemStack( + CustomItemStack.create( new ItemStack(Material.WHITE_STAINED_GLASS), Theme.MAIN.getColor() + "Crafting Materials" ) @@ -36,7 +36,7 @@ public final class NetworksItemGroups { public static final DummyItemGroup TOOLS = new DummyItemGroup( Keys.newKey("tools"), - new CustomItemStack( + CustomItemStack.create( new ItemStack(Material.PAINTING), Theme.MAIN.getColor() + "Network Management Tools" ) @@ -44,7 +44,7 @@ public final class NetworksItemGroups { public static final DummyItemGroup NETWORK_ITEMS = new DummyItemGroup( Keys.newKey("network_items"), - new CustomItemStack( + CustomItemStack.create( new ItemStack(Material.BLACK_STAINED_GLASS), Theme.MAIN.getColor() + "Network Items" ) @@ -52,7 +52,7 @@ public final class NetworksItemGroups { public static final DummyItemGroup NETWORK_QUANTUMS = new DummyItemGroup( Keys.newKey("network_quantums"), - new CustomItemStack( + CustomItemStack.create( new ItemStack(Material.WHITE_TERRACOTTA), Theme.MAIN.getColor() + "Network Quantum Storage Devices" ) @@ -60,7 +60,7 @@ public final class NetworksItemGroups { public static final ItemGroup DISABLED_ITEMS = new HiddenItemGroup( Keys.newKey("disabled_items"), - new CustomItemStack( + CustomItemStack.create( new ItemStack(Material.BARRIER), Theme.MAIN.getColor() + "Disabled/Removed Items" ) diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkAutoCrafter.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkAutoCrafter.java index 112d56f4f..78cc59cd6 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkAutoCrafter.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkAutoCrafter.java @@ -52,11 +52,11 @@ public class NetworkAutoCrafter extends NetworkObject { private static final int BLUEPRINT_SLOT = 10; private static final int OUTPUT_SLOT = 16; - public static final CustomItemStack BLUEPRINT_BACKGROUND_STACK = new CustomItemStack( + public static final ItemStack BLUEPRINT_BACKGROUND_STACK = CustomItemStack.create( Material.BLUE_STAINED_GLASS_PANE, Theme.PASSIVE + "Crafting Blueprint" ); - public static final CustomItemStack OUTPUT_BACKGROUND_STACK = new CustomItemStack( + public static final ItemStack OUTPUT_BACKGROUND_STACK = CustomItemStack.create( Material.GREEN_STAINED_GLASS_PANE, Theme.PASSIVE + "Output" ); diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkControlV.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkControlV.java index e62fda7af..941d9d618 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkControlV.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkControlV.java @@ -53,7 +53,7 @@ public class NetworkControlV extends NetworkDirectional { private final Set blockCache = new HashSet<>(); - public static final CustomItemStack TEMPLATE_BACKGROUND_STACK = new CustomItemStack( + public static final ItemStack TEMPLATE_BACKGROUND_STACK = CustomItemStack.create( Material.BLUE_STAINED_GLASS_PANE, Theme.PASSIVE + "Paste items matching template" ); @@ -166,7 +166,7 @@ protected int[] getOtherBackgroundSlots() { @Nullable @Override - protected CustomItemStack getOtherBackgroundStack() { + protected ItemStack getOtherBackgroundStack() { return TEMPLATE_BACKGROUND_STACK; } diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkControlX.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkControlX.java index 3a31da924..a0bb911ef 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkControlX.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkControlX.java @@ -52,7 +52,7 @@ public class NetworkControlX extends NetworkDirectional { private final Set blockCache = new HashSet<>(); - public static final CustomItemStack TEMPLATE_BACKGROUND_STACK = new CustomItemStack( + public static final ItemStack TEMPLATE_BACKGROUND_STACK = CustomItemStack.create( Material.BLUE_STAINED_GLASS_PANE, Theme.PASSIVE + "Cut items matching template.", Theme.PASSIVE + "Leaving blank will cut anything" @@ -167,7 +167,7 @@ protected int[] getOtherBackgroundSlots() { @Nullable @Override - protected CustomItemStack getOtherBackgroundStack() { + protected ItemStack getOtherBackgroundStack() { return TEMPLATE_BACKGROUND_STACK; } diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkDirectional.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkDirectional.java index c2b64e519..c955f972a 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkDirectional.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkDirectional.java @@ -276,7 +276,7 @@ protected int[] getOtherBackgroundSlots() { } @Nullable - protected CustomItemStack getOtherBackgroundStack() { + protected ItemStack getOtherBackgroundStack() { return null; } @@ -314,7 +314,7 @@ public int[] getItemSlots() { @Nonnull public static ItemStack getDirectionalSlotPane(@Nonnull BlockFace blockFace, @Nonnull SlimefunItem slimefunItem, boolean active) { - final ItemStack displayStack = new CustomItemStack( + final ItemStack displayStack = CustomItemStack.create( slimefunItem.getItem(), Theme.PASSIVE + "Direction " + blockFace.name() + " (" + ChatColor.stripColor(slimefunItem.getItemName()) + ")" ); @@ -334,7 +334,7 @@ public static ItemStack getDirectionalSlotPane(@Nonnull BlockFace blockFace, @No @Nonnull public static ItemStack getDirectionalSlotPane(@Nonnull BlockFace blockFace, @Nonnull Material blockMaterial, boolean active) { if (blockMaterial.isItem() && !blockMaterial.isAir()) { - final ItemStack displayStack = new CustomItemStack( + final ItemStack displayStack = CustomItemStack.create( blockMaterial, Theme.PASSIVE + "Direction " + blockFace.name() + " (" + blockMaterial.name() + ")" ); @@ -351,7 +351,7 @@ public static ItemStack getDirectionalSlotPane(@Nonnull BlockFace blockFace, @No return displayStack; } else { Material material = active ? Material.GREEN_STAINED_GLASS_PANE : Material.RED_STAINED_GLASS_PANE; - return new CustomItemStack( + return CustomItemStack.create( material, ChatColor.GRAY + "Set direction: " + blockFace.name() ); diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkEncoder.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkEncoder.java index e6137bf67..990ace78f 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkEncoder.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkEncoder.java @@ -48,11 +48,11 @@ public class NetworkEncoder extends NetworkObject { private static final int CHARGE_COST = 20000; - public static final CustomItemStack BLUEPRINT_BACK_STACK = new CustomItemStack( + public static final ItemStack BLUEPRINT_BACK_STACK = CustomItemStack.create( Material.BLUE_STAINED_GLASS_PANE, Theme.PASSIVE + "Blank Blueprint" ); - public static final CustomItemStack ENCODE_STACK = new CustomItemStack( + public static final ItemStack ENCODE_STACK = CustomItemStack.create( Material.BLUE_STAINED_GLASS_PANE, Theme.PASSIVE + "Click to encode when valid" ); diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkExport.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkExport.java index a4f6ec429..8d4c5ebdd 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkExport.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkExport.java @@ -39,12 +39,12 @@ public class NetworkExport extends NetworkObject { private static final int OUTPUT_ITEM_SLOT = 24; private static final int[] OUTPUT_ITEM_BACKDROP = {14, 15, 16, 23, 25, 32, 33, 34}; - private static final CustomItemStack TEST_BACKDROP_STACK = new CustomItemStack( + private static final ItemStack TEST_BACKDROP_STACK = CustomItemStack.create( Material.GREEN_STAINED_GLASS_PANE, Theme.SUCCESS + "Export Item Matching" ); - private static final CustomItemStack OUTPUT_BACKDROP_STACK = new CustomItemStack( + private static final ItemStack OUTPUT_BACKDROP_STACK = CustomItemStack.create( Material.ORANGE_STAINED_GLASS_PANE, Theme.SUCCESS + "Output Slot" ); diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkGreedyBlock.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkGreedyBlock.java index c44228fbc..2a3a95b83 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkGreedyBlock.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkGreedyBlock.java @@ -32,12 +32,12 @@ public class NetworkGreedyBlock extends NetworkObject { 6,7,8,15,17,24,25,26 }; - private static final CustomItemStack TEMPLATE_BACKGROUND_STACK = new CustomItemStack( + private static final ItemStack TEMPLATE_BACKGROUND_STACK = CustomItemStack.create( Material.GREEN_STAINED_GLASS_PANE, Theme.SUCCESS + "Store items matching" ); - private static final CustomItemStack STORAGE_BACKGROUND_STACK = new CustomItemStack( + private static final ItemStack STORAGE_BACKGROUND_STACK = CustomItemStack.create( Material.ORANGE_STAINED_GLASS_PANE, Theme.SUCCESS + "Storage" ); diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkPowerDisplay.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkPowerDisplay.java index 10e53cd2c..ea1cd400a 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkPowerDisplay.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkPowerDisplay.java @@ -33,7 +33,7 @@ public class NetworkPowerDisplay extends NetworkObject { }; private static final int DISPLAY_SLOT = 4; - private static final CustomItemStack EMPTY = new CustomItemStack( + private static final ItemStack EMPTY = CustomItemStack.create( Material.RED_STAINED_GLASS_PANE, Theme.CLICK_INFO + "Status", Theme.PASSIVE + "Disconnected" @@ -98,8 +98,8 @@ public int[] getSlotsAccessedByItemTransport(ItemTransportFlow flow) { }; } - private static CustomItemStack getChargeStack(long charge) { - return new CustomItemStack( + private static ItemStack getChargeStack(long charge) { + return CustomItemStack.create( Material.GREEN_STAINED_GLASS_PANE, Theme.CLICK_INFO + "Status", Theme.PASSIVE + "Current Network Charge: " + charge + "j" diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkPurger.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkPurger.java index 4ec2451b4..765a96896 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkPurger.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkPurger.java @@ -39,7 +39,7 @@ public class NetworkPurger extends NetworkObject { private static final int TEST_ITEM_SLOT = 13; private static final int[] TEST_ITEM_BACKDROP = {3, 4, 5, 12, 14, 21, 22, 23}; - private static final CustomItemStack TEST_BACKDROP_STACK = new CustomItemStack( + private static final ItemStack TEST_BACKDROP_STACK = CustomItemStack.create( Material.GREEN_STAINED_GLASS_PANE, Theme.SUCCESS + "Purge Item Matching" ); diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkPusher.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkPusher.java index 57dad76c9..2e1f13ec0 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkPusher.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkPusher.java @@ -37,7 +37,7 @@ public class NetworkPusher extends NetworkDirectional { private static final int UP_SLOT = 14; private static final int DOWN_SLOT = 32; - public static final CustomItemStack TEMPLATE_BACKGROUND_STACK = new CustomItemStack( + public static final ItemStack TEMPLATE_BACKGROUND_STACK = CustomItemStack.create( Material.BLUE_STAINED_GLASS_PANE, Theme.PASSIVE + "Push items matching template" ); @@ -121,7 +121,7 @@ protected int[] getOtherBackgroundSlots() { @Nullable @Override - protected CustomItemStack getOtherBackgroundStack() { + protected ItemStack getOtherBackgroundStack() { return TEMPLATE_BACKGROUND_STACK; } diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumStorage.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumStorage.java index 311097ec2..5ac10d982 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumStorage.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumStorage.java @@ -64,31 +64,31 @@ public class NetworkQuantumStorage extends SlimefunItem implements DistinctiveIt public static final int ITEM_SET_SLOT = 13; public static final int OUTPUT_SLOT = 7; - private static final ItemStack BACK_INPUT = new CustomItemStack( + private static final ItemStack BACK_INPUT = CustomItemStack.create( Material.GREEN_STAINED_GLASS_PANE, Theme.PASSIVE + "Input" ); - private static final ItemStack BACK_ITEM = new CustomItemStack( + private static final ItemStack BACK_ITEM = CustomItemStack.create( Material.BLUE_STAINED_GLASS_PANE, Theme.PASSIVE + "Item Stored" ); - private static final ItemStack NO_ITEM = new CustomItemStack( + private static final ItemStack NO_ITEM = CustomItemStack.create( Material.RED_STAINED_GLASS_PANE, Theme.ERROR + "No Registered Item", Theme.PASSIVE + "Click the icon below while", Theme.PASSIVE + "holding an item to register it." ); - private static final ItemStack SET_ITEM = new CustomItemStack( + private static final ItemStack SET_ITEM = CustomItemStack.create( Material.LIME_STAINED_GLASS_PANE, Theme.SUCCESS + "Set Item", Theme.PASSIVE + "Drag an item on top of this pane to register it.", Theme.PASSIVE + "Shift Click to change voiding" ); - private static final ItemStack BACK_OUTPUT = new CustomItemStack( + private static final ItemStack BACK_OUTPUT = CustomItemStack.create( Material.ORANGE_STAINED_GLASS_PANE, Theme.PASSIVE + "Output" ); diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumWorkbench.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumWorkbench.java index 56d05f7ff..743b50ede 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumWorkbench.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumWorkbench.java @@ -42,7 +42,7 @@ public class NetworkQuantumWorkbench extends SlimefunItem { private static final int CRAFT_SLOT = 23; private static final int OUTPUT_SLOT = 25; - private static final CustomItemStack CRAFT_BUTTON_STACK = new CustomItemStack( + private static final ItemStack CRAFT_BUTTON_STACK = CustomItemStack.create( Material.CRAFTING_TABLE, Theme.CLICK_INFO + "Click to entangle" ); diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkWirelessReceiver.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkWirelessReceiver.java index 673623554..2c371a217 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkWirelessReceiver.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkWirelessReceiver.java @@ -37,7 +37,7 @@ public class NetworkWirelessReceiver extends NetworkObject { 3, 4, 5, 12, 14, 21, 22, 23 }; - private static final CustomItemStack RECEIVED_BACKGROUND_STACK = new CustomItemStack( + private static final ItemStack RECEIVED_BACKGROUND_STACK = CustomItemStack.create( Material.GREEN_STAINED_GLASS_PANE, Theme.SUCCESS + "Received items" ); diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkWirelessTransmitter.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkWirelessTransmitter.java index 1dd3829b4..63b0a8ccd 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkWirelessTransmitter.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkWirelessTransmitter.java @@ -43,7 +43,7 @@ public class NetworkWirelessTransmitter extends NetworkObject { 3, 4, 5, 12, 14, 21, 22, 23 }; - private static final CustomItemStack TEMPLATE_BACKGROUND_STACK = new CustomItemStack( + private static final ItemStack TEMPLATE_BACKGROUND_STACK = CustomItemStack.create( Material.GREEN_STAINED_GLASS_PANE, Theme.SUCCESS + "Transmit items matching" ); diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/grid/AbstractGrid.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/grid/AbstractGrid.java index 21f882d8a..1239add31 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/network/grid/AbstractGrid.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/grid/AbstractGrid.java @@ -42,27 +42,27 @@ public abstract class AbstractGrid extends NetworkObject { - private static final CustomItemStack BLANK_SLOT_STACK = new CustomItemStack( + private static final ItemStack BLANK_SLOT_STACK = CustomItemStack.create( Material.LIGHT_GRAY_STAINED_GLASS_PANE, " " ); - private static final CustomItemStack PAGE_PREVIOUS_STACK = new CustomItemStack( + private static final ItemStack PAGE_PREVIOUS_STACK = CustomItemStack.create( Material.RED_STAINED_GLASS_PANE, Theme.CLICK_INFO.getColor() + "Previous Page" ); - private static final CustomItemStack PAGE_NEXT_STACK = new CustomItemStack( + private static final ItemStack PAGE_NEXT_STACK = CustomItemStack.create( Material.RED_STAINED_GLASS_PANE, Theme.CLICK_INFO.getColor() + "Next Page" ); - private static final CustomItemStack CHANGE_SORT_STACK = new CustomItemStack( + private static final ItemStack CHANGE_SORT_STACK = CustomItemStack.create( Material.BLUE_STAINED_GLASS_PANE, Theme.CLICK_INFO.getColor() + "Change Sort Order" ); - private static final CustomItemStack FILTER_STACK = new CustomItemStack( + private static final ItemStack FILTER_STACK = CustomItemStack.create( Material.NAME_TAG, Theme.CLICK_INFO.getColor() + "Set Filter (Right Click to Clear)" ); @@ -350,23 +350,23 @@ public void postRegister() { protected abstract int getFilterSlot(); - protected CustomItemStack getBlankSlotStack() { + protected ItemStack getBlankSlotStack() { return BLANK_SLOT_STACK; } - protected CustomItemStack getPagePreviousStack() { + protected ItemStack getPagePreviousStack() { return PAGE_PREVIOUS_STACK; } - protected CustomItemStack getPageNextStack() { + protected ItemStack getPageNextStack() { return PAGE_NEXT_STACK; } - protected CustomItemStack getChangeSortStack() { + protected ItemStack getChangeSortStack() { return CHANGE_SORT_STACK; } - protected CustomItemStack getFilterStack() { + protected ItemStack getFilterStack() { return FILTER_STACK; } diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/grid/NetworkCraftingGrid.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/grid/NetworkCraftingGrid.java index c1c90c036..61f232a4a 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/network/grid/NetworkCraftingGrid.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/grid/NetworkCraftingGrid.java @@ -50,7 +50,7 @@ public class NetworkCraftingGrid extends AbstractGrid { private static final int CRAFT_BUTTON_SLOT = 34; private static final int CRAFT_OUTPUT_SLOT = 43; - private static final CustomItemStack CRAFT_BUTTON_STACK = new CustomItemStack( + private static final ItemStack CRAFT_BUTTON_STACK = CustomItemStack.create( Material.CRAFTING_TABLE, Theme.CLICK_INFO.getColor() + "Craft", Theme.CLICK_INFO + "Left Click: " + Theme.PASSIVE + "Try to Craft", diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkConfigurator.java b/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkConfigurator.java index 971cfd344..742fc819d 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkConfigurator.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkConfigurator.java @@ -2,7 +2,6 @@ import de.jeff_media.morepersistentdatatypes.DataType; import io.github.sefiraat.networks.slimefun.network.NetworkDirectional; -import io.github.sefiraat.networks.slimefun.network.NetworkPusher; import io.github.sefiraat.networks.utils.Keys; import io.github.sefiraat.networks.utils.NetworkUtils; import io.github.sefiraat.networks.utils.StackUtils; diff --git a/src/main/java/io/github/sefiraat/networks/utils/Theme.java b/src/main/java/io/github/sefiraat/networks/utils/Theme.java index 3f4057588..756f6601c 100644 --- a/src/main/java/io/github/sefiraat/networks/utils/Theme.java +++ b/src/main/java/io/github/sefiraat/networks/utils/Theme.java @@ -132,7 +132,7 @@ public static ItemStack themedItemStack(Material material, Theme themeType, Stri } finalLore.add(""); finalLore.add(applyThemeToString(Theme.CLICK_INFO, themeType.getLoreLine())); - return new CustomItemStack( + return CustomItemStack.create( material, Theme.applyThemeToString(themeType, name), finalLore.toArray(new String[finalLore.size() - 1])