diff --git a/src/main/java/io/github/null2264/cobblegen/FluidInteraction.java b/src/main/java/io/github/null2264/cobblegen/FluidInteraction.java index dc1ff2a..c47cc36 100644 --- a/src/main/java/io/github/null2264/cobblegen/FluidInteraction.java +++ b/src/main/java/io/github/null2264/cobblegen/FluidInteraction.java @@ -1,5 +1,6 @@ package io.github.null2264.cobblegen; +import io.github.null2264.cobblegen.CobbleGen; import io.github.null2264.cobblegen.data.CGRegistryImpl; import io.github.null2264.cobblegen.data.model.CGRegistry; import io.github.null2264.cobblegen.data.model.Generator; @@ -160,6 +161,8 @@ public boolean interact(LevelAccessor level, BlockPos pos, BlockState state, boo */ @ApiStatus.Internal public Optional interactFromPipeState(Level level, BlockPos pos, Fluid fluid1, Fluid fluid2) { + if (CobbleGen.META_CONFIG.create.disablePipe) return Optional.empty(); + Fluid source; Fluid neighbour; List generators = generatorMap.get(fluid1); @@ -228,4 +231,4 @@ public static Map> read(FriendlyByteBuf buf) { } ); } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/null2264/cobblegen/mixin/core/CobbleGenMixinPlugin.java b/src/main/java/io/github/null2264/cobblegen/mixin/core/CobbleGenMixinPlugin.java index ea420ea..84fb689 100644 --- a/src/main/java/io/github/null2264/cobblegen/mixin/core/CobbleGenMixinPlugin.java +++ b/src/main/java/io/github/null2264/cobblegen/mixin/core/CobbleGenMixinPlugin.java @@ -1,6 +1,5 @@ package io.github.null2264.cobblegen.mixin.core; -import io.github.null2264.cobblegen.CobbleGen; import io.github.null2264.cobblegen.compat.LoaderCompat; import org.objectweb.asm.tree.ClassNode; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; @@ -50,10 +49,8 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { if (mixinClassName.contains("CreateFluidReactionsMixin")) { if (!LoaderCompat.isModLoaded("create")) return false; - if (mixinClassName.endsWith("PatchF")) return isPatchFOrNewer() >= 1 && !CobbleGen.META_CONFIG.create.disablePipe; - if (mixinClassName.endsWith("PatchE")) return isPatchFOrNewer() <= 0 && !CobbleGen.META_CONFIG.create.disablePipe; - - return !CobbleGen.META_CONFIG.create.disablePipe; + if (mixinClassName.endsWith("PatchF")) return isPatchFOrNewer() >= 1; + if (mixinClassName.endsWith("PatchE")) return isPatchFOrNewer() <= 0; } return true; }