From f68acfcc50135463ffa93571e3892b582e99bd90 Mon Sep 17 00:00:00 2001 From: jbredwards <47703524+jbredwards@users.noreply.github.com> Date: Sun, 27 Mar 2022 12:40:16 -0400 Subject: [PATCH 1/3] Update FluidBasic.java --- .../charles445/simpledifficulty/fluid/FluidBasic.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/charles445/simpledifficulty/fluid/FluidBasic.java b/src/main/java/com/charles445/simpledifficulty/fluid/FluidBasic.java index 73c5d38..c9ab77c 100644 --- a/src/main/java/com/charles445/simpledifficulty/fluid/FluidBasic.java +++ b/src/main/java/com/charles445/simpledifficulty/fluid/FluidBasic.java @@ -3,11 +3,15 @@ import com.charles445.simpledifficulty.SimpleDifficulty; import com.charles445.simpledifficulty.api.SDFluids; +import git.jbredwards.fluidlogged_api.api.fluid.ICompatibleFluid; + import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fml.common.Optional; -public class FluidBasic extends Fluid +@Optional.Interface(iface = "git.jbredwards.fluidlogged_api.api.fluid.ICompatibleFluid", modid = "fluidlogged_api") +public class FluidBasic extends Fluid implements ICompatibleFluid { public FluidBasic(String fluidName, String still, String flowing, int ARGB) { @@ -24,4 +28,9 @@ public FluidBasic(String fluidName, String still, String flowing, int ARGB) FluidRegistry.registerFluid(SDFluids.fluids.get(fluidName)); FluidRegistry.addBucketForFluid(SDFluids.fluids.get(fluidName)); } + + @Nonnull + @Override + @Optional.Method("fluidlogged_api") + public Fluid getParentFluid() { return FluidRegistry.WATER; } } From 8b2a5d549f02e160885555205a84872821d1d805 Mon Sep 17 00:00:00 2001 From: jbredwards <47703524+jbredwards@users.noreply.github.com> Date: Sun, 27 Mar 2022 12:42:31 -0400 Subject: [PATCH 2/3] Update build.gradle --- build.gradle | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 35f88d5..d69811f 100644 --- a/build.gradle +++ b/build.gradle @@ -27,8 +27,14 @@ minecraft { } dependencies { - + //fluidlogged api + deobfCompile 'com.github.jbredwards:fluidlogged-api:b896736552' + compile 'org.spongepowered:mixin:0.8' +} +repositories { + //fluidlogged api + maven { url 'https://jitpack.io' } } processResources{ From 079d54784551bbbc32f67d4df9a1638d2b456523 Mon Sep 17 00:00:00 2001 From: jbredwards <47703524+jbredwards@users.noreply.github.com> Date: Sun, 27 Mar 2022 14:54:53 -0400 Subject: [PATCH 3/3] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d69811f..d64be7a 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ minecraft { dependencies { //fluidlogged api - deobfCompile 'com.github.jbredwards:fluidlogged-api:b896736552' + deobfCompile 'com.github.jbredwards:fluidlogged-api:ccf9bba5ec' compile 'org.spongepowered:mixin:0.8' }