Port Forge support from Minecraft 26.1 to 26.2

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

@@ -6,7 +6,7 @@
 # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
 modLoader="javafml" #mandatory
 # A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[62,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
+loaderVersion="[65,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
 license="https://raw.githubusercontent.com/cabaletta/baritone/1.16.2/LICENSE"
 # A URL to refer people to when problems occur with this mod
 issueTrackerURL="https://github.com/cabaletta/baritone/issues" #optional
@@ -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="[26.1, 26.1.2]"
+versionRange="[26.2]"
 ordering="NONE"
 side="BOTH"

gradle.properties

@@ -1,16 +1,16 @@
 org.gradle.jvmargs=-Xmx4G
 
-available_loaders=fabric,forge,neoforge,tweaker
+available_loaders=forge
 
-mod_version=1.18.0
+mod_version=1.18.0-26.2
 maven_group=baritone
 archives_base_name=baritone
 
 java_version=25
 
-minecraft_version=26.1.2
+minecraft_version=26.2
 
-forge_version=64.0.11
+forge_version=65.0.3
 
 neoforge_version=78
 

src/api/java/baritone/api/Settings.java

@@ -1281,7 +1281,7 @@ public final class Settings {
     public final Setting<Consumer<Component>> logger = new Setting<>((msg) -> {
         try {
             final GuiMessageTag tag = useMessageTag.value ? Helper.MESSAGE_TAG : null;
-            Minecraft.getInstance().gui.getChat().addPlayerMessage(msg, null, tag);
+            Minecraft.getInstance().gui.hud.getChat().addPlayerMessage(msg, null, tag);
         } catch (Throwable t) {
             LOGGER.warn("Failed to log message to chat: " + msg.getString(), t);
         }

src/api/java/baritone/api/command/manager/ICommandManager.java

@@ -21,7 +21,7 @@
 import baritone.api.command.ICommand;
 import baritone.api.command.argument.ICommandArgument;
 import baritone.api.command.registry.Registry;
-import net.minecraft.util.Tuple;
+import com.mojang.datafixers.util.Pair;
 
 import java.util.List;
 import java.util.stream.Stream;
@@ -44,9 +44,9 @@ public interface ICommandManager {
 
     boolean execute(String string);
 
-    boolean execute(Tuple<String, List<ICommandArgument>> expanded);
+    boolean execute(Pair<String, List<ICommandArgument>> expanded);
 
-    Stream<String> tabComplete(Tuple<String, List<ICommandArgument>> expanded);
+    Stream<String> tabComplete(Pair<String, List<ICommandArgument>> expanded);
 
     Stream<String> tabComplete(String prefix);
 }

src/api/java/baritone/api/utils/gui/BaritoneToast.java

@@ -24,6 +24,6 @@
 public class BaritoneToast {
     private static final SystemToast.SystemToastId BARITONE_TOAST_ID = new SystemToast.SystemToastId(5000L);
     public static void addOrUpdate(Component title, Component subtitle) {
-        SystemToast.addOrUpdate(Minecraft.getInstance().getToastManager(), BARITONE_TOAST_ID, title, subtitle);
+        SystemToast.addOrUpdate(Minecraft.getInstance().gui.toastManager(), BARITONE_TOAST_ID, title, subtitle);
     }
 }

src/launch/java/baritone/launch/mixins/MixinFireworkRocketEntity.java

@@ -44,7 +44,7 @@ public abstract class MixinFireworkRocketEntity extends Entity implements IFirew
     public abstract boolean isAttachedToEntity();
 
     private MixinFireworkRocketEntity(Level level) {
-        super(EntityType.FIREWORK_ROCKET, level);
+        super(null, level);
     }
 
     @Override

src/launch/java/baritone/launch/mixins/MixinMinecraft.java

@@ -24,6 +24,7 @@
 import baritone.api.event.events.WorldEvent;
 import baritone.api.event.events.type.EventState;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.player.LocalPlayer;
@@ -165,27 +166,17 @@ private void postLoadWorld(final ClientLevel world, final CallbackInfo ci) {
     @Redirect(
             method = "tick",
             at = @At(
-                    value = "FIELD",
-                    opcode = Opcodes.GETFIELD,
-                    target = "Lnet/minecraft/client/Minecraft;screen:Lnet/minecraft/client/gui/screens/Screen;"
-            ),
-            slice = @Slice(
-                    from = @At(
-                            value = "INVOKE",
-                            target = "Lnet/minecraft/client/gui/components/DebugScreenOverlay;showDebugScreen()Z"
-                    ),
-                    to = @At(
-                            value = "CONSTANT",
-                            args = "stringValue=Keybindings"
-                    )
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/client/gui/Gui;screen()Lnet/minecraft/client/gui/screens/Screen;",
+                    ordinal = 1
             )
     )
-    private Screen passEvents(Minecraft instance) {
+    private Screen passEvents(Gui instance) {
         // allow user input is only the primary baritone
         if (BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().isPathing() && player != null) {
             return null;
         }
-        return instance.screen;
+        return instance.screen();
     }
 
     // TODO

src/main/java/baritone/Baritone.java

@@ -245,7 +245,7 @@ public void openClick() {
         new Thread(() -> {
             try {
                 Thread.sleep(100);
-                mc.execute(() -> mc.setScreen(new GuiClick()));
+                mc.execute(() -> mc.gui.setScreen(new GuiClick()));
             } catch (Exception ignored) {}
         }).start();
     }

src/main/java/baritone/cache/CachedChunk.java

@@ -50,22 +50,22 @@ public final class CachedChunk {
             Blocks.SPAWNER,
             Blocks.BARRIER,
             Blocks.OBSERVER,
-            Blocks.WHITE_SHULKER_BOX,
-            Blocks.ORANGE_SHULKER_BOX,
-            Blocks.MAGENTA_SHULKER_BOX,
-            Blocks.LIGHT_BLUE_SHULKER_BOX,
-            Blocks.YELLOW_SHULKER_BOX,
-            Blocks.LIME_SHULKER_BOX,
-            Blocks.PINK_SHULKER_BOX,
-            Blocks.GRAY_SHULKER_BOX,
-            Blocks.LIGHT_GRAY_SHULKER_BOX,
-            Blocks.CYAN_SHULKER_BOX,
-            Blocks.PURPLE_SHULKER_BOX,
-            Blocks.BLUE_SHULKER_BOX,
-            Blocks.BROWN_SHULKER_BOX,
-            Blocks.GREEN_SHULKER_BOX,
-            Blocks.RED_SHULKER_BOX,
-            Blocks.BLACK_SHULKER_BOX,
+            Blocks.DYED_SHULKER_BOX.white(),
+            Blocks.DYED_SHULKER_BOX.orange(),
+            Blocks.DYED_SHULKER_BOX.magenta(),
+            Blocks.DYED_SHULKER_BOX.lightBlue(),
+            Blocks.DYED_SHULKER_BOX.yellow(),
+            Blocks.DYED_SHULKER_BOX.lime(),
+            Blocks.DYED_SHULKER_BOX.pink(),
+            Blocks.DYED_SHULKER_BOX.gray(),
+            Blocks.DYED_SHULKER_BOX.lightGray(),
+            Blocks.DYED_SHULKER_BOX.cyan(),
+            Blocks.DYED_SHULKER_BOX.purple(),
+            Blocks.DYED_SHULKER_BOX.blue(),
+            Blocks.DYED_SHULKER_BOX.brown(),
+            Blocks.DYED_SHULKER_BOX.green(),
+            Blocks.DYED_SHULKER_BOX.red(),
+            Blocks.DYED_SHULKER_BOX.black(),
             Blocks.NETHER_PORTAL,
             Blocks.HOPPER,
             Blocks.BEACON,
@@ -87,22 +87,22 @@ public final class CachedChunk {
             Blocks.WITHER_SKELETON_WALL_SKULL,
             Blocks.ENCHANTING_TABLE,
             Blocks.ANVIL,
-            Blocks.WHITE_BED,
-            Blocks.ORANGE_BED,
-            Blocks.MAGENTA_BED,
-            Blocks.LIGHT_BLUE_BED,
-            Blocks.YELLOW_BED,
-            Blocks.LIME_BED,
-            Blocks.PINK_BED,
-            Blocks.GRAY_BED,
-            Blocks.LIGHT_GRAY_BED,
-            Blocks.CYAN_BED,
-            Blocks.PURPLE_BED,
-            Blocks.BLUE_BED,
-            Blocks.BROWN_BED,
-            Blocks.GREEN_BED,
-            Blocks.RED_BED,
-            Blocks.BLACK_BED,
+            Blocks.BED.white(),
+            Blocks.BED.orange(),
+            Blocks.BED.magenta(),
+            Blocks.BED.lightBlue(),
+            Blocks.BED.yellow(),
+            Blocks.BED.lime(),
+            Blocks.BED.pink(),
+            Blocks.BED.gray(),
+            Blocks.BED.lightGray(),
+            Blocks.BED.cyan(),
+            Blocks.BED.purple(),
+            Blocks.BED.blue(),
+            Blocks.BED.brown(),
+            Blocks.BED.green(),
+            Blocks.BED.red(),
+            Blocks.BED.black(),
             Blocks.DRAGON_EGG,
             Blocks.JUKEBOX,
             Blocks.END_GATEWAY,

src/main/java/baritone/cache/WorldProvider.java

@@ -22,7 +22,7 @@
 import baritone.api.utils.IPlayerContext;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.resources.Identifier;
-import net.minecraft.util.Tuple;
+import com.mojang.datafixers.util.Pair;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.storage.LevelResource;
 import org.apache.commons.lang3.SystemUtils;
@@ -71,8 +71,8 @@ public final WorldData getCurrentWorld() {
      */
     public final void initWorld(Level world) {
         this.getSaveDirectories(world).ifPresent(dirs -> {
-            final Path worldDir = dirs.getA();
-            final Path readmeDir = dirs.getB();
+            final Path worldDir = dirs.getFirst();
+            final Path readmeDir = dirs.getSecond();
 
             try {
                 // lol wtf is this baritone folder in my minecraft save?
@@ -119,7 +119,7 @@ private Path getWorldDataDirectory(Path parent, Level world) {
      * @return An {@link Optional} containing the world's baritone dir and readme dir, or {@link Optional#empty()} if
      *         the world isn't valid for caching.
      */
-    private Optional<Tuple<Path, Path>> getSaveDirectories(Level world) {
+    private Optional<Pair<Path, Path>> getSaveDirectories(Level world) {
         Path worldDir;
         Path readmeDir;
 
@@ -156,7 +156,7 @@ private Optional<Tuple<Path, Path>> getSaveDirectories(Level world) {
             readmeDir = baritone.getDirectory();
         }
 
-        return Optional.of(new Tuple<>(worldDir, readmeDir));
+        return Optional.of(new Pair<>(worldDir, readmeDir));
     }
 
     /**

src/main/java/baritone/command/ExampleBaritoneControl.java

@@ -38,7 +38,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.HoverEvent;
 import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.util.Tuple;
+import com.mojang.datafixers.util.Pair;
 import net.minecraft.util.Util;
 
 import java.util.List;
@@ -66,7 +66,7 @@ public void onSendChatMessage(ChatEvent event) {
             event.cancel();
             String commandStr = msg.substring(forceRun ? FORCE_COMMAND_PREFIX.length() : prefix.length());
             if (!runCommand(commandStr) && !commandStr.trim().isEmpty()) {
-                new CommandNotFoundException(CommandManager.expand(commandStr).getA()).handle(null, null);
+                new CommandNotFoundException(CommandManager.expand(commandStr).getFirst()).handle(null, null);
             }
         } else if ((settings.chatControl.value || settings.chatControlAnyway.value) && runCommand(msg)) {
             event.cancel();
@@ -103,10 +103,10 @@ public boolean runCommand(String msg) {
         if (msg.isEmpty()) {
             return this.runCommand("help");
         }
-        Tuple<String, List<ICommandArgument>> pair = CommandManager.expand(msg);
-        String command = pair.getA();
-        String rest = msg.substring(pair.getA().length());
-        ArgConsumer argc = new ArgConsumer(this.manager, pair.getB());
+        Pair<String, List<ICommandArgument>> pair = CommandManager.expand(msg);
+        String command = pair.getFirst();
+        String rest = msg.substring(pair.getFirst().length());
+        ArgConsumer argc = new ArgConsumer(this.manager, pair.getSecond());
         if (!argc.hasAny()) {
             Settings.Setting setting = settings.byLowerName.get(command.toLowerCase(Locale.US));
             if (setting != null) {
@@ -123,7 +123,7 @@ public boolean runCommand(String msg) {
                 if (setting.isJavaOnly()) {
                     continue;
                 }
-                if (setting.getName().equalsIgnoreCase(pair.getA())) {
+                if (setting.getName().equalsIgnoreCase(pair.getFirst())) {
                     logRanCommand(command, rest);
                     try {
                         this.manager.execute(String.format("set %s %s", setting.getName(), argc.getString()));
@@ -134,7 +134,7 @@ public boolean runCommand(String msg) {
         }
 
         // If the command exists, then handle echoing the input
-        if (this.manager.getCommand(pair.getA()) != null) {
+        if (this.manager.getCommand(pair.getFirst()) != null) {
             logRanCommand(command, rest);
         }
 

src/main/java/baritone/command/defaults/RenderCommand.java

@@ -21,8 +21,6 @@
 import baritone.api.command.Command;
 import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
-import baritone.api.utils.BetterBlockPos;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;
@@ -36,16 +34,7 @@ public RenderCommand(IBaritone baritone) {
     @Override
     public void execute(String label, IArgConsumer args) throws CommandException {
         args.requireMax(0);
-        BetterBlockPos origin = ctx.playerFeet();
-        int renderDistance = (ctx.minecraft().options.renderDistance().get() + 1) * 16;
-        ctx.minecraft().levelRenderer.setBlocksDirty(
-                origin.x - renderDistance,
-                ctx.world().getMinY(),
-                origin.z - renderDistance,
-                origin.x + renderDistance,
-                ctx.world().getMaxY(),
-                origin.z + renderDistance
-        );
+        ctx.minecraft().levelRenderer.resetLevelRenderData();
         logDirect("Done");
     }
 

src/main/java/baritone/command/manager/CommandManager.java

@@ -30,7 +30,7 @@
 import baritone.command.argument.ArgConsumer;
 import baritone.command.argument.CommandArguments;
 import baritone.command.defaults.DefaultCommands;
-import net.minecraft.util.Tuple;
+import com.mojang.datafixers.util.Pair;
 
 import java.util.List;
 import java.util.Locale;
@@ -79,7 +79,7 @@ public boolean execute(String string) {
     }
 
     @Override
-    public boolean execute(Tuple<String, List<ICommandArgument>> expanded) {
+    public boolean execute(Pair<String, List<ICommandArgument>> expanded) {
         ExecutionWrapper execution = this.from(expanded);
         if (execution != null) {
             execution.execute();
@@ -88,16 +88,16 @@ public boolean execute(Tuple<String, List<ICommandArgument>> expanded) {
     }
 
     @Override
-    public Stream<String> tabComplete(Tuple<String, List<ICommandArgument>> expanded) {
+    public Stream<String> tabComplete(Pair<String, List<ICommandArgument>> expanded) {
         ExecutionWrapper execution = this.from(expanded);
         return execution == null ? Stream.empty() : execution.tabComplete();
     }
 
     @Override
     public Stream<String> tabComplete(String prefix) {
-        Tuple<String, List<ICommandArgument>> pair = expand(prefix, true);
-        String label = pair.getA();
-        List<ICommandArgument> args = pair.getB();
+        Pair<String, List<ICommandArgument>> pair = expand(prefix, true);
+        String label = pair.getFirst();
+        List<ICommandArgument> args = pair.getSecond();
         if (args.isEmpty()) {
             return new TabCompleteHelper()
                     .addCommands(this.baritone.getCommandManager())
@@ -108,21 +108,21 @@ public Stream<String> tabComplete(String prefix) {
         }
     }
 
-    private ExecutionWrapper from(Tuple<String, List<ICommandArgument>> expanded) {
-        String label = expanded.getA();
-        ArgConsumer args = new ArgConsumer(this, expanded.getB());
+    private ExecutionWrapper from(Pair<String, List<ICommandArgument>> expanded) {
+        String label = expanded.getFirst();
+        ArgConsumer args = new ArgConsumer(this, expanded.getSecond());
 
         ICommand command = this.getCommand(label);
         return command == null ? null : new ExecutionWrapper(command, label, args);
     }
 
-    private static Tuple<String, List<ICommandArgument>> expand(String string, boolean preserveEmptyLast) {
+    private static Pair<String, List<ICommandArgument>> expand(String string, boolean preserveEmptyLast) {
         String label = string.split("\\s", 2)[0];
         List<ICommandArgument> args = CommandArguments.from(string.substring(label.length()), preserveEmptyLast);
-        return new Tuple<>(label, args);
+        return new Pair<>(label, args);
     }
 
-    public static Tuple<String, List<ICommandArgument>> expand(String string) {
+    public static Pair<String, List<ICommandArgument>> expand(String string) {
         return expand(string, false);
     }