port to 1.20.5

build.gradle

@@ -37,7 +37,13 @@ allprojects {
     }
     group = rootProject.maven_group
 
-    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21
+
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(21))
+        }
+    }
 
     repositories {
         maven {
@@ -72,8 +78,8 @@ allprojects {
     }
 
     dependencies {
-        implementation "org.spongepowered:mixin:0.8.5"
-        implementation "org.ow2.asm:asm:9.3"
+        compileOnly "org.spongepowered:mixin:0.8"
+        compileOnly "org.ow2.asm:asm:9.7"
         // The following line declares the yarn mappings you may select this one as well.
         // mappings "net.fabricmc:yarn:1.17.1+build.32:v2"
         //launchImplementation('dev.babbaj:nether-pathfinder:1.3.0')

buildSrc/build.gradle

@@ -40,5 +40,5 @@ dependencies {
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0'
     implementation group: 'commons-io', name: 'commons-io', version: '2.7'
 
-    implementation group: 'xyz.wagyourtail.unimined', name: 'xyz.wagyourtail.unimined.gradle.plugin', version: '1.1.0'
+    implementation group: 'xyz.wagyourtail.unimined', name: 'xyz.wagyourtail.unimined.gradle.plugin', version: '1.2.3'
 }

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

@@ -25,6 +25,6 @@
 
   "depends": {
     "fabricloader": ">=0.14.22",
-    "minecraft": ["1.20.3", "1.20.4"]
+    "minecraft": ["1.20.5", "1.20.6"]
   }
 }

gradle.properties

@@ -1,16 +1,16 @@
 org.gradle.jvmargs=-Xmx4G
 
-available_loaders=fabric,forge,neoforge,tweaker
+available_loaders=fabric,neoforge,tweaker
 
 mod_version=1.10.2
 maven_group=baritone
 archives_base_name=baritone
 
-minecraft_version=1.20.4
+minecraft_version=1.20.5
 
 forge_version=49.0.3
 neoforge_version=0-beta
 
-fabric_version=0.14.22
+fabric_version=0.15.10
 
 nether_pathfinder_version=1.4.1

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

@@ -1,4 +1,4 @@
-# This is an example mods.toml file. It contains the data relating to the loading mods.
+# This is an example neoforge.mods.toml file. It contains the data relating to the loading mods.
 # There are several mandatory fields (#mandatory), and many more that are optional (#optional).
 # The overall format is standard TOML format, v0.5.0.
 # Note that there are a couple of TOML lists in this file.
@@ -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.20.3, 1.20.4]"
+versionRange="[1.20.5, 1.20.6]"
 ordering="NONE"
 side="BOTH"

src/api/java/baritone/api/utils/BlockOptionalMeta.java

@@ -18,26 +18,26 @@
 package baritone.api.utils;
 
 import baritone.api.utils.accessor.IItemStack;
+import baritone.api.utils.accessor.ILootTable;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import io.netty.util.concurrent.ThreadPerTaskExecutor;
 import net.minecraft.client.Minecraft;
-import net.minecraft.core.BlockPos;
+import net.minecraft.commands.Commands;
+import net.minecraft.core.RegistryAccess;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.ReloadableServerRegistries;
+import net.minecraft.server.ReloadableServerResources;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.progress.ChunkProgressListener;
-import net.minecraft.server.packs.PackType;
 import net.minecraft.server.packs.VanillaPackResources;
 import net.minecraft.server.packs.repository.ServerPacksSource;
-import net.minecraft.server.packs.resources.MultiPackResourceManager;
-import net.minecraft.server.packs.resources.ReloadableResourceManager;
-import net.minecraft.util.Unit;
 import net.minecraft.world.RandomSequences;
 import net.minecraft.world.flag.FeatureFlagSet;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
 import net.minecraft.world.level.CustomSpawner;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
@@ -48,8 +48,8 @@
 import net.minecraft.world.level.storage.ServerLevelData;
 import net.minecraft.world.level.storage.loot.BuiltInLootTables;
 import net.minecraft.world.level.storage.loot.LootContext;
-import net.minecraft.world.level.storage.loot.LootDataManager;
 import net.minecraft.world.level.storage.loot.LootParams;
+import net.minecraft.world.level.storage.loot.LootTable;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.phys.Vec3;
@@ -60,7 +60,6 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -75,7 +74,6 @@ public final class BlockOptionalMeta {
     private final Set<BlockState> blockstates;
     private final ImmutableSet<Integer> stateHashes;
     private final ImmutableSet<Integer> stackHashes;
-    private static LootDataManager lootTables;
     private static Map<Block, List<Item>> drops = new HashMap<>();
 
     public BlockOptionalMeta(@Nonnull Block block) {
@@ -218,43 +216,21 @@ private static VanillaPackResources getVanillaServerPack() {
         return null;
     }
 
-    public static LootDataManager getManager() {
-        if (lootTables == null) {
-            MultiPackResourceManager resources = new MultiPackResourceManager(PackType.SERVER_DATA, List.of(getVanillaServerPack()));
-            ReloadableResourceManager resourceManager = new ReloadableResourceManager(PackType.SERVER_DATA);
-            lootTables = new LootDataManager();
-            resourceManager.registerReloadListener(lootTables);
-            try {
-                resourceManager.createReload(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), CompletableFuture.completedFuture(Unit.INSTANCE), resources.listPacks().toList()).done().get();
-            } catch (Exception exception) {
-                throw new RuntimeException(exception);
-            }
-
-        }
-        return lootTables;
-    }
-
     private static synchronized List<Item> drops(Block b) {
         return drops.computeIfAbsent(b, block -> {
-            ResourceLocation lootTableLocation = block.getLootTable();
-            if (lootTableLocation == BuiltInLootTables.EMPTY) {
+            ResourceLocation lootTableLocation = block.getLootTable().location();
+            if (lootTableLocation.equals(BuiltInLootTables.EMPTY.location())) {
                 return Collections.emptyList();
             } else {
                 List<Item> items = new ArrayList<>();
                 try {
+                    ServerLevel lv2 = ServerLevelStub.fastCreate();
 
-                    getManager().getLootTable(lootTableLocation).getRandomItemsRaw(
-                            new LootContext.Builder(
-                                    new LootParams.Builder(ServerLevelStub.fastCreate())
-                                            .withParameter(LootContextParams.ORIGIN, Vec3.atLowerCornerOf(BlockPos.ZERO))
-                                            .withParameter(LootContextParams.TOOL, ItemStack.EMPTY)
-                                            .withOptionalParameter(LootContextParams.BLOCK_ENTITY, null)
-                                            .withParameter(LootContextParams.BLOCK_STATE, block.defaultBlockState())
-                                            .create(LootContextParamSets.BLOCK)
-                            ).withOptionalRandomSeed(1L)
-                                    .create(null),
-                            stack -> items.add(stack.getItem())
-                    );
+                    LootParams.Builder lv5 = new LootParams.Builder(lv2)
+                        .withParameter(LootContextParams.ORIGIN, Vec3.ZERO)
+                        .withParameter(LootContextParams.BLOCK_STATE, b.defaultBlockState())
+                        .withParameter(LootContextParams.TOOL, new ItemStack(Items.NETHERITE_PICKAXE, 1));
+                    getDrops(block, lv5).stream().map(ItemStack::getItem).forEach(items::add);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -263,7 +239,19 @@ private static synchronized List<Item> drops(Block b) {
         });
     }
 
-    private static class ServerLevelStub extends ServerLevel {
+    private static List<ItemStack> getDrops(Block state, LootParams.Builder params) {
+        ResourceKey<LootTable> lv = state.getLootTable();
+        if (lv == BuiltInLootTables.EMPTY) {
+            return Collections.emptyList();
+        } else {
+            LootParams lv2 = params.withParameter(LootContextParams.BLOCK_STATE, state.defaultBlockState()).create(LootContextParamSets.BLOCK);
+            ServerLevelStub lv3 = (ServerLevelStub) lv2.getLevel();
+            LootTable lv4 = lv3.holder().getLootTable(lv);
+            return((ILootTable) lv4).invokeGetRandomItems(new LootContext.Builder(lv2).withOptionalRandomSeed(1).create(null));
+        }
+    }
+
+    public static class ServerLevelStub extends ServerLevel {
         private static Minecraft client = Minecraft.getInstance();
         private static Unsafe unsafe = getUnsafe();
 
@@ -285,6 +273,15 @@ public static ServerLevelStub fastCreate() {
             }
         }
 
+        @Override
+        public RegistryAccess registryAccess() {
+            return client.level.registryAccess();
+        }
+
+        public ReloadableServerRegistries.Holder holder() {
+            return new ReloadableServerRegistries.Holder(registryAccess().freeze());
+        }
+
         public static Unsafe getUnsafe() {
             try {
                 Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");

src/api/java/baritone/api/utils/accessor/ILootTable.java

@@ -0,0 +1,28 @@
+/*
+ * 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.api.utils.accessor;
+
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.storage.loot.LootContext;
+
+public interface ILootTable {
+
+    ObjectArrayList<ItemStack> invokeGetRandomItems(LootContext context);
+
+}

src/launch/java/baritone/launch/mixins/MixinLootContext.java → src/launch/java/baritone/launch/mixins/MixinLootContextBuilder.java

@@ -19,41 +19,28 @@
 
 import baritone.api.utils.BlockOptionalMeta;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.ReloadableServerRegistries;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.storage.loot.LootContext;
-import net.minecraft.world.level.storage.loot.LootDataManager;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(LootContext.Builder.class)
-public class MixinLootContext {
+public abstract class MixinLootContextBuilder {
 
-    @Redirect(
-            method = "create",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/server/level/ServerLevel.getServer()Lnet/minecraft/server/MinecraftServer;"
-            )
-    )
-    private MinecraftServer getServer(ServerLevel world) {
-        if (world == null) {
-            return null;
-        }
-        return world.getServer();
-    }
+    @Shadow public abstract ServerLevel getLevel();
 
-    @Redirect(
-            method = "create",
-            at = @At(
-                    value = "INVOKE",
-                    target = "Lnet/minecraft/server/MinecraftServer;getLootData()Lnet/minecraft/world/level/storage/loot/LootDataManager;"
-            )
-    )
-    private LootDataManager getLootTableManager(MinecraftServer server) {
-        if (server == null) {
-            return BlockOptionalMeta.getManager();
+    @Redirect(method = "create", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;reloadableRegistries()Lnet/minecraft/server/ReloadableServerRegistries$Holder;"))
+    private ReloadableServerRegistries.Holder create(MinecraftServer instance) {
+        if (instance != null) {
+            return instance.reloadableRegistries();
         }
-        return server.getLootData();
+        if (getLevel() instanceof BlockOptionalMeta.ServerLevelStub sls) {
+            return sls.holder();
+        }
+        return null;
     }
+
 }

src/launch/java/baritone/launch/mixins/MixinLootTable.java

@@ -0,0 +1,34 @@
+/*
+ * 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.api.utils.accessor.ILootTable;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.storage.loot.LootContext;
+import net.minecraft.world.level.storage.loot.LootTable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(LootTable.class)
+public abstract class MixinLootTable implements ILootTable {
+
+    @Invoker
+    public abstract ObjectArrayList<ItemStack> invokeGetRandomItems(LootContext context);
+
+}

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.screens.ReceivingLevelScreen;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.player.LocalPlayer;
@@ -130,7 +131,7 @@ private void postUpdateEntities(CallbackInfo ci) {
             method = "setLevel",
             at = @At("HEAD")
     )
-    private void preLoadWorld(ClientLevel world, CallbackInfo ci) {
+    private void preLoadWorld(ClientLevel world, ReceivingLevelScreen.Reason arg2, CallbackInfo ci) {
         // If we're unloading the world but one doesn't exist, ignore it
         if (this.level == null && world == null) {
             return;
@@ -150,7 +151,7 @@ private void preLoadWorld(ClientLevel world, CallbackInfo ci) {
             method = "setLevel",
             at = @At("RETURN")
     )
-    private void postLoadWorld(ClientLevel world, CallbackInfo ci) {
+    private void postLoadWorld(ClientLevel world, ReceivingLevelScreen.Reason arg2, CallbackInfo ci) {
         // still fire event for both null, as that means we've just finished exiting a world
 
         // mc.world changing is only the primary baritone

src/launch/java/baritone/launch/mixins/MixinWorldRenderer.java

@@ -44,9 +44,11 @@ public class MixinWorldRenderer {
             at = @At("RETURN"),
             locals = LocalCapture.CAPTURE_FAILSOFT
     )
-    private void onStartHand(PoseStack matrixStackIn, float partialTicks, long finishTimeNano, boolean drawBlockOutline, Camera activeRenderInfoIn, GameRenderer gameRendererIn, LightTexture lightmapIn, Matrix4f projectionIn, CallbackInfo ci) {
+    private void onStartHand(float f, long l, boolean bl, Camera arg, GameRenderer arg2, LightTexture arg3, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            ibaritone.getGameEventHandler().onRenderPass(new RenderEvent(partialTicks, matrixStackIn, projectionIn));
+            PoseStack poseStack = new PoseStack();
+            poseStack.mulPose(matrix4f);
+            ibaritone.getGameEventHandler().onRenderPass(new RenderEvent(f, poseStack, matrix4f2));
         }
     }
 }