code cleanup

Fix3dll · Oct 6, 2024 · be2ec2c · be2ec2c
1 parent 94379dc
commit be2ec2c
Show file tree

Hide file tree

Showing 33 changed files with 46 additions and 299 deletions.
diff --git a/src/main/java/codes/biscuit/skyblockaddons/SkyblockAddons.java b/src/main/java/codes/biscuit/skyblockaddons/SkyblockAddons.java
@@ -9,8 +9,8 @@
 import codes.biscuit.skyblockaddons.mixins.hooks.FontRendererHook;
 import codes.biscuit.skyblockaddons.utils.gson.RarityAdapter;
 import codes.biscuit.skyblockaddons.utils.gson.UuidAdapter;
-import codes.biscuit.skyblockaddons.utils.pojo.ElectionData;
-import codes.biscuit.skyblockaddons.utils.pojo.OnlineData;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.ElectionData;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.OnlineData;
 import codes.biscuit.skyblockaddons.core.Translations;
 import codes.biscuit.skyblockaddons.core.dungeons.DungeonManager;
 import codes.biscuit.skyblockaddons.features.EntityOutlines.EntityOutlineRenderer;

diff --git a/src/main/java/codes/biscuit/skyblockaddons/config/PetCacheManager.java b/src/main/java/codes/biscuit/skyblockaddons/config/PetCacheManager.java
@@ -2,6 +2,7 @@
 
 import codes.biscuit.skyblockaddons.SkyblockAddons;
 import codes.biscuit.skyblockaddons.core.Feature;
+import codes.biscuit.skyblockaddons.core.PetInfo;
 import codes.biscuit.skyblockaddons.features.PetManager;
 import lombok.Getter;
 import lombok.Setter;
@@ -31,7 +32,7 @@ public static class PetCache {
 
         /**
          * key = index + 45 * (pageNum - 1), value = {@link PetManager.Pet}
-         * @see codes.biscuit.skyblockaddons.utils.pojo.PetInfo
+         * @see PetInfo
          */
         @Getter private final HashMap<Integer, PetManager.Pet> petMap = new HashMap<>();
     }

diff --git a/src/main/java/codes/biscuit/skyblockaddons/core/Island.java b/src/main/java/codes/biscuit/skyblockaddons/core/Island.java
@@ -1,6 +1,6 @@
 package codes.biscuit.skyblockaddons.core;
 
-import codes.biscuit.skyblockaddons.utils.pojo.LocationData;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.LocationData;
 import lombok.Getter;
 import lombok.Setter;
 

diff --git a/...it/skyblockaddons/utils/pojo/PetInfo.java → .../biscuit/skyblockaddons/core/PetInfo.java b/...it/skyblockaddons/utils/pojo/PetInfo.java → .../biscuit/skyblockaddons/core/PetInfo.java
@@ -1,6 +1,5 @@
-package codes.biscuit.skyblockaddons.utils.pojo;
+package codes.biscuit.skyblockaddons.core;
 
-import codes.biscuit.skyblockaddons.core.Rarity;
 import com.google.gson.annotations.SerializedName;
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...yblockaddons/utils/skyblockdata/Rune.java → ...des/biscuit/skyblockaddons/core/Rune.java b/...yblockaddons/utils/skyblockdata/Rune.java → ...des/biscuit/skyblockaddons/core/Rune.java
@@ -1,4 +1,4 @@
-package codes.biscuit.skyblockaddons.utils.skyblockdata;
+package codes.biscuit.skyblockaddons.core;
 
 import lombok.Getter;
 import net.minecraft.nbt.NBTTagCompound;

