Revert "1.20.4 update"

This reverts commit da3dce5.
MiranCZ · Apr 6, 2024 · d8ebb5c · d8ebb5c
1 parent da3dce5
commit d8ebb5c
Show file tree

Hide file tree

Showing 23 changed files with 916 additions and 621 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "fabric-loom" version "1.5-SNAPSHOT"
+    id "fabric-loom" version "1.4-SNAPSHOT"
     id "maven-publish"
     id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
@@ -16,6 +16,7 @@ repositories {
     maven {
         name = "MarvionKiritoRepo"
         url = "https://marvionkirito.github.io/maven/"
+        artifactUrls("https://marvionkirito.github.io/maven/cabaletta/baritone-unoptimized/1.20.2-beta1")
     }
     maven {
         name = 'babbaj-repo'
@@ -36,27 +37,27 @@ dependencies {
     modImplementation("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
 
     // Jackson JSON
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.16.1'
-    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.16.1'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.16.1'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.16.0'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.16.0'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.16.0'
 
     // Nether pathfinder
     implementation 'dev.babbaj:nether-pathfinder:1.5'
 
     // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
     // You may need to force-disable transitiveness on them.
-    shadow('com.fasterxml.jackson.core:jackson-core:2.16.1')
-    shadow('com.fasterxml.jackson.core:jackson-annotations:2.16.1')
-    shadow('com.fasterxml.jackson.core:jackson-databind:2.16.1')
+    shadow('com.fasterxml.jackson.core:jackson-core:2.16.0')
+    shadow('com.fasterxml.jackson.core:jackson-annotations:2.16.0')
+    shadow('com.fasterxml.jackson.core:jackson-databind:2.16.0')
 
     // 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.4-beta1'
-        include "baritone-api-fabric:baritone-unoptimized-fabric-1.20.4-beta1"
+        modImplementation 'baritone-api-fabric:baritone-unoptimized-fabric-1.20.2-beta1'
+        include "baritone-api-fabric:baritone-unoptimized-fabric-1.20.2-beta1"
     } else {
-        modImplementation "cabaletta:baritone-unoptimized-fabric:1.20.4-beta1"
-        include "cabaletta:baritone-unoptimized-fabric:1.20.4-beta1"
+        modImplementation "cabaletta:baritone-unoptimized:1.20.2-beta1"
+        include "cabaletta:baritone-unoptimized:1.20.2-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.4
-yarn_mappings=1.20.4+build.3
-loader_version=0.15.7
+minecraft_version=1.20.2
+yarn_mappings=1.20.2+build.4
+loader_version=0.15.1
 # Mod Properties
-mod_version=1.20.4-beta1
+mod_version=1.20.2-beta1
 maven_group=gaucho-matrero.altoclef
 archives_base_name=altoclef
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.96.3+1.20.4
+fabric_version=0.91.2+1.20.2
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/adris/altoclef/AltoClef.java b/src/main/java/adris/altoclef/AltoClef.java
@@ -231,10 +231,9 @@ private void initializeBaritoneSettings() {
         getClientBaritoneSettings().blocksToAvoid.value = List.of(Blocks.FLOWERING_AZALEA, Blocks.AZALEA,
                 Blocks.POWDER_SNOW, Blocks.BIG_DRIPLEAF, Blocks.BIG_DRIPLEAF_STEM, Blocks.CAVE_VINES,
                 Blocks.CAVE_VINES_PLANT, Blocks.TWISTING_VINES, Blocks.TWISTING_VINES_PLANT, Blocks.SWEET_BERRY_BUSH,
-                Blocks.WARPED_ROOTS, Blocks.VINE, Blocks.GRASS_BLOCK, Blocks.FERN, Blocks.TALL_GRASS, Blocks.LARGE_FERN,
+                Blocks.WARPED_ROOTS, Blocks.VINE, Blocks.GRASS, Blocks.FERN, Blocks.TALL_GRASS, Blocks.LARGE_FERN,
                 Blocks.SMALL_AMETHYST_BUD, Blocks.MEDIUM_AMETHYST_BUD, Blocks.LARGE_AMETHYST_BUD,
-                Blocks.AMETHYST_CLUSTER, Blocks.SCULK, Blocks.SCULK_VEIN, Blocks.SUNFLOWER, Blocks.LILAC,
-                Blocks.ROSE_BUSH, Blocks.PEONY);
+                Blocks.AMETHYST_CLUSTER, Blocks.SCULK, Blocks.SCULK_VEIN);
         // Let baritone move items to hotbar to use them
         // Reduces a bit of far rendering to save FPS
         getClientBaritoneSettings().fadePath.value = true;

diff --git a/src/main/java/adris/altoclef/TaskCatalogue.java b/src/main/java/adris/altoclef/TaskCatalogue.java
@@ -154,7 +154,7 @@ public class TaskCatalogue {
             }
             mine("bamboo", Blocks.BAMBOO, Items.BAMBOO);
             shear("vine", Blocks.VINE, Items.VINE).dontMineIfPresent();
-            shear("grass", Blocks.GRASS_BLOCK, Items.GRASS_BLOCK).dontMineIfPresent();
+            shear("grass", Blocks.GRASS, Items.GRASS).dontMineIfPresent();
             shear("lily_pad", Blocks.LILY_PAD, Items.LILY_PAD).dontMineIfPresent();
             shear("tall_grass", Blocks.TALL_GRASS, Items.TALL_GRASS).dontMineIfPresent();
             shear("fern", Blocks.FERN, Items.FERN).dontMineIfPresent();

diff --git a/src/main/java/adris/altoclef/chains/DeathMenuChain.java b/src/main/java/adris/altoclef/chains/DeathMenuChain.java
@@ -8,11 +8,7 @@
 import adris.altoclef.util.time.TimerGame;
 import adris.altoclef.util.time.TimerReal;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.DeathScreen;
-import net.minecraft.client.gui.screen.DisconnectedScreen;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.TitleScreen;
-import net.minecraft.client.gui.screen.multiplayer.ConnectScreen;
+import net.minecraft.client.gui.screen.*;
 import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
 import net.minecraft.client.network.ServerAddress;
 import net.minecraft.client.network.ServerInfo;

diff --git a/src/main/java/adris/altoclef/mixins/BlockModifiedByPlayerMixin.java b/src/main/java/adris/altoclef/mixins/BlockModifiedByPlayerMixin.java
@@ -14,7 +14,6 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(Block.class)
 public class BlockModifiedByPlayerMixin {
@@ -23,7 +22,7 @@ public class BlockModifiedByPlayerMixin {
             method = "onBreak",
             at = @At("HEAD")
     )
-    public void onBlockBroken(World world, BlockPos pos, BlockState state, PlayerEntity player, CallbackInfoReturnable<BlockState> ci) {
+    public void onBlockBroken(World world, BlockPos pos, BlockState state, PlayerEntity player, CallbackInfo ci) {
         if (player.getWorld() == world) {
             BlockBrokenEvent evt = new BlockBrokenEvent();
             evt.blockPos = pos;

diff --git a/src/main/java/adris/altoclef/tasks/InteractWithBlockTask.java b/src/main/java/adris/altoclef/tasks/InteractWithBlockTask.java
@@ -61,7 +61,7 @@ public class InteractWithBlockTask extends Task {
             Blocks.BIG_DRIPLEAF_STEM,
             Blocks.SMALL_DRIPLEAF,
             Blocks.TALL_GRASS,
-            Blocks.GRASS_BLOCK,
+            Blocks.GRASS,
             Blocks.SWEET_BERRY_BUSH
     };
     private Task _unstuckTask = null;