From dc03d1c20023279d72114351b67360cc2bbb811e Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 11 Mar 2024 12:15:42 +0100 Subject: [PATCH 1/2] Merge pull request #483 from desht/desht-forge-fluid-fix fix: FluidStackImpl#getRawFluidSupplier crashing on forge/neoforge --- .../main/java/dev/architectury/fluid/forge/FluidStackImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge/src/main/java/dev/architectury/fluid/forge/FluidStackImpl.java b/forge/src/main/java/dev/architectury/fluid/forge/FluidStackImpl.java index cdbc1543..b39bf5b9 100644 --- a/forge/src/main/java/dev/architectury/fluid/forge/FluidStackImpl.java +++ b/forge/src/main/java/dev/architectury/fluid/forge/FluidStackImpl.java @@ -54,7 +54,7 @@ public FluidStack create(Supplier fluid, long amount, CompoundTag tag) { @Override public Supplier getRawFluidSupplier(FluidStack object) { - return BuiltInRegistries.FLUID.getHolderOrThrow(BuiltInRegistries.FLUID.getResourceKey(object.getRawFluid()).orElseThrow()); + return () -> BuiltInRegistries.FLUID.getHolderOrThrow(BuiltInRegistries.FLUID.getResourceKey(object.getRawFluid()).orElseThrow()).value(); } @Override From 256124d551e243c7843951a573a771dba82583a6 Mon Sep 17 00:00:00 2001 From: Jab125 <67534807+Jab125@users.noreply.github.com> Date: Sun, 17 Mar 2024 19:24:36 +1100 Subject: [PATCH 2/2] use 20.2.88 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e3a2c8d3..e7f8d6e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ fabric_api_version=0.89.1+1.20.2 mod_menu_version=7.0.0 forge_version=48.0.38 -neoforge_version=20.2.59-beta +neoforge_version=20.2.88 curseforge_id=419699 modrinth_id=lhGA9TYQ