Merge pull request cabaletta#4692 from rfresh2/1.21.5

1.21.5

Author: leijurv

SETUP.md

@@ -56,7 +56,7 @@ The recommended Java versions by Minecraft version are
 | 1.12.2 - 1.16.5               | 8             |
 | 1.17.1                        | 16            |
 | 1.18.2 - 1.20.4               | 17            |
-| 1.20.5 - 1.21.4               | 21            |
+| 1.20.5 - 1.21.5               | 21            |
 
 Download java: https://adoptium.net/
 

build.gradle

@@ -92,7 +92,7 @@ allprojects {
         mappings {
             intermediary()
             mojmap()
-            parchment("1.20.6", "2024.05.01")
+            parchment("1.21.4", "2025.03.23")
 
             devFallbackNamespace "official"
         }

fabric/src/main/resources/fabric.mod.json

@@ -11,7 +11,7 @@
   "contact": {
     "homepage": "https://github.com/cabaletta/baritone",
     "sources": "https://github.com/cabaletta/baritone",
-    "issues": "https://github.com/cabaletta/baritone/issues" 
+    "issues": "https://github.com/cabaletta/baritone/issues"
   },
 
   "license": "LGPL-3.0",
@@ -23,10 +23,9 @@
   "mixins": [
       "mixins.baritone.json"
   ],
-
   "depends": {
     "fabricloader": ">=0.14.22",
-    "minecraft": ["1.21.4"]
+    "minecraft": ["1.21.5"]
   },
   "custom": {
     "modmenu": {

forge/src/main/resources/META-INF/mods.toml

@@ -35,6 +35,6 @@ A Minecraft pathfinder bot.
 modId="minecraft"
 mandatory=true
 # This version range declares a minimum of the current minecraft version up to but not including the next major version
-versionRange="[1.21.4]"
+versionRange="[1.21.5]"
 ordering="NONE"
 side="BOTH"

gradle.properties

@@ -1,20 +1,20 @@
 org.gradle.jvmargs=-Xmx4G
 
-available_loaders=fabric,forge,neoforge,tweaker
+available_loaders=fabric,neoforge,forge,tweaker
 
-mod_version=1.13.0
+mod_version=1.14.0
 maven_group=baritone
 archives_base_name=baritone
 
 java_version=21
 
-minecraft_version=1.21.4
+minecraft_version=1.21.5
 
-forge_version=54.0.5
+forge_version=55.0.9
 
-neoforge_version=9-beta
+neoforge_version=63-beta
 
-fabric_version=0.16.9
+fabric_version=0.16.10
 
 nether_pathfinder_version=1.4.1
 

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -35,6 +35,6 @@ A Minecraft pathfinder bot.
 modId="minecraft"
 type="required"
 # This version range declares a minimum of the current minecraft version up to but not including the next major version
-versionRange="[1.21.4]"
+versionRange="[1.21.5]"
 ordering="NONE"
 side="BOTH"

scripts/proguard.pro

@@ -41,7 +41,7 @@
 
 # setting names are reflected from field names, so keep field names
 -keepclassmembers class baritone.api.Settings {
-    public <fields>;    
+    public <fields>;
 }
 
 # need to keep mixin names
@@ -346,4 +346,4 @@
     public int length();
     public java.lang.String substring(int);
     public java.lang.String substring(int,int);
-}
+}

src/api/java/baritone/api/command/helpers/Paginator.java

@@ -21,17 +21,16 @@
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidTypeException;
 import baritone.api.utils.Helper;
-
-import java.awt.*;
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.Function;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.ClickEvent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.HoverEvent;
 import net.minecraft.network.chat.MutableComponent;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Function;
+
 public class Paginator<E> implements Helper {
 
     public final List<E> entries;
@@ -78,12 +77,10 @@ public void display(Function<E, Component> transform, String commandPrefix) {
         MutableComponent prevPageComponent = Component.literal("<<");
         if (hasPrevPage) {
             prevPageComponent.setStyle(prevPageComponent.getStyle()
-                    .withClickEvent(new ClickEvent(
-                            ClickEvent.Action.RUN_COMMAND,
+                    .withClickEvent(new ClickEvent.RunCommand(
                             String.format("%s %d", commandPrefix, page - 1)
                     ))
-                    .withHoverEvent(new HoverEvent(
-                            HoverEvent.Action.SHOW_TEXT,
+                    .withHoverEvent(new HoverEvent.ShowText(
                             Component.literal("Click to view previous page")
                     )));
         } else {
@@ -92,9 +89,8 @@ public void display(Function<E, Component> transform, String commandPrefix) {
         MutableComponent nextPageComponent = Component.literal(">>");
         if (hasNextPage) {
             nextPageComponent.setStyle(nextPageComponent.getStyle()
-                    .withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, String.format("%s %d", commandPrefix, page + 1)))
-                    .withHoverEvent(new HoverEvent(
-                            HoverEvent.Action.SHOW_TEXT,
+                    .withClickEvent(new ClickEvent.RunCommand(String.format("%s %d", commandPrefix, page + 1)))
+                    .withHoverEvent(new HoverEvent.ShowText(
                             Component.literal("Click to view next page")
                     )));
         } else {

src/launch/java/baritone/launch/mixins/MixinClientPlayerEntity.java

@@ -23,9 +23,9 @@
 import baritone.api.event.events.SprintStateEvent;
 import baritone.api.event.events.type.EventState;
 import baritone.behavior.LookBehavior;
-import net.minecraft.client.KeyMapping;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.world.entity.player.Abilities;
+import net.minecraft.world.entity.player.Input;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -110,13 +110,13 @@ private boolean onMayFlyNeoforge(LocalPlayer instance) throws Throwable {
             method = "aiStep",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/client/KeyMapping.isDown()Z"
+                    target = "Lnet/minecraft/world/entity/player/Input;sprint()Z"
             )
     )
-    private boolean isKeyDown(KeyMapping keyBinding) {
+    private boolean redirectSprintInput(final Input instance) {
         IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
         if (baritone == null) {
-            return keyBinding.isDown();
+            return instance.sprint();
         }
         SprintStateEvent event = new SprintStateEvent();
         baritone.getGameEventHandler().onPlayerSprintState(event);
@@ -127,7 +127,7 @@ private boolean isKeyDown(KeyMapping keyBinding) {
             // hitting control shouldn't make all bots sprint
             return false;
         }
-        return keyBinding.isDown();
+        return instance.sprint();
     }
 
     @Inject(

src/launch/java/baritone/launch/mixins/MixinRenderPipelines.java

@@ -0,0 +1,35 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone 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.
+ *
+ * Baritone 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 Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch.mixins;
+
+import baritone.utils.accessor.IRenderPipelines;
+import com.mojang.blaze3d.pipeline.RenderPipeline;
+import net.minecraft.client.renderer.RenderPipelines;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(RenderPipelines.class)
+public class MixinRenderPipelines implements IRenderPipelines {
+    @Final @Shadow
+    private static RenderPipeline.Snippet LINES_SNIPPET;
+
+    public RenderPipeline.Snippet getLinesSnippet() {
+        return LINES_SNIPPET;
+    }
+}