diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index ebc037d45..9e35b4324 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -29,8 +29,8 @@ jobs: - name: Build (fabric) with Gradle run: ./gradlew build -Pbaritone.fabric_build - - name: Build (forge) with Gradle - run: ./gradlew build -Pbaritone.forge_build -Ploom.platform=forge +# - name: Build (forge) with Gradle +# run: ./gradlew build -Pbaritone.forge_build -Ploom.platform=forge - name: Archive Artifacts uses: actions/upload-artifact@v2 diff --git a/gradle.properties b/gradle.properties index 162c6cc00..3954aa49b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ 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 +minecraft_version=1.18.2 forge_version=1.18-38.0.10 fabric_version=0.12.5 diff --git a/src/api/java/baritone/api/utils/BlockOptionalMeta.java b/src/api/java/baritone/api/utils/BlockOptionalMeta.java index d7b1b8148..d18936bf7 100644 --- 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.Pack; 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 final class BlockOptionalMeta { 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); }