1.21.4 project and misc changes

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-	id("fabric-loom") version "1.8-SNAPSHOT"
+	id("fabric-loom") version "1.9-SNAPSHOT"
 	id("maven-publish")
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -19,7 +19,7 @@ stonecutter {
 	centralScript = "build.gradle.kts"
 
 	create(rootProject) {
-		versions("1.21.1", "1.21.3")
+		versions("1.21.1", "1.21.3", "1.21.4")
 		vcsVersion = "1.21.3"
 	}
 }

src/main/java/wtf/cheeze/sbt/command/CommandUtils.java

@@ -25,6 +25,9 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
+import wtf.cheeze.sbt.utils.enums.Crops;
+import wtf.cheeze.sbt.utils.enums.Rarity;
+import wtf.cheeze.sbt.utils.enums.Slayers;
 import wtf.cheeze.sbt.utils.skyblock.SkyblockConstants;
 
 import java.util.function.Supplier;
@@ -48,7 +51,7 @@ public static SuggestionProvider<FabricClientCommandSource> getArrayAsSuggestion
         };
     }
 
-    static int[] getCalcPetTable(SkyblockConstants.Rarity rarity) {
+    static int[] getCalcPetTable(Rarity rarity) {
         return switch (rarity) {
             case COMMON -> SkyblockConstants.PET_LEVELS_COMMON;
             case UNCOMMON -> SkyblockConstants.PET_LEVELS_UNCOMMON;
@@ -59,7 +62,7 @@ static int[] getCalcPetTable(SkyblockConstants.Rarity rarity) {
         };
     }
 
-    static int[] getCalcSlayerTable(SkyblockConstants.Slayers slayer) {
+    static int[] getCalcSlayerTable(Slayers slayer) {
         return switch (slayer) {
             case ZOMBIE -> SkyblockConstants.SLAYER_LEVELS_ZOMBIE;
             case SPIDER -> SkyblockConstants.SLAYER_LEVELS_SPIDER;
@@ -68,7 +71,7 @@ static int[] getCalcSlayerTable(SkyblockConstants.Slayers slayer) {
         };
     }
 
-    static int[] getCalcCropTable(SkyblockConstants.Crops crop) {
+    static int[] getCalcCropTable(Crops crop) {
         return switch (crop) {
             case WHEAT, PUMPKIN, MUSHROOM -> SkyblockConstants.CROP_LEVELS_WPMS;
             case CARROT, POTATO -> SkyblockConstants.CROP_LEVELS_CP;

src/main/java/wtf/cheeze/sbt/command/SBTCommand.java

@@ -34,6 +34,8 @@
 import wtf.cheeze.sbt.features.CalcPowder;
 import wtf.cheeze.sbt.features.chat.PartyFeatures;
 import wtf.cheeze.sbt.utils.NumberUtils;
+import wtf.cheeze.sbt.utils.enums.Rarity;
+import wtf.cheeze.sbt.utils.enums.Slayers;
 import wtf.cheeze.sbt.utils.skyblock.SkyblockConstants;
 import wtf.cheeze.sbt.utils.skyblock.SkyblockUtils;
 import wtf.cheeze.sbt.hud.HudScreen;
@@ -84,7 +86,7 @@ public class SBTCommand {
                                                 }
                                                 var levelStart = IntegerArgumentType.getInteger(context, "level-start");
                                                 var levelEnd = IntegerArgumentType.getInteger(context, "level-end");
-                                                var cap = slayer == SkyblockConstants.Slayers.VAMPIRE ? 5 : 9;
+                                                var cap = slayer == Slayers.VAMPIRE ? 5 : 9;
 
                                                 if (levelStart > levelEnd || levelEnd < 0 || levelStart < 0 || levelStart > cap || levelEnd > cap) {
                                                     context.getSource().sendFeedback(Text.of(PREFIX + " §cInvalid arguments"));
@@ -140,7 +142,7 @@ public class SBTCommand {
                                                 var levelStart = IntegerArgumentType.getInteger(context, "level-start");
                                                 var levelEnd = IntegerArgumentType.getInteger(context, "level-end");
 
-                                                var cap = (rarity == SkyblockConstants.Rarity.LEGENDARY || rarity == SkyblockConstants.Rarity.MYTHIC) ? 200 : 100;
+                                                var cap = (rarity == Rarity.LEGENDARY || rarity == Rarity.MYTHIC) ? 200 : 100;
 
 
                                                 if (levelStart < 0 || levelEnd < 0 || levelStart > cap || levelEnd > cap || levelStart >= levelEnd) {

src/main/java/wtf/cheeze/sbt/config/SBTConfig.java

@@ -34,7 +34,7 @@
 import java.nio.file.Path;
 
 
-public class SBTConfig {
+public class  SBTConfig {
 
     public static final Path PATH = FabricLoader.getInstance().getConfigDir().resolve("skyblocktweaks-config.json");
 

src/main/java/wtf/cheeze/sbt/config/persistent/ProfileData.java

@@ -18,10 +18,10 @@
  */
 package wtf.cheeze.sbt.config.persistent;
 
-import wtf.cheeze.sbt.utils.skyblock.SkyblockConstants;
+import wtf.cheeze.sbt.utils.enums.Skills;
 
 import java.util.EnumMap;
 
 public class ProfileData {
-    public EnumMap<SkyblockConstants.Skills, Integer> skillLevels = new EnumMap<>(SkyblockConstants.Skills.class);
+    public EnumMap<Skills, Integer> skillLevels = new EnumMap<>(Skills.class);
 }

src/main/java/wtf/cheeze/sbt/features/CalcPowder.java

@@ -20,7 +20,7 @@
 
 import java.util.Map;
 
-import static wtf.cheeze.sbt.utils.skyblock.SkyblockConstants.Powder;
+import wtf.cheeze.sbt.utils.enums.Powder;
 
 /**
  * This lives in its own class instead of SkyblockConstants because it has its own complex logic

src/main/java/wtf/cheeze/sbt/features/huds/QuiverHUD.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2024 MisterCheezeCake
+ *
+ * This file is part of SkyblockTweaks.
+ *
+ * SkyblockTweaks is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SkyblockTweaks is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with SkyblockTweaks. If not, see <https://www.gnu.org/licenses/>.
+ */
 package wtf.cheeze.sbt.features.huds;
 
 import dev.isxander.yacl3.api.Option;

src/main/java/wtf/cheeze/sbt/features/huds/SkillHUDManager.java

@@ -37,6 +37,7 @@
 import wtf.cheeze.sbt.hud.utils.HudInformation;
 import wtf.cheeze.sbt.hud.components.SingleHudLine;
 import wtf.cheeze.sbt.hud.bases.TextHUD;
+import wtf.cheeze.sbt.utils.enums.Skills;
 import wtf.cheeze.sbt.utils.render.Colors;
 import wtf.cheeze.sbt.utils.skyblock.IconDict;
 import wtf.cheeze.sbt.utils.skyblock.SkyblockConstants;
@@ -65,7 +66,7 @@ private SkillHUDManager() {
     private static final int PERSIST_TICKS = 60;
 
     private int timeLeft = 0;
-    private SkyblockConstants.Skills currentSkill = SkyblockConstants.Skills.UNKNOWN;
+    private Skills currentSkill = Skills.UNKNOWN;
     private float gained = 0;
     private float total = 0;
     private float progress = 0;
@@ -171,13 +172,13 @@ public SkillHUD() {
             );
         }
 
-        private static int tryAndGetSkillLevel(SkyblockConstants.Skills skill) {
+        private static int tryAndGetSkillLevel(Skills skill) {
             var profile = SkyblockTweaks.PD.profiles.get(SkyblockTweaks.DATA.getCurrentProfileUnique());
             if (profile == null) return -1;
             return profile.skillLevels.getOrDefault(skill, -1);
         }
 
-        private static int[] getSkillTable(SkyblockConstants.Skills skill) {
+        private static int[] getSkillTable(Skills skill) {
             return switch (skill) {
                 case FARMING, FISHING, FORAGING, MINING, COMBAT, ENCHANTING, ALCHEMY, TAMING, CARPENTRY, UNKNOWN ->
                         SkyblockConstants.SKILL_LEVELS;

src/main/java/wtf/cheeze/sbt/hud/utils/DrawMode.java

@@ -23,7 +23,9 @@
 import wtf.cheeze.sbt.utils.TextUtils;
 
 public enum DrawMode implements NameableEnum {
-    PURE, SHADOW, OUTLINE;
+    PURE,
+    SHADOW,
+    OUTLINE;
 
     @Override
     public Text getDisplayName() {

src/main/java/wtf/cheeze/sbt/utils/enums/Crops.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2024 MisterCheezeCake
+ *
+ * This file is part of SkyblockTweaks.
+ *
+ * SkyblockTweaks is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SkyblockTweaks is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with SkyblockTweaks. If not, see <https://www.gnu.org/licenses/>.
+ */
+package wtf.cheeze.sbt.utils.enums;
+
+public enum Crops {
+    WHEAT,
+    CARROT,
+    POTATO,
+    MELON,
+    PUMPKIN,
+    SUGAR_CANE,
+    COCOA_BEANS,
+    CACTUS,
+    MUSHROOM,
+    NETHER_WART
+}

src/main/java/wtf/cheeze/sbt/utils/enums/Location.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2024 MisterCheezeCake
+ *
+ * This file is part of SkyblockTweaks.
+ *
+ * SkyblockTweaks is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SkyblockTweaks is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with SkyblockTweaks. If not, see <https://www.gnu.org/licenses/>.
+ */
+package wtf.cheeze.sbt.utils.enums;
+
+// Inspired by Skyblocker's Location enum
+public enum Location {
+    PRIVATE_ISLAND("dynamic", "Private Location"),
+    GARDEN("garden", "The Garden"),
+    HUB("hub", "The Hub"),
+    FARMING("farming_1", "The Barn"),
+    PARK("foraging_1", "The Park"),
+    SPIDERS_DEN("combat_1", "The Spider's Den"),
+    END("combat_3", "The End"),
+    CRIMSON_ISLE("crimson_isle", "The Crimson Isle"),
+    GOLD_MINE("mining_1", "The Gold Mine"),
+    DEEP_CAVERNS("mining_2", "The Deep Caverns"),
+    DWARVEN_MINES("mining_3", "The Dwarven Mines"),
+    CRYSTAL_HOLLOWS("crystal_hollows", "The Crystal Hollows"),
+    GLACITE_MINESHAFT("mineshaft", "Glacite Mineshaft"),
+    DUNGEON_HUB("dungeon_hub", "The Dungeon Hub"),
+    JERRYS_WORKSHOP("winter", "Jerry's Workshop"),
+    RIFT("rift", "The Rift"),
+    DARK_AUCTION("dark_auction", "The Dark Auction"),
+    DUNGEON("dungeon", "Dungeons"),
+    KUUDRA("kuudra", "Kuudra"),
+    UNKNOWN("unknown", "Unknown Location");
+
+    Location(String mode, String name) {
+        this.mode = mode;
+        this.name = name;
+    }
+
+    ;
+    private final String mode;
+    private final String name;
+
+    public String getMode() {
+        return mode;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

src/main/java/wtf/cheeze/sbt/utils/enums/Powder.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2024 MisterCheezeCake
+ *
+ * This file is part of SkyblockTweaks.
+ *
+ * SkyblockTweaks is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SkyblockTweaks is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with SkyblockTweaks. If not, see <https://www.gnu.org/licenses/>.
+ */
+package wtf.cheeze.sbt.utils.enums;
+
+public enum Powder {
+    MITHRIL,
+    GEMSTONE,
+    GLACITE;
+
+    public String getDisplayName() {
+        return name().substring(0, 1).toUpperCase() + name().substring(1).toLowerCase();
+    }
+}

src/main/java/wtf/cheeze/sbt/utils/enums/Rarity.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2024 MisterCheezeCake
+ *
+ * This file is part of SkyblockTweaks.
+ *
+ * SkyblockTweaks is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SkyblockTweaks is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with SkyblockTweaks. If not, see <https://www.gnu.org/licenses/>.
+ */
+package wtf.cheeze.sbt.utils.enums;
+
+public enum Rarity {
+    COMMON,
+    UNCOMMON,
+    RARE,
+    EPIC,
+    LEGENDARY,
+    MYTHIC,
+    DIVINE,
+    SPECIAL,
+    VERY_SPECIAL,
+    ULTIMATE
+}

src/main/java/wtf/cheeze/sbt/utils/enums/Skills.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2024 MisterCheezeCake
+ *
+ * This file is part of SkyblockTweaks.
+ *
+ * SkyblockTweaks is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SkyblockTweaks is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with SkyblockTweaks. If not, see <https://www.gnu.org/licenses/>.
+ */
+package wtf.cheeze.sbt.utils.enums;
+
+/**
+ * Skills
+ * Unknown is used rather than null when no skill is known to prevent NPEs
+ */
+public enum Skills {
+    COMBAT,
+    MINING,
+    FARMING,
+    FORAGING,
+    FISHING,
+    ENCHANTING,
+    ALCHEMY,
+    TAMING,
+    CARPENTRY,
+    RUNECRAFTING,
+    SOCIAL,
+    UNKNOWN
+}