Merge pull request #561 from ItzKatze/master

ItzKatze · web-flow · commit 3b6348f464e9 · 2025-11-24T19:13:52.000+01:00
cleaned up some things
diff --git a/commons/src/main/java/net/swofty/commons/item/attribute/ItemAttribute.java b/commons/src/main/java/net/swofty/commons/item/attribute/ItemAttribute.java
@@ -1,5 +1,7 @@
 package net.swofty.commons.item.attribute;
 
+import lombok.Getter;
+import lombok.Setter;
 import net.swofty.commons.statistics.ItemStatistics;
 import org.jetbrains.annotations.Nullable;
 import org.reflections.Reflections;
@@ -11,6 +13,8 @@
 import java.util.Set;
 import java.util.stream.Stream;
 
+@Setter
+@Getter
 public abstract class ItemAttribute<T> {
     private static final ArrayList<ItemAttribute> attributes = new ArrayList<>();
 
@@ -28,14 +32,6 @@ public ItemAttribute() {
 
     public abstract String saveIntoString();
 
-    public T getValue() {
-        return value;
-    }
-
-    public void setValue(T value) {
-        this.value = value;
-    }
-
     public static void registerItemAttributes() {
         loopThroughPackage(
                 "net.swofty.commons.item.attribute.attributes", ItemAttribute.class
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/stats/GUICombatStats.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/stats/GUICombatStats.java
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/stats/GUIGatheringStats.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/stats/GUIGatheringStats.java
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/stats/GUIMiscStats.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/stats/GUIMiscStats.java
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/BowComponent.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/BowComponent.java
@@ -30,7 +30,7 @@ public BowComponent(BiConsumer<SkyBlockPlayer, SkyBlockItem> shootHandler, boole
     }
 
     public BowComponent(String handlerId, boolean shouldBeArrow) {
-        this(BowRegistry.getHandler(handlerId).getShootHandler(), shouldBeArrow);
+        this(BowRegistry.getHandler(handlerId).shootHandler(), shouldBeArrow);
     }
 
     public void onBowShoot(SkyBlockPlayer player, SkyBlockItem item) {
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/ability/abilities/BuildersWandAbility.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/ability/abilities/BuildersWandAbility.java
@@ -36,8 +36,8 @@ private static void fillConnectedFaces(SkyBlockPlayer player, Pos origin, BlockF
         List<Pos> blocksForUndo = new ArrayList<>(); // NOTE: To be used later
         blocks.add(origin);
         Instance w = player.getInstance();
-        Vec[] check = null;
-        Vec translate = null;
+        Vec[] check;
+        Vec translate;
         int blocksPlaced = 0;
 
         check = switch (face) {
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/bow/BowHandler.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/bow/BowHandler.java
@@ -1,18 +1,11 @@
 package net.swofty.type.skyblockgeneric.item.handlers.bow;
 
-import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
 import net.swofty.type.skyblockgeneric.item.SkyBlockItem;
 import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
 
 import java.util.function.BiConsumer;
 
-@Getter
-@Setter
-@AllArgsConstructor
 @Builder
-public class BowHandler {
-    private final BiConsumer<SkyBlockPlayer, SkyBlockItem> shootHandler;
+public record BowHandler(BiConsumer<SkyBlockPlayer, SkyBlockItem> shootHandler) {
 }
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/lore/LoreRegistry.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/lore/LoreRegistry.java
@@ -69,9 +69,7 @@ public class LoreRegistry {
                 "§e ",
                 "§eClick to open!"
         ), (item, player) -> "§aSkyBlock Menu §7(Click)"));
-        register("HOT_POTATO_BOOK", new LoreConfig((item, player) -> {
-            return PotatoType.allLores();
-        }, null));
+        register("HOT_POTATO_BOOK", new LoreConfig((item, player) -> PotatoType.allLores(), null));
     }
 
     public static void register(String id, LoreConfig handler) {
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/orbs/ServerOrbRegistry.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/orbs/ServerOrbRegistry.java
@@ -13,9 +13,7 @@ public class ServerOrbRegistry {
     private static final Map<String, ServerOrbHandler> HANDLERS = new HashMap<>();
 
     static {
-        registerHandler("WHEAT_CRYSTAL_ORB_HANDLER", new ServerOrbHandler(crystalImpl -> {
-            return Block.WHEAT;
-        }));
+        registerHandler("WHEAT_CRYSTAL_ORB_HANDLER", new ServerOrbHandler(crystalImpl -> Block.WHEAT));
         registerHandler("FLOWER_CRYSTAL_ORB_HANDLER", new ServerOrbHandler(crystalImpl -> {
             List<Material> flowers = Groups.FLOWERS;
             Material randomMaterial = flowers.get(new Random().nextInt(flowers.size()));
@@ -25,12 +23,8 @@ public class ServerOrbRegistry {
             boolean isPumpkin = new Random().nextBoolean();
             return isPumpkin ? Block.PUMPKIN : Block.MELON;
         }));
-        registerHandler("POTATO_CRYSTAL_ORB_HANDLER", new ServerOrbHandler(crystalImpl -> {
-            return Block.POTATOES;
-        }));
-        registerHandler("CARROT_CRYSTAL_ORB_HANDLER", new ServerOrbHandler(crystalImpl -> {
-            return Block.CARROTS;
-        }));
+        registerHandler("POTATO_CRYSTAL_ORB_HANDLER", new ServerOrbHandler(crystalImpl -> Block.POTATOES));
+        registerHandler("CARROT_CRYSTAL_ORB_HANDLER", new ServerOrbHandler(crystalImpl -> Block.CARROTS));
     }
 
     public static void registerHandler(String id, ServerOrbHandler handler) {
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/place/PlaceEventRegistry.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/place/PlaceEventRegistry.java
@@ -18,49 +18,43 @@ public class PlaceEventRegistry {
     private static final Map<String, PlaceEventHandler> REGISTERED_HANDLERS = new HashMap<>();
 
     static {
-        register("minion", new PlaceEventHandler() {
-            @Override
-            public void onPlace(PlayerBlockPlaceEvent event, SkyBlockPlayer player, SkyBlockItem item) {
-                if (!HypixelConst.isIslandServer()) {
-                    player.sendMessage("§cYou can only place minions on your island!");
-                    event.setCancelled(true);
-                    return;
-                }
+        register("minion", (event, player, item) -> {
+            if (!HypixelConst.isIslandServer()) {
+                player.sendMessage("§cYou can only place minions on your island!");
+                event.setCancelled(true);
+                return;
+            }
 
-                DatapointMinionData.ProfileMinionData playerData = player.getSkyblockDataHandler().get(
-                        SkyBlockDataHandler.Data.MINION_DATA, DatapointMinionData.class
-                ).getValue();
+            DatapointMinionData.ProfileMinionData playerData = player.getSkyblockDataHandler().get(
+                    SkyBlockDataHandler.Data.MINION_DATA, DatapointMinionData.class
+            ).getValue();
 
-                int slots = playerData.getSlots();
+            int slots = playerData.getSlots();
 
-                IslandMinionData minionData = player.getSkyBlockIsland().getMinionData();
+            IslandMinionData minionData = player.getSkyBlockIsland().getMinionData();
 
-                if (minionData.getMinions().size() >= slots) {
-                    player.sendMessage("§cYou have reached the maximum amount of minions you can place!");
-                    event.setCancelled(true);
-                    return;
-                }
+            if (minionData.getMinions().size() >= slots) {
+                player.sendMessage("§cYou have reached the maximum amount of minions you can place!");
+                event.setCancelled(true);
+                return;
+            }
 
-                MinionComponent component = item.toConfigurableItem().getComponent(MinionComponent.class);
+            MinionComponent component = item.toConfigurableItem().getComponent(MinionComponent.class);
 
-                IslandMinionData.IslandMinion minion = minionData.initializeMinion(Pos.fromPoint(event.getBlockPosition()),
-                        component.getMinionRegistry(),
-                        item.getAttributeHandler().getMinionData(),
-                        item.getAttributeHandler().isMithrilInfused());
-                minionData.spawn(minion);
+            IslandMinionData.IslandMinion minion = minionData.initializeMinion(Pos.fromPoint(event.getBlockPosition()),
+                    component.getMinionRegistry(),
+                    item.getAttributeHandler().getMinionData(),
+                    item.getAttributeHandler().isMithrilInfused());
+            minionData.spawn(minion);
 
-                event.setBlock(Block.AIR);
+            event.setBlock(Block.AIR);
 
-                player.sendMessage(
-                        "§bYou placed a minion! (" + minionData.getMinions().size() + "/" + playerData.getSlots() + ")"
-                );
-            }
+            player.sendMessage(
+                    "§bYou placed a minion! (" + minionData.getMinions().size() + "/" + playerData.getSlots() + ")"
+            );
         });
-        register("CARROT_CRYSTAL_PLACE", new PlaceEventHandler() {
-            @Override
-            public void onPlace(PlayerBlockPlaceEvent event, SkyBlockPlayer player, SkyBlockItem item) {
+        register("CARROT_CRYSTAL_PLACE", (event, player, item) -> {
 
-            }
         });
     }
 
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/updater/NonPlayerItemUpdater.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/updater/NonPlayerItemUpdater.java
@@ -102,7 +102,7 @@ public ItemStack.Builder getUpdatedItem() {
             stack = ItemStackCreator.clearAttributes(stack);
         }
 
-        for(ItemAttribute attribute : ItemAttribute.getPossibleAttributes()) {
+        for (ItemAttribute attribute : ItemAttribute.getPossibleAttributes()) {
             stack = stack.set(Tag.String(attribute.getKey()),
                     item.getAttribute(attribute.getKey()).saveIntoString());
         }
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/updater/PlayerItemUpdater.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/updater/PlayerItemUpdater.java
@@ -42,7 +42,7 @@ public static Map.Entry<SkyBlockItem, ItemStack.Builder> playerUpdateFull(SkyBlo
             return Map.entry(new SkyBlockItem(stack), ItemStackCreator.getFromStack(stack));
 
         if (!SkyBlockItem.isSkyBlockItem(stack) || stack.material().equals(Material.AIR)) {
-            /**
+            /*
              * Item is not SkyBlock item, so we just instance it here
              */
             SkyBlockItem item = new SkyBlockItem(stack.material());
@@ -57,13 +57,13 @@ public static Map.Entry<SkyBlockItem, ItemStack.Builder> playerUpdateFull(SkyBlo
                             .amount(stack.amount()));
         }
 
-        /**
+        /*
          * Check for value updates
          */
         SkyBlockItem item = new SkyBlockItem(stack);
         ItemStack.Builder toReturn = item.getItemStackBuilder().amount(stack.amount());
 
-        /**
+        /*
          * Update SkyBlock Item Instance
          */
         ItemAttributeHandler handler = item.getAttributeHandler();
@@ -79,7 +79,7 @@ public static Map.Entry<SkyBlockItem, ItemStack.Builder> playerUpdateFull(SkyBlo
             handler.setRarity(handler.getRarity().upgrade());
         }
 
-        /**
+        /*
          * Update Lore
          */
         ItemLore lore = new ItemLore(stack);
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/levels/LevelsGuide.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/levels/LevelsGuide.java
@@ -72,10 +72,10 @@ public static Builder builder(ItemStack.Builder material, HypixelInventoryGUI gu
         }
 
         public static class Builder {
-            private Map<SkyBlockLevelCauseAbstr, String> causes = new HashMap<>();
-            private ItemStack.Builder material;
-            private HypixelInventoryGUI guiToOpen;
-            private Function<SkyBlockPlayer, List<String>> display;
+            private final Map<SkyBlockLevelCauseAbstr, String> causes = new HashMap<>();
+            private final ItemStack.Builder material;
+            private final HypixelInventoryGUI guiToOpen;
+            private final Function<SkyBlockPlayer, List<String>> display;
 
             public Builder(ItemStack.Builder material, HypixelInventoryGUI guiToOpen, Function<SkyBlockPlayer, List<String>> display) {
                 this.material = material;
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/levels/SkyBlockLevelLoader.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/levels/SkyBlockLevelLoader.java
@@ -105,13 +105,14 @@ private static SkyBlockLevelRequirement parseLevel(LevelEntry entry) {
 
         // Parse prefix item if provided
         Material prefixItem = null;
-        if (entry.prefixItem != null) {
+        String entryPrefixItem = entry.prefixItem;
+        if (entryPrefixItem != null) {
             try {
-                prefixItem = Material.fromKey(entry.prefixItem.toUpperCase());
+                prefixItem = Material.fromKey(entryPrefixItem.toUpperCase());
             } catch (IllegalArgumentException | InvalidKeyException e) {
                 // Try to find by key value
                 prefixItem = Material.values().stream()
-                        .filter(material -> material.key().value().equalsIgnoreCase(entry.prefixItem))
+                        .filter(material -> material.key().value().equalsIgnoreCase(entryPrefixItem))
                         .findFirst()
                         .orElse(null);
             }
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/museum/MuseumDisplay.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/museum/MuseumDisplay.java
@@ -6,5 +6,6 @@ public abstract class MuseumDisplay {
     public abstract MuseumDisplayEntityInformation display(SkyBlockPlayer player,
                                                            MuseumDisplays display,
                                                            boolean empty,
-                                                           int position);
+                                                           int position
+    );
 }
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/noteblock/Note.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/noteblock/Note.java
@@ -8,16 +8,16 @@
 
 public class Note {
 
-    private byte instrument;
-    private byte key;
-    private byte volume;
+    private final byte instrument;
+    private final byte key;
+    private final byte volume;
     private Note(byte instrument, byte key, byte volume) {
         this.instrument = instrument;
         this.key = key;
         this.volume = volume;
     }
 
-    private static SoundEvent[] SOUNDS = new SoundEvent[] {
+    private static final SoundEvent[] SOUNDS = new SoundEvent[] {
             SoundEvent.BLOCK_NOTE_BLOCK_HARP,
             SoundEvent.BLOCK_NOTE_BLOCK_BASS,
             SoundEvent.BLOCK_NOTE_BLOCK_BASEDRUM,
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/particle/ParticleEngine.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/particle/ParticleEngine.java
@@ -20,7 +20,7 @@ public class ParticleEngine
       private Particle particle;
       private Pos position;
       private Vec offsets;
-      private int particleCount;
+      private final int particleCount;
       private ParticleShape shape;
 
       private Duration displayTime;

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public BowComponent(BiConsumer<SkyBlockPlayer, SkyBlockItem> shootHandler, boole`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public BowComponent(String handlerId, boolean shouldBeArrow) {`
`33`		`- this(BowRegistry.getHandler(handlerId).getShootHandler(), shouldBeArrow);`
	`33`	`+ this(BowRegistry.getHandler(handlerId).shootHandler(), shouldBeArrow);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public void onBowShoot(SkyBlockPlayer player, SkyBlockItem item) {`