Remove even more useless stuff

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

@@ -210,7 +210,7 @@ public abstract class LoaderInteractionElement<T extends Enum<T> & LoaderSetting
         }
 
         if (currentElement.hasTicks(this)) {
-            swInventory.setItem(ticksStart + 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 -> {
+            swInventory.setItem(ticksStart + 3, new SWItem(Material.RED_DYE, 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 -> {
                 long ticks = extraTicks.get(index);
                 ticks -= clickType.isShiftClick() ? 5 : 1;
                 if (ticks < 1) ticks = 1;
@@ -234,7 +234,7 @@ public abstract class LoaderInteractionElement<T extends Enum<T> & LoaderSetting
                 swAnvilInv.open();
             });
 
-            swInventory.setItem(ticksStart + 5, new SWItem(SWItem.getDye(10), BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE", player), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE_SHIFT", player)), false, clickType -> {}).getItemStack(), clickType -> {
+            swInventory.setItem(ticksStart + 5, new SWItem(Material.LIME_DYE, BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE", player), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE_SHIFT", player)), false, clickType -> {}).getItemStack(), clickType -> {
                 long ticks = extraTicks.get(index);
                 ticks += clickType.isShiftClick() ? 5 : 1;
                 extraTicks.set(index, ticks);

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

@@ -63,7 +63,7 @@ public class LoaderWait implements LoaderElement {
         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)).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 -> {
+        swInventory.setItem(3, new SWItem(Material.RED_DYE, 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;
             if (delay < 0) delay = 0;
             swInventory.setItem(4, menu(player));
@@ -80,7 +80,7 @@ public class LoaderWait implements LoaderElement {
             });
             swAnvilInv.open();
         });
-        swInventory.setItem(5, new SWItem(SWItem.getDye(10), BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE", player), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE_SHIFT", player)), false, clickType -> {}).getItemStack(), clickType -> {
+        swInventory.setItem(5, new SWItem(Material.LIME_DYE, BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE", player), Arrays.asList(BauSystem.MESSAGE.parse("LOADER_SETTING_TICKS_ADD_ONE_SHIFT", player)), false, clickType -> {}).getItemStack(), clickType -> {
             delay += clickType.isShiftClick() ? 5 : 1;
             swInventory.setItem(4, menu(player));
         });

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

@@ -69,7 +69,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
 
         // Base Tick
         int baseTicks = simulatorGroup.getBaseTick();
-        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(9, new SWItem(Material.LIME_DYE, "§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));
@@ -83,7 +83,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
         });
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
-        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(27, new SWItem(baseTicks > 0 ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 simulatorGroup.changeBaseTicks(-baseTicks);
             } else {
@@ -163,7 +163,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
         }
 
         //Pos X
-        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(15, new SWItem(Material.LIME_DYE, "§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));
@@ -177,13 +177,13 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).setItem(Material.PAPER).open();
         }));
-        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(33, new SWItem(Material.RED_DYE, "§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, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(16, new SWItem(Material.LIME_DYE, "§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));
@@ -197,13 +197,13 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).setItem(Material.PAPER).open();
         }));
-        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(34, new SWItem(Material.RED_DYE, "§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, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(17, new SWItem(Material.LIME_DYE, "§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));
@@ -217,7 +217,7 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).setItem(Material.PAPER).open();
         }));
