diff --git a/build.gradle b/build.gradle index 31ecf51a5..278265023 100644 --- a/build.gradle +++ b/build.gradle @@ -57,6 +57,9 @@ repositories { name = 'curseforge' url = 'https://minecraft.curseforge.com/api/maven' } + maven { + url 'https://jitpack.io' + } } version = "3.0.5" @@ -109,6 +112,10 @@ dependencies { compile 'org.checkerframework:checker-qual:2.10.0' compileOnly "com.google.code.findbugs:jsr305:+" + + modCompile ('com.github.Virtuoel:Towelette:519538e54b') { + transitive = false + } } processResources { diff --git a/src/main/java/techreborn/rei/MachineRecipeCategory.java b/src/main/java/techreborn/compat/rei/MachineRecipeCategory.java similarity index 99% rename from src/main/java/techreborn/rei/MachineRecipeCategory.java rename to src/main/java/techreborn/compat/rei/MachineRecipeCategory.java index 2acbcaba4..74333e6c8 100644 --- a/src/main/java/techreborn/rei/MachineRecipeCategory.java +++ b/src/main/java/techreborn/compat/rei/MachineRecipeCategory.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.rei; +package techreborn.compat.rei; import com.mojang.blaze3d.platform.GlStateManager; import me.shedaniel.rei.api.*; diff --git a/src/main/java/techreborn/rei/MachineRecipeDisplay.java b/src/main/java/techreborn/compat/rei/MachineRecipeDisplay.java similarity index 98% rename from src/main/java/techreborn/rei/MachineRecipeDisplay.java rename to src/main/java/techreborn/compat/rei/MachineRecipeDisplay.java index f05b81f30..ce15b7bc7 100644 --- a/src/main/java/techreborn/rei/MachineRecipeDisplay.java +++ b/src/main/java/techreborn/compat/rei/MachineRecipeDisplay.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.rei; +package techreborn.compat.rei; import me.shedaniel.rei.api.RecipeDisplay; import net.minecraft.item.ItemStack; diff --git a/src/main/java/techreborn/rei/ReiPlugin.java b/src/main/java/techreborn/compat/rei/ReiPlugin.java similarity index 98% rename from src/main/java/techreborn/rei/ReiPlugin.java rename to src/main/java/techreborn/compat/rei/ReiPlugin.java index f72955809..6e4e82816 100644 --- a/src/main/java/techreborn/rei/ReiPlugin.java +++ b/src/main/java/techreborn/compat/rei/ReiPlugin.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.rei; +package techreborn.compat.rei; import me.shedaniel.rei.api.REIPluginEntry; import me.shedaniel.rei.api.RecipeDisplay; @@ -39,8 +39,8 @@ import techreborn.api.recipe.recipes.*; import techreborn.init.ModRecipes; import techreborn.init.TRContent; import techreborn.init.TRContent.Machine; -import techreborn.rei.rollingmachine.RollingMachineCategory; -import techreborn.rei.rollingmachine.RollingMachineDisplay; +import techreborn.compat.rei.rollingmachine.RollingMachineCategory; +import techreborn.compat.rei.rollingmachine.RollingMachineDisplay; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/techreborn/rei/rollingmachine/RollingMachineCategory.java b/src/main/java/techreborn/compat/rei/rollingmachine/RollingMachineCategory.java similarity index 96% rename from src/main/java/techreborn/rei/rollingmachine/RollingMachineCategory.java rename to src/main/java/techreborn/compat/rei/rollingmachine/RollingMachineCategory.java index 46e5f2086..42fedb96b 100644 --- a/src/main/java/techreborn/rei/rollingmachine/RollingMachineCategory.java +++ b/src/main/java/techreborn/compat/rei/rollingmachine/RollingMachineCategory.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.rei.rollingmachine; +package techreborn.compat.rei.rollingmachine; import me.shedaniel.rei.api.Renderable; import me.shedaniel.rei.api.Renderer; @@ -33,7 +33,7 @@ import net.minecraft.util.Identifier; import reborncore.common.crafting.RebornRecipeType; import reborncore.common.util.StringUtils; import techreborn.api.recipe.recipes.RollingMachineRecipe; -import techreborn.rei.ReiPlugin; +import techreborn.compat.rei.ReiPlugin; public class RollingMachineCategory extends DefaultCraftingCategory { diff --git a/src/main/java/techreborn/rei/rollingmachine/RollingMachineDisplay.java b/src/main/java/techreborn/compat/rei/rollingmachine/RollingMachineDisplay.java similarity index 90% rename from src/main/java/techreborn/rei/rollingmachine/RollingMachineDisplay.java rename to src/main/java/techreborn/compat/rei/rollingmachine/RollingMachineDisplay.java index 81c91614d..c46a9ff61 100644 --- a/src/main/java/techreborn/rei/rollingmachine/RollingMachineDisplay.java +++ b/src/main/java/techreborn/compat/rei/rollingmachine/RollingMachineDisplay.java @@ -1,4 +1,4 @@ -package techreborn.rei.rollingmachine; +package techreborn.compat.rei.rollingmachine; import me.shedaniel.rei.plugin.DefaultShapedDisplay; import net.minecraft.recipe.ShapedRecipe; diff --git a/src/main/java/techreborn/compat/towelette/TowelettePlugin.java b/src/main/java/techreborn/compat/towelette/TowelettePlugin.java new file mode 100644 index 000000000..61fd56594 --- /dev/null +++ b/src/main/java/techreborn/compat/towelette/TowelettePlugin.java @@ -0,0 +1,27 @@ +package techreborn.compat.towelette; + +import net.minecraft.fluid.Fluid; +import net.minecraft.util.Identifier; +import techreborn.init.ModFluids; +import virtuoel.towelette.api.ToweletteApi; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class TowelettePlugin implements ToweletteApi { + + private List fluids; + + @Override + public boolean isFluidBlacklisted(Fluid fluid, Identifier id) { + if(fluids == null){ + fluids = new ArrayList<>(); + Arrays.stream(ModFluids.values()).forEach(modFluids -> { + fluids.add(modFluids.getFluid()); + fluids.add(modFluids.getFlowingFluid()); + }); + } + return fluids.contains(fluid); + } +} diff --git a/src/main/java/techreborn/init/ModFluids.java b/src/main/java/techreborn/init/ModFluids.java index 4792f1113..6a4b71948 100644 --- a/src/main/java/techreborn/init/ModFluids.java +++ b/src/main/java/techreborn/init/ModFluids.java @@ -107,6 +107,10 @@ public enum ModFluids { return stillFluid; } + public RebornFluid getFlowingFluid() { + return flowingFluid; + } + public RebornFluidBlock getBlock() { return block; } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7ab86e95f..ca530a87d 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -20,7 +20,10 @@ "techreborn.TechRebornClient" ], "rei_plugins": [ - "techreborn.rei.ReiPlugin" + "techreborn.compat.rei.ReiPlugin" + ], + "towelette": [ + "techreborn.compat.towelette.TowelettePlugin" ] }, "depends": {