From f0cc430e2e87b543bc61ca3b3a1bd84b368757cb Mon Sep 17 00:00:00 2001 From: Cameron Reed Date: Thu, 15 Feb 2024 14:51:43 -0700 Subject: [PATCH] Update to 1.20.4 --- build.gradle | 2 +- gradle.properties | 10 +++++----- src/main/java/cmods/haxxor/HaxxorModule.java | 4 ++-- src/main/java/cmods/haxxor/client/AutoFarmer.java | 8 ++++---- .../java/cmods/haxxor/client/ui/CropSelectScreen.java | 2 +- .../cmods/haxxor/client/ui/ElevatorOptionsScreen.java | 2 +- .../cmods/haxxor/client/ui/FarmerOptionsScreen.java | 2 +- .../java/cmods/haxxor/client/ui/GlowOptionsScreen.java | 2 +- .../cmods/haxxor/client/ui/HaxxorOptionsScreen.java | 2 +- .../java/cmods/haxxor/client/ui/UIOptionsScreen.java | 2 +- src/main/resources/fabric.mod.json | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index 7d9c377..242e428 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation files("libs/cmods-1.2.0-dev.jar") + modImplementation files("libs/cmods-1.2.1-dev.jar") modCompileOnly "com.terraformersmc:modmenu:4.1.1" } diff --git a/gradle.properties b/gradle.properties index eb80a13..99b64c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,13 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.20.1 -yarn_mappings=1.20.1+build.10 -loader_version=0.14.22 +minecraft_version=1.20.4 +yarn_mappings=1.20.4+build.3 +loader_version=0.15.6 # Mod Properties -mod_version=2.4.0 +mod_version=2.4.1 maven_group=cmods archives_base_name=haxxor # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.87.0+1.20.1 +fabric_version=0.96.1+1.20.4 diff --git a/src/main/java/cmods/haxxor/HaxxorModule.java b/src/main/java/cmods/haxxor/HaxxorModule.java index 55a90ff..8dd35b3 100644 --- a/src/main/java/cmods/haxxor/HaxxorModule.java +++ b/src/main/java/cmods/haxxor/HaxxorModule.java @@ -29,8 +29,8 @@ public class HaxxorModule extends Module { } public static void init() { - HaxxorOptions options = HaxxorOptions.getInstance(); - ArrayList optionButtons = new ArrayList<>(2); + final HaxxorOptions options = HaxxorOptions.getInstance(); + ArrayList optionButtons = new ArrayList<>(4); ArrayList uiOptions = new ArrayList<>(2); diff --git a/src/main/java/cmods/haxxor/client/AutoFarmer.java b/src/main/java/cmods/haxxor/client/AutoFarmer.java index 4b88011..e866e50 100644 --- a/src/main/java/cmods/haxxor/client/AutoFarmer.java +++ b/src/main/java/cmods/haxxor/client/AutoFarmer.java @@ -43,7 +43,7 @@ public class AutoFarmer { // Really just a namespace and needed to separate thin PLACE_OFF_HAND } - private enum GROWTH_PATTERN { + public enum GROWTH_PATTERN { BASIC, LEAVE_BASE } @@ -61,14 +61,14 @@ public class AutoFarmer { // Really just a namespace and needed to separate thin } public static boolean canFarm() { - return queuedActions.size() > 0; + return !queuedActions.isEmpty(); } public static void tick(MinecraftClient client) { if (client.player == null) return; - if (queuedStopPackets.size() > 0) + if (!queuedStopPackets.isEmpty()) sendStopPackets(client); scanBlocks(client); @@ -265,7 +265,7 @@ public class AutoFarmer { // Really just a namespace and needed to separate thin if (block.getBlock() instanceof CropBlock) return ((CropBlock) block.getBlock()).isMature(block); if (blockType == NetherWartBlock.class) - return block.get(NetherWartBlock.AGE) >= NetherWartBlock.field_31199; + return block.get(NetherWartBlock.AGE) >= NetherWartBlock.MAX_AGE; return false; } diff --git a/src/main/java/cmods/haxxor/client/ui/CropSelectScreen.java b/src/main/java/cmods/haxxor/client/ui/CropSelectScreen.java index a917188..9e437b5 100644 --- a/src/main/java/cmods/haxxor/client/ui/CropSelectScreen.java +++ b/src/main/java/cmods/haxxor/client/ui/CropSelectScreen.java @@ -66,7 +66,7 @@ public class CropSelectScreen extends Screen { final int column2 = width / 2 + column2_offset; final int startHeight = (int) Math.floor(height * startHeight_multiplier) + heightOffset; - this.renderBackground(context); + this.renderBackground(context, mouseX, mouseY, delta); context.drawCenteredTextWithShadow(textRenderer, Text.translatable("haxxor.options.farmer.crop_select.seeds"), column1 + buttonWidth / 2, startHeight - rowIncrement, 0xffffff); diff --git a/src/main/java/cmods/haxxor/client/ui/ElevatorOptionsScreen.java b/src/main/java/cmods/haxxor/client/ui/ElevatorOptionsScreen.java index 72949b5..a8483a7 100644 --- a/src/main/java/cmods/haxxor/client/ui/ElevatorOptionsScreen.java +++ b/src/main/java/cmods/haxxor/client/ui/ElevatorOptionsScreen.java @@ -53,7 +53,7 @@ public class ElevatorOptionsScreen extends Screen { } public void render(DrawContext context, int mouseX, int mouseY, float delta) { - this.renderBackground(context); + this.renderBackground(context, mouseX, mouseY, delta); context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff); super.render(context, mouseX, mouseY, delta); } diff --git a/src/main/java/cmods/haxxor/client/ui/FarmerOptionsScreen.java b/src/main/java/cmods/haxxor/client/ui/FarmerOptionsScreen.java index a3b234a..c1befdb 100644 --- a/src/main/java/cmods/haxxor/client/ui/FarmerOptionsScreen.java +++ b/src/main/java/cmods/haxxor/client/ui/FarmerOptionsScreen.java @@ -77,7 +77,7 @@ public class FarmerOptionsScreen extends Screen { } public void render(DrawContext context, int mouseX, int mouseY, float delta) { - this.renderBackground(context); + this.renderBackground(context, mouseX, mouseY, delta); context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff); super.render(context, mouseX, mouseY, delta); } diff --git a/src/main/java/cmods/haxxor/client/ui/GlowOptionsScreen.java b/src/main/java/cmods/haxxor/client/ui/GlowOptionsScreen.java index 6312e63..909957f 100644 --- a/src/main/java/cmods/haxxor/client/ui/GlowOptionsScreen.java +++ b/src/main/java/cmods/haxxor/client/ui/GlowOptionsScreen.java @@ -56,7 +56,7 @@ public class GlowOptionsScreen extends Screen { } public void render(DrawContext context, int mouseX, int mouseY, float delta) { - this.renderBackground(context); + this.renderBackground(context, mouseX, mouseY, delta); context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff); super.render(context, mouseX, mouseY, delta); } diff --git a/src/main/java/cmods/haxxor/client/ui/HaxxorOptionsScreen.java b/src/main/java/cmods/haxxor/client/ui/HaxxorOptionsScreen.java index 0122c07..b80dfce 100644 --- a/src/main/java/cmods/haxxor/client/ui/HaxxorOptionsScreen.java +++ b/src/main/java/cmods/haxxor/client/ui/HaxxorOptionsScreen.java @@ -58,7 +58,7 @@ public class HaxxorOptionsScreen extends Screen { } public void render(DrawContext context, int mouseX, int mouseY, float delta) { - renderBackground(context); + renderBackground(context, mouseX, mouseY, delta); Text versionText = Text.literal("v" + HaxxorClient.version); diff --git a/src/main/java/cmods/haxxor/client/ui/UIOptionsScreen.java b/src/main/java/cmods/haxxor/client/ui/UIOptionsScreen.java index a9b374e..c1df995 100644 --- a/src/main/java/cmods/haxxor/client/ui/UIOptionsScreen.java +++ b/src/main/java/cmods/haxxor/client/ui/UIOptionsScreen.java @@ -51,7 +51,7 @@ public class UIOptionsScreen extends Screen { } public void render(DrawContext context, int mouseX, int mouseY, float delta) { - this.renderBackground(context); + this.renderBackground(context, mouseX, mouseY, delta); context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff); super.render(context, mouseX, mouseY, delta); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 3bb3e82..5f5f56b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,7 +23,7 @@ "depends": { "fabricloader": ">=0.14.10", "fabric": "*", - "minecraft": "1.20.1", - "cmods": "1.2.0" + "minecraft": "1.20.4", + "cmods": "1.2.1" } }