1.20.6 update

MarvionKirito · Jun 20, 2024 · 1713539 · 1713539
1 parent 2ca4196
commit 1713539
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 27 deletions.
diff --git a/build.gradle b/build.gradle
@@ -52,11 +52,11 @@ dependencies {
     // Thank you georgeagostino for fixing my garbage
     if (getProject().hasProperty("altoclef.development")) {
         // Must run build from baritone-plus once
-        modImplementation 'baritone-api-fabric:baritone-unoptimized-fabric-1.20.5-beta1'
-        include "baritone-api-fabric:baritone-unoptimized-fabric-1.20.5-beta1"
+        modImplementation 'baritone-api-fabric:baritone-unoptimized-fabric-1.20.6-beta1'
+        include "baritone-api-fabric:baritone-unoptimized-fabric-1.20.6-beta1"
     } else {
-        modImplementation "cabaletta:baritone-unoptimized-fabric:1.20.5-beta1"
-        include "cabaletta:baritone-unoptimized-fabric:1.20.5-beta1"
+        modImplementation "cabaletta:baritone-unoptimized-fabric:1.20.6-beta1"
+        include "cabaletta:baritone-unoptimized-fabric:1.20.6-beta1"
     }
     //modImplementation 'baritone-api-fabric:baritone-api-fabric:1.6.3'
     //implementation files('baritone-plus/build/libs/baritone-unoptimized-fabric-1.6.3.jar')

diff --git a/gradle.properties b/gradle.properties
@@ -8,13 +8,13 @@ org.gradle.caching=true
 org.gradle.warning.mode=all
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.20.5
-yarn_mappings=1.20.5+build.1
+minecraft_version=1.20.6
+yarn_mappings=1.20.6+build.3
 loader_version=0.15.11
 # Mod Properties
-mod_version=1.20.5-beta1
+mod_version=1.20.6-beta1
 maven_group=gaucho-matrero.altoclef
 archives_base_name=altoclef
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.97.8+1.20.5
+fabric_version=0.100.2+1.20.6
diff --git a/src/main/java/adris/altoclef/tasks/speedrun/MarvionBeatMinecraftTask.java b/src/main/java/adris/altoclef/tasks/speedrun/MarvionBeatMinecraftTask.java
@@ -1973,6 +1973,12 @@ private Task getEyesOfEnderTask(AltoClef mod, int targetEyes) {
                 } else {
                     _starterGearTask = null;
                 }
+                if (shouldForce(mod, _shieldTask) && !StorageHelper.isArmorEquipped(mod, COLLECT_SHIELD)) {
+                    setDebugState("Getting shield for defense purposes only.");
+                    return _shieldTask;
+                } else {
+                    _shieldTask = null;
+                }
                 if (shouldForce(mod, _foodTask)) {
                     setDebugState("Getting food for ender eye journey.");
                     return _foodTask;
@@ -2014,12 +2020,6 @@ private Task getEyesOfEnderTask(AltoClef mod, int targetEyes) {
                     setDebugState("Looting chest for goodies");
                     return _lootTask;
                 }
-                if (shouldForce(mod, _shieldTask) && !StorageHelper.isArmorEquipped(mod, COLLECT_SHIELD)) {
-                    setDebugState("Getting shield for defense purposes only.");
-                    return _shieldTask;
-                } else {
-                    _shieldTask = null;
-                }
                 if (shouldForce(mod, _ironGearTask) && !StorageHelper.isArmorEquipped(mod, COLLECT_IRON_ARMOR)) {
                     setDebugState("Getting iron gear before diamond gear for defense purposes only.");
                     return _ironGearTask;
@@ -2096,6 +2096,18 @@ private Task getEyesOfEnderTask(AltoClef mod, int targetEyes) {
                 } else {
                     _starterGearTask = null;
                 }
+                // Then get shield
+                if (_config.getShield && !shieldSatisfied && !mod.getFoodChain().needsToEat()) {
+                    ItemTarget shield = new ItemTarget(COLLECT_SHIELD);
+                    if (mod.getItemStorage().hasItem(shield) && !StorageHelper.isArmorEquipped(mod, COLLECT_SHIELD)) {
+                        setDebugState("Equipping shield.");
+                        return new EquipArmorTask(COLLECT_SHIELD);
+                    }
+                    _shieldTask = TaskCatalogue.getItemTask(shield);
+                    return _shieldTask;
+                } else {
+                    _shieldTask = null;
+                }
                 // Then get food
                 if (StorageHelper.calculateInventoryFoodScore(mod) < _config.minFoodUnits) {
                     _foodTask = new CollectFoodTask(_config.foodUnits);
@@ -2120,18 +2132,6 @@ private Task getEyesOfEnderTask(AltoClef mod, int targetEyes) {
                         return _lootTask;
                     }
                 }
-                // Then get shield
-                if (_config.getShield && !shieldSatisfied && !mod.getFoodChain().needsToEat()) {
-                    ItemTarget shield = new ItemTarget(COLLECT_SHIELD);
-                    if (mod.getItemStorage().hasItem(shield) && !StorageHelper.isArmorEquipped(mod, COLLECT_SHIELD)) {
-                        setDebugState("Equipping shield.");
-                        return new EquipArmorTask(COLLECT_SHIELD);
-                    }
-                    _shieldTask = TaskCatalogue.getItemTask(shield);
-                    return _shieldTask;
-                } else {
-                    _shieldTask = null;
-                }
                 // Then get iron
                 if (_config.ironGearBeforeDiamondGear && !ironGearSatisfied && !eyeGearSatisfied &&
                         !_isEquippingDiamondArmor) {

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "altoclef",
-  "version": "1.20.5-beta1",
+  "version": "1.20.6-beta1",
   "name": "Alto Clef",
   "description": "Plays Block Game",
   "authors": [