-        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(35, new SWItem(Material.RED_DYE, "§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/SimulatorObserverGui.java

@@ -149,13 +149,13 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
         Supplier<Integer> getter = observerPhase::getTickOffset;
         Consumer<Integer> setter = observerPhase::setTickOffset;
         return new SWItem[] {
-                new SWItem(SWItem.getDye(getter.get() < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+                new SWItem(getter.get() < max ? Material.LIME_DYE : Material.GRAY_DYE, "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
                     if (clickType == ClickType.DOUBLE_CLICK) return;
                     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 -> {
+                new SWItem(getter.get() > min ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
                     if (clickType == ClickType.DOUBLE_CLICK) return;
                     setter.accept(Math.max(min, getter.get() - (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
@@ -169,13 +169,13 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
     @Override
     public SWItem[] lastColumn() {
         return new SWItem[]{
-                new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+                new SWItem(Material.LIME_DYE, "§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 -> {
+                new SWItem(Material.GRAY_DYE, "§7", clickType -> {
                 }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
         };
     }

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

@@ -96,7 +96,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
 
         //Tick Offset
         int offset = observer.getTickOffset();
-        inventory.setItem(10, new SWItem(SWItem.getDye(offset < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(10, new SWItem(offset < max ? Material.LIME_DYE : Material.GRAY_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.setTickOffset(Math.min(max, offset + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
@@ -113,7 +113,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         offsetItem.getItemStack().setAmount(Math.max(1, Math.min(offset, 64)));
         inventory.setItem(19, offsetItem);
 
-        inventory.setItem(28, new SWItem(SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(28, new SWItem(offset > min ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
@@ -121,7 +121,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
 
         //Order
         int order = observer.getOrder();
-        inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(13, new SWItem(order < SimulatorPhase.ORDER_LIMIT ? Material.LIME_DYE : Material.GRAY_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
@@ -139,7 +139,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         orderItem.getItemStack().setAmount(Math.max(1, Math.min(Math.abs(order), 30)));
         inventory.setItem(22, orderItem);
 
-        inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(31, new SWItem(order > -SimulatorPhase.ORDER_LIMIT ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);

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

@@ -67,7 +67,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
 
         // Base Tick
         int baseTicks = observer.getBaseTick();
-        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(9, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
@@ -82,7 +82,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
         });
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
-        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(27, new SWItem(baseTicks > 0 ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 observer.changeBaseTicks(-baseTicks);
@@ -93,7 +93,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos X
-        inventory.setItem(15,  new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(15,  new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
             SimulatorWatcher.update(simulator);
@@ -105,14 +105,14 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(33, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Y
-        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(16, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(0, clickType.isShiftClick() ? 5 : 1, 0);
             SimulatorWatcher.update(simulator);
@@ -124,14 +124,14 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(34, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(0, clickType.isShiftClick() ? -5 : -1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Z
-        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(17, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(0, 0, clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
@@ -143,7 +143,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(35, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(0, 0, clickType.isShiftClick() ? -5 : -1);
             SimulatorWatcher.update(simulator);

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

@@ -164,13 +164,13 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
         Supplier<Integer> getter = redstoneSubPhase.place ? redstoneSubPhase.phase::getTickOffset : redstoneSubPhase.phase::getLifetime;
         Consumer<Integer> setter = redstoneSubPhase.place ? redstoneSubPhase.phase::setTickOffset : redstoneSubPhase.phase::setLifetime;
         return new SWItem[] {
-                new SWItem(SWItem.getDye(getter.get() < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+                new SWItem(getter.get() < max ? Material.LIME_DYE : Material.GRAY_DYE, "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
                     if (clickType == ClickType.DOUBLE_CLICK) return;
                     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 -> {
+                new SWItem(getter.get() > min ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
                     if (clickType == ClickType.DOUBLE_CLICK) return;
                     setter.accept(Math.max(min, getter.get() - (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
@@ -184,13 +184,13 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
     @Override
     public SWItem[] lastColumn() {
         return new SWItem[]{
-                new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+                new SWItem(Material.LIME_DYE, "§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 -> {
+                new SWItem(Material.GRAY_DYE, "§7", clickType -> {
                 }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
         };
     }

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

@@ -97,7 +97,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
 
         //Tick Offset
         int offset = redstone.getTickOffset();
-        inventory.setItem(10, new SWItem(SWItem.getDye(offset < maxOffset ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(10, new SWItem(offset < maxOffset ? Material.LIME_DYE : Material.GRAY_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setTickOffset(Math.min(maxOffset, offset + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
@@ -114,7 +114,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         offsetItem.getItemStack().setAmount(Math.max(1, Math.min(offset, 64)));
         inventory.setItem(19, offsetItem);
 
-        inventory.setItem(28, new SWItem(SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(28, new SWItem(offset > min ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
@@ -122,7 +122,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
 
         //Lifetime
         int lifetime = redstone.getLifetime();
-        inventory.setItem(11, new SWItem(SWItem.getDye(lifetime < maxLifetime ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(11, new SWItem(lifetime < maxLifetime ? Material.LIME_DYE : Material.GRAY_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setLifetime(Math.min(maxLifetime, lifetime + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
@@ -139,7 +139,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         lifetimeItem.getItemStack().setAmount(Math.max(1, Math.min(lifetime, 64)));
         inventory.setItem(20, lifetimeItem);
 
-        inventory.setItem(29, new SWItem(SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(29, new SWItem(lifetime > 0 ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setLifetime(Math.max(0, lifetime - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
@@ -147,7 +147,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
 
         //Order
         int order = redstone.getOrder();
-        inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(13, new SWItem(order < SimulatorPhase.ORDER_LIMIT ? Material.LIME_DYE : Material.GRAY_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
@@ -165,7 +165,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         orderItem.getItemStack().setAmount(Math.max(1, Math.min(Math.abs(order), 30)));
         inventory.setItem(22, orderItem);
 
-        inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(31, new SWItem(order > -SimulatorPhase.ORDER_LIMIT ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);

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

@@ -66,7 +66,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
 
         // Base Tick
         int baseTicks = redstone.getBaseTick();
-        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(9, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
@@ -81,7 +81,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
         });
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
-        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(27, new SWItem(baseTicks > 0 ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 redstone.changeBaseTicks(-baseTicks);
@@ -92,7 +92,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos X
-        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(15, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
             SimulatorWatcher.update(simulator);
@@ -104,14 +104,14 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(33, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Y
-        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(16, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(0, clickType.isShiftClick() ? 5 : 1, 0);
             SimulatorWatcher.update(simulator);
@@ -123,14 +123,14 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(34, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(0, clickType.isShiftClick() ? -5 : -1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Z
-        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(17, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(0, 0, clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
@@ -142,7 +142,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(35, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(0, 0, clickType.isShiftClick() ? -5 : -1);
             SimulatorWatcher.update(simulator);

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

@@ -66,37 +66,37 @@ public class SimulatorSettingsGui extends SimulatorBaseGui {
         }));
 
         //Pos X
-        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(15, new SWItem(Material.LIME_DYE, "§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, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(33, new SWItem(Material.RED_DYE, "§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, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(16, new SWItem(Material.LIME_DYE, "§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, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(34, new SWItem(Material.RED_DYE, "§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, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(17, new SWItem(Material.LIME_DYE, "§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, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(35, new SWItem(Material.RED_DYE, "§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

@@ -134,13 +134,13 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
         tnt.getItemStack().setAmount(Math.min(tntSetting.getCount(), 64));
 
         return new SWItem[]{
-                new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+                new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
                     if (clickType == ClickType.DOUBLE_CLICK) return;
                     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 -> {
+                new SWItem(tntSetting.getCount() > 1 ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
                     if (clickType == ClickType.DOUBLE_CLICK) return;
                     tntSetting.setCount(Math.max(1, tntSetting.getCount() - (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
@@ -154,13 +154,13 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
     @Override
     public SWItem[] lastColumn() {
         return new SWItem[]{
-                new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+                new SWItem(Material.LIME_DYE, "§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 -> {
+                new SWItem(Material.GRAY_DYE, "§7", clickType -> {
                 }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
         };
     }

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

@@ -77,7 +77,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
 
         //Count
         int count = tnt.getCount();
-        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(9, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setCount(count + (clickType.isShiftClick() ? 5 : 1));
             SimulatorWatcher.update(simulator);
@@ -94,7 +94,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         countItem.getItemStack().setAmount(Math.max(1, Math.min(count, 64)));
         inventory.setItem(18, countItem);
 
-        inventory.setItem(27, new SWItem(SWItem.getDye(count > 1 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(27, new SWItem(count > 1 ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setCount(Math.max(1, count - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
@@ -102,7 +102,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
 
         //Tick Offset
         int offset = tnt.getTickOffset();
-        inventory.setItem(10, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(10, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setTickOffset(offset + (clickType.isShiftClick() ? 5 : 1));
             SimulatorWatcher.update(simulator);
@@ -119,7 +119,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         offsetItem.getItemStack().setAmount(Math.max(1, Math.min(offset, 64)));
         inventory.setItem(19, offsetItem);
 
-        inventory.setItem(28, new SWItem(SWItem.getDye(offset > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(28, new SWItem(offset > 0 ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setTickOffset(Math.max(0, offset - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
@@ -127,7 +127,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
 
         //Lifetime
         int lifetime = tnt.getLifetime();
-        inventory.setItem(11, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(11, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setLifetime(lifetime + (clickType.isShiftClick() ? 5 : 1));
             SimulatorWatcher.update(simulator);
@@ -144,7 +144,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         lifetimeItem.getItemStack().setAmount(Math.max(1, Math.min(lifetime, 64)));
         inventory.setItem(20, lifetimeItem);
 
-        inventory.setItem(29, new SWItem(SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(29, new SWItem(lifetime > 0 ? Material.GRAY_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setLifetime(Math.max(1, lifetime - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
@@ -152,7 +152,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
 
         //Order
         int order = tnt.getOrder();
-        inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(13, new SWItem(order < SimulatorPhase.ORDER_LIMIT ? Material.LIME_DYE : Material.GRAY_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
@@ -170,7 +170,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         orderItem.getItemStack().setAmount(Math.max(1, Math.min(Math.abs(order), 30)));
         inventory.setItem(22, orderItem);
 
-        inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(31, new SWItem(order > -SimulatorPhase.ORDER_LIMIT ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);

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

@@ -75,7 +75,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
 
         // Base Tick
         int baseTicks = tnt.getBaseTick();
-        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        inventory.setItem(9, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
@@ -90,7 +90,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
         });
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
-        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+        inventory.setItem(27, new SWItem(baseTicks > 0 ? Material.RED_DYE : Material.GRAY_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 tnt.changeBaseTicks(-baseTicks);
@@ -138,7 +138,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
         inventory.setItem(30, positivXItem);
 
         // Pos X
-        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
+        inventory.setItem(15, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(clickType.isShiftClick() ? 0.0625 : 1, 0, 0);
             SimulatorWatcher.update(simulator);
@@ -150,14 +150,14 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
+        inventory.setItem(33, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(clickType.isShiftClick() ? -0.0625 : -1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         // Pos Y
-        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
+        inventory.setItem(16, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(0, clickType.isShiftClick() ? 0.0625 : 1, 0);
             SimulatorWatcher.update(simulator);
@@ -169,14 +169,14 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
+        inventory.setItem(34, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(0, clickType.isShiftClick() ? -0.0625 : -1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         // Pos Z
-        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
+        inventory.setItem(17, new SWItem(Material.LIME_DYE, "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(0, 0, clickType.isShiftClick() ? 0.0625 : 1);
             SimulatorWatcher.update(simulator);
@@ -188,7 +188,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
                 return true;
             }, this).open();
         }));
-        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
+        inventory.setItem(35, new SWItem(Material.RED_DYE, "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
             if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(0, 0, clickType.isShiftClick() ? -0.0625 : -1);
             SimulatorWatcher.update(simulator);

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

@@ -23,6 +23,7 @@ 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.Material;
 import org.bukkit.entity.Player;
 
 import java.util.List;
@@ -51,14 +52,14 @@ public abstract class SimulatorPageGui<T> extends SimulatorBaseGui {
         headerAndFooter();
         page = Math.min(page, maxPage());
 
-        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 -> {
+        inventory.setItem(size - 9, new SWItem(page > 0 ? Material.LIME_DYE : Material.GRAY_DYE, 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, 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 -> {
+        inventory.setItem(size - 1, new SWItem(hasNext ? Material.LIME_DYE : Material.GRAY_DYE, hasNext ? (byte) 10 : (byte) 8, Core.MESSAGE.parse(hasNext ? "SWLISINV_NEXT_PAGE_ACTIVE" : "SWLISINV_NEXT_PAGE_INACTIVE", player), clickType -> {
             if (hasNext) {
                 page++;
                 open();

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

@@ -24,6 +24,7 @@ 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.Material;
 import org.bukkit.entity.Player;
 
 import java.util.List;
@@ -51,14 +52,14 @@ public abstract class SimulatorScrollGui<T> extends SimulatorBaseGui {
         headerAndFooter();
         scroll = maxScroll();
 
-        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 -> {
+        inventory.setItem(size - 9, new SWItem(scroll > 0 ? Material.LIME_DYE : Material.GRAY_DYE, 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, 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 -> {
+        inventory.setItem(size - 1, new SWItem(hasNext ? Material.LIME_DYE : Material.GRAY_DYE, 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();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java

@@ -76,8 +76,8 @@ public class SmartPlaceListener implements Listener {
 
         IGNORED.add(Material.TNT);
         IGNORED.add(Material.REDSTONE_ORE);
-        IGNORED.add(SWItem.getMaterial("BEEHIVE"));
+        IGNORED.add(Material.BEEHIVE);
-        IGNORED.add(SWItem.getMaterial("SEA_PICKLE"));
+        IGNORED.add(Material.SEA_PICKLE);
         IGNORED.remove(Material.STONE);
         IGNORED.remove(Material.BARRIER);
     }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SpectatorListener.java

@@ -23,7 +23,6 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
-import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import de.steamwar.sql.BauweltMember;
 import de.steamwar.techhider.TechHider;
@@ -71,18 +70,18 @@ public class SpectatorListener implements Listener {
                 materials.add(value);
             }
         }
-        materials.add(SWItem.getMaterial("SCULK_SENSOR"));
+        materials.add(Material.SCULK_SENSOR);
-        materials.add(SWItem.getMaterial("CALIBRATED_SCULK_SENSOR"));
+        materials.add(Material.CALIBRATED_SCULK_SENSOR);
-        materials.add(SWItem.getMaterial("SCULK_SHRIEKER"));
+        materials.add(Material.SCULK_SHRIEKER);
-        materials.add(SWItem.getMaterial("AMETHYST_BLOCK"));
+        materials.add(Material.AMETHYST_BLOCK);
-        materials.add(SWItem.getMaterial("AMETHYST_CLUSTER"));
+        materials.add(Material.AMETHYST_CLUSTER);
-        materials.add(SWItem.getMaterial("SMALL_AMETHYST_BUG"));
+        materials.add(Material.SMALL_AMETHYST_BUD);
-        materials.add(SWItem.getMaterial("MEDIUM_AMETHYST_BUG"));
+        materials.add(Material.MEDIUM_AMETHYST_BUD);
-        materials.add(SWItem.getMaterial("LARGE_AMETHYST_BUG"));
+        materials.add(Material.LARGE_AMETHYST_BUD);
         materials.add(Material.TRIPWIRE_HOOK);
         materials.add(Material.TRIPWIRE);
         materials.add(Material.DAYLIGHT_DETECTOR);
-        materials.add(SWItem.getMaterial("LIGHTNING_ROD"));
+        materials.add(Material.LIGHTNING_ROD);
         materials.add(Material.PISTON);
         materials.add(Material.PISTON_HEAD);
         materials.add(Material.MOVING_PISTON);
@@ -96,7 +95,7 @@ public class SpectatorListener implements Listener {
         materials.add(Material.ACTIVATOR_RAIL);
         materials.add(Material.TNT);
         materials.add(Material.REDSTONE_ORE);
-        materials.add(SWItem.getMaterial("SCAFFOLDING"));
+        materials.add(Material.SCAFFOLDING);
         materials.add(Material.WATER);
         materials.remove(Material.BARRIER);
         materials.remove(Material.STONE);

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GUI.java

@@ -51,9 +51,8 @@ public class GUI {
 
     @SuppressWarnings("deprecation")
     private static void addTeamRequest(Player p, SWInventory inv, int pos, FightTeam team) {
-        byte colorCode = ColorConverter.chat2dye(team.getColor()).getDyeData();
         String name = team.getLeader() != null ? team.getLeader().getEntity().getName() : team.getName();
-        inv.setItem(pos, SWItem.getDye(colorCode), colorCode, msg.parse("JOIN_REQUEST_TEAM", p, team.getColor() + name), click -> {
+        inv.setItem(pos, ColorConverter.chat2dye(team.getColor()), msg.parse("JOIN_REQUEST_TEAM", p, team.getColor() + name), click -> {
             p.closeInventory();
 
             if(ArenaMode.ManualTeams.contains(Config.mode) && team.canbeLeader(p))
@@ -226,7 +225,7 @@ public class GUI {
         });
 
         if (Fight.publicOnly()) {
-            inv.setItem(row * 9, SWItem.getDye(8), (byte)8, msg.parse("SCHEM_PRIVATE_FORBIDDEN", p, type.name()), (ClickType click)->{});
+            inv.setItem(row * 9, Material.GRAY_DYE, (byte)8, msg.parse("SCHEM_PRIVATE_FORBIDDEN", p, type.name()), (ClickType click)->{});
             return;
         }
 
@@ -238,11 +237,11 @@ public class GUI {
         }
 
         if (SchematicNode.getAllAccessibleSchematicsOfType(SteamwarUser.get(p.getUniqueId()).getId(), type.toDB()).isEmpty() && !Config.test()) {
-            inv.setItem(row * 9, SWItem.getDye(8), (byte)8, msg.parse("SCHEM_NO_PRIVATE", p, type.name()), (ClickType click)->{});
+            inv.setItem(row * 9, Material.GRAY_DYE, (byte)8, msg.parse("SCHEM_NO_PRIVATE", p, type.name()), (ClickType click)->{});
             return;
         }
 
-        inv.setItem(row * 9, SWItem.getMaterial("CAULDRON_ITEM"), msg.parse("SCHEM_PRIVATE", p, type.name()), (ClickType click) -> {
+        inv.setItem(row * 9, Material.CAULDRON, msg.parse("SCHEM_PRIVATE", p, type.name()), (ClickType click) -> {
             p.closeInventory();
             schemDialog(p, type, false, false);
         });

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java

@@ -149,7 +149,7 @@ public class FightSchematic extends StateDependent {
 
     private void replaceTeamColor(Clipboard clipboard) {
         try {
-            WorldeditWrapper.impl.replaceTeamColor(clipboard, ArenaMode.AntiPrepare.contains(Config.mode) ? ColorConverter.chat2dye(team.getColor()) : DyeColor.PINK);
+            WorldeditWrapper.impl.replaceTeamColor(clipboard, ArenaMode.AntiPrepare.contains(Config.mode) ? ColorConverter.chat2dyeColor(team.getColor()) : DyeColor.PINK);
         } catch (WorldEditException e) {
             Bukkit.getLogger().log(Level.SEVERE, "Could not recolor schematic", e);
         }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java

@@ -78,19 +78,19 @@ public class FightTeam {
         }
 
         if(Config.test())
-            notReadyKit.setItem(5, "CHOOSE_SCHEMATIC", new ItemBuilder(SWItem.getMaterial("CAULDRON_ITEM")).enchant().build(), GUI::preSchemDialog);
+            notReadyKit.setItem(5, "CHOOSE_SCHEMATIC", new ItemBuilder(Material.CAULDRON).enchant().build(), GUI::preSchemDialog);
 
         notReadyKit.setItem(3, "MANAGE_PLAYERS", SWItem.getPlayerSkull("AdmiralSeekrank").getItemStack(), GUI::managePlayers);
-        notReadyKit.setItem(4, "TEAM_NOT_READY", new ItemBuilder(SWItem.getDye(10), (short) 10).enchant().build(), player -> Objects.requireNonNull(Fight.getPlayerTeam(player)).setReady(true));
+        notReadyKit.setItem(4, "TEAM_NOT_READY", new ItemBuilder(Material.LIME_DYE, (short) 10).enchant().build(), player -> Objects.requireNonNull(Fight.getPlayerTeam(player)).setReady(true));
     }
     private static final HotbarKit chooseSchemKit = new HotbarKit(notReadyKit);
     static {
-        chooseSchemKit.setItem(4, "CHOOSE_SCHEMATIC", new ItemBuilder(SWItem.getMaterial("CAULDRON_ITEM")).enchant().build(), GUI::preSchemDialog);
+        chooseSchemKit.setItem(4, "CHOOSE_SCHEMATIC", new ItemBuilder(Material.CAULDRON).enchant().build(), GUI::preSchemDialog);
     }
     private static final HotbarKit readyKit = new HotbarKit(memberKit);
     static {
         readyKit.setItem(1, null, null, null);
-        readyKit.setItem(4, "TEAM_READY", new ItemBuilder(SWItem.getDye(8), (short) 8).enchant().build(), player -> Objects.requireNonNull(Fight.getPlayerTeam(player)).setReady(false));
+        readyKit.setItem(4, "TEAM_READY", new ItemBuilder(Material.GRAY_DYE, (short) 8).enchant().build(), player -> Objects.requireNonNull(Fight.getPlayerTeam(player)).setReady(false));
     }
 
     @Getter

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Kit.java

@@ -295,7 +295,7 @@ public class Kit {
             int pos = 44;
             while(it.hasNext()){
                 PotionEffect effect = it.next();
-                SWItem item = new SWItem(SWItem.getMaterial("POTION"), effect.getType().getName());
+                SWItem item = new SWItem(Material.POTION, effect.getType().getName());
                 inv.setItem(pos, item);
                 pos--;
             }
@@ -303,12 +303,12 @@ public class Kit {
 
         inv.setCallback(-999, click -> player.closeInventory());
         if(Config.GameModeConfig.Kits.PersonalKits){
-            inv.setItem(49, SWItem.getMaterial("WOOD_AXE"), FightSystem.getMessage().parse("KIT_PREVIEW_EDIT", player), clickType -> PersonalKitCreator.openKitCreator(player, PersonalKit.get(SteamwarUser.get(player.getUniqueId()).getId(), Config.GameModeConfig.Schematic.Type.toDB(), name)));
+            inv.setItem(49, Material.WOODEN_AXE, FightSystem.getMessage().parse("KIT_PREVIEW_EDIT", player), clickType -> PersonalKitCreator.openKitCreator(player, PersonalKit.get(SteamwarUser.get(player.getUniqueId()).getId(), Config.GameModeConfig.Schematic.Type.toDB(), name)));
             inv.setItem(53, Material.BARRIER, FightSystem.getMessage().parse("KIT_PREVIEW_DELETE", player), clickType -> {
                 player.closeInventory();
                 SWInventory conf = new SWInventory(player, 9, FightSystem.getMessage().parse("KIT_DELETION_CONFIRMATION", player));
-                conf.setItem(8, SWItem.getDye(1), FightSystem.getMessage().parse("KIT_DELETION_ABORT", player), click -> player.closeInventory());
+                conf.setItem(8, Material.RED_DYE, FightSystem.getMessage().parse("KIT_DELETION_ABORT", player), click -> player.closeInventory());
-                conf.setItem(0, SWItem.getDye(10), FightSystem.getMessage().parse("KIT_DELETION_DELETE", player), click -> {
+                conf.setItem(0, Material.LIME_DYE, FightSystem.getMessage().parse("KIT_DELETION_DELETE", player), click -> {
                     player.closeInventory();
                     SteamwarUser user = SteamwarUser.get(player.getUniqueId());
                     PersonalKit kit = PersonalKit.get(user.getId(), Config.GameModeConfig.Schematic.Type.toDB(), name);
@@ -327,11 +327,11 @@ public class Kit {
                 conf.open();
             });
         }
-        inv.setItem(45, SWItem.getDye(10), (byte)10, FightSystem.getMessage().parse("KIT_PREVIEW_CHOOSE", player), click -> {
+        inv.setItem(45, Material.LIME_DYE, (byte)10, FightSystem.getMessage().parse("KIT_PREVIEW_CHOOSE", player), click -> {
             Commands.kit(player, name);
             player.closeInventory();
         });
-        inv.setItem(53, SWItem.getDye(1), (byte)1, FightSystem.getMessage().parse("KIT_PREVIEW_BACK", player), click -> GUI.kitSelection(player, ""));
+        inv.setItem(53, Material.RED_DYE, (byte)1, FightSystem.getMessage().parse("KIT_PREVIEW_BACK", player), click -> GUI.kitSelection(player, ""));
         inv.open();
     }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java

@@ -43,6 +43,7 @@ import de.steamwar.techhider.BlockIds;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.TextComponent;
+import net.minecraft.world.entity.Pose;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -291,7 +292,7 @@ public class PacketProcessor implements Listener {
         int entityId = source.readInt();
         boolean sneaking = source.readBoolean();
 
-        execSync(() -> entities.get(entityId).setPose(sneaking ? de.steamwar.core.FlatteningWrapper.EntityPose.SNEAKING : de.steamwar.core.FlatteningWrapper.EntityPose.NORMAL));
+        execSync(() -> entities.get(entityId).setPose(sneaking ? Pose.CROUCHING : Pose.STANDING));
     }
 
     private void entityAnimation() throws IOException {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/ColorConverter.java

@@ -21,6 +21,7 @@ package de.steamwar.fightsystem.utils;
 
 import org.bukkit.ChatColor;
 import org.bukkit.DyeColor;
+import org.bukkit.Material;
 
 import java.util.EnumMap;
 import java.util.Map;
@@ -28,28 +29,50 @@ import java.util.Map;
 public class ColorConverter {
     private ColorConverter(){}
 
-    private static final Map<ChatColor, DyeColor> chat2dye = new EnumMap<>(ChatColor.class);
+    private static final Map<ChatColor, DyeColor> chat2dyeColor = new EnumMap<>(ChatColor.class);
+    private static final Map<ChatColor, Material> chat2dye = new EnumMap<>(ChatColor.class);
 
     static{
-        chat2dye.put(ChatColor.WHITE, DyeColor.WHITE);
+        chat2dyeColor.put(ChatColor.WHITE, DyeColor.WHITE);
-        chat2dye.put(ChatColor.GOLD, DyeColor.ORANGE);
+        chat2dyeColor.put(ChatColor.GOLD, DyeColor.ORANGE);
-        chat2dye.put(ChatColor.LIGHT_PURPLE, DyeColor.MAGENTA);
+        chat2dyeColor.put(ChatColor.LIGHT_PURPLE, DyeColor.MAGENTA);
-        chat2dye.put(ChatColor.BLUE, DyeColor.LIGHT_BLUE);
+        chat2dyeColor.put(ChatColor.BLUE, DyeColor.LIGHT_BLUE);
-        chat2dye.put(ChatColor.YELLOW, DyeColor.YELLOW);
+        chat2dyeColor.put(ChatColor.YELLOW, DyeColor.YELLOW);
-        chat2dye.put(ChatColor.GREEN, DyeColor.LIME);
+        chat2dyeColor.put(ChatColor.GREEN, DyeColor.LIME);
-        chat2dye.put(ChatColor.RED, DyeColor.RED);
+        chat2dyeColor.put(ChatColor.RED, DyeColor.RED);
-        chat2dye.put(ChatColor.DARK_GRAY, DyeColor.GRAY);
+        chat2dyeColor.put(ChatColor.DARK_GRAY, DyeColor.GRAY);
-        chat2dye.put(ChatColor.DARK_AQUA, DyeColor.CYAN);
+        chat2dyeColor.put(ChatColor.DARK_AQUA, DyeColor.CYAN);
-        chat2dye.put(ChatColor.DARK_PURPLE, DyeColor.PURPLE);
+        chat2dyeColor.put(ChatColor.DARK_PURPLE, DyeColor.PURPLE);
-        chat2dye.put(ChatColor.DARK_BLUE, DyeColor.BLUE);
+        chat2dyeColor.put(ChatColor.DARK_BLUE, DyeColor.BLUE);
-        chat2dye.put(ChatColor.AQUA, DyeColor.CYAN);
+        chat2dyeColor.put(ChatColor.AQUA, DyeColor.CYAN);
-        chat2dye.put(ChatColor.DARK_GREEN, DyeColor.GREEN);
+        chat2dyeColor.put(ChatColor.DARK_GREEN, DyeColor.GREEN);
-        chat2dye.put(ChatColor.DARK_RED, DyeColor.RED);
+        chat2dyeColor.put(ChatColor.DARK_RED, DyeColor.RED);
-        chat2dye.put(ChatColor.BLACK, DyeColor.BLACK);
+        chat2dyeColor.put(ChatColor.BLACK, DyeColor.BLACK);
-        chat2dye.put(ChatColor.GRAY, FlatteningWrapper.impl.getSilver());
+        chat2dyeColor.put(ChatColor.GRAY, DyeColor.LIGHT_GRAY);
+
+        chat2dye.put(ChatColor.WHITE, Material.WHITE_DYE);
+        chat2dye.put(ChatColor.GOLD, Material.ORANGE_DYE);
+        chat2dye.put(ChatColor.LIGHT_PURPLE, Material.MAGENTA_DYE);
+        chat2dye.put(ChatColor.BLUE, Material.LIGHT_BLUE_DYE);
+        chat2dye.put(ChatColor.YELLOW, Material.YELLOW_DYE);
+        chat2dye.put(ChatColor.GREEN, Material.LIME_DYE);
+        chat2dye.put(ChatColor.RED, Material.RED_DYE);
+        chat2dye.put(ChatColor.DARK_GRAY, Material.GRAY_DYE);
+        chat2dye.put(ChatColor.DARK_AQUA, Material.CYAN_DYE);
+        chat2dye.put(ChatColor.DARK_PURPLE, Material.PURPLE_DYE);
+        chat2dye.put(ChatColor.DARK_BLUE, Material.BLUE_DYE);
+        chat2dye.put(ChatColor.AQUA, Material.CYAN_DYE);
+        chat2dye.put(ChatColor.DARK_GREEN, Material.GREEN_DYE);
+        chat2dye.put(ChatColor.DARK_RED, Material.RED_DYE);
+        chat2dye.put(ChatColor.BLACK, Material.BLACK_DYE);
+        chat2dye.put(ChatColor.GRAY, Material.LIGHT_GRAY_DYE);
     }
 
-    public static DyeColor chat2dye(ChatColor color){
+    public static DyeColor chat2dyeColor(ChatColor color){
+        return chat2dyeColor.get(color);
+    }
+
+    public static Material chat2dye(ChatColor color){
         return chat2dye.get(color);
     }
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FlatteningWrapper.java

@@ -19,7 +19,6 @@
 
 package de.steamwar.fightsystem.utils;
 
-import org.bukkit.DyeColor;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
@@ -36,10 +35,6 @@ import org.bukkit.inventory.meta.ItemMeta;
 public class FlatteningWrapper {
     public static final FlatteningWrapper impl = new FlatteningWrapper();
 
-    public DyeColor getSilver() {
-        return DyeColor.LIGHT_GRAY;
-    }
-
     public boolean isWater(Block block) {
         if(block.getType() == Material.WATER)
             return true;

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java

@@ -25,7 +25,6 @@ import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentTask;
 import de.steamwar.fightsystem.utils.Message;
-import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 
@@ -37,7 +36,7 @@ import java.util.function.Predicate;
 
 public abstract class WinconditionBlocks extends Wincondition implements PrintableWincondition {
 
-    public static final Material PUMPKIN_LANTERN = SWItem.getMaterial("JACK_O_LANTERN");
+    public static final Material PUMPKIN_LANTERN = Material.JACK_O_LANTERN;
 
     private final Map<FightTeam, TeamBlocks> teamMap = new HashMap<>();
     private final String barMessage;

LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntCommand.java

@@ -60,13 +60,13 @@ public class EggHuntCommand extends SWCommand {
                 .collect(Collectors.toList());
         SWListInv<Egg> inv = new SWListInv<>(player, LobbySystem.getMessage().parse("EASTER_EGG_MENU", player, foundCount.get(), EggHunt.getEggList().size()), false, entries, (clickType, egg) -> {
         });
-        inv.setItem(49, new SWItem(SWItem.getDye(15), (byte) 15, LobbySystem.getMessage().parse(Selection.ALL.key, player), Collections.emptyList(), selection == Selection.ALL, clickType -> {
+        inv.setItem(49, new SWItem(Material.WHITE_DYE, (byte) 15, LobbySystem.getMessage().parse(Selection.ALL.key, player), Collections.emptyList(), selection == Selection.ALL, clickType -> {
             genericCommand(player, Selection.ALL);
         }));
-        inv.setItem(48, new SWItem(SWItem.getDye(1), (byte) 1, LobbySystem.getMessage().parse(Selection.NOT_FOUND.key, player), Collections.emptyList(), selection == Selection.NOT_FOUND, clickType -> {
+        inv.setItem(48, new SWItem(Material.RED_DYE, (byte) 1, LobbySystem.getMessage().parse(Selection.NOT_FOUND.key, player), Collections.emptyList(), selection == Selection.NOT_FOUND, clickType -> {
             genericCommand(player, Selection.NOT_FOUND);
         }));
-        inv.setItem(50, new SWItem(SWItem.getDye(2), (byte) 2, LobbySystem.getMessage().parse(Selection.FOUND.key, player), Collections.emptyList(), selection == Selection.FOUND, clickType -> {
+        inv.setItem(50, new SWItem(Material.GREEN_DYE, (byte) 2, LobbySystem.getMessage().parse(Selection.FOUND.key, player), Collections.emptyList(), selection == Selection.FOUND, clickType -> {
             genericCommand(player, Selection.FOUND);
         }));
         inv.open();

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

@@ -94,7 +94,7 @@ public class GUI {
         SteamwarUser user = getUser(player);
         SWInventory inv = new SWInventory(player, 9 * 2, node.generateBreadcrumbs(user));
         if(!node.isDir()) {
-            inv.setItem(0, SWItem.getMaterial("WOOD_AXE"), SchematicSystem.MESSAGE.parse("GUI_INFO_LOAD", player), Arrays.asList(
+            inv.setItem(0, Material.WOODEN_AXE, SchematicSystem.MESSAGE.parse("GUI_INFO_LOAD", player), Arrays.asList(
                     SchematicSystem.MESSAGE.parse("GUI_LOAD_LATEST", player),
                     SchematicSystem.MESSAGE.parse("GUI_LOAD_REVISION", player)
             ), false, click -> {
@@ -119,14 +119,14 @@ public class GUI {
             });
         }
 
-        inv.setItem(9, new SWItem(SWItem.getMaterial("LEASH"), SchematicSystem.MESSAGE.parse("GUI_INFO_BACK", player), clickType -> {
+        inv.setItem(9, new SWItem(Material.LEAD, 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()){
                 CheckedSchematic.getLastDeclinedOfNode(node.getId()).stream().findFirst().ifPresent(checkedSchematic ->
-                        inv.setItem(1, SWItem.getDye(10), (byte) 10, SchematicSystem.MESSAGE.parse("GUI_INFO_STATUS", player, node.getSchemtype().name()), Collections.singletonList(SchematicSystem.MESSAGE.parse("GUI_INFO_STATUS_LORE", player, checkedSchematic.getDeclineReason().replaceAll("&", "§"))), false, click -> {}));
+                        inv.setItem(1, Material.LIME_DYE, (byte) 10, SchematicSystem.MESSAGE.parse("GUI_INFO_STATUS", player, node.getSchemtype().name()), Collections.singletonList(SchematicSystem.MESSAGE.parse("GUI_INFO_STATUS_LORE", player, checkedSchematic.getDeclineReason().replaceAll("&", "§"))), false, click -> {}));
             }
             Material mat = SWItem.getMaterial(node.getItem());
 
@@ -142,23 +142,23 @@ public class GUI {
                 inv.setItem(6, SWItem.getMaterial(node.getSchemtype().getMaterial()), SchematicSystem.MESSAGE.parse("GUI_INFO_TYPE", player, node.getSchemtype().name()), Arrays.asList(SchematicSystem.MESSAGE.parse("CHANGE", player), SchematicSystem.MESSAGE.parse("CLICK", player)), node.getSchemtype().fightType(), click -> {
                     changeType(player, node);
                 });
-                inv.setItem(7, SWItem.getMaterial("MAGENTA_GLAZED_TERRACOTTA"), SchematicSystem.MESSAGE.parse("GUI_INFO_DOWNLOAD", player), click -> {
+                inv.setItem(7, Material.MAGENTA_GLAZED_TERRACOTTA, SchematicSystem.MESSAGE.parse("GUI_INFO_DOWNLOAD", player), click -> {
                     player.closeInventory();
                     SchematicCommandUtils.download(player, node);
                 });
                 if(node.getSchemtype().fightType()) {
-                    inv.setItem(14, SWItem.getMaterial(node.replaceColor() ? "PINK_WOOL" : "LIGHT_GRAY_WOOL"), SchematicSystem.MESSAGE.parse("GUI_INFO_COLOR", player), Arrays.asList(SchematicSystem.MESSAGE.parse("CURRENT", player, SchematicSystem.MESSAGE.parse(node.replaceColor()?"ON":"OFF", player)), SchematicSystem.MESSAGE.parse("CHANGE", player), SchematicSystem.MESSAGE.parse("CLICK", player)), false, clickType -> {
+                    inv.setItem(14, node.replaceColor() ? Material.PINK_WOOL : Material.LIGHT_GRAY_WOOL, SchematicSystem.MESSAGE.parse("GUI_INFO_COLOR", player), Arrays.asList(SchematicSystem.MESSAGE.parse("CURRENT", player, SchematicSystem.MESSAGE.parse(node.replaceColor()?"ON":"OFF", player)), SchematicSystem.MESSAGE.parse("CHANGE", player), SchematicSystem.MESSAGE.parse("CLICK", player)), false, clickType -> {
                         node.setReplaceColor(!node.replaceColor());
                         info(player, node, back);
                     });
-                    inv.setItem(13, SWItem.getMaterial(node.allowReplay() ? "EYE_OF_ENDER" : "ENDER_PEARL"), SchematicSystem.MESSAGE.parse("GUI_INFO_REPLAY", player), Arrays.asList(SchematicSystem.MESSAGE.parse("CURRENT", player, SchematicSystem.MESSAGE.parse(node.allowReplay()?"ON":"OFF", player)), SchematicSystem.MESSAGE.parse("GUI_INFO_REPLAY_OFF", player), SchematicSystem.MESSAGE.parse("CLICK", player)), false, clickType -> {
+                    inv.setItem(13, node.allowReplay() ? Material.ENDER_EYE : Material.ENDER_PEARL, SchematicSystem.MESSAGE.parse("GUI_INFO_REPLAY", player), Arrays.asList(SchematicSystem.MESSAGE.parse("CURRENT", player, SchematicSystem.MESSAGE.parse(node.allowReplay()?"ON":"OFF", player)), SchematicSystem.MESSAGE.parse("GUI_INFO_REPLAY_OFF", player), SchematicSystem.MESSAGE.parse("CLICK", player)), false, clickType -> {
                         if(node.allowReplay()) {
                             SWInventory confInv = new SWInventory(player, 9, SchematicSystem.MESSAGE.parse("GUI_INFO_REPLAY_TITLE", player));
-                            confInv.setItem(0, SWItem.getDye(10), (byte) 10, SchematicSystem.MESSAGE.parse("CONFIRM", player), type -> {
+                            confInv.setItem(0, Material.LIME_DYE, (byte) 10, SchematicSystem.MESSAGE.parse("CONFIRM", player), type -> {
                                 node.setAllowReplay(false);
                                 info(player, node, back);
                             });
-                            confInv.setItem(8, SWItem.getDye(1), (byte) 1, SchematicSystem.MESSAGE.parse("CANCEL", player), type -> {
+                            confInv.setItem(8, Material.RED_DYE, (byte) 1, SchematicSystem.MESSAGE.parse("CANCEL", player), type -> {
                                 info(player, node, back);
                             });
                             confInv.open();
@@ -188,13 +188,13 @@ public class GUI {
                 anvilInv.open();
             });
             if(node.getOwner() != 0) {
-                inv.setItem(17, SWItem.getDye(1), (byte) 1, SchematicSystem.MESSAGE.parse("GUI_INFO_DELETE", player), click -> {
+                inv.setItem(17, Material.RED_DYE, (byte) 1, SchematicSystem.MESSAGE.parse("GUI_INFO_DELETE", player), click -> {
                     delete(player, node, back);
                 });
             }
         }else{
             if(!node.isDir()) {
-                inv.setItem(4, SWItem.getMaterial("CAULDRON_ITEM"), SchematicSystem.MESSAGE.parse("GUI_INFO_TYPE", player, node.getSchemtype().name()), Collections.emptyList(), node.getSchemtype().fightType(), click -> {});
+                inv.setItem(4, Material.CAULDRON, SchematicSystem.MESSAGE.parse("GUI_INFO_TYPE", player, node.getSchemtype().name()), Collections.emptyList(), node.getSchemtype().fightType(), click -> {});
             }
 
             SteamwarUser owneruser = SteamwarUser.byId(node.getOwner());
@@ -203,7 +203,7 @@ public class GUI {
             inv.setItem(8, skull.getItemStack(), clickType -> {});
 
             if(NodeMember.getNodeMember(node.getId(), user.getId()) != null) {
-                inv.setItem(17, SWItem.getDye(1), (byte) 1, SchematicSystem.MESSAGE.parse("GUI_INFO_MEMBER_REMOVE", player), click -> {
+                inv.setItem(17, Material.RED_DYE, (byte) 1, SchematicSystem.MESSAGE.parse("GUI_INFO_MEMBER_REMOVE", player), click -> {
                     delete(player, node, back);
                 });
             }
@@ -269,7 +269,7 @@ public class GUI {
     private static void deleteOwn(Player p, SchematicNode schem, SchematicSelector back){
         SteamwarUser user = getUser(p);
         SWInventory inv = new SWInventory(p, 9, SchematicSystem.MESSAGE.parse("GUI_DELETE_OWN_TITLE", p, schem.generateBreadcrumbs(user)));
-        inv.setItem(0, SWItem.getDye(1), (byte) 1, SchematicSystem.MESSAGE.parse("CONFIRM", p), click -> {
+        inv.setItem(0, Material.RED_DYE, (byte) 1, SchematicSystem.MESSAGE.parse("CONFIRM", p), click -> {
             p.performCommand("schematic delete " + schem.generateBreadcrumbs(user));
 
             if(back != null) {
@@ -280,7 +280,7 @@ public class GUI {
                 }
             }
         });
-        inv.setItem(8, SWItem.getDye(14), (byte) 14, SchematicSystem.MESSAGE.parse("CANCEL", p), click -> p.closeInventory());
+        inv.setItem(8, Material.ORANGE_DYE, (byte) 14, SchematicSystem.MESSAGE.parse("CANCEL", p), click -> p.closeInventory());
         inv.setCallback(-999, click -> p.closeInventory());
         inv.open();
     }
@@ -288,7 +288,7 @@ public class GUI {
     private static void deleteMembership(Player p, SchematicNode schem, SchematicSelector back){
         SteamwarUser user = getUser(p);
         SWInventory inv = new SWInventory(p, 9, SchematicSystem.MESSAGE.parse("GUI_DELETE_MEMBER_TITLE", p, schem.generateBreadcrumbs(user)));
-        inv.setItem(0, SWItem.getDye(1), (byte) 1, SchematicSystem.MESSAGE.parse("CONFIRM", p), click -> {
+        inv.setItem(0, Material.RED_DYE, (byte) 1, SchematicSystem.MESSAGE.parse("CONFIRM", p), click -> {
             NodeMember member = NodeMember.getNodeMember(schem.getId(), user.getId());
             if(member != null)
                 member.delete();
@@ -301,7 +301,7 @@ public class GUI {
                 }
             }
         });
-        inv.setItem(8, SWItem.getDye(14), (byte) 14, SchematicSystem.MESSAGE.parse("CANCEL", p), click -> p.closeInventory());
+        inv.setItem(8, Material.ORANGE_DYE, (byte) 14, SchematicSystem.MESSAGE.parse("CANCEL", p), click -> p.closeInventory());
         inv.setCallback(-999, click -> p.closeInventory());
         inv.open();
     }

SchematicSystem/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java

@@ -487,20 +487,20 @@ public class SchematicCommandUtils {
 
     private static void submitSchemGUI(Player player, SchematicNode node, SchematicType type) {
         SWInventory inv = new SWInventory(player, 9, SchematicSystem.MESSAGE.parse("UTIL_SUBMIT_TITLE", player));
-        inv.setItem(0, SWItem.getMaterial("SIGN"), SchematicSystem.MESSAGE.parse(node.allowReplay()?"UTIL_SUBMIT_REPLAY_ON":"UTIL_SUBMIT_REPLAY_OFF", player), click -> {
+        inv.setItem(0, Material.OAK_SIGN, SchematicSystem.MESSAGE.parse(node.allowReplay()?"UTIL_SUBMIT_REPLAY_ON":"UTIL_SUBMIT_REPLAY_OFF", player), click -> {
             node.setAllowReplay(!node.allowReplay());
             submitSchemGUI(player, node, type);
         });
-        inv.setItem(1, SWItem.getMaterial(node.replaceColor() ? "PINK_WOOL" : "LIGHT_GRAY_WOOL"), SchematicSystem.MESSAGE.parse(node.replaceColor()?"UTIL_SUBMIT_COLOR_ON":"UTIL_SUBMIT_COLOR_OFF", player), click -> {
+        inv.setItem(1, node.replaceColor() ? Material.PINK_WOOL : Material.LIGHT_GRAY_WOOL, SchematicSystem.MESSAGE.parse(node.replaceColor()?"UTIL_SUBMIT_COLOR_ON":"UTIL_SUBMIT_COLOR_OFF", player), click -> {
             node.setReplaceColor(!node.replaceColor());
             submitSchemGUI(player, node, type);
         });
-        inv.setItem(7, SWItem.getDye(7), (byte) 7, SchematicSystem.MESSAGE.parse("UTIL_SUBMIT_DIRECT", player), click -> {
+        inv.setItem(7, Material.LIGHT_GRAY_DYE, (byte) 7, SchematicSystem.MESSAGE.parse("UTIL_SUBMIT_DIRECT", player), click -> {
             node.setSchemtype(type.checkType());
             SchematicSystem.MESSAGE.send(type.getManualCheck() ? "UTIL_SUBMIT_DIRECT_DONE" : "UTIL_SUBMIT_DIRECT_PLAYABLE", player);
             player.closeInventory();
         });
-        inv.setItem(8, SWItem.getDye(10), (byte) 10, SchematicSystem.MESSAGE.parse("UTIL_SUBMIT_EXTEND", player), click -> {
+        inv.setItem(8, Material.LIME_DYE, (byte) 10, SchematicSystem.MESSAGE.parse("UTIL_SUBMIT_EXTEND", player), click -> {
             NetworkSender.send(new PrepareSchemPacket(SteamwarUser.get(player.getUniqueId()).getId(), node.getId(), type.toDB()));
             SchematicSystem.MESSAGE.send("UTIL_SUBMIT_EXTEND_DONE", player);
             player.closeInventory();

SpigotCore/SpigotCore_Main/src/de/steamwar/core/ChatWrapper.java

@@ -19,6 +19,7 @@
 
 package de.steamwar.core;
 
+import lombok.experimental.UtilityClass;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.contents.PlainTextContents;
 import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket;
@@ -26,9 +27,8 @@ import net.minecraft.network.syncher.SynchedEntityData;
 
 import java.util.ArrayList;
 
+@UtilityClass
 public class ChatWrapper {
-    public static final ChatWrapper impl = new ChatWrapper();
-
     public Object stringToChatComponent(String text) {
         return MutableComponent.create(PlainTextContents.create(text));
     }

SpigotCore/SpigotCore_Main/src/de/steamwar/core/CheckpointUtilsJ9.java

@@ -26,6 +26,7 @@ import io.netty.channel.ChannelFuture;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerConnectionListener;
 import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.CraftWorld;
 import org.eclipse.openj9.criu.CRIUSupport;
 import org.eclipse.openj9.criu.JVMCRIUException;
 import sun.misc.Signal;
@@ -96,7 +97,9 @@ class CheckpointUtilsJ9 {
     private static void freezeInternal(Path path) throws Exception {
         Bukkit.getPluginManager().callEvent(new CRIUSleepEvent());
 
-        Bukkit.getWorlds().forEach(FlatteningWrapper.impl::syncSave);
+        Bukkit.getWorlds().forEach(world -> {
+            ((CraftWorld) world).getHandle().save(null, true, false);
+        });
         Statement.closeAll();
 
         // Close socket

SpigotCore/SpigotCore_Main/src/de/steamwar/core/FlatteningWrapper.java

@@ -19,339 +19,14 @@
 
 package de.steamwar.core;
 
-import com.destroystokyo.paper.profile.PlayerProfile;
+import lombok.experimental.UtilityClass;
-import de.steamwar.Reflection;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.protocol.game.ClientboundSetObjectivePacket;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.Pose;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.World;
-import org.bukkit.craftbukkit.CraftWorld;
-import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.SkullMeta;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Optional;
 
+@UtilityClass
 public class FlatteningWrapper {
-    private FlatteningWrapper() {}
-
-    public static final FlatteningWrapper impl = new FlatteningWrapper();
-
-    private static final Map<String, Material> renamedLegacy = new HashMap<>();
-
-    static{
-        renamedLegacy.put("WOOD", Material.OAK_WOOD);
-        renamedLegacy.put("SAPLING", Material.OAK_SAPLING);
-        renamedLegacy.put("STATIONARY_WATER", Material.WATER);
-        renamedLegacy.put("STATIONARY_LAVA", Material.LAVA);
-        renamedLegacy.put("LOG", Material.OAK_LOG);
-        renamedLegacy.put("LEAVES", Material.OAK_LEAVES);
-        renamedLegacy.put("BED_BLOCK", Material.RED_BED);
-        renamedLegacy.put("BED", Material.RED_BED);
-        renamedLegacy.put("PISTON_STICKY_BASE", Material.STICKY_PISTON);
-        renamedLegacy.put("WEB", Material.COBWEB);
-        renamedLegacy.put("LONG_GRASS", Material.TALL_GRASS);
-        renamedLegacy.put("PISTON_BASE", Material.PISTON);
-        renamedLegacy.put("PISTON_EXTENSION", Material.PISTON_HEAD);
-        renamedLegacy.put("WOOL", Material.WHITE_WOOL);
-        renamedLegacy.put("PISTON_MOVING_PIECE", Material.MOVING_PISTON);
-        renamedLegacy.put("YELLOW_FLOWER", Material.DANDELION);
-        renamedLegacy.put("RED_ROSE", Material.POPPY);
-        renamedLegacy.put("DOUBLE_STEP", Material.SMOOTH_STONE);
-        renamedLegacy.put("STEP", Material.SMOOTH_STONE_SLAB);
-        renamedLegacy.put("MOB_SPAWNER", Material.SPAWNER);
-        renamedLegacy.put("WOOD_STAIRS", Material.OAK_STAIRS);
-        renamedLegacy.put("WORKBENCH", Material.CRAFTING_TABLE);
-        renamedLegacy.put("CROPS", Material.WHEAT_SEEDS);
-        renamedLegacy.put("SEEDS", Material.WHEAT_SEEDS);
-        renamedLegacy.put("SOIL", Material.FARMLAND);
-        renamedLegacy.put("BURNING_FURNACE", Material.FURNACE);
-        renamedLegacy.put("SIGN_POST", Material.OAK_SIGN);
-        renamedLegacy.put("SIGN", Material.OAK_SIGN);
-        renamedLegacy.put("WOODEN_DOOR", Material.OAK_DOOR);
-        renamedLegacy.put("WOOD_DOOR", Material.OAK_DOOR);
-        renamedLegacy.put("RAILS", Material.RAIL);
-        renamedLegacy.put("WALL_SIGN", Material.OAK_WALL_SIGN);
-        renamedLegacy.put("STONE_PLATE", Material.STONE_PRESSURE_PLATE);
-        renamedLegacy.put("WOOD_PLATE", Material.OAK_PRESSURE_PLATE);
-        renamedLegacy.put("GLOWING_REDSTONE_ORE", Material.REDSTONE_ORE);
-        renamedLegacy.put("REDSTONE_TORCH_OFF", Material.REDSTONE_TORCH);
-        renamedLegacy.put("REDSTONE_TORCH_ON", Material.REDSTONE_TORCH);
-        renamedLegacy.put("IRON_DOOR_BLOCK", Material.IRON_DOOR);
-        renamedLegacy.put("SUGAR_CANE_BLOCK", Material.SUGAR_CANE);
-        renamedLegacy.put("CAKE_BLOCK", Material.CAKE);
-        renamedLegacy.put("MELON_BLOCK", Material.MELON);
-        renamedLegacy.put("BEETROOT_BLOCK", Material.BEETROOT);
-        renamedLegacy.put("FENCE", Material.OAK_FENCE);
-        renamedLegacy.put("PORTAL", Material.NETHER_PORTAL);
-        renamedLegacy.put("DIODE_BLOCK_OFF", Material.REPEATER);
-        renamedLegacy.put("DIODE_BLOCK_ON", Material.REPEATER);
-        renamedLegacy.put("DIODE", Material.REPEATER);
-        renamedLegacy.put("STAINED_GLASS", Material.WHITE_STAINED_GLASS);
-        renamedLegacy.put("TRAP_DOOR", Material.OAK_TRAPDOOR);
-        renamedLegacy.put("MONSTER_EGGS", Material.SKELETON_SPAWN_EGG);
-        renamedLegacy.put("MONSTER_EGG", Material.SKELETON_SPAWN_EGG);
-        renamedLegacy.put("SMOOTH_BRICK", Material.STONE_BRICKS);
-        renamedLegacy.put("HUGE_MUSHROOM_1", Material.MUSHROOM_STEM);
-        renamedLegacy.put("HUGE_MUSHROOM_2", Material.RED_MUSHROOM);
-        renamedLegacy.put("IRON_FENCE", Material.IRON_BARS);
-        renamedLegacy.put("THIN_GLASS", Material.GLASS_PANE);
-        renamedLegacy.put("FENCE_GATE", Material.OAK_FENCE_GATE);
-        renamedLegacy.put("SMOOTH_STAIRS", Material.STONE_BRICK_STAIRS);
-        renamedLegacy.put("MYCEL", Material.MYCELIUM);
-        renamedLegacy.put("WATER_LILY", Material.LILY_PAD);
-        renamedLegacy.put("NETHER_FENCE", Material.NETHER_BRICK_FENCE);
-        renamedLegacy.put("NETHER_WARTS", Material.NETHER_WART);
-        renamedLegacy.put("NETHER_STALK", Material.NETHER_WART);
-        renamedLegacy.put("ENCHANTMENT_TABLE", Material.ENCHANTING_TABLE);
-        renamedLegacy.put("ENDER_PORTAL", Material.END_PORTAL);
-        renamedLegacy.put("ENDER_PORTAL_FRAME", Material.END_PORTAL_FRAME);
-        renamedLegacy.put("ENDER_STONE", Material.END_STONE);
-        renamedLegacy.put("REDSTONE_LAMP_OFF", Material.REDSTONE_LAMP);
-        renamedLegacy.put("REDSTONE_LAMP_ON", Material.REDSTONE_LAMP);
-        renamedLegacy.put("WOOD_DOUBLE_STEP", Material.OAK_SLAB);
-        renamedLegacy.put("WOOD_STEP", Material.OAK_SLAB);
-        renamedLegacy.put("SPRUCE_WOOD_STAIRS", Material.SPRUCE_STAIRS);
-        renamedLegacy.put("BIRCH_WOOD_STAIRS", Material.BIRCH_STAIRS);
-        renamedLegacy.put("JUNGLE_WOOD_STAIRS", Material.JUNGLE_STAIRS);
-        renamedLegacy.put("COMMAND", Material.COMMAND_BLOCK);
-        renamedLegacy.put("COBBLE_WALL", Material.COBBLESTONE_WALL);
-        renamedLegacy.put("WOOD_BUTTON", Material.OAK_BUTTON);
-        renamedLegacy.put("SKULL", Material.SKELETON_SKULL);
-        renamedLegacy.put("SKULL_ITEM", Material.SKELETON_SKULL);
-        renamedLegacy.put("GOLD_PLATE", Material.LIGHT_WEIGHTED_PRESSURE_PLATE);
-        renamedLegacy.put("IRON_PLATE", Material.HEAVY_WEIGHTED_PRESSURE_PLATE);
-        renamedLegacy.put("REDSTONE_COMPARATOR_OFF", Material.COMPARATOR);
-        renamedLegacy.put("REDSTONE_COMPARATOR_ON", Material.COMPARATOR);
-        renamedLegacy.put("REDSTONE_COMPARATOR", Material.COMPARATOR);
-        renamedLegacy.put("QUARTZ_ORE", Material.QUARTZ);
-        renamedLegacy.put("STAINED_CLAY", Material.WHITE_TERRACOTTA);
-        renamedLegacy.put("STAINED_GLASS_PANE", Material.WHITE_STAINED_GLASS_PANE);
-        renamedLegacy.put("LEAVES_2", Material.ACACIA_LEAVES);
-        renamedLegacy.put("LOG_2", Material.ACACIA_LOG);
-        renamedLegacy.put("CARPET", Material.WHITE_CARPET);
-        renamedLegacy.put("HARD_CLAY", Material.TERRACOTTA);
-        renamedLegacy.put("DOUBLE_PLANT", Material.SUNFLOWER);
-        renamedLegacy.put("STANDING_BANNER", Material.WHITE_BANNER);
-        renamedLegacy.put("BANNER", Material.WHITE_BANNER);
-        renamedLegacy.put("WALL_BANNER", Material.WHITE_WALL_BANNER);
-        renamedLegacy.put("DAYLIGHT_DETECTOR_INVERTED", Material.DAYLIGHT_DETECTOR);
-        renamedLegacy.put("DOUBLE_STONE_SLAB2", Material.RED_SANDSTONE_SLAB);
-        renamedLegacy.put("STONE_SLAB2", Material.RED_SANDSTONE_SLAB);
-        renamedLegacy.put("PURPUR_DOUBLE_SLAB", Material.PURPUR_SLAB);
-        renamedLegacy.put("END_BRICKS", Material.END_STONE_BRICKS);
-        renamedLegacy.put("COMMAND_REPEATING", Material.REPEATING_COMMAND_BLOCK);
-        renamedLegacy.put("COMMAND_CHAIN", Material.CHAIN_COMMAND_BLOCK);
-        renamedLegacy.put("MAGMA", Material.MAGMA_BLOCK);
-        renamedLegacy.put("RED_NETHER_BRICK", Material.RED_NETHER_BRICKS);
-        renamedLegacy.put("SILVER_SHULKER_BOX", Material.LIGHT_GRAY_SHULKER_BOX);
-        renamedLegacy.put("SILVER_GLAZED_TERRACOTTA", Material.LIGHT_GRAY_TERRACOTTA);
-        renamedLegacy.put("CONCRETE", Material.WHITE_CONCRETE);
-        renamedLegacy.put("CONCRETE_POWDER", Material.WHITE_CONCRETE_POWDER);
-        renamedLegacy.put("IRON_SPADE", Material.IRON_SHOVEL);
-        renamedLegacy.put("WOOD_SWORD", Material.WOODEN_SWORD);
-        renamedLegacy.put("WOOD_SPADE", Material.WOODEN_SHOVEL);
-        renamedLegacy.put("WOOD_PICKAXE", Material.WOODEN_PICKAXE);
-        renamedLegacy.put("WOOD_AXE", Material.WOODEN_AXE);
-        renamedLegacy.put("STONE_SPADE", Material.STONE_SHOVEL);
-        renamedLegacy.put("DIAMOND_SPADE", Material.DIAMOND_SHOVEL);
-        renamedLegacy.put("MUSHROOM_SOUP", Material.MUSHROOM_STEW);
-        renamedLegacy.put("GOLD_SWORD", Material.GOLDEN_SWORD);
-        renamedLegacy.put("GOLD_SPADE", Material.GOLDEN_SHOVEL);
-        renamedLegacy.put("GOLD_PICKAXE", Material.GOLDEN_PICKAXE);
-        renamedLegacy.put("GOLD_AXE", Material.GOLDEN_AXE);
-        renamedLegacy.put("SULPHUR", Material.GUNPOWDER);
-        renamedLegacy.put("WOOD_HOE", Material.WOODEN_HOE);
-        renamedLegacy.put("GOLD_HOE", Material.GOLDEN_HOE);
-        renamedLegacy.put("GOLD_HELMET", Material.GOLDEN_HELMET);
-        renamedLegacy.put("GOLD_CHESTPLATE", Material.GOLDEN_CHESTPLATE);
-        renamedLegacy.put("GOLD_LEGGINGS", Material.GOLDEN_LEGGINGS);
-        renamedLegacy.put("GOLD_BOOTS", Material.GOLDEN_BOOTS);
-        renamedLegacy.put("PORK", Material.PORKCHOP);
-        renamedLegacy.put("GRILLED_PORK", Material.COOKED_PORKCHOP);
-        renamedLegacy.put("SNOW_BALL", Material.SNOWBALL);
-        renamedLegacy.put("BOAT", Material.OAK_BOAT);
-        renamedLegacy.put("CLAY_BRICK", Material.BRICKS);
-        renamedLegacy.put("STORAGE_MINECART", Material.CHEST_MINECART);
-        renamedLegacy.put("POWERED_MINECART", Material.FURNACE_MINECART);
-        renamedLegacy.put("WATCH", Material.CLOCK);
-        renamedLegacy.put("RAW_FISH", Material.SALMON);
-        renamedLegacy.put("COOKED_FISH", Material.COOKED_SALMON);
-        renamedLegacy.put("INK_SACK", Material.INK_SAC);
-        renamedLegacy.put("RAW_BEEF", Material.BEEF);
-        renamedLegacy.put("RAW_CHICKEN", Material.CHICKEN);
-        renamedLegacy.put("EYE_OF_ENDER", Material.ENDER_EYE);
-        renamedLegacy.put("SPECKLED_MELON", Material.GLISTERING_MELON_SLICE);
-        renamedLegacy.put("EXP_BOTTLE", Material.EXPERIENCE_BOTTLE);
-        renamedLegacy.put("FIREBALL", Material.FIRE_CHARGE);
-        renamedLegacy.put("BOOK_AND_QUILL", Material.WRITABLE_BOOK);
-        renamedLegacy.put("FLOWER_POT_ITEM", Material.FLOWER_POT);
-        renamedLegacy.put("EMPTY_MAP", Material.MAP);
-        renamedLegacy.put("BREWING_STAND_ITEM", Material.BREWING_STAND);
-        renamedLegacy.put("CAULDRON_ITEM", Material.CAULDRON);
-        renamedLegacy.put("CARROT_ITEM", Material.CARROT);
-        renamedLegacy.put("POTATO_ITEM", Material.POTATO);
-        renamedLegacy.put("SPRUCE_DOOR_ITEM", Material.SPRUCE_DOOR);
-        renamedLegacy.put("BIRCH_DOOR_ITEM", Material.BIRCH_DOOR);
-        renamedLegacy.put("JUNGLE_DOOR_ITEM", Material.JUNGLE_DOOR);
-        renamedLegacy.put("ACACIA_DOOR_ITEM", Material.ACACIA_DOOR);
-        renamedLegacy.put("DARK_OAK_DOOR_ITEM", Material.DARK_OAK_DOOR);
-        renamedLegacy.put("CARROT_STICK", Material.CARROT_ON_A_STICK);
-        renamedLegacy.put("FIREWORK", Material.FIREWORK_ROCKET);
-        renamedLegacy.put("FIREWORK_CHARGE", Material.FIREWORK_STAR);
-        renamedLegacy.put("NETHER_BRICK_ITEM", Material.NETHER_BRICKS);
-        renamedLegacy.put("EXPLOSIVE_MINECART", Material.TNT_MINECART);
-        renamedLegacy.put("IRON_BARDING", Material.IRON_HORSE_ARMOR);
-        renamedLegacy.put("GOLD_BARDING", Material.GOLDEN_HORSE_ARMOR);
-        renamedLegacy.put("DIAMOND_BARDING", Material.DIAMOND_HORSE_ARMOR);
-        renamedLegacy.put("LEASH", Material.LEAD);
-        renamedLegacy.put("COMMAND_MINECART", Material.COMMAND_BLOCK_MINECART);
-        renamedLegacy.put("CHORUS_FRUIT_POPPED", Material.POPPED_CHORUS_FRUIT);
-        renamedLegacy.put("DRAGONS_BREATH", Material.DRAGON_BREATH);
-        renamedLegacy.put("BOAT_SPRUCE", Material.SPRUCE_BOAT);
-        renamedLegacy.put("BOAT_BIRCH", Material.BIRCH_BOAT);
-        renamedLegacy.put("BOAT_JUNGLE", Material.JUNGLE_BOAT);
-        renamedLegacy.put("BOAT_ACACIA", Material.ACACIA_BOAT);
-        renamedLegacy.put("BOAT_DARK_OAK", Material.DARK_OAK_BOAT);
-        renamedLegacy.put("TOTEM", Material.TOTEM_OF_UNDYING);
-        renamedLegacy.put("GOLD_RECORD", Material.MUSIC_DISC_13);
-        renamedLegacy.put("GREEN_RECORD", Material.MUSIC_DISC_CAT);
-        renamedLegacy.put("RECORD_3", Material.MUSIC_DISC_BLOCKS);
-        renamedLegacy.put("RECORD_4", Material.MUSIC_DISC_CHIRP);
-        renamedLegacy.put("RECORD_5", Material.MUSIC_DISC_FAR);
-        renamedLegacy.put("RECORD_6", Material.MUSIC_DISC_MALL);
-        renamedLegacy.put("RECORD_7", Material.MUSIC_DISC_MELLOHI);
-        renamedLegacy.put("RECORD_8", Material.MUSIC_DISC_STAL);
-        renamedLegacy.put("RECORD_9", Material.MUSIC_DISC_STRAD);
-        renamedLegacy.put("RECORD_10", Material.MUSIC_DISC_WARD);
-        renamedLegacy.put("RECORD_11", Material.MUSIC_DISC_11);
-        renamedLegacy.put("RECORD_12", Material.MUSIC_DISC_WAIT);
-    }
-
-    private static final Reflection.Field<?> scoreboardName = Reflection.getField(ClientboundSetObjectivePacket.class, Component.class, 0);
-    public void setScoreboardTitle(Object packet, String title) {
-        scoreboardName.set(packet, ChatWrapper.impl.stringToChatComponent(title));
-    }
-
-    private static final Class<?> scoreActionEnum = null;
-    private static final Reflection.Field<?> scoreAction = null;
-    private static final Object scoreActionChange = null;
-
-    public void setScoreAction(Object packet) {
-        scoreAction.set(packet, scoreActionChange);
-    }
-
-    public Material getMaterial(String material) {
-        try{
-            return Material.valueOf(material);
-        }catch(IllegalArgumentException e){
-            return renamedLegacy.get(material);
-        }
-    }
-
-    public Material getDye(int colorCode) {
-        switch(colorCode){
-            case 1:
-                return Material.RED_DYE;
-            case 2:
-                return Material.GREEN_DYE;
-            case 3:
-                return Material.BROWN_DYE;
-            case 4:
-                return Material.LAPIS_LAZULI;
-            case 5:
-                return Material.PURPLE_DYE;
-            case 6:
-                return Material.CYAN_DYE;
-            case 7:
-                return Material.LIGHT_GRAY_DYE;
-            case 8:
-                return Material.GRAY_DYE;
-            case 9:
-                return Material.PINK_DYE;
-            case 10:
-                return Material.LIME_DYE;
-            case 11:
-                return Material.YELLOW_DYE;
-            case 12:
-                return Material.LIGHT_BLUE_DYE;
-            case 13:
-                return Material.MAGENTA_DYE;
-            case 14:
-                return Material.ORANGE_DYE;
-            case 15:
-                return Material.WHITE_DYE;
-            default:
-                return Material.BLACK_DYE;
-        }
-    }
-
-    public ItemStack setSkullOwner(String player) {
-        ItemStack head = new ItemStack(Material.PLAYER_HEAD, 1);
-        head.editMeta(SkullMeta.class, skullMeta -> {
-            try {
-                OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(player.startsWith(".") ? player.substring(1) : player);
-                PlayerProfile playerProfile = offlinePlayer.getPlayerProfile();
-                playerProfile.complete();
-                skullMeta.setPlayerProfile(playerProfile);
-            } catch (Exception e) {
-                // Ignore
-            }
-        });
-        return head;
-    }
-
-    protected static final Class<?> entityPose = Pose.class;
-    protected static final Object shooting = entityPose.getEnumConstants()[16];
-    protected static final Object standing = entityPose.getEnumConstants()[0];
-    protected static final Object swimming = entityPose.getEnumConstants()[3];
-    protected static final Object sneaking = entityPose.getEnumConstants()[5];
-    public Object getPose(FlatteningWrapper.EntityPose pose) {
-        switch (pose) {
-            case SHOOTING:
-                return shooting;
-            case SNEAKING:
-                return sneaking;
-            case SWIMMING:
-                return swimming;
-            case NORMAL:
-            default:
-                return standing;
-        }
-    }
 
     public Object formatDisplayName(String displayName) {
-        return displayName != null ? Optional.of(ChatWrapper.impl.stringToChatComponent(displayName)) : Optional.empty();
+        return displayName != null ? Optional.of(ChatWrapper.stringToChatComponent(displayName)) : Optional.empty();
-    }
-
-    private static final Reflection.Field<net.minecraft.world.entity.EntityType> spawnType = Reflection.getField(ProtocolWrapper.spawnPacket, net.minecraft.world.entity.EntityType.class, 0);
-    public void setSpawnPacketType(Object packet, EntityType type) {
-        ResourceLocation key = CraftNamespacedKey.toMinecraft(type.getKey());
-        spawnType.set(packet, BuiltInRegistries.ENTITY_TYPE.get(key).get().value());
-    }
-
-    public int getViewDistance(Player player) {
-        return player.getClientViewDistance();
-    }
-
-    public void syncSave(World world) {
-        ((CraftWorld) world).getHandle().save(null, true, false);
-    }
-
-    public enum EntityPose {
-        NORMAL,
-        SNEAKING,
-        SWIMMING,
-        SHOOTING,
-        ;
     }
 }

SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRenderer.java

@@ -45,7 +45,7 @@ public class WorldEditRenderer implements Listener {
 
     private static WorldEditRenderer INSTANCE;
 
-    private static final Material WAND = FlatteningWrapper.impl.getMaterial("WOOD_AXE");
+    private static final Material WAND = Material.WOODEN_AXE;
 
     private final WorldEditPlugin we;
 

SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntity.java

@@ -27,16 +27,19 @@ import de.steamwar.core.FlatteningWrapper;
 import de.steamwar.core.ProtocolWrapper;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import lombok.Getter;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.*;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.EntityDataSerializers;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.PositionMoveRotation;
 import net.minecraft.world.phys.Vec3;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
 import org.bukkit.entity.EntityType;
 import org.bukkit.inventory.ItemStack;
 
@@ -77,7 +80,7 @@ public class REntity {
     @Getter
     private boolean invisible;
     @Getter
-    private FlatteningWrapper.EntityPose pose = FlatteningWrapper.EntityPose.NORMAL;
+    private Pose pose = Pose.STANDING;
     @Getter
     private boolean bowDrawn;
     @Getter
@@ -195,9 +198,9 @@ public class REntity {
         server.updateEntity(this, packet);
     }
 
-    public void setPose(FlatteningWrapper.EntityPose pose) {
+    public void setPose(Pose pose) {
         this.pose = pose;
-        server.updateEntity(this, getDataWatcherPacket(poseDataWatcher, FlatteningWrapper.impl.getPose(pose)));
+        server.updateEntity(this, getDataWatcherPacket(poseDataWatcher, pose));
     }
 
     public void setOnFire(boolean perma) {
@@ -222,7 +225,7 @@ public class REntity {
     public void setDisplayName(String displayName) {
         this.displayName = displayName;
         server.updateEntity(this, getDataWatcherPacket(
-                nameWatcher, FlatteningWrapper.impl.formatDisplayName(displayName),
+                nameWatcher, FlatteningWrapper.formatDisplayName(displayName),
                 nameVisibleWatcher, displayName != null
         ));
     }
@@ -260,14 +263,8 @@ public class REntity {
         // empty for regular entity
     }
 
-    private static final Function<REntity, Object> livingSpawnPacketGenerator = REntity::spawnPacketGenerator;
     void spawn(Consumer<Object> packetSink) {
-        if(entityType.isAlive()) {
+        packetSink.accept(spawnPacketGenerator());
-            packetSink.accept(livingSpawnPacketGenerator.apply(this));
-        } else {
-            packetSink.accept(spawnPacketGenerator());
-        }
-
         postSpawn(packetSink);
     }
 
@@ -276,8 +273,8 @@ public class REntity {
             packetSink.accept(getHeadRotationPacket());
         }
 
-        if(pose != FlatteningWrapper.EntityPose.NORMAL) {
+        if(pose != Pose.STANDING) {
-            packetSink.accept(getDataWatcherPacket(poseDataWatcher, FlatteningWrapper.impl.getPose(pose)));
+            packetSink.accept(getDataWatcherPacket(poseDataWatcher, pose));
         }
 
         byte status = getEntityStatus();
@@ -286,7 +283,7 @@ public class REntity {
         }
 
         if(displayName != null) {
-            packetSink.accept(getDataWatcherPacket(nameWatcher, FlatteningWrapper.impl.formatDisplayName(displayName), nameVisibleWatcher, true));
+            packetSink.accept(getDataWatcherPacket(nameWatcher, FlatteningWrapper.formatDisplayName(displayName), nameVisibleWatcher, true));
         }
 
         if(noGravity) {
@@ -324,7 +321,7 @@ public class REntity {
 
         if(fireTick != 0)
             status |= 1;
-        if(pose == FlatteningWrapper.EntityPose.SNEAKING)
+        if(pose == Pose.CROUCHING)
             status |= 2;
         if(invisible)
             status |= 0x20;
@@ -335,7 +332,7 @@ public class REntity {
     }
 
     protected Object getDataWatcherPacket(Object... dataWatcherKeyValues) {
-        return ChatWrapper.impl.getDataWatcherPacket(entityId, dataWatcherKeyValues);
+        return ChatWrapper.getDataWatcherPacket(entityId, dataWatcherKeyValues);
     }
 
     private Object getTeleportPacket(){
@@ -374,6 +371,7 @@ public class REntity {
         return new ClientboundSetEquipmentPacket(entityId, Collections.singletonList(Pair.of((EquipmentSlot) slot, CraftItemStack.asNMSCopy(stack))));
     }
 
+    private static final Reflection.Field<net.minecraft.world.entity.EntityType> spawnType = Reflection.getField(ProtocolWrapper.spawnPacket, net.minecraft.world.entity.EntityType.class, 0);
     private static Function<REntity, Object> entitySpawnPacketGenerator(Class<?> spawnPacket, int posOffset) {
         BountifulWrapper.UUIDSetter uuid = BountifulWrapper.impl.getUUIDSetter(spawnPacket);
         Function<REntity, Object> packetGenerator = spawnPacketGenerator(spawnPacket, posOffset);
@@ -381,7 +379,8 @@ public class REntity {
         return entity -> {
             Object packet = packetGenerator.apply(entity);
             uuid.set(packet, entity.uuid);
-            FlatteningWrapper.impl.setSpawnPacketType(packet, entity.entityType);
+            ResourceLocation key = CraftNamespacedKey.toMinecraft(entity.entityType.getKey());
+            spawnType.set(packet, BuiltInRegistries.ENTITY_TYPE.get(key).get().value());
             return packet;
         };
     }

SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntityServer.java

@@ -21,7 +21,6 @@ package de.steamwar.entity;
 
 import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.core.Core;
-import de.steamwar.core.FlatteningWrapper;
 import net.minecraft.network.protocol.game.ServerboundInteractPacket;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -287,7 +286,7 @@ public class REntityServer implements Listener {
     }
 
     private int viewRadius(Player player) {
-        return FlatteningWrapper.impl.getViewDistance(player) / 2;
+        return player.getClientViewDistance() / 2;
     }
 
     private long entityToId(REntity entity) {

SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RTextDisplay.java

@@ -77,7 +77,7 @@ public class RTextDisplay extends RDisplay {
     private static final EntityDataAccessor<Component> textWatcher = new EntityDataAccessor<>(23, EntityDataSerializers.COMPONENT);
     private void getText(boolean ignoreDefault, BiConsumer<Object, Object> packetSink) {
         if (ignoreDefault || !text.isEmpty()) {
-            packetSink.accept(textWatcher, ChatWrapper.impl.stringToChatComponent(text));
+            packetSink.accept(textWatcher, ChatWrapper.stringToChatComponent(text));
         }
     }
 

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

@@ -19,15 +19,17 @@
 
 package de.steamwar.inventory;
 
+import com.destroystokyo.paper.profile.PlayerProfile;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import de.steamwar.core.FlatteningWrapper;
 import de.steamwar.core.TrickyTrialsWrapper;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.SkullMeta;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -47,27 +49,29 @@ public class SWItem {
 
     public static SWItem getPlayerSkull(String playerName){
         SWItem p = new SWItem();
-        ItemStack head = FlatteningWrapper.impl.setSkullOwner(playerName);
+        ItemStack head = new ItemStack(Material.PLAYER_HEAD, 1);
+        head.editMeta(SkullMeta.class, skullMeta -> {
+            try {
+                OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(playerName.startsWith(".") ? playerName.substring(1) : playerName);
+                PlayerProfile playerProfile = offlinePlayer.getPlayerProfile();
+                playerProfile.complete();
+                skullMeta.setPlayerProfile(playerProfile);
+            } catch (Exception e) {
+                // Ignore
+            }
+        });
         p.setItemStack(head);
         return p;
     }
 
     public static Material getMaterial(String material){
         try{
-            Material m = FlatteningWrapper.impl.getMaterial(material);
+            return Material.valueOf(material);
-            if(m == null)
-                return Material.BARRIER;
-
-            return m;
         }catch(IllegalArgumentException e){
-            return Material.STONE;
+            return Material.BARRIER;
         }
     }
 
-    public static Material getDye(int colorCode){
-        return FlatteningWrapper.impl.getDye(colorCode);
-    }
-
     public SWItem() {
         itemStack = new ItemStack(Material.AIR);
         itemMeta = itemStack.getItemMeta();
@@ -119,13 +123,7 @@ public class SWItem {
     public static SWItem getItemFromJson(JsonObject itemJson) {
         SWItem item = null;
         try {
-            if(itemJson.has("color")) {
+            item = new SWItem(SWItem.getMaterial(itemJson.get("material").getAsString()), itemJson.get("title").getAsString());
-                item = new SWItem(SWItem.getDye(itemJson.get("color").getAsInt()),
-                        itemJson.has("color")?itemJson.get("color").getAsByte():0,
-                        itemJson.get("title").getAsString());
-            }else {
-                item = new SWItem(SWItem.getMaterial(itemJson.get("material").getAsString()), itemJson.get("title").getAsString());
-            }
         }catch (IllegalArgumentException e) {
             item = new SWItem(Material.STONE, itemJson.get("title").getAsString());
         }

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

@@ -64,27 +64,27 @@ public class SWListInv<T> extends SWInventory {
 
         if (sizeBiggerMax()) {
             if (page != 0) {
-                setItem(45, new SWItem(SWItem.getDye(10), (byte) 10, Core.MESSAGE.parse("SWLISINV_PREVIOUS_PAGE_ACTIVE", player), (ClickType click) -> {
+                setItem(45, new SWItem(Material.LIME_DYE, (byte) 10, Core.MESSAGE.parse("SWLISINV_PREVIOUS_PAGE_ACTIVE", player), (ClickType click) -> {
                     page--;
                     open();
                 }).setCustomModelData(CMDs.PREVIOUS_PAGE));
             } else {
-                setItem(45, new SWItem(SWItem.getDye(8), (byte) 8, Core.MESSAGE.parse("SWLISINV_PREVIOUS_PAGE_INACTIVE", player), (ClickType click) -> {
+                setItem(45, new SWItem(Material.GRAY_DYE, (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, new SWItem(SWItem.getDye(10), (byte) 10, Core.MESSAGE.parse("SWLISINV_NEXT_PAGE_ACTIVE", player), (ClickType click) -> {
+                setItem(53, new SWItem(Material.LIME_DYE, (byte) 10, Core.MESSAGE.parse("SWLISINV_NEXT_PAGE_ACTIVE", player), (ClickType click) -> {
                     page++;
                     open();
                 }).setCustomModelData(CMDs.NEXT_PAGE));
             } else {
-                setItem(53, new SWItem(SWItem.getDye(8), (byte) 8, Core.MESSAGE.parse("SWLISINV_NEXT_PAGE_INACTIVE", player), (ClickType click) -> {
+                setItem(53, new SWItem(Material.GRAY_DYE, (byte) 8, Core.MESSAGE.parse("SWLISINV_NEXT_PAGE_INACTIVE", player), (ClickType click) -> {
                 }).setCustomModelData(CMDs.NEXT_PAGE));
             }
         } else if (!dynamicSize) {
-            setItem(45, new SWItem(SWItem.getDye(8), (byte) 8, Core.MESSAGE.parse("SWLISINV_PREVIOUS_PAGE_INACTIVE", player), (ClickType click) -> {
+            setItem(45, new SWItem(Material.GRAY_DYE, (byte) 8, Core.MESSAGE.parse("SWLISINV_PREVIOUS_PAGE_INACTIVE", player), (ClickType click) -> {
             }).setCustomModelData(CMDs.PREVIOUS_PAGE));
-            setItem(53, new SWItem(SWItem.getDye(8), (byte) 8, Core.MESSAGE.parse("SWLISINV_NEXT_PAGE_INACTIVE", player), (ClickType click) -> {
+            setItem(53, new SWItem(Material.GRAY_DYE, (byte) 8, Core.MESSAGE.parse("SWLISINV_NEXT_PAGE_INACTIVE", player), (ClickType click) -> {
             }).setCustomModelData(CMDs.NEXT_PAGE));
         }
 
@@ -142,7 +142,7 @@ public class SWListInv<T> extends SWInventory {
         for(SchematicNode s : schems){
             Material m;
             if(s.getItem().isEmpty())
-                m = SWItem.getMaterial("CAULDRON_ITEM");
+                m = Material.CAULDRON;
             else
                 m = SWItem.getMaterial(s.getItem());
             SWItem item = new SWItem(m,"§e" + s.getName());

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

@@ -137,7 +137,7 @@ public class SchematicSelector {
             }
         }
         if(target.target.dirs) {
-            inv.setItem(49, SWItem.getDye(10), Core.MESSAGE.parse("SCHEM_SELECTOR_SEL_DIR", player), clickType -> {
+            inv.setItem(49, Material.LIME_DYE, Core.MESSAGE.parse("SCHEM_SELECTOR_SEL_DIR", player), clickType -> {
                 player.closeInventory();
                 callback.accept(parent);
             });
@@ -312,7 +312,7 @@ public class SchematicSelector {
                 openFilter();
             } else {
                 SWAnvilInv swAnvilInv = new SWAnvilInv(player, Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_ENTER_OWNER", player));
-                swAnvilInv.setItem(SWItem.getMaterial("SKULL_ITEM"), (byte) 3, Collections.singletonList(Core.MESSAGE.parse("SCHEM_SELECTOR_CLICK_BACK", player)), false);
+                swAnvilInv.setItem(Material.SKELETON_SKULL, (byte) 3, Collections.singletonList(Core.MESSAGE.parse("SCHEM_SELECTOR_CLICK_BACK", player)), false);
                 swAnvilInv.setCallback(s -> {
                     if(SteamwarUser.get(s) != null) {
                         filter = filter.withOwner(SteamwarUser.get(s).getId());
@@ -324,7 +324,7 @@ public class SchematicSelector {
             }
         };
         if(filter.getOwner() == null) {
-            inv.setItem(1, SWItem.getMaterial("SKULL_ITEM"), (byte) 3, Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_OWNER", player), ownerCallback);
+            inv.setItem(1, Material.SKELETON_SKULL, (byte) 3, Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_OWNER", player), ownerCallback);
         } else {
             SteamwarUser tUser = SteamwarUser.byId(filter.getOwner());
             SWItem item = SWItem.getPlayerSkull(tUser.getUserName());
@@ -408,12 +408,12 @@ public class SchematicSelector {
             }
         }
 
-        inv.setItem(7, SWItem.getDye(1), Core.MESSAGE.parse("SCHEM_SELECTOR_CANCEL", player), clickType -> {
+        inv.setItem(7, Material.RED_DYE, Core.MESSAGE.parse("SCHEM_SELECTOR_CANCEL", player), clickType -> {
             filter = null;
             depth = 0;
             openList(null);
         });
-        inv.setItem(8, SWItem.getDye(10), Core.MESSAGE.parse("SCHEM_SELECTOR_GO", player), clickType -> {
+        inv.setItem(8, Material.LIME_DYE, Core.MESSAGE.parse("SCHEM_SELECTOR_GO", player), clickType -> {
             if (!filter.equals(filters[0])) {
                 for (int i = filters.length - 1; i > 0; i--) {
                     filters[i] = filters[i-1];
@@ -646,7 +646,7 @@ public class SchematicSelector {
                 return o1.getSchemtype().name().compareTo(o2.getSchemtype().name());
             }
         }),
-        LAST_UPDATED(SWItem.getMaterial("WATCH"), "SCHEM_SELECTOR_SORTING_UPDATE", Comparator.comparing(SchematicNode::getLastUpdate));
+        LAST_UPDATED(Material.CLOCK, "SCHEM_SELECTOR_SORTING_UPDATE", Comparator.comparing(SchematicNode::getLastUpdate));
 
         private final Material mat;
         private final String name;

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

@@ -23,7 +23,7 @@ import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
-import de.steamwar.sql.GameModeConfig;
+import de.steamwar.data.BauLockState;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
@@ -33,13 +33,16 @@ import de.steamwar.messages.PlayerChatter;
 import de.steamwar.network.packets.server.BaumemberUpdatePacket;
 import de.steamwar.persistent.Bauserver;
 import de.steamwar.sql.BauweltMember;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.sql.SteamwarUser;
-import de.steamwar.velocitycore.*;
+import de.steamwar.velocitycore.ServerStarter;
+import de.steamwar.velocitycore.ServerVersion;
+import de.steamwar.velocitycore.SubserverSystem;
+import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.inventory.SWInventory;
 import de.steamwar.velocitycore.inventory.SWItem;
 import de.steamwar.velocitycore.network.NetworkSender;
 import de.steamwar.velocitycore.util.BauLock;
-import de.steamwar.data.BauLockState;
 
 import java.util.Collection;
 import java.util.function.Consumer;
@@ -219,7 +222,7 @@ public class BauCommand extends SWCommand {
     @Register("delete")
     public void delete(PlayerChatter sender, ServerVersion version) {
         SWInventory inventory = new SWInventory(sender, 9, new Message("BAU_DELETE_GUI_NAME"));
-        inventory.addItem(0, new SWItem(new Message("BAU_DELETE_GUI_DELETE"), 10), click -> {
+        inventory.addItem(0, new SWItem("LIME_DYE", new Message("BAU_DELETE_GUI_DELETE")), click -> {
             String world = version.getWorldFolder(ServerStarter.WORLDS_BASE_PATH) + sender.user().getId();
 
             VelocityCore.schedule(() -> {
@@ -233,7 +236,7 @@ public class BauCommand extends SWCommand {
 
             inventory.close();
         });
-        inventory.addItem(8, new SWItem(new Message("BAU_DELETE_GUI_CANCEL"), 1), click -> inventory.close());
+        inventory.addItem(8, new SWItem("RED_DYE", new Message("BAU_DELETE_GUI_CANCEL")), click -> inventory.close());
         inventory.open();
     }
 

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

@@ -21,7 +21,6 @@ package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.command.SWCommand;
-import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
@@ -29,7 +28,7 @@ import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.persistent.Arenaserver;
 import de.steamwar.persistent.Subserver;
-import de.steamwar.sql.SchematicType;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.velocitycore.ServerStarter;
 import de.steamwar.velocitycore.inventory.SWInventory;
@@ -100,15 +99,15 @@ public class FightCommand extends SWCommand {
         }
 
         SWInventory inventory = new SWInventory(sender, 9, new Message("FIGHT_MERGE_TITLE"));
-        inventory.addItem(0, new SWItem(new Message("FIGHT_MERGE_DECLINE"), 1), click -> {
+        inventory.addItem(0, new SWItem("RED_DYE", new Message("FIGHT_MERGE_DECLINE")), click -> {
             inventory.close();
             declineMerge.run(sender, mode, map);
         });
         Arenaserver finalMergable = mergable;
-        SWItem item = new SWItem(new Message("FIGHT_MERGE_INFO", mode.GameName, finalMergable.getMap()), 11);
+        SWItem item = new SWItem("YELLOW_DYE", new Message("FIGHT_MERGE_INFO", mode.GameName, finalMergable.getMap()));
         item.addLore(new Message("FIGHT_MERGE_INFO_LORE_1", finalMergable.getRegisteredServer().getPlayersConnected().toArray(new Player[1])[0].getUsername()));
         inventory.addItem(4, item, click -> {});
-        inventory.addItem(8, new SWItem(new Message("FIGHT_MERGE_ACCEPT"), 10), click -> {
+        inventory.addItem(8, new SWItem("LIME_DYE", new Message("FIGHT_MERGE_ACCEPT")), click -> {
             if(Subserver.getServerList().contains(finalMergable)) {
                 finalMergable.sendPlayer(sender.getPlayer());
             } else {

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

@@ -19,17 +19,17 @@
 
 package de.steamwar.velocitycore.commands;
 
-import de.steamwar.linkage.Linked;
-import de.steamwar.velocitycore.inventory.SWInventory;
-import de.steamwar.velocitycore.inventory.SWItem;
-import de.steamwar.velocitycore.inventory.SWListInv;
-import de.steamwar.velocitycore.inventory.SWStreamInv;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.sql.Mod;
 import de.steamwar.sql.UserPerm;
+import de.steamwar.velocitycore.inventory.SWInventory;
+import de.steamwar.velocitycore.inventory.SWItem;
+import de.steamwar.velocitycore.inventory.SWListInv;
+import de.steamwar.velocitycore.inventory.SWStreamInv;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -72,11 +72,11 @@ public class ModCommand extends SWCommand {
     private void openTypeGUI(PlayerChatter player, String title, Consumer<Mod.ModType> function) {
         SWInventory inv = new SWInventory(player, 9, new Message(title));
 
-        inv.addItem(1, new SWItem(new Message("MOD_UNCLASSIFIED"), 8), click -> function.accept(Mod.ModType.UNKLASSIFIED));
+        inv.addItem(1, new SWItem("GRAY_DYE", new Message("MOD_UNCLASSIFIED")), click -> function.accept(Mod.ModType.UNKLASSIFIED));
-        inv.addItem(2, new SWItem(new Message("MOD_ALLOWED"), 2), click -> function.accept(Mod.ModType.GREEN));
+        inv.addItem(2, new SWItem("GREEN_DYE", new Message("MOD_ALLOWED")), click -> function.accept(Mod.ModType.GREEN));
-        inv.addItem(3, new SWItem(new Message("MOD_FORBIDDEN"), 11), click -> function.accept(Mod.ModType.YELLOW));
+        inv.addItem(3, new SWItem("YELLOW_DYE", new Message("MOD_FORBIDDEN")), click -> function.accept(Mod.ModType.YELLOW));
-        inv.addItem(4, new SWItem(new Message("MOD_AUTOBAN"), 1), click -> function.accept(Mod.ModType.RED));
+        inv.addItem(4, new SWItem("RED_DYE", new Message("MOD_AUTOBAN")), click -> function.accept(Mod.ModType.RED));
-        inv.addItem(5, new SWItem(new Message("MOD_YT"), 13), click -> function.accept(Mod.ModType.YOUTUBER_ONLY));
+        inv.addItem(5, new SWItem("MAGENTA_DYE", new Message("MOD_YT")), click -> function.accept(Mod.ModType.YOUTUBER_ONLY));
 
         inv.addItem(8, new SWItem("ARROW", new Message("MOD_ITEM_BACK")), click -> {
             inv.close();

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

@@ -424,25 +424,25 @@ public class TeamCommand extends SWCommand {
         DiscordBot.withBot(bot -> bot.getEventChannel().update());
     }
 
-    private static final Map<String, Integer> COLOR_CODES = new HashMap<>();
+    private static final Map<String, String> COLOR_CODES = new HashMap<>();
 
     static {
-        COLOR_CODES.put("4", 1);
+        COLOR_CODES.put("4", "RED_DYE");
-        COLOR_CODES.put("c", 15);
+        COLOR_CODES.put("c", "WHITE_DYE");
-        COLOR_CODES.put("6", 14);
+        COLOR_CODES.put("6", "ORANGE_DYE");
-        COLOR_CODES.put("e", 11);
+        COLOR_CODES.put("e", "YELLOW_DYE");
-        COLOR_CODES.put("2", 2);
+        COLOR_CODES.put("2", "GREEN_DYE");
-        COLOR_CODES.put("a", 10);
+        COLOR_CODES.put("a", "LIME_DYE");
-        COLOR_CODES.put("b", 12);
+        COLOR_CODES.put("b", "LIGHT_BLUE_DYE");
-        COLOR_CODES.put("3", 6);
+        COLOR_CODES.put("3", "CYAN_DYE");
-        COLOR_CODES.put("1", 4);
+        COLOR_CODES.put("1", "LAPIS_LAZULI");
-        COLOR_CODES.put("9", 6);
+        COLOR_CODES.put("9", "CYAN_DYE");
-        COLOR_CODES.put("d", 9);
+        COLOR_CODES.put("d", "PINK_DYE");
-        COLOR_CODES.put("5", 5);
+        COLOR_CODES.put("5", "PURPLE_DYE");
-        COLOR_CODES.put("f", 15);
+        COLOR_CODES.put("f", "WHITE_DYE");
-        COLOR_CODES.put("7", 7);
+        COLOR_CODES.put("7", "LIGHT_GRAY_DYE");
-        COLOR_CODES.put("8", 8);
+        COLOR_CODES.put("8", "GRAY_DYE");
-        COLOR_CODES.put("0", 16);
+        COLOR_CODES.put("0", "BLACK_DYE");
     }
 
     @Register("color")
@@ -453,7 +453,7 @@ public class TeamCommand extends SWCommand {
         if(notDuringEvent(sender))
             return;
 
-        SWListInv<String> inv = new SWListInv<>(sender, new Message("TEAM_COLOR_TITLE"), COLOR_CODES.entrySet().stream().map(entry -> new SWListInv.SWListEntry<>(new SWItem(new Message("PLAIN_STRING", "§" + entry.getKey() + team.getTeamKuerzel()), entry.getValue()), entry.getKey())).toList(), (click, element) -> {});
+        SWListInv<String> inv = new SWListInv<>(sender, new Message("TEAM_COLOR_TITLE"), COLOR_CODES.entrySet().stream().map(entry -> new SWListInv.SWListEntry<>(new SWItem(entry.getValue(), new Message("PLAIN_STRING", "§" + entry.getKey() + team.getTeamKuerzel())), entry.getKey())).toList(), (click, element) -> {});
         inv.setCallback((click, element) -> {
             inv.close();
             team.setTeamColor(element);

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

@@ -21,8 +21,8 @@ package de.steamwar.velocitycore.inventory;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import de.steamwar.messages.Message;
 import de.steamwar.messages.Chatter;
+import de.steamwar.messages.Message;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -49,11 +49,6 @@ public class SWItem {
         this.title = title;
     }
 
-    public SWItem(Message title, int color) {
-        this.title = title;
-        this.color = color;
-    }
-
     public static SWItem getSkull(String skullOwner) {
         SWItem item = new SWItem("SKULL", new Message("PLAIN_STRING", skullOwner));
         item.setSkullOwner(skullOwner);

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

@@ -44,19 +44,19 @@ public class SWListInv<T> extends SWInventory {
     public void open(){
         if(elements.size() > 54){
             if(page != 0)
-                addItem(45, new SWItem(new Message("INV_PAGE_BACK", "e"), 10), (InvCallback.ClickType click) -> {
+                addItem(45, new SWItem("LIME_DYE", new Message("INV_PAGE_BACK", "e")), (InvCallback.ClickType click) -> {
                     page--;
                     open();
                 });
             else
-                addItem(45, new SWItem(new Message("INV_PAGE_BACK", "7"), 8), (InvCallback.ClickType click) -> {});
+                addItem(45, new SWItem("GRAY_DYE", new Message("INV_PAGE_BACK", "7")), (InvCallback.ClickType click) -> {});
             if(page < elements.size()/45)
-                addItem(53, new SWItem(new Message("INV_PAGE_NEXT", "e"), 10), (InvCallback.ClickType click) -> {
+                addItem(53, new SWItem("LIME_DYE", new Message("INV_PAGE_NEXT", "e")), (InvCallback.ClickType click) -> {
                     page++;
                     open();
                 });
             else
-                addItem(53, new SWItem(new Message("INV_PAGE_NEXT", "7"), 8), (InvCallback.ClickType click) -> {});
+                addItem(53, new SWItem("GRAY_DYE", new Message("INV_PAGE_NEXT", "7")), (InvCallback.ClickType click) -> {});
         }
 
         int ipageLimit = elements.size() - page*45;

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

@@ -42,20 +42,20 @@ public class SWStreamInv<T> extends SWInventory {
         List<SWListInv.SWListEntry<T>> entries = constructor.apply(page);
 
         if(page != 0)
-            addItem(45, new SWItem(new Message("INV_PAGE_BACK", "e"), 10), (InvCallback.ClickType click) -> {
+            addItem(45, new SWItem("LIME_DYE", new Message("INV_PAGE_BACK", "e")), (InvCallback.ClickType click) -> {
                 page--;
                 open();
             });
         else
-            addItem(45, new SWItem(new Message("INV_PAGE_BACK", "7"), 8), (InvCallback.ClickType click) -> {});
+            addItem(45, new SWItem("GRAY_DYE", new Message("INV_PAGE_BACK", "7")), (InvCallback.ClickType click) -> {});
 
         if(entries.size() == 45)
-            addItem(53, new SWItem(new Message("INV_PAGE_NEXT", "e"), 10), (InvCallback.ClickType click) -> {
+            addItem(53, new SWItem("LIME_DYE", new Message("INV_PAGE_NEXT", "e")), (InvCallback.ClickType click) -> {
                 page++;
                 open();
             });
         else
-            addItem(53, new SWItem(new Message("INV_PAGE_NEXT", "7"), 8), (InvCallback.ClickType click) -> {});
+            addItem(53, new SWItem("GRAY_DYE", new Message("INV_PAGE_NEXT", "7")), (InvCallback.ClickType click) -> {});
 
         for(int i = 0; i < entries.size(); i++) {
             SWListInv.SWListEntry<T> item = entries.get(i);