Yes

JellyLabScripts · Nov 26, 2023 · fc9efc8 · fc9efc8
1 parent 6749924
commit fc9efc8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -35,8 +35,8 @@ loom {
             property("mixin.debug", "true")
             property("asmhelper.verbose", "true")
             arg("--tweakClass", "cc.polyfrost.oneconfig.loader.stage0.LaunchWrapperTweaker")
-            arg("-Dfml.coreMods.load", "com.github.may2beez.farmhelperv2.transformer.FMLCore")
-            arg("--tweakClass", "com.github.may2beez.farmhelperv2.transformer.Tweaker")
+            arg("-Dfml.coreMods.load", "com.jelly.farmhelperv2.transformer.FMLCore")
+            arg("--tweakClass", "com.jelly.farmhelperv2.transformer.Tweaker")
         }
     }
     forge {
@@ -62,7 +62,7 @@ repositories {
     maven("https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1")
     maven("https://repo.polyfrost.cc/releases")
     maven("https://repo.essential.gg/repository/maven-public")
-    maven ("https://jitpack.io")
+    maven("https://jitpack.io")
 }
 
 val shadowImpl: Configuration by configurations.creating {
@@ -99,7 +99,7 @@ tasks.withType(JavaCompile::class) {
 tasks.withType(Jar::class) {
     archiveBaseName.set(modName)
     manifest.attributes.run {
-        this["FMLCorePlugin"] = "com.github.may2beez.farmhelperv2.transformer.FMLCore"
+        this["FMLCorePlugin"] = "com.jelly.farmhelperv2.transformer.FMLCore"
         this["FMLCorePluginContainsFMLMod"] = "true"
         this["ForceLoadAsMod"] = "true"
         this["TweakOrder"] = "0"

diff --git a/gradle.properties b/gradle.properties
@@ -5,4 +5,4 @@ mcVersion=1.8.9
 modid=farmhelperv2
 modName=FarmHelper
 version=2.0.0
-shouldRelease=false
+shouldRelease=true
diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/ProfitCalculator.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/ProfitCalculator.java
@@ -3,7 +3,6 @@
 import cc.polyfrost.oneconfig.utils.Multithreading;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import com.jelly.farmhelperv2.config.FarmHelperConfig;
 import com.jelly.farmhelperv2.event.ClickedBlockEvent;
 import com.jelly.farmhelperv2.event.ReceivePacketEvent;
 import com.jelly.farmhelperv2.feature.IFeature;
@@ -338,41 +337,41 @@ public void onBlockChange(ClickedBlockEvent event) {
         if (!GameStateHandler.getInstance().inGarden()) return;
 
         switch (MacroHandler.getInstance().getCrop()) {
-            case FarmHelperConfig.CropEnum.NETHER_WART:
-            case FarmHelperConfig.CropEnum.CARROT:
-            case FarmHelperConfig.CropEnum.POTATO:
-            case FarmHelperConfig.CropEnum.WHEAT:
+            case NETHER_WART:
+            case CARROT:
+            case POTATO:
+            case WHEAT:
                 if (event.getBlock() instanceof BlockCrops ||
                         event.getBlock() instanceof BlockNetherWart) {
                     blocksBroken++;
                 }
                 break;
-            case FarmHelperConfig.CropEnum.SUGAR_CANE:
+            case SUGAR_CANE:
                 if (event.getBlock() instanceof BlockReed) {
                     blocksBroken++;
                 }
                 break;
-            case FarmHelperConfig.CropEnum.MELON:
+            case MELON:
                 if (event.getBlock().equals(Blocks.melon_block)) {
                     blocksBroken++;
                 }
                 break;
-            case FarmHelperConfig.CropEnum.PUMPKIN:
+            case PUMPKIN:
                 if (event.getBlock().equals(Blocks.pumpkin)) {
                     blocksBroken++;
                 }
                 break;
-            case FarmHelperConfig.CropEnum.CACTUS:
+            case CACTUS:
                 if (event.getBlock().equals(Blocks.cactus)) {
                     blocksBroken++;
                 }
                 break;
-            case FarmHelperConfig.CropEnum.COCOA_BEANS:
+            case COCOA_BEANS:
                 if (event.getBlock().equals(Blocks.cocoa)) {
                     blocksBroken++;
                 }
                 break;
-            case FarmHelperConfig.CropEnum.MUSHROOM:
+            case MUSHROOM:
                 if (event.getBlock().equals(Blocks.red_mushroom) ||
                         event.getBlock().equals(Blocks.brown_mushroom)) {
                     blocksBroken++;

diff --git a/src/main/java/com/jelly/farmhelperv2/gui/AutoUpdaterGUI.java b/src/main/java/com/jelly/farmhelperv2/gui/AutoUpdaterGUI.java
@@ -36,7 +36,7 @@ public class AutoUpdaterGUI extends GuiScreen {
     static final int DOWNLOAD_BUTTON_ID = 1;
     static final int CLOSE_BUTTON_ID = 2;
     private static final Minecraft mc = Minecraft.getMinecraft();
-    private static final String GITHUB_API_URL = "https://api.github.com/repos/May2Beez/FarmHelperV2/releases";
+    private static final String GITHUB_API_URL = "https://api.github.com/repos/JellyLabScripts/FarmHelper/releases";
     private static final int CONNECT_TIMEOUT = 10000;
     private static final int READ_TIMEOUT = 10000;
     public static boolean checkedForUpdates = false;

diff --git a/src/main/resources/mixins.farmhelper.json → src/main/resources/mixins.farmhelperv2.json b/src/main/resources/mixins.farmhelper.json → src/main/resources/mixins.farmhelperv2.json