diff options
3 files changed, 9 insertions, 7 deletions
diff --git a/fabric/src/main/java/me/shedaniel/rei/impl/common/compat/FabricFluidAPISupportPlugin.java b/fabric/src/main/java/me/shedaniel/rei/impl/common/compat/FabricFluidAPISupportPlugin.java index 9a5f362bd..74d74698a 100644 --- a/fabric/src/main/java/me/shedaniel/rei/impl/common/compat/FabricFluidAPISupportPlugin.java +++ b/fabric/src/main/java/me/shedaniel/rei/impl/common/compat/FabricFluidAPISupportPlugin.java @@ -23,15 +23,15 @@ package me.shedaniel.rei.impl.common.compat; -import dev.architectury.event.CompoundEventResult; -import dev.architectury.fluid.FluidStack; import me.shedaniel.architectury.event.CompoundEventResult; +import me.shedaniel.architectury.fluid.FluidStack; import me.shedaniel.architectury.utils.Fraction; import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.fluid.FluidSupportProvider; import me.shedaniel.rei.api.common.plugins.REIServerPlugin; import me.shedaniel.rei.api.common.util.EntryStacks; import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext; +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; import net.fabricmc.fabric.api.transfer.v1.storage.Storage; @@ -52,7 +52,7 @@ public class FabricFluidAPISupportPlugin implements REIServerPlugin { try (Transaction transaction = Transaction.openOuter()) { result = StreamSupport.stream(storage.iterable(transaction).spliterator(), false) .filter(view -> !view.isResourceBlank() && !view.getResource().isBlank()) - .map(view -> EntryStacks.of(FluidStack.create(view.getResource().getFluid(), view.getAmount(), view.getResource().getNbt()))) + .map(view -> EntryStacks.of(FluidStack.create(view.getResource().getFluid(), Fraction.of(view.getAmount(), FluidConstants.BUCKET), view.getResource().getNbt()))) .collect(Collectors.toList()); } if (!result.isEmpty()) { diff --git a/forge/build.gradle b/forge/build.gradle index 9b2f40ee4..cae50b1c7 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.github.johnrengelman.shadow" version "5.0.0" + id "com.github.johnrengelman.shadow" version "7.0.0" } architectury { @@ -57,7 +57,7 @@ dependencies { common(project(path: ":jei-compatibility-layer", configuration: "dev")) { transitive false } shadowCommon(project(path: ":jei-compatibility-layer", configuration: "dev")) { transitive false } - common(project(path: ":jei-internals-workaround", configuration: "dev")) { transitive = false } + runtimeClasspath(project(path: ":jei-internals-workaround", configuration: "dev")) { transitive = false } depProjects.forEach { common(project(path: it, configuration: "dev")) { transitive false } @@ -82,6 +82,8 @@ dependencies { modRuntime("curse.maven:jep-417645:3198370") modRuntime("curse.maven:simple-storage-network-268495:3257204") modRuntime("curse.maven:create-328085:3278516") + modRuntime("curse.maven:industrial-foregoing-266515:3446262") + modRuntime("curse.maven:titanium-287342:3346366") } shadowJar { diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/util/CrashReportUtils.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/util/CrashReportUtils.java index ac7cc3777..d3159a9ca 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/util/CrashReportUtils.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/util/CrashReportUtils.java @@ -35,8 +35,8 @@ public class CrashReportUtils { Throwable temp = throwable; while (temp != null) { temp = temp.getCause(); - if (temp instanceof ReportedException reportedException) { - return essential(reportedException, task); + if (temp instanceof ReportedException) { + return essential(temp, task); } } CrashReport report = CrashReport.forThrowable(throwable, task); |