diff --git a/src/main/java/codes/biscuit/skyblockaddons/features/EntityOutlines/FeatureTrackerQuest.java b/src/main/java/codes/biscuit/skyblockaddons/features/EntityOutlines/FeatureTrackerQuest.java
@@ -191,8 +191,8 @@ public void onChatReceived(ClientChatReceivedEvent e) {
                 // The player has 10 minutes to kill the animal
                 CooldownManager.put("TREVOR_THE_TRAPPER_HUNT", 600000);
                 // The player has cooldown before they can receive another animal after killing the current one
-                if (main.getUtils().getMayor().startsWith("Finnegan")
-                        || main.getUtils().getJerryMayor().startsWith("Finnegan")
+                if (main.getUtils().getMayor().equals("Finnegan")
+                        || main.getUtils().getJerryMayor().equals("Finnegan")
                         || (main.getUtils().getMinisterAndPerk().getKey().equals("Finnegan")
                         && main.getUtils().getMinisterAndPerk().getValue().equals("Pelt-pocalypse"))) {
                     CooldownManager.put("TREVOR_THE_TRAPPER_RETURN", 16000);

diff --git a/src/main/java/codes/biscuit/skyblockaddons/features/PetManager.java b/src/main/java/codes/biscuit/skyblockaddons/features/PetManager.java
@@ -2,12 +2,12 @@
 
 import codes.biscuit.skyblockaddons.SkyblockAddons;
 import codes.biscuit.skyblockaddons.core.InventoryType;
+import codes.biscuit.skyblockaddons.core.PetInfo;
 import codes.biscuit.skyblockaddons.core.Rarity;
 import codes.biscuit.skyblockaddons.utils.ColorCode;
 import codes.biscuit.skyblockaddons.utils.ItemUtils;
 import codes.biscuit.skyblockaddons.utils.TextUtils;
-import codes.biscuit.skyblockaddons.utils.pojo.PetInfo;
-import codes.biscuit.skyblockaddons.utils.skyblockdata.PetItem;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.PetItem;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import lombok.Getter;
@@ -174,7 +174,7 @@ public void updatePetItem(String rarityColor, String petItem) {
      * Parses the petInfo in the pet's ExtraAttributes to JsonObject after than converts to {@link Pet}
      * @param stack The pet ItemStack
      * @return {@link Pet}
-     * @see codes.biscuit.skyblockaddons.utils.pojo.PetInfo
+     * @see PetInfo
      * @author Fix3dll
      */
     private Pet getPetFromItemStack(ItemStack stack) {

diff --git a/src/main/java/codes/biscuit/skyblockaddons/features/backpacks/ContainerPreview.java b/src/main/java/codes/biscuit/skyblockaddons/features/backpacks/ContainerPreview.java
@@ -6,7 +6,7 @@
 
 import java.util.List;
 
-import static codes.biscuit.skyblockaddons.utils.skyblockdata.ContainerData.ContainerType;
+import static codes.biscuit.skyblockaddons.utils.data.skyblockdata.ContainerData.ContainerType;
 
 @Getter
 public class ContainerPreview {

diff --git a/src/main/java/codes/biscuit/skyblockaddons/features/backpacks/ContainerPreviewManager.java b/src/main/java/codes/biscuit/skyblockaddons/features/backpacks/ContainerPreviewManager.java
@@ -9,8 +9,8 @@
 import codes.biscuit.skyblockaddons.utils.EnumUtils;
 import codes.biscuit.skyblockaddons.utils.ItemUtils;
 import codes.biscuit.skyblockaddons.utils.TextUtils;
-import codes.biscuit.skyblockaddons.utils.skyblockdata.ContainerData;
-import codes.biscuit.skyblockaddons.utils.skyblockdata.ContainerData.ContainerType;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.ContainerData;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.ContainerData.ContainerType;
 import lombok.Getter;
 import lombok.NonNull;
 import net.minecraft.client.Minecraft;

diff --git a/src/main/java/codes/biscuit/skyblockaddons/features/dragontracker/DragonTracker.java b/src/main/java/codes/biscuit/skyblockaddons/features/dragontracker/DragonTracker.java
@@ -3,7 +3,7 @@
 import codes.biscuit.skyblockaddons.SkyblockAddons;
 import codes.biscuit.skyblockaddons.features.ItemDiff;
 import codes.biscuit.skyblockaddons.utils.ItemUtils;
-import codes.biscuit.skyblockaddons.utils.pojo.PetInfo;
+import codes.biscuit.skyblockaddons.core.PetInfo;
 import com.google.common.collect.Lists;
 import lombok.Getter;
 

diff --git a/src/main/java/codes/biscuit/skyblockaddons/features/slayertracker/SlayerTracker.java b/src/main/java/codes/biscuit/skyblockaddons/features/slayertracker/SlayerTracker.java
@@ -5,7 +5,7 @@
 import codes.biscuit.skyblockaddons.utils.DevUtils;
 import codes.biscuit.skyblockaddons.utils.EnumUtils;
 import codes.biscuit.skyblockaddons.utils.ItemUtils;
-import codes.biscuit.skyblockaddons.utils.skyblockdata.Rune;
+import codes.biscuit.skyblockaddons.core.Rune;
 import lombok.Getter;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.nbt.NBTTagCompound;

diff --git a/src/main/java/codes/biscuit/skyblockaddons/gui/buttons/IslandButton.java b/src/main/java/codes/biscuit/skyblockaddons/gui/buttons/IslandButton.java
@@ -5,7 +5,7 @@
 import codes.biscuit.skyblockaddons.utils.ColorCode;
 import codes.biscuit.skyblockaddons.utils.DrawUtils;
 import codes.biscuit.skyblockaddons.utils.objects.Pair;
-import codes.biscuit.skyblockaddons.utils.pojo.ElectionData;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.ElectionData;
 import lombok.Getter;
 import lombok.Setter;
 import net.minecraft.client.Minecraft;

diff --git a/src/main/java/codes/biscuit/skyblockaddons/misc/Updater.java b/src/main/java/codes/biscuit/skyblockaddons/misc/Updater.java
@@ -2,7 +2,7 @@
 
 import codes.biscuit.skyblockaddons.SkyblockAddons;
 import codes.biscuit.skyblockaddons.asm.SkyblockAddonsASMTransformer;
-import codes.biscuit.skyblockaddons.utils.pojo.OnlineData;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.OnlineData;
 import lombok.Getter;
 import net.minecraft.event.ClickEvent;
 import net.minecraft.event.HoverEvent;

diff --git a/src/main/java/codes/biscuit/skyblockaddons/utils/APIManager.java b/src/main/java/codes/biscuit/skyblockaddons/utils/APIManager.java
diff --git a/src/main/java/codes/biscuit/skyblockaddons/utils/ItemUtils.java b/src/main/java/codes/biscuit/skyblockaddons/utils/ItemUtils.java
@@ -4,10 +4,10 @@
 import codes.biscuit.skyblockaddons.core.Rarity;
 import codes.biscuit.skyblockaddons.core.ItemType;
 import codes.biscuit.skyblockaddons.features.backpacks.BackpackColor;
-import codes.biscuit.skyblockaddons.utils.pojo.PetInfo;
-import codes.biscuit.skyblockaddons.utils.skyblockdata.CompactorItem;
-import codes.biscuit.skyblockaddons.utils.skyblockdata.ContainerData;
-import codes.biscuit.skyblockaddons.utils.skyblockdata.Rune;
+import codes.biscuit.skyblockaddons.core.PetInfo;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.CompactorItem;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.ContainerData;
+import codes.biscuit.skyblockaddons.core.Rune;
 import lombok.Setter;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.init.Items;

diff --git a/src/main/java/codes/biscuit/skyblockaddons/utils/data/DataUtils.java b/src/main/java/codes/biscuit/skyblockaddons/utils/data/DataUtils.java
@@ -6,8 +6,8 @@
 import codes.biscuit.skyblockaddons.core.Language;
 import codes.biscuit.skyblockaddons.features.PetManager;
 import codes.biscuit.skyblockaddons.utils.LocationUtils;
-import codes.biscuit.skyblockaddons.utils.pojo.LocationData;
-import codes.biscuit.skyblockaddons.utils.pojo.OnlineData;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.LocationData;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.OnlineData;
 import codes.biscuit.skyblockaddons.core.Translations;
 import codes.biscuit.skyblockaddons.core.seacreatures.SeaCreature;
 import codes.biscuit.skyblockaddons.core.seacreatures.SeaCreatureManager;
@@ -18,9 +18,9 @@
 import codes.biscuit.skyblockaddons.utils.ItemUtils;
 import codes.biscuit.skyblockaddons.utils.Utils;
 import codes.biscuit.skyblockaddons.utils.data.requests.*;
-import codes.biscuit.skyblockaddons.utils.skyblockdata.CompactorItem;
-import codes.biscuit.skyblockaddons.utils.skyblockdata.ContainerData;
-import codes.biscuit.skyblockaddons.utils.skyblockdata.PetItem;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.CompactorItem;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.ContainerData;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.PetItem;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;

diff --git a/src/main/java/codes/biscuit/skyblockaddons/utils/data/requests/CompactorItemsRequest.java b/src/main/java/codes/biscuit/skyblockaddons/utils/data/requests/CompactorItemsRequest.java
@@ -5,7 +5,7 @@
 import codes.biscuit.skyblockaddons.utils.data.DataFetchCallback;
 import codes.biscuit.skyblockaddons.utils.data.JSONResponseHandler;
 import codes.biscuit.skyblockaddons.utils.data.RemoteFileRequest;
-import codes.biscuit.skyblockaddons.utils.skyblockdata.CompactorItem;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.CompactorItem;
 import com.google.gson.reflect.TypeToken;
 import org.apache.logging.log4j.Logger;
 

diff --git a/src/main/java/codes/biscuit/skyblockaddons/utils/data/requests/ContainersRequest.java b/src/main/java/codes/biscuit/skyblockaddons/utils/data/requests/ContainersRequest.java
@@ -5,7 +5,7 @@
 import codes.biscuit.skyblockaddons.utils.data.DataFetchCallback;
 import codes.biscuit.skyblockaddons.utils.data.JSONResponseHandler;
 import codes.biscuit.skyblockaddons.utils.data.RemoteFileRequest;
-import codes.biscuit.skyblockaddons.utils.skyblockdata.ContainerData;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.ContainerData;
 import com.google.gson.reflect.TypeToken;
 import org.apache.logging.log4j.Logger;
 

diff --git a/src/main/java/codes/biscuit/skyblockaddons/utils/data/requests/LocationsRequest.java b/src/main/java/codes/biscuit/skyblockaddons/utils/data/requests/LocationsRequest.java
@@ -5,7 +5,7 @@
 import codes.biscuit.skyblockaddons.utils.data.DataFetchCallback;
 import codes.biscuit.skyblockaddons.utils.data.JSONResponseHandler;
 import codes.biscuit.skyblockaddons.utils.data.RemoteFileRequest;
-import codes.biscuit.skyblockaddons.utils.pojo.LocationData;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.LocationData;
 import com.google.gson.reflect.TypeToken;
 import org.apache.logging.log4j.Logger;
 

diff --git a/src/main/java/codes/biscuit/skyblockaddons/utils/data/requests/MayorRequest.java b/src/main/java/codes/biscuit/skyblockaddons/utils/data/requests/MayorRequest.java
@@ -9,7 +9,7 @@
 import codes.biscuit.skyblockaddons.utils.data.JSONResponseHandler;
 import codes.biscuit.skyblockaddons.utils.data.RemoteFileRequest;
 import codes.biscuit.skyblockaddons.utils.objects.Pair;
-import codes.biscuit.skyblockaddons.utils.pojo.ElectionData;
+import codes.biscuit.skyblockaddons.utils.data.skyblockdata.ElectionData;
 import org.apache.logging.log4j.Logger;
 
 import java.net.URI;