Merge pull request #3292 from wagyourtail/1.18.2

1.18.2
cabaletta · Mar 8, 2022 · 9c6c977 · 9c6c977
2 parents b6cc15e + 38c5388
commit 9c6c977
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,12 +1,12 @@
 org.gradle.jvmargs=-Xmx2048M
 
-mod_version=1.8.2
+mod_version=1.8.3
 maven_group=baritone
 archives_base_name=baritone
 
-minecraft_version=1.18
-forge_version=1.18-38.0.10
-fabric_version=0.12.5
+minecraft_version=1.18.2
+forge_version=1.18.2-40.0.0
+fabric_version=0.13.1
 
 # # un comment for forge debugging default (as opposed to fabric)
 # baritone.forge_build=true

diff --git a/src/api/java/baritone/api/utils/BlockOptionalMeta.java b/src/api/java/baritone/api/utils/BlockOptionalMeta.java
@@ -29,7 +29,6 @@
 import net.minecraft.server.packs.repository.PackRepository;
 import net.minecraft.server.packs.repository.ServerPacksSource;
 import net.minecraft.server.packs.resources.ReloadableResourceManager;
-import net.minecraft.server.packs.resources.SimpleReloadableResourceManager;
 import net.minecraft.util.Unit;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -147,11 +146,11 @@ public static LootTables getManager() {
             PackRepository rpl = new PackRepository(PackType.SERVER_DATA, new ServerPacksSource());
             rpl.reload();
             PackResources thePack = rpl.getAvailablePacks().iterator().next().open();
-            ReloadableResourceManager resourceManager = new SimpleReloadableResourceManager(PackType.SERVER_DATA);
+            ReloadableResourceManager resourceManager = new ReloadableResourceManager(PackType.SERVER_DATA);
             manager = new LootTables(predicate);
             resourceManager.registerReloadListener(manager);
             try {
-                resourceManager.reload(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), Collections.singletonList(thePack), CompletableFuture.completedFuture(Unit.INSTANCE)).get();
+                resourceManager.createReload(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), CompletableFuture.completedFuture(Unit.INSTANCE), Collections.singletonList(thePack)).done().get();
             } catch (Exception exception) {
                 throw new RuntimeException(exception);
             }