Merge pull request 'GUIImprovements' (#64) from GUIImprovements into main

Reviewed-on: SteamWar/SteamWar#64
Reviewed-by: Chaoscaot <max@chaoscaot.de>

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditor.java

@@ -23,6 +23,7 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.gui.BauGUI;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.core.TrickyTrialsWrapper;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
 import de.steamwar.linkage.Linked;
@@ -74,7 +75,7 @@ public class BauGuiEditor implements Listener {
         inv.setItem(mapping.getSize() + 5, new SWItem(Material.BARRIER, BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_TRASH", p), Arrays.asList(BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_TRASH_LORE", p)), false, clickType -> {
         }).getItemStack());
         inv.setItem(mapping.getSize() + 6, new SWItem(TrickyTrialsWrapper.impl.getTurtleScute(), BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_MORE", p)).getItemStack());
-        inv.setItem(mapping.getSize() + 8, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_CLOSE", p)).getItemStack());
+        inv.setItem(mapping.getSize() + 8, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_CLOSE", p)).setCustomModelData(CMDs.BACK).getItemStack());
 
         p.openInventory(inv);
         p.getOpenInventory().setCursor(cursor == null ? new SWItem().getItemStack() : cursor);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/LoaderInteractionElement.java

@@ -20,6 +20,7 @@
 package de.steamwar.bausystem.features.loader.elements;
 
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
@@ -113,7 +114,7 @@ public abstract class LoaderInteractionElement<T extends Enum<T> & LoaderSetting
         });
         listInv.setItem(48, new SWItem(Material.ARROW, "§7Back", clickType -> {
             backAction.run();
-        }));
+        }).setCustomModelData(CMDs.BACK));
         listInv.setItem(50, new SWItem(Material.GHAST_SPAWN_EGG, "§7Insert another Setting", clickType -> {
             elements.add(defaultSetting);
             extraPower.add(0);
@@ -150,7 +151,7 @@ public abstract class LoaderInteractionElement<T extends Enum<T> & LoaderSetting
 
         SWInventory swInventory = new SWInventory(player, guiSize, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_TITLE", player));
         for (int i = guiSize - 9; i < guiSize; i++) swInventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§7", clickType -> {}));
-        swInventory.setItem(guiSize - 9, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_BACK", player)).getItemStack(), clickType -> back.run());
+        swInventory.setItem(guiSize - 9, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_BACK", player)).setCustomModelData(CMDs.BACK).getItemStack(), clickType -> back.run());
         swInventory.setItem(guiSize - 5, new SWItem(Material.WOODEN_AXE, BauSystem.MESSAGE.parse("LOADER_GUI_SETTINGS_COPY", player)).getItemStack(), clickType -> {
             SWAnvilInv swAnvilInv = new SWAnvilInv(player, BauSystem.MESSAGE.parse("LOADER_GUI_COPY_TITLE", player), "1");
             swAnvilInv.setCallback(s -> {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderWait.java

@@ -21,6 +21,7 @@ package de.steamwar.bausystem.features.loader.elements.impl;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.loader.elements.LoaderElement;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
@@ -60,7 +61,7 @@ public class LoaderWait implements LoaderElement {
     public void click(Player player, Runnable backAction) {
         SWInventory swInventory = new SWInventory(player, 18, BauSystem.MESSAGE.parse("LOADER_GUI_WAIT_TITLE", player));
         for (int i = 9; i < 18; i++) swInventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§7"));
-        swInventory.setItem(9, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_WAIT_BACK", player)).getItemStack(), clickType -> backAction.run());
+        swInventory.setItem(9, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LOADER_GUI_WAIT_BACK", player)).setCustomModelData(CMDs.BACK).getItemStack(), clickType -> backAction.run());
 
         swInventory.setItem(3, new SWItem(SWItem.getDye(1), BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_REMOVE_ONE", player), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_REMOVE_ONE_SHIFT", player)), false, clickType -> {}).getItemStack(), clickType -> {
             delay -= clickType.isShiftClick() ? 5 : 1;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupGui.java

@@ -25,6 +25,7 @@ import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorPageGui;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -70,12 +71,12 @@ public class SimulatorGroupGui extends SimulatorPageGui<SimulatorElement<?>> {
 
         inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
             back.open();
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         inventory.setItem(8, new SWItem(Material.BARRIER, "§eDelete", clickType -> {
             simulatorGroup.getElements().clear();
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.DELETE));
 
         inventory.setItem(4, simulatorGroup.toItem(player, clickType -> {
             if (simulatorGroup.getMaterial() == null) return;
@@ -85,7 +86,7 @@ public class SimulatorGroupGui extends SimulatorPageGui<SimulatorElement<?>> {
 
         inventory.setItem(48, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
             new SimulatorGroupSettingsGui(player, simulator, simulatorGroup, this).open();
-        }));
+        }).setCustomModelData(CMDs.Simulator.SETTINGS));
         boolean disabled = simulatorGroup.getMaterial() == null ? simulatorGroup.getElements().stream().allMatch(SimulatorElement::isDisabled) : simulatorGroup.isDisabled();
         inventory.setItem(50, new SWItem(disabled ? Material.ENDER_PEARL : Material.ENDER_EYE, simulatorGroup.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
             if (simulatorGroup.getMaterial() == null) {
@@ -96,7 +97,7 @@ public class SimulatorGroupGui extends SimulatorPageGui<SimulatorElement<?>> {
                 simulatorGroup.setDisabled(!disabled);
             }
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
     }
 
     @Override

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java

@@ -25,10 +25,10 @@ import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
 
 import java.util.Arrays;
 
@@ -58,7 +58,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
         // Back Arrow
         inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
             back.open();
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         // Material Chooser
         inventory.setItem(4, simulatorGroup.toItem(player, clickType -> {
@@ -69,10 +69,10 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
 
         // Base Tick
         int baseTicks = simulatorGroup.getBaseTick();
-        inventory.setItem(9, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             simulatorGroup.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         SWItem baseTick = new SWItem(Material.REPEATER, "§eTicks§8:§7 " + baseTicks, clickType -> {
             new SimulatorAnvilGui<>(player, "Ticks", baseTicks + "", Integer::parseInt, integer -> {
                 if (integer < 0) return false;
@@ -83,14 +83,14 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
         });
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
-        inventory.setItem(27, SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 simulatorGroup.changeBaseTicks(-baseTicks);
             } else {
                 simulatorGroup.changeBaseTicks(clickType.isShiftClick() ? -5 : -1);
             }
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         boolean allTNT = simulatorGroup.getElements().stream().allMatch(TNTElement.class::isInstance);
 
@@ -163,10 +163,10 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
         }
 
         //Pos X
-        inventory.setItem(15, SWItem.getDye(10), "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
             simulatorGroup.move(clickType.isShiftClick() ? (allTNT ? 0.0625 : 5) : 1, 0, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(24, new SWItem(Material.PAPER, "§eX", clickType -> {
             new SimulatorAnvilGui<>(player, "Relative X", "", Double::parseDouble, number -> {
                 if(!allTNT){
@@ -177,16 +177,16 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).setItem(Material.PAPER).open();
         }));
-        inventory.setItem(33, SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
             simulatorGroup.move(clickType.isShiftClick() ? (allTNT ? -0.0625 : -5) : -1, 0, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Y
-        inventory.setItem(16, SWItem.getDye(10), "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
             simulatorGroup.move(0, clickType.isShiftClick() ? (allTNT ? 0.0625 : 5) : 1, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(25, new SWItem(Material.PAPER, "§eY", clickType -> {
             new SimulatorAnvilGui<>(player, "Relative Y", "", Double::parseDouble, number -> {
                 if(!allTNT){
@@ -197,16 +197,16 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).setItem(Material.PAPER).open();
         }));
-        inventory.setItem(34, SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
             simulatorGroup.move(0, clickType.isShiftClick() ? (allTNT ? -0.0625 : -5) : -1, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
 
         //Pos Z
-        inventory.setItem(17, SWItem.getDye(10), "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
             simulatorGroup.move(0, 0, clickType.isShiftClick() ? (allTNT ? 0.0625 : 5) : 1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(26, new SWItem(Material.PAPER, "§eZ", clickType -> {
             new SimulatorAnvilGui<>(player, "Relative Z", "", Double::parseDouble, number -> {
                 if(!allTNT){
@@ -217,9 +217,9 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).setItem(Material.PAPER).open();
         }));
-        inventory.setItem(35, SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
             simulatorGroup.move(0, 0, clickType.isShiftClick() ? (allTNT ? -0.0625 : -5) : -1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGui.java

@@ -24,6 +24,7 @@ import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorPageGui;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -50,7 +51,7 @@ public class SimulatorGui extends SimulatorPageGui<SimulatorGroup> {
         }));
         inventory.setItem(49, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
             new SimulatorSettingsGui(player, simulator, this).open();
-        }));
+        }).setCustomModelData(CMDs.Simulator.SETTINGS));
     }
 
     @Override

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorMaterialGui.java

@@ -23,6 +23,7 @@ import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorPageGui;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -75,7 +76,7 @@ public class SimulatorMaterialGui extends SimulatorPageGui<Material> {
         }));
         inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
             back.open();
-        }));
+        }).setCustomModelData(CMDs.BACK));
     }
 
     @Override

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverGui.java

@@ -26,6 +26,7 @@ import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement;
 import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorScrollGui;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -82,12 +83,12 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
                     new SimulatorGroupGui(player, simulator, newParent, simulatorGui).open();
                 }
             }
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         inventory.setItem(8, new SWItem(Material.BARRIER, "§eDelete", clickType -> {
             observer.getPhases().clear();
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.DELETE));
 
         // Material Chooser
         inventory.setItem(4, observer.toItem(player, clickType -> {
@@ -97,18 +98,18 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
         // Settings
         inventory.setItem(47, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
             new SimulatorObserverSettingsGui(player, simulator, observer, this).open();
-        }));
+        }).setCustomModelData(CMDs.Simulator.SETTINGS));
 
         // Enable/Disable
         inventory.setItem(48, new SWItem(observer.isDisabled() ? Material.ENDER_PEARL : Material.ENDER_EYE, observer.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
             observer.setDisabled(!observer.isDisabled());
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
 
         // Group chooser
         inventory.setItem(51, new SWItem(Material.LEAD, "§eJoin Group", clickType -> {
             new SimulatorGroupChooserGui(player, simulator, observer, observer.getGroup(simulator), this).open();
-        }));
+        }).setCustomModelData(CMDs.Simulator.JOIN_GROUP));
     }
 
     @Override
@@ -151,15 +152,15 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
                 new SWItem(SWItem.getDye(getter.get() < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
                     setter.accept(Math.min(max, getter.get() + (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
-                }),
+                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                 observer,
                 new SWItem(SWItem.getDye(getter.get() > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
                     setter.accept(Math.max(min, getter.get() - (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
-                }),
+                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
                 new SWItem(Material.ANVIL, "§eEdit Activation", clickType -> {
                     new SimulatorObserverPhaseSettingsGui(player, simulator, this.observer, observerPhase, this).open();
-                }),
+                }).setCustomModelData(CMDs.Simulator.EDIT_ACTIVATION),
         };
     }
 
@@ -168,12 +169,12 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
         return new SWItem[]{
                 new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
                     addNewPhase(clickType.isShiftClick());
-                }),
+                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                 new SWItem(Material.QUARTZ, "§eObserver§8:§a New Phase", clickType -> {
                     addNewPhase(false);
-                }),
+                }).setCustomModelData(CMDs.Simulator.NEW_PHASE),
                 new SWItem(SWItem.getDye(8), "§7", clickType -> {
-                }),
+                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
         };
     }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverPhaseSettingsGui.java

@@ -27,6 +27,7 @@ import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.core.Core;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
@@ -62,7 +63,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         // Back Arrow
         inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
             back.open();
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         // Material Chooser
         inventory.setItem(4, observerElement.toItem(player, clickType -> {
@@ -74,7 +75,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
             observerElement.getPhases().remove(observer);
             back.open();
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.DELETE));
 
         int index = observerElement.getPhases().indexOf(observer);
         int min;
@@ -95,10 +96,10 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
 
         //Tick Offset
         int offset = observer.getTickOffset();
-        inventory.setItem(10, SWItem.getDye(offset < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(10, new SWItem(SWItem.getDye(offset < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             observer.setTickOffset(Math.min(max, offset + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         SWItem offsetItem = new SWItem(Material.REPEATER, "§eStart at§8:§7 " + offset, clickType -> {
             new SimulatorAnvilGui<>(player, "Start at", offset + "", Integer::parseInt, integer -> {
@@ -111,17 +112,17 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         offsetItem.getItemStack().setAmount(Math.max(1, Math.min(offset, 64)));
         inventory.setItem(19, offsetItem);
 
-        inventory.setItem(28, SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(28, new SWItem(SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             observer.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Order
         int order = observer.getOrder();
-        inventory.setItem(13, SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             observer.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         Material negativeNumbers = Material.getMaterial(Core.getVersion() >= 19 ? "RECOVERY_COMPASS" : "FIREWORK_STAR");
         SWItem orderItem = new SWItem(order >= 0 ? Material.COMPASS : negativeNumbers, "§eActivation Order§8:§7 " + order, clickType -> {
@@ -136,10 +137,10 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         orderItem.getItemStack().setAmount(Math.max(1, Math.min(Math.abs(order), 30)));
         inventory.setItem(22, orderItem);
 
-        inventory.setItem(31, SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             observer.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         // Update orientation
         inventory.setItem(25, new SWItem(Material.SUNFLOWER, "§7", clickType -> {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverSettingsGui.java

@@ -24,6 +24,7 @@ import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -56,7 +57,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
         // Back Arrow
         inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
             back.open();
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         // Material Chooser
         inventory.setItem(4, observer.toItem(player, clickType -> {
@@ -65,10 +66,10 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
 
         // Base Tick
         int baseTicks = observer.getBaseTick();
-        inventory.setItem(9, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             observer.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         SWItem baseTick = new SWItem(Material.REPEATER, "§eTicks§8:§7 " + baseTicks, clickType -> {
             new SimulatorAnvilGui<>(player, "Ticks", baseTicks + "", Integer::parseInt, integer -> {
                 if (integer < 0) return false;
@@ -79,20 +80,20 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
         });
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
-        inventory.setItem(27, SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 observer.changeBaseTicks(-baseTicks);
             } else {
                 observer.changeBaseTicks(clickType.isShiftClick() ? -5 : -1);
             }
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos X
-        inventory.setItem(15, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(15,  new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             observer.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(24, new SWItem(Material.PAPER, "§eX§8:§7 " + observer.getPosition().getBlockX(), clickType -> {
             new SimulatorAnvilGui<>(player, "X", observer.getPosition().getBlockX() + "", Integer::parseInt, i -> {
                 observer.getPosition().setX(i);
@@ -100,16 +101,16 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(33, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             observer.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Y
-        inventory.setItem(16, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             observer.move(0, clickType.isShiftClick() ? 5 : 1, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
         inventory.setItem(25, new SWItem(Material.PAPER, "§eY§8:§7 " + observer.getPosition().getBlockY(), clickType -> {
             new SimulatorAnvilGui<>(player, "Y", observer.getPosition().getBlockY() + "", Integer::parseInt, i -> {
                 observer.getPosition().setY(i);
@@ -117,16 +118,16 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(34, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             observer.move(0, clickType.isShiftClick() ? -5 : -1, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Z
-        inventory.setItem(17, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             observer.move(0, 0, clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
         inventory.setItem(26, new SWItem(Material.PAPER, "§eZ§8:§7 " + observer.getPosition().getBlockZ(), clickType -> {
             new SimulatorAnvilGui<>(player, "Z", observer.getPosition().getBlockZ() + "", Integer::parseInt, i -> {
                 observer.getPosition().setZ(i);
@@ -134,9 +135,9 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(35, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             observer.move(0, 0, clickType.isShiftClick() ? -5 : -1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneGui.java

@@ -26,6 +26,7 @@ import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement;
 import de.steamwar.bausystem.features.simulator.data.redstone.RedstonePhase;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorScrollGui;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import lombok.AllArgsConstructor;
 import org.bukkit.Material;
@@ -88,12 +89,12 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
                     new SimulatorGroupGui(player, simulator, newParent, simulatorGui).open();
                 }
             }
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         inventory.setItem(8, new SWItem(Material.BARRIER, "§eDelete", clickType -> {
             redstone.getPhases().clear();
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.DELETE));
 
         // Material Chooser
         inventory.setItem(4, redstone.toItem(player, clickType -> {
@@ -103,18 +104,18 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
         // Settings
         inventory.setItem(47, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
             new SimulatorRedstoneSettingsGui(player, simulator, redstone, this).open();
-        }));
+        }).setCustomModelData(CMDs.Simulator.SETTINGS));
 
         // Enable/Disable
         inventory.setItem(48, new SWItem(redstone.isDisabled() ? Material.ENDER_PEARL : Material.ENDER_EYE, redstone.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
             redstone.setDisabled(!redstone.isDisabled());
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
 
         // Group chooser
         inventory.setItem(51, new SWItem(Material.LEAD, "§eJoin Group", clickType -> {
             new SimulatorGroupChooserGui(player, simulator, redstone, redstone.getGroup(simulator), this).open();
-        }));
+        }).setCustomModelData(CMDs.Simulator.JOIN_GROUP));
     }
 
     @Override
@@ -166,15 +167,15 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
                 new SWItem(SWItem.getDye(getter.get() < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
                     setter.accept(Math.min(max, getter.get() + (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
-                }),
+                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                 redstone,
                 new SWItem(SWItem.getDye(getter.get() > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
                     setter.accept(Math.max(min, getter.get() - (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
-                }),
+                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
                 new SWItem(Material.ANVIL, "§eEdit Activation", clickType -> {
                     new SimulatorRedstonePhaseSettingsGui(player, simulator, this.redstone, redstoneSubPhase.phase, this).open();
-                }),
+                }).setCustomModelData(CMDs.Simulator.EDIT_ACTIVATION),
         };
     }
 
@@ -183,12 +184,12 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
         return new SWItem[]{
                 new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
                     addNewPhase(clickType.isShiftClick());
-                }),
+                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                 new SWItem(Material.REDSTONE, "§eRedstone§8:§a New Phase", clickType -> {
                     addNewPhase(false);
-                }),
+                }).setCustomModelData(CMDs.Simulator.NEW_PHASE),
                 new SWItem(SWItem.getDye(8), "§7", clickType -> {
-                }),
+                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
         };
     }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstonePhaseSettingsGui.java

@@ -27,6 +27,7 @@ import de.steamwar.bausystem.features.simulator.data.redstone.RedstonePhase;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.core.Core;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -60,7 +61,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         // Back Arrow
         inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
             back.open();
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         // Material Chooser
         inventory.setItem(4, redstoneElement.toItem(player, clickType -> {
@@ -72,7 +73,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
             redstoneElement.getPhases().remove(redstone);
             back.open();
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.DELETE));
 
         int index = redstoneElement.getPhases().indexOf(redstone);
         int min;
@@ -96,10 +97,10 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
 
         //Tick Offset
         int offset = redstone.getTickOffset();
-        inventory.setItem(10, SWItem.getDye(offset < maxOffset ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(10, new SWItem(SWItem.getDye(offset < maxOffset ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             redstone.setTickOffset(Math.min(maxOffset, offset + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         SWItem offsetItem = new SWItem(Material.REPEATER, "§eStart at§8:§7 " + offset, clickType -> {
             new SimulatorAnvilGui<>(player, "Start at", offset + "", Integer::parseInt, integer -> {
@@ -112,17 +113,17 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         offsetItem.getItemStack().setAmount(Math.max(1, Math.min(offset, 64)));
         inventory.setItem(19, offsetItem);
 
-        inventory.setItem(28, SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(28, new SWItem(SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             redstone.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Lifetime
         int lifetime = redstone.getLifetime();
-        inventory.setItem(11, SWItem.getDye(lifetime < maxLifetime ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(11, new SWItem(SWItem.getDye(lifetime < maxLifetime ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             redstone.setLifetime(Math.min(maxLifetime, lifetime + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         SWItem lifetimeItem = new SWItem(Material.CLOCK, "§eActivation Time§8:§7 " + lifetime, clickType -> {
             new SimulatorAnvilGui<>(player, "Activation Time", lifetime + "", Integer::parseInt, integer -> {
@@ -135,17 +136,17 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         lifetimeItem.getItemStack().setAmount(Math.max(1, Math.min(lifetime, 64)));
         inventory.setItem(20, lifetimeItem);
 
-        inventory.setItem(29, SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(29, new SWItem(SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             redstone.setLifetime(Math.max(0, lifetime - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Order
         int order = redstone.getOrder();
-        inventory.setItem(13, SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             redstone.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         Material negativeNumbers = Material.getMaterial(Core.getVersion() >= 19 ? "RECOVERY_COMPASS" : "FIREWORK_STAR");
         SWItem orderItem = new SWItem(order >= 0 ? Material.COMPASS : negativeNumbers, "§eActivation Order§8:§7 " + order, clickType -> {
@@ -160,9 +161,9 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         orderItem.getItemStack().setAmount(Math.max(1, Math.min(Math.abs(order), 30)));
         inventory.setItem(22, orderItem);
 
-        inventory.setItem(31, SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             redstone.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneSettingsGui.java

@@ -24,6 +24,7 @@ import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -55,7 +56,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
         // Back Arrow
         inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
             back.open();
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         // Material Chooser
         inventory.setItem(4, redstone.toItem(player, clickType -> {
@@ -64,10 +65,10 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
 
         // Base Tick
         int baseTicks = redstone.getBaseTick();
-        inventory.setItem(9, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             redstone.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         SWItem baseTick = new SWItem(Material.REPEATER, "§eTicks§8:§7 " + baseTicks, clickType -> {
             new SimulatorAnvilGui<>(player, "Ticks", baseTicks + "", Integer::parseInt, integer -> {
                 if (integer < 0) return false;
@@ -78,20 +79,20 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
         });
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
-        inventory.setItem(27, SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 redstone.changeBaseTicks(-baseTicks);
             } else {
                 redstone.changeBaseTicks(clickType.isShiftClick() ? -5 : -1);
             }
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos X
-        inventory.setItem(15, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             redstone.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(24, new SWItem(Material.PAPER, "§eX§8:§7 " + redstone.getPosition().getBlockX(), clickType -> {
             new SimulatorAnvilGui<>(player, "X", redstone.getPosition().getBlockX() + "", Integer::parseInt, i -> {
                 redstone.getPosition().setX(i);
@@ -99,16 +100,16 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(33, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             redstone.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Y
-        inventory.setItem(16, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             redstone.move(0, clickType.isShiftClick() ? 5 : 1, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(25, new SWItem(Material.PAPER, "§eY§8:§7 " + redstone.getPosition().getBlockY(), clickType -> {
             new SimulatorAnvilGui<>(player, "Y", redstone.getPosition().getBlockY() + "", Integer::parseInt, i -> {
                 redstone.getPosition().setY(i);
@@ -116,16 +117,16 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(34, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             redstone.move(0, clickType.isShiftClick() ? -5 : -1, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Z
-        inventory.setItem(17, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             redstone.move(0, 0, clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(26, new SWItem(Material.PAPER, "§eZ§8:§7 " + redstone.getPosition().getBlockZ(), clickType -> {
             new SimulatorAnvilGui<>(player, "Z", redstone.getPosition().getBlockZ() + "", Integer::parseInt, i -> {
                 redstone.getPosition().setZ(i);
@@ -133,9 +134,9 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(35, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             redstone.move(0, 0, clickType.isShiftClick() ? -5 : -1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorSettingsGui.java

@@ -22,6 +22,7 @@ package de.steamwar.bausystem.features.simulator.gui;
 import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -47,7 +48,7 @@ public class SimulatorSettingsGui extends SimulatorBaseGui {
         // Back Arrow
         inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
             back.open();
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         // Material Chooser
         inventory.setItem(4, simulator.toItem(player, clickType -> {
@@ -61,39 +62,39 @@ public class SimulatorSettingsGui extends SimulatorBaseGui {
         }));
 
         //Pos X
-        inventory.setItem(15, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             simulator.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(24, new SWItem(Material.PAPER, "§eX", clickType -> {
         }));
-        inventory.setItem(33, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             simulator.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Y
-        inventory.setItem(16, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             simulator.move(0, clickType.isShiftClick() ? 5 : 1, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(25, new SWItem(Material.PAPER, "§eY", clickType -> {
         }));
-        inventory.setItem(34, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             simulator.move(0, clickType.isShiftClick() ? -5 : -1, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Z
-        inventory.setItem(17, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             simulator.move(0, 0, clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(26, new SWItem(Material.PAPER, "§eZ", clickType -> {
         }));
-        inventory.setItem(35, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             simulator.move(0, 0, clickType.isShiftClick() ? -5 : -1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTGui.java

@@ -29,6 +29,7 @@ import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorScrollGui;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -81,12 +82,12 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
                     new SimulatorGroupGui(player, simulator, newParent, simulatorGui).open();
                 }
             }
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         inventory.setItem(8, new SWItem(Material.BARRIER, "§eDelete", clickType -> {
             tnt.getPhases().clear();
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.DELETE));
 
         // Material Chooser
         inventory.setItem(4, tnt.toItem(player, clickType -> {
@@ -95,11 +96,11 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
 
         inventory.setItem(47, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
             new SimulatorTNTSettingsGui(player, simulator, tnt, this).open();
-        }));
+        }).setCustomModelData(CMDs.Simulator.SETTINGS));
         inventory.setItem(48, new SWItem(tnt.isDisabled() ? Material.ENDER_PEARL : Material.ENDER_EYE, tnt.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
             tnt.setDisabled(!tnt.isDisabled());
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
         inventory.setItem(49, new SWItem(Material.CALIBRATED_SCULK_SENSOR, "§eCreate Stab", click -> {
             new SimulatorAnvilGui<>(player, "Depth Limit", "", Integer::parseInt, depthLimit -> {
                 if (depthLimit <= 0) return false;
@@ -107,17 +108,17 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
                 SimulatorWatcher.update(simulator);
                 return true;
             }, null).open();
-        }));
+        }).setCustomModelData(CMDs.Simulator.CREATE_STAB));
         inventory.setItem(50, new SWItem(Material.CHEST, parent.getElements().size() == 1 ? "§eMake Group" : "§eAdd another TNT to Group", clickType -> {
             TNTElement tntElement = new TNTElement(tnt.getPosition().clone());
             tntElement.add(new TNTPhase());
             parent.add(tntElement);
             new SimulatorGroupGui(player, simulator, parent, new SimulatorGui(player, simulator)).open();
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.MAKE_GROUP));
         inventory.setItem(51, new SWItem(Material.LEAD, "§eJoin Group", clickType -> {
             new SimulatorGroupChooserGui(player, simulator, tnt, tnt.getGroup(simulator), this).open();
-        }));
+        }).setCustomModelData(CMDs.Simulator.JOIN_GROUP));
     }
 
     @Override
@@ -136,15 +137,15 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
                 new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
                     tntSetting.setCount(tntSetting.getCount() + (clickType.isShiftClick() ? 5 : 1));
                     SimulatorWatcher.update(simulator);
-                }),
+                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                 tnt,
                 new SWItem(SWItem.getDye(tntSetting.getCount() > 1 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
                     tntSetting.setCount(Math.max(1, tntSetting.getCount() - (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
-                }),
+                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
                 new SWItem(Material.ANVIL, "§eEdit Phase", clickType -> {
                     new SimulatorTNTPhaseSettingsGui(player, simulator, this.tnt, tntSetting, this).open();
-                }),
+                }).setCustomModelData(CMDs.Simulator.EDIT_ACTIVATION),
         };
     }
 
@@ -153,12 +154,12 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
         return new SWItem[]{
                 new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
                     addNewPhase(clickType.isShiftClick());
-                }),
+                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                 new SWItem(Material.GUNPOWDER, "§eTNT§8:§a New Phase", clickType -> {
                     addNewPhase(false);
-                }),
+                }).setCustomModelData(CMDs.Simulator.NEW_PHASE),
                 new SWItem(SWItem.getDye(8), "§7", clickType -> {
-                }),
+                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
         };
     }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTPhaseSettingsGui.java

@@ -27,6 +27,7 @@ import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.core.Core;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -60,7 +61,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         // Back Arrow
         inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
             back.open();
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         // Material Chooser
         inventory.setItem(4, tntElement.toItem(player, clickType -> {
@@ -72,14 +73,14 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
             tntElement.getPhases().remove(tnt);
             back.open();
             SimulatorWatcher.update(simulator);
-        }));
+        }).setCustomModelData(CMDs.Simulator.DELETE));
 
         //Count
         int count = tnt.getCount();
-        inventory.setItem(9, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             tnt.setCount(count + (clickType.isShiftClick() ? 5 : 1));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         SWItem countItem = new SWItem(Material.TNT, "§eCount§8:§7 " + count, clickType -> {
             new SimulatorAnvilGui<>(player, "Count", count + "", Integer::parseInt, integer -> {
@@ -92,17 +93,17 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         countItem.getItemStack().setAmount(Math.max(1, Math.min(count, 64)));
         inventory.setItem(18, countItem);
 
-        inventory.setItem(27, SWItem.getDye(count > 1 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(27, new SWItem(SWItem.getDye(count > 1 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             tnt.setCount(Math.max(1, count - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Tick Offset
         int offset = tnt.getTickOffset();
-        inventory.setItem(10, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(10, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             tnt.setTickOffset(offset + (clickType.isShiftClick() ? 5 : 1));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         SWItem offsetItem = new SWItem(Material.REPEATER, "§eStart at§8:§7 " + offset, clickType -> {
             new SimulatorAnvilGui<>(player, "Start at", offset + "", Integer::parseInt, integer -> {
@@ -115,17 +116,17 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         offsetItem.getItemStack().setAmount(Math.max(1, Math.min(offset, 64)));
         inventory.setItem(19, offsetItem);
 
-        inventory.setItem(28, SWItem.getDye(offset > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(28, new SWItem(SWItem.getDye(offset > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             tnt.setTickOffset(Math.max(0, offset - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Lifetime
         int lifetime = tnt.getLifetime();
-        inventory.setItem(11, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(11, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             tnt.setLifetime(lifetime + (clickType.isShiftClick() ? 5 : 1));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         SWItem lifetimeItem = new SWItem(Material.CLOCK, "§eLifetime§8:§7 " + lifetime, clickType -> {
             new SimulatorAnvilGui<>(player, "Lifetime", lifetime + "", Integer::parseInt, integer -> {
@@ -138,17 +139,17 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         lifetimeItem.getItemStack().setAmount(Math.max(1, Math.min(lifetime, 64)));
         inventory.setItem(20, lifetimeItem);
 
-        inventory.setItem(29, SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(29, new SWItem(SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             tnt.setLifetime(Math.max(1, lifetime - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Order
         int order = tnt.getOrder();
-        inventory.setItem(13, SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             tnt.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         Material negativeNumbers = Material.getMaterial(Core.getVersion() >= 19 ? "RECOVERY_COMPASS" : "FIREWORK_STAR");
         SWItem orderItem = new SWItem(order >= 0 ? Material.COMPASS : negativeNumbers, "§eCalculation Order§8:§7 " + order, clickType -> {
@@ -163,10 +164,10 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         orderItem.getItemStack().setAmount(Math.max(1, Math.min(Math.abs(order), 30)));
         inventory.setItem(22, orderItem);
 
-        inventory.setItem(31, SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             tnt.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Jump
         SWItem jumpX = new SWItem(tnt.isXJump() ? Material.LIME_WOOL : Material.RED_WOOL, "§7TNT §eJump X§8: " + (tnt.isZJump() ? "§aon" : "§coff"), clickType -> {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTSettingsGui.java

@@ -24,10 +24,10 @@ import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -58,7 +58,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
         // Back Arrow
         inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
             back.open();
-        }));
+        }).setCustomModelData(CMDs.BACK));
 
         // Material Chooser
         List<String> lore = new ArrayList<>();
@@ -74,10 +74,10 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
 
         // Base Tick
         int baseTicks = tnt.getBaseTick();
-        inventory.setItem(9, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             tnt.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         SWItem baseTick = new SWItem(Material.REPEATER, "§eTicks§8:§7 " + baseTicks, clickType -> {
             new SimulatorAnvilGui<>(player, "Ticks", baseTicks + "", Integer::parseInt, integer -> {
                 if (integer < 0) return false;
@@ -88,14 +88,14 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
         });
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
-        inventory.setItem(27, SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 tnt.changeBaseTicks(-baseTicks);
             } else {
                 tnt.changeBaseTicks(clickType.isShiftClick() ? -5 : -1);
             }
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         // Subpixel Alignment
         inventory.setItem(21, new SWItem(Material.SUNFLOWER, "§7Align§8: §eCenter", clickType -> {
@@ -135,10 +135,10 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
         inventory.setItem(30, positivXItem);
 
         // Pos X
-        inventory.setItem(15, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
+        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
             tnt.move(clickType.isShiftClick() ? 0.0625 : 1, 0, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(24, new SWItem(Material.PAPER, "§eX§8:§7 " + tnt.getPosition().getX(), clickType -> {
             new SimulatorAnvilGui<>(player, "X", tnt.getPosition().getX() + "", Double::parseDouble, d -> {
                 tnt.getPosition().setX(d);
@@ -146,16 +146,16 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(33, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
+        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
             tnt.move(clickType.isShiftClick() ? -0.0625 : -1, 0, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         // Pos Y
-        inventory.setItem(16, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
+        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
             tnt.move(0, clickType.isShiftClick() ? 0.0625 : 1, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(25, new SWItem(Material.PAPER, "§eY§8:§7 " + tnt.getPosition().getY(), clickType -> {
             new SimulatorAnvilGui<>(player, "Y", tnt.getPosition().getY() + "", Double::parseDouble, d -> {
                 tnt.getPosition().setY(d);
@@ -163,16 +163,16 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(34, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
+        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
             tnt.move(0, clickType.isShiftClick() ? -0.0625 : -1, 0);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         // Pos Z
-        inventory.setItem(17, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
+        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
             tnt.move(0, 0, clickType.isShiftClick() ? 0.0625 : 1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(26, new SWItem(Material.PAPER, "§eZ§8:§7 " + tnt.getPosition().getZ(), clickType -> {
             new SimulatorAnvilGui<>(player, "Z", tnt.getPosition().getZ() + "", Double::parseDouble, d -> {
                 tnt.getPosition().setZ(d);
@@ -180,9 +180,9 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(35, SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
+        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
             tnt.move(0, 0, clickType.isShiftClick() ? -0.0625 : -1);
             SimulatorWatcher.update(simulator);
-        });
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorPageGui.java

@@ -21,6 +21,7 @@ package de.steamwar.bausystem.features.simulator.gui.base;
 
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.core.Core;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.entity.Player;
 
@@ -50,19 +51,19 @@ public abstract class SimulatorPageGui<T> extends SimulatorBaseGui {
         headerAndFooter();
         page = Math.min(page, maxPage());
 
-        inventory.setItem(size - 9, SWItem.getDye(page > 0 ? 10 : 8), page > 0 ? (byte) 10 : (byte) 8, Core.MESSAGE.parse(page > 0 ? "SWLISINV_PREVIOUS_PAGE_ACTIVE" : "SWLISINV_PREVIOUS_PAGE_INACTIVE", player), clickType -> {
+        inventory.setItem(size - 9, new SWItem(SWItem.getDye(page > 0 ? 10 : 8), page > 0 ? (byte) 10 : (byte) 8, Core.MESSAGE.parse(page > 0 ? "SWLISINV_PREVIOUS_PAGE_ACTIVE" : "SWLISINV_PREVIOUS_PAGE_INACTIVE", player), clickType -> {
             if (page > 0) {
                 page--;
                 open();
             }
-        });
+        }).setCustomModelData(CMDs.PREVIOUS_PAGE));
         boolean hasNext = page < maxPage() - (data.size() % (size - 18) == 0 ? 1 : 0);
-        inventory.setItem(size - 1, SWItem.getDye(hasNext ? 10 : 8), hasNext ? (byte) 10 : (byte) 8, Core.MESSAGE.parse(hasNext ? "SWLISINV_NEXT_PAGE_ACTIVE" : "SWLISINV_NEXT_PAGE_INACTIVE", player), clickType -> {
+        inventory.setItem(size - 1, new SWItem(SWItem.getDye(hasNext ? 10 : 8), hasNext ? (byte) 10 : (byte) 8, Core.MESSAGE.parse(hasNext ? "SWLISINV_NEXT_PAGE_ACTIVE" : "SWLISINV_NEXT_PAGE_INACTIVE", player), clickType -> {
             if (hasNext) {
                 page++;
                 open();
             }
-        });
+        }).setCustomModelData(CMDs.NEXT_PAGE));
 
         int minElement = page * (size - 18);
         int maxElement = Math.min(data.size(), (page + 1) * (size - 18));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorScrollGui.java

@@ -22,6 +22,7 @@ package de.steamwar.bausystem.features.simulator.gui.base;
 
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.core.Core;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.entity.Player;
 
@@ -50,19 +51,19 @@ public abstract class SimulatorScrollGui<T> extends SimulatorBaseGui {
         headerAndFooter();
         scroll = maxScroll();
 
-        inventory.setItem(size - 9, SWItem.getDye(scroll > 0 ? 10 : 8), scroll > 0 ? (byte) 10 : (byte) 8, Core.MESSAGE.parse(scroll > 0 ? "SWLISINV_PREVIOUS_PAGE_ACTIVE" : "SWLISINV_PREVIOUS_PAGE_INACTIVE", player), clickType -> {
+        inventory.setItem(size - 9, new SWItem(SWItem.getDye(scroll > 0 ? 10 : 8), scroll > 0 ? (byte) 10 : (byte) 8, Core.MESSAGE.parse(scroll > 0 ? "SWLISINV_PREVIOUS_PAGE_ACTIVE" : "SWLISINV_PREVIOUS_PAGE_INACTIVE", player), clickType -> {
             if (scroll > 0) {
                 scroll = Math.max(0, scroll - 9);
                 open();
             }
-        });
+        }).setCustomModelData(CMDs.PREVIOUS_PAGE));
         boolean hasNext = (data.size() + 1) - scroll > 9;
-        inventory.setItem(size - 1, SWItem.getDye(hasNext ? 10 : 8), hasNext ? (byte) 10 : (byte) 8, Core.MESSAGE.parse(hasNext ? "SWLISINV_NEXT_PAGE_ACTIVE" : "SWLISINV_NEXT_PAGE_INACTIVE", player), clickType -> {
+        inventory.setItem(size - 1, new SWItem(SWItem.getDye(hasNext ? 10 : 8), hasNext ? (byte) 10 : (byte) 8, Core.MESSAGE.parse(hasNext ? "SWLISINV_NEXT_PAGE_ACTIVE" : "SWLISINV_NEXT_PAGE_INACTIVE", player), clickType -> {
             if (hasNext) {
                 scroll = Math.min(scroll + 9, data.size() + 1 - 9);
                 open();
             }
-        });
+        }).setCustomModelData(CMDs.NEXT_PAGE));
 
         for (int i = 0; i < 9; i++) {
             if (scroll + i < data.size()) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauSettings.java

@@ -21,6 +21,7 @@ package de.steamwar.bausystem.features.slaves.laufbau;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.shared.Pair;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
 import org.bukkit.Material;
@@ -91,7 +92,7 @@ public class LaufbauSettings {
         });
         inv.setItem(49, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("LAUFBAU_SETTINGS_GUI_BACK", p), clickType -> {
             open();
-        }));
+        }).setCustomModelData(CMDs.BACK));
         inv.open();
     }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialCommand.java

@@ -26,6 +26,7 @@ import de.steamwar.bausystem.shared.EnumDisplay;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
@@ -202,9 +203,9 @@ public class MaterialCommand extends SWCommand implements Listener {
     private void searchGUI(Player p) {
         SWInventory swInventory = new SWInventory(p, 54, BauSystem.MESSAGE.parse("MATERIAL_SEARCH", p));
         Search search = searchMap.get(p);
-        swInventory.setItem(45, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("MATERIAL_BACK", p), clickType -> {
+        swInventory.setItem(0, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("MATERIAL_BACK", p), clickType -> {
             materialGUI(p);
-        }));
+        }).setCustomModelData(CMDs.BACK));
         swInventory.setItem(10, new SWItem(Material.NAME_TAG, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_NAME", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, search.name), clickType -> {
             SWAnvilInv swAnvilInv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_NAME", p), search.name);
             swAnvilInv.setCallback(s -> {

BauSystem/build.gradle.kts

@@ -40,6 +40,7 @@ tasks.register<DevServer>("DevBau20") {
     description = "Run a 1.20 Dev Bau"
     dependsOn(":SpigotCore:shadowJar")
     dependsOn(":BauSystem:shadowJar")
+    dependsOn(":SchematicSystem:shadowJar")
     template = "Bau20"
 }
 

CommonCore/Data/build.gradle.kts

@@ -0,0 +1,25 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+plugins {
+    steamwar.java
+}
+
+dependencies {
+}

CommonCore/Data/src/de/steamwar/data/CMDs.java

@@ -0,0 +1,92 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.data;
+
+// Custom Model Data Constants
+public interface CMDs {
+
+    // Material.ARROW
+    int BACK = 1;
+
+    // Material.DYE (Color 10/8)
+    int PREVIOUS_PAGE = 1;
+
+    // Material.DYE (Color 10/8)
+    int NEXT_PAGE = 2;
+
+    // BauSystem Simulator
+    interface Simulator {
+
+        // Material.BARRIER
+        int DELETE = 1;
+
+        // Material.REPEATER
+        int SETTINGS = 1;
+
+        // Material.ENDER_PEARL and Material.ENDER_EYE
+        int ENABLED_OR_DISABLED = 1;
+
+        // Material.DYE (Color 10/8)
+        int INCREMENT_OR_DISABLED = 3;
+
+        // Material.DYE (Color 1/8)
+        int DECREMENT_OR_DISABLED = 3;
+
+        // Material.LEAD
+        int JOIN_GROUP = 1;
+
+        // Material.ANVIL
+        int EDIT_ACTIVATION = 1;
+
+        // Material.QUARTZ, Material.REDSTONE, Material.GUNPOWDER
+        int NEW_PHASE = 1;
+
+        // Material.CALIBRATED_SCULK_SENSOR
+        int CREATE_STAB = 1;
+
+        // Material.CHEST
+        int MAKE_GROUP = 1;
+    }
+
+    // Schematic System
+    interface Schematic {
+
+        // Material.LEAD
+        int BACK = 2;
+
+        // Material.BUCKET
+        int OWN_SCHEMS = 1;
+
+        // Material.GLASS
+        int PUBLIC_SCHEMS = 1;
+
+        // Material.CHEST
+        int NEW_DIR = 2;
+
+        // Material.NAME_TAG
+        int FILTER = 3;
+
+        // Material.PAPER, Material.CAULDRON, Material.CLOCK
+        int SORT_ASCENDING = 3;
+
+        // Material.PAPER, Material.CAULDRON, Material.CLOCK
+        int SORT_DESCENDING = 4;
+    }
+}

CommonCore/build.gradle.kts

@@ -24,4 +24,5 @@ plugins {
 dependencies {
     api(project(":CommonCore:SQL"))
     api(project(":CommonCore:Network"))
+    api(project(":CommonCore:Data"))
 }

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java

@@ -21,12 +21,12 @@ package de.steamwar.schematicsystem.commands.schematiccommand;
 
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.core.Core;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.*;
 import de.steamwar.schematicsystem.CheckSchemType;
 import de.steamwar.schematicsystem.SafeSchematicNode;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoChecker;
-import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils;
 import de.steamwar.sql.*;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -38,7 +38,7 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
-import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils.*;
+import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils.getUser;
 
 public class GUI {
     private GUI() {}
@@ -101,9 +101,9 @@ public class GUI {
             });
         }
 
-        inv.setItem(9, SWItem.getMaterial("LEASH"), SchematicSystem.MESSAGE.parse("GUI_INFO_BACK", player), clickType -> {
+        inv.setItem(9, new SWItem(SWItem.getMaterial("LEASH"), SchematicSystem.MESSAGE.parse("GUI_INFO_BACK", player), clickType -> {
             back.reOpen();
-        });
+        }).setCustomModelData(CMDs.Schematic.BACK));
 
         if(node.getOwner() == user.getId()){
             if(!node.isDir() && node.getSchemtype().writeable()){

SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java

@@ -142,65 +142,82 @@ public class SWItem {
             loreArray.forEach(jsonElement -> lore.add(jsonElement.getAsString()));
             item.setLore(lore);
         }
+
+        if (itemJson.has("customModelData"))
+            item.setCustomModelData(itemJson.get("customModelData").getAsInt());
         return item;
     }
 
-    private void hideAttributes() {
+    private SWItem hideAttributes() {
-        if (itemMeta == null) return;
+        if (itemMeta == null) return this;
         for (ItemFlag flag : EnumSet.allOf(ItemFlag.class)) {
             itemMeta.addItemFlags(flag);
         }
+        return this;
     }
 
     public ItemStack getItemStack() {
         return itemStack;
     }
 
-    public void setItemStack(ItemStack itemStack) {
+    public SWItem setItemStack(ItemStack itemStack) {
         this.itemStack = itemStack;
         itemMeta = itemStack.getItemMeta();
         hideAttributes();
+        return this;
     }
 
     public ItemMeta getItemMeta() {
         return itemMeta;
     }
 
-    public void setItemMeta(ItemMeta itemMeta) {
+    public SWItem setItemMeta(ItemMeta itemMeta) {
         this.itemMeta = itemMeta;
         itemStack.setItemMeta(itemMeta);
         hideAttributes();
+        return this;
     }
 
     public InvCallback getCallback() {
         return callback;
     }
 
-    public void setCallback(InvCallback callback) {
+    public SWItem setCallback(InvCallback callback) {
         this.callback = callback;
+        return this;
     }
 
-    public void setName(String name) {
+    public SWItem setName(String name) {
         itemMeta.setDisplayName(name);
         itemStack.setItemMeta(itemMeta);
+        return this;
     }
 
-    public void setLore(List<String> lore) {
+    public SWItem setLore(List<String> lore) {
         itemMeta.setLore(lore);
         itemStack.setItemMeta(itemMeta);
+        return this;
     }
 
-    public void setLore(String... lore) {
+    public SWItem setLore(String... lore) {
         itemMeta.setLore(Arrays.stream(lore).collect(Collectors.toList()));
         itemStack.setItemMeta(itemMeta);
+        return this;
     }
 
-    public void setEnchanted(boolean enchanted) {
+    public SWItem setEnchanted(boolean enchanted) {
         if (enchanted){
             itemMeta.addEnchant(TrickyTrialsWrapper.impl.getUnbreakingEnchantment() , 10, true);
         } else {
             itemMeta.removeEnchant(TrickyTrialsWrapper.impl.getUnbreakingEnchantment());
         }
         itemStack.setItemMeta(itemMeta);
+        return this;
+    }
+
+    public SWItem setCustomModelData(int customModelData) {
+        itemMeta.setCustomModelData(customModelData);
+        itemStack.setItemMeta(itemMeta);
+        return this;
     }
 }

SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWListInv.java

@@ -20,6 +20,7 @@
 package de.steamwar.inventory;
 
 import de.steamwar.core.Core;
+import de.steamwar.data.CMDs;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SchematicType;
 import org.bukkit.Bukkit;
@@ -63,28 +64,28 @@ public class SWListInv<T> extends SWInventory {
 
         if (sizeBiggerMax()) {
             if (page != 0) {
-                setItem(45, SWItem.getDye(10), (byte) 10, Core.MESSAGE.parse("SWLISINV_PREVIOUS_PAGE_ACTIVE", player), (ClickType click) -> {
+                setItem(45, new SWItem(SWItem.getDye(10), (byte) 10, Core.MESSAGE.parse("SWLISINV_PREVIOUS_PAGE_ACTIVE", player), (ClickType click) -> {
                     page--;
                     open();
-                });
+                }).setCustomModelData(CMDs.PREVIOUS_PAGE));
             } else {
-                setItem(45, SWItem.getDye(8), (byte) 8, Core.MESSAGE.parse("SWLISINV_PREVIOUS_PAGE_INACTIVE", player), (ClickType click) -> {
+                setItem(45, new SWItem(SWItem.getDye(8), (byte) 8, Core.MESSAGE.parse("SWLISINV_PREVIOUS_PAGE_INACTIVE", player), (ClickType click) -> {
-                });
+                }).setCustomModelData(CMDs.PREVIOUS_PAGE));
             }
             if (page < elements.size() / 45 - (elements.size() % 45 == 0 ? 1 : 0)) {
-                setItem(53, SWItem.getDye(10), (byte) 10, Core.MESSAGE.parse("SWLISINV_NEXT_PAGE_ACTIVE", player), (ClickType click) -> {
+                setItem(53, new SWItem(SWItem.getDye(10), (byte) 10, Core.MESSAGE.parse("SWLISINV_NEXT_PAGE_ACTIVE", player), (ClickType click) -> {
                     page++;
                     open();
-                });
+                }).setCustomModelData(CMDs.NEXT_PAGE));
             } else {
-                setItem(53, SWItem.getDye(8), (byte) 8, Core.MESSAGE.parse("SWLISINV_NEXT_PAGE_INACTIVE", player), (ClickType click) -> {
+                setItem(53, new SWItem(SWItem.getDye(8), (byte) 8, Core.MESSAGE.parse("SWLISINV_NEXT_PAGE_INACTIVE", player), (ClickType click) -> {
-                });
+                }).setCustomModelData(CMDs.NEXT_PAGE));
             }
         } else if (!dynamicSize) {
-            setItem(45, SWItem.getDye(8), (byte) 8, Core.MESSAGE.parse("SWLISINV_PREVIOUS_PAGE_INACTIVE", player), (ClickType click) -> {
+            setItem(45, new SWItem(SWItem.getDye(8), (byte) 8, Core.MESSAGE.parse("SWLISINV_PREVIOUS_PAGE_INACTIVE", player), (ClickType click) -> {
-            });
+            }).setCustomModelData(CMDs.PREVIOUS_PAGE));
-            setItem(53, SWItem.getDye(8), (byte) 8, Core.MESSAGE.parse("SWLISINV_NEXT_PAGE_INACTIVE", player), (ClickType click) -> {
+            setItem(53, new SWItem(SWItem.getDye(8), (byte) 8, Core.MESSAGE.parse("SWLISINV_NEXT_PAGE_INACTIVE", player), (ClickType click) -> {
-            });
+            }).setCustomModelData(CMDs.NEXT_PAGE));
         }
 
         int ipageLimit = elements.size() - page * 45;

SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SchematicSelector.java

@@ -24,6 +24,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.internal.Streams;
 import com.google.gson.stream.JsonReader;
 import de.steamwar.core.Core;
+import de.steamwar.data.CMDs;
 import de.steamwar.sql.*;
 import lombok.*;
 import org.bukkit.Bukkit;
@@ -113,7 +114,7 @@ public class SchematicSelector {
         List<SWListInv.SWListEntry<SchematicNode>> list = new ArrayList<>();
 
         if(depth != 0) {
-            list.add(new SWListInv.SWListEntry<>(new SWItem(Material.ARROW, Core.MESSAGE.parse("SCHEM_SELECTOR_BACK", player), clickType -> {}), null));
+            list.add(new SWListInv.SWListEntry<>(new SWItem(Material.ARROW, Core.MESSAGE.parse("SCHEM_SELECTOR_BACK", player), clickType -> {}).setCustomModelData(CMDs.BACK), null));
         }
 
         for (SchematicNode node : nodes) {
@@ -124,15 +125,15 @@ public class SchematicSelector {
         SWListInv<SchematicNode> inv = new SWListInv<>(player, MessageFormat.format(injectable.createTitle(player), target.target.getName(player), (filter == null || filter.getName() == null)?(parent == null?"/":parent.generateBreadcrumbs()):filter.getName()), false, list, (clickType, node) -> handleClick(node, parent));
         if(publicMode == PublicMode.ALL) {
             if(user.getId() == 0) {
-                inv.setItem(48, Material.BUCKET, Core.MESSAGE.parse("SCHEM_SELECTOR_OWN", player), clickType -> {
+                inv.setItem(48, new SWItem(Material.BUCKET, Core.MESSAGE.parse("SCHEM_SELECTOR_OWN", player), clickType -> {
                     this.user = SteamwarUser.get(player.getUniqueId());
                     openList(null);
-                });
+                }).setCustomModelData(CMDs.Schematic.OWN_SCHEMS));
             } else {
-                inv.setItem(48, Material.GLASS, Core.MESSAGE.parse("SCHEM_SELECTOR_PUB", player), clickType -> {
+                inv.setItem(48, new SWItem(Material.GLASS, Core.MESSAGE.parse("SCHEM_SELECTOR_PUB", player), clickType -> {
                     this.user = SteamwarUser.get(0);
                     openList(null);
-                });
+                }).setCustomModelData(CMDs.Schematic.PUBLIC_SCHEMS));
             }
         }
         if(target.target.dirs) {
@@ -142,10 +143,10 @@ public class SchematicSelector {
             });
         }
         if(user.getId() != 0) {
-            inv.setItem(50, Material.CHEST, Core.MESSAGE.parse("SCHEM_SELECTOR_NEW_DIR", player), clickType -> createFolderIn(parent));
+            inv.setItem(50, new SWItem(Material.CHEST, Core.MESSAGE.parse("SCHEM_SELECTOR_NEW_DIR", player), clickType -> createFolderIn(parent)).setCustomModelData(CMDs.Schematic.NEW_DIR));
         }
-        inv.setItem(51, Material.NAME_TAG, Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER", player), clickType -> openFilter());
+        inv.setItem(51, new SWItem(Material.NAME_TAG, Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER", player), clickType -> openFilter()).setCustomModelData(CMDs.Schematic.FILTER));
-        inv.setItem(47, sorting.mat, Core.MESSAGE.parse("SCHEM_SELECTOR_SORTING", player), Arrays.asList(
+        inv.setItem(47, new SWItem(sorting.mat, Core.MESSAGE.parse("SCHEM_SELECTOR_SORTING", player), Arrays.asList(
                 Core.MESSAGE.parse("SCHEM_SELECTOR_SORTING_CURRENT", player, sorting.parseName(player)),
                 Core.MESSAGE.parse("SCHEM_SELECTOR_SORTING_DIRECTION", player, Core.MESSAGE.parse(invertSorting?"SCHEM_SELECTOR_SORTING_DSC":"SCHEM_SELECTOR_SORTING_ASC", player))
         ), invertSorting, click -> {
@@ -155,7 +156,7 @@ public class SchematicSelector {
                 invertSorting = !invertSorting;
             }
             openList(parent);
-        });
+        }).setCustomModelData(invertSorting ? CMDs.Schematic.SORT_DESCENDING : CMDs.Schematic.SORT_ASCENDING));
 
         injectable.onListRender(this, inv, parent);
         inv.open();

Teamserver/src/de/steamwar/teamserver/command/MaterialCommand.java

@@ -20,6 +20,7 @@
 package de.steamwar.teamserver.command;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
@@ -206,9 +207,9 @@ public class MaterialCommand extends SWCommand implements Listener {
     private void searchGUI(Player p) {
         SWInventory swInventory = new SWInventory(p, 54, Builder.MESSAGE.parse("MATERIAL_SEARCH", p));
         Search search = searchMap.get(p);
-        swInventory.setItem(45, new SWItem(Material.ARROW, Builder.MESSAGE.parse("MATERIAL_BACK", p), clickType -> {
+        swInventory.setItem(0, new SWItem(Material.ARROW, Builder.MESSAGE.parse("MATERIAL_BACK", p), clickType -> {
             materialGUI(p);
-        }));
+        }).setCustomModelData(CMDs.BACK));
         swInventory.setItem(10, new SWItem(Material.NAME_TAG, Builder.MESSAGE.parse("MATERIAL_SEARCH_NAME", p) + Builder.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, search.name), clickType -> {
             SWAnvilInv swAnvilInv = new SWAnvilInv(p, Builder.MESSAGE.parse("MATERIAL_SEARCH_NAME", p), search.name);
             swAnvilInv.setCallback(s -> {

VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java

@@ -153,6 +153,7 @@ public class VelocityCore implements ReloadablePlugin {
         new CheckListener();
         new IPSanitizer();
         new VersionAnnouncer();
+        new TexturePackSystem();
 
         local = new Node.LocalNode();
         if(MAIN_SERVER) {

VelocityCore/src/de/steamwar/velocitycore/inventory/SWItem.java

@@ -42,6 +42,7 @@ public class SWItem {
     @Getter
     private InvCallback callback;
     private int color = 0;
+    private int customModelData = 0;
 
     public SWItem(String material, Message title) {
         this.material = material.toUpperCase();
@@ -64,6 +65,11 @@ public class SWItem {
         return this;
     }
 
+    public SWItem setCustomModelData(int customModelData) {
+        this.customModelData = customModelData;
+        return this;
+    }
+
     public JsonObject writeToString(Chatter player, int position) {
         JsonObject object = new JsonObject();
         object.addProperty("material", material);
@@ -84,6 +90,9 @@ public class SWItem {
             }
             object.add("lore", array);
         }
+        if (customModelData > 0) {
+            object.addProperty("customModelData", customModelData);
+        }
 
         return object;
     }

VelocityCore/src/de/steamwar/velocitycore/listeners/TexturePackSystem.java

@@ -0,0 +1,105 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.velocitycore.listeners;
+
+import com.velocitypowered.api.event.Subscribe;
+import com.velocitypowered.api.event.player.ServerPostConnectEvent;
+import com.velocitypowered.api.proxy.player.ResourcePackInfo;
+import de.steamwar.velocitycore.VelocityCore;
+import net.kyori.adventure.text.Component;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+// https://jd.papermc.io/velocity/3.4.0/com/velocitypowered/api/proxy/player/ResourcePackInfo.Builder.html#setHash(byte%5B%5D)
+public class TexturePackSystem extends BasicListener {
+
+    private static final File PACKS_DIR = new File("/var/www/packs");
+    private static final String BASE_ULR = "https://packs.steamwar.de/";
+    private TreeMap<Integer, Integer> protocolVersionToPackVersion = new TreeMap<>();
+
+    public TexturePackSystem() {
+        // https://minecraft.wiki/w/Pack_format#List_of_resource_pack_formats
+        // https://minecraft.wiki/w/Minecraft_Wiki:Projects/wiki.vg_merge/Protocol_version_numbers
+        protocolVersionToPackVersion.put(759, 9);
+        protocolVersionToPackVersion.put(761, 12);
+        protocolVersionToPackVersion.put(762, 13);
+        protocolVersionToPackVersion.put(763, 15);
+        protocolVersionToPackVersion.put(764, 18);
+        protocolVersionToPackVersion.put(765, 22);
+        protocolVersionToPackVersion.put(766, 32);
+        protocolVersionToPackVersion.put(767, 34);
+        protocolVersionToPackVersion.put(768, 42);
+        protocolVersionToPackVersion.put(769, 46);
+        protocolVersionToPackVersion.put(770, 55);
+    }
+
+    @Subscribe
+    public void onLogin(ServerPostConnectEvent event) {
+        if (event.getPreviousServer() != null) {
+            return;
+        }
+        VelocityCore.schedule(() -> {
+            int playerVersion = event.getPlayer().getProtocolVersion().getProtocol();
+            File selectedPack = null;
+            while (selectedPack == null) {
+                Map.Entry<Integer, Integer> pack = protocolVersionToPackVersion.floorEntry(playerVersion);
+                if (pack == null) return;
+
+                for (File file : PACKS_DIR.listFiles()) {
+                    if (file.getName().startsWith(pack.getValue() + "_")) {
+                        selectedPack = file;
+                        break;
+                    }
+                }
+
+                playerVersion--;
+            }
+
+            String fileName = selectedPack.getName();
+            fileName = fileName.substring(fileName.indexOf('_') + 1, fileName.lastIndexOf('.'));
+            byte[] hash = hexStringToByteArray(fileName);
+
+            ResourcePackInfo resourcePackInfo = VelocityCore.getProxy().createResourcePackBuilder(BASE_ULR + selectedPack.getName())
+                    .setId(UUID.nameUUIDFromBytes(fileName.getBytes(StandardCharsets.UTF_8)))
+                    .setHash(hash)
+                    .setShouldForce(false)
+                    .setPrompt(Component.text("The SteamWar TexturePack improves GUIs!"))
+                    .build();
+            event.getPlayer().sendResourcePacks(resourcePackInfo);
+        }).delay(500, TimeUnit.MILLISECONDS).schedule();
+    }
+
+    public static byte[] hexStringToByteArray(String s) {
+        int len = s.length();
+        byte[] data = new byte[len / 2];
+
+        for (int i = 0; i < len; i += 2) {
+            data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
+                    + Character.digit(s.charAt(i+1), 16));
+        }
+
+        return data;
+    }
+}

settings.gradle.kts

@@ -184,6 +184,7 @@ include("CommandFramework")
 
 include(
     "CommonCore",
+    "CommonCore:Data",
     "CommonCore:SQL",
     "CommonCore:Network"
 )