From 2f9b154e22377c383edf02f7f52d056f3155dd7b Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 15 Sep 2019 13:59:46 +0100 Subject: [PATCH] Move to RC's fluid instance, closes #1826 --- build.gradle | 12 +++++++----- .../generator/BaseFluidGeneratorBlockEntity.java | 2 +- .../java/techreborn/client/gui/GuiQuantumTank.java | 2 +- .../techreborn/compat/rei/MachineRecipeCategory.java | 3 +-- .../techreborn/compat/rei/MachineRecipeDisplay.java | 3 +-- .../FluidReplicatorRecipeCategory.java | 2 +- .../FluidReplicatorRecipeDisplay.java | 2 +- src/main/java/techreborn/utils/FluidUtils.java | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index aa302ef79..fddf52038 100644 --- a/build.gradle +++ b/build.gradle @@ -76,7 +76,6 @@ dependencies { modCompile "net.fabricmc.fabric-api:fabric-api:0.3.1+build.208" modCompile "io.github.prospector:modmenu:1.7.7+build.116" - modCompile "io.github.prospector.silk:SilkAPI:1.2.4-43" modCompile ("me.shedaniel:RoughlyEnoughItems:3.0-pre+build.1") { //Thanks for moving the project breaking gradle... exclude group: 'io.github.prospector.modmenu', module: 'ModMenu' @@ -90,17 +89,20 @@ dependencies { transitive = false } } else { - modCompile (rcVersion){ + modCompile (rcVersion) { transitive = false } } - + include rcVersion - + + compile 'org.checkerframework:checker-qual:2.10.0' + compile 'org.spongepowered:configurate-hocon:3.6' + compile 'org.checkerframework:checker-qual:2.10.0' compileOnly "com.google.code.findbugs:jsr305:+" - modCompile ('com.github.Virtuoel:Towelette:519538e54b') { + modCompileOnly ('com.github.Virtuoel:Towelette:519538e54b') { transitive = false } } diff --git a/src/main/java/techreborn/blockentity/generator/BaseFluidGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/BaseFluidGeneratorBlockEntity.java index 4b132b77b..8acf290a7 100644 --- a/src/main/java/techreborn/blockentity/generator/BaseFluidGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/BaseFluidGeneratorBlockEntity.java @@ -32,11 +32,11 @@ import org.apache.commons.lang3.Validate; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; import reborncore.common.blocks.BlockMachineBase; +import reborncore.common.fluid.container.FluidInstance; import reborncore.common.fluid.container.ItemFluidInfo; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.util.RebornInventory; import reborncore.common.util.Tank; -import io.github.prospector.silk.fluid.FluidInstance; import techreborn.api.generator.EFluidGenerator; import techreborn.api.generator.FluidGeneratorRecipe; import techreborn.api.generator.FluidGeneratorRecipeList; diff --git a/src/main/java/techreborn/client/gui/GuiQuantumTank.java b/src/main/java/techreborn/client/gui/GuiQuantumTank.java index 1b2afc9ba..173d8090f 100644 --- a/src/main/java/techreborn/client/gui/GuiQuantumTank.java +++ b/src/main/java/techreborn/client/gui/GuiQuantumTank.java @@ -24,11 +24,11 @@ package techreborn.client.gui; -import io.github.prospector.silk.fluid.FluidInstance; import net.minecraft.entity.player.PlayerEntity; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.common.fluid.FluidUtil; +import reborncore.common.fluid.container.FluidInstance; import techreborn.blockentity.machine.tier3.QuantumTankBlockEntity; public class GuiQuantumTank extends GuiBase { diff --git a/src/main/java/techreborn/compat/rei/MachineRecipeCategory.java b/src/main/java/techreborn/compat/rei/MachineRecipeCategory.java index 90639af23..b338daadb 100644 --- a/src/main/java/techreborn/compat/rei/MachineRecipeCategory.java +++ b/src/main/java/techreborn/compat/rei/MachineRecipeCategory.java @@ -38,6 +38,7 @@ import net.minecraft.text.TranslatableText; import net.minecraft.util.Identifier; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipeType; +import reborncore.common.fluid.container.FluidInstance; import reborncore.common.util.StringUtils; import java.util.Collections; @@ -45,8 +46,6 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Supplier; -import io.github.prospector.silk.fluid.FluidInstance; - public class MachineRecipeCategory implements RecipeCategory> { private final RebornRecipeType rebornRecipeType; diff --git a/src/main/java/techreborn/compat/rei/MachineRecipeDisplay.java b/src/main/java/techreborn/compat/rei/MachineRecipeDisplay.java index f0958c011..2a497da98 100644 --- a/src/main/java/techreborn/compat/rei/MachineRecipeDisplay.java +++ b/src/main/java/techreborn/compat/rei/MachineRecipeDisplay.java @@ -28,6 +28,7 @@ import me.shedaniel.rei.api.RecipeDisplay; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import reborncore.common.crafting.ingredient.RebornIngredient; +import reborncore.common.fluid.container.FluidInstance; import techreborn.api.recipe.recipes.BlastFurnaceRecipe; import reborncore.common.crafting.RebornFluidRecipe; import reborncore.common.crafting.RebornRecipe; @@ -36,8 +37,6 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import io.github.prospector.silk.fluid.FluidInstance; - public class MachineRecipeDisplay implements RecipeDisplay { private final R recipe; diff --git a/src/main/java/techreborn/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java b/src/main/java/techreborn/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java index 328111d84..7123b3ab9 100644 --- a/src/main/java/techreborn/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java +++ b/src/main/java/techreborn/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java @@ -4,7 +4,6 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Supplier; -import io.github.prospector.silk.fluid.FluidInstance; import me.shedaniel.math.api.Point; import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.api.RecipeCategory; @@ -21,6 +20,7 @@ import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; import net.minecraft.util.Identifier; import reborncore.common.crafting.RebornRecipeType; +import reborncore.common.fluid.container.FluidInstance; import reborncore.common.util.StringUtils; import techreborn.api.recipe.recipes.FluidReplicatorRecipe; import techreborn.compat.rei.ReiPlugin; diff --git a/src/main/java/techreborn/compat/rei/fluidreplicator/FluidReplicatorRecipeDisplay.java b/src/main/java/techreborn/compat/rei/fluidreplicator/FluidReplicatorRecipeDisplay.java index e247b9de1..bad1e672a 100644 --- a/src/main/java/techreborn/compat/rei/fluidreplicator/FluidReplicatorRecipeDisplay.java +++ b/src/main/java/techreborn/compat/rei/fluidreplicator/FluidReplicatorRecipeDisplay.java @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import io.github.prospector.silk.fluid.FluidInstance; +import reborncore.common.fluid.container.FluidInstance; import me.shedaniel.rei.api.RecipeDisplay; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; diff --git a/src/main/java/techreborn/utils/FluidUtils.java b/src/main/java/techreborn/utils/FluidUtils.java index e6312f82b..4a359fd0f 100644 --- a/src/main/java/techreborn/utils/FluidUtils.java +++ b/src/main/java/techreborn/utils/FluidUtils.java @@ -24,7 +24,7 @@ package techreborn.utils; -import io.github.prospector.silk.fluid.FluidInstance; +import reborncore.common.fluid.container.FluidInstance; import net.minecraft.block.Block; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; @@ -66,7 +66,7 @@ public class FluidUtils { FluidInstance targetFluidInstance = target.getFluidInstance(null); Fluid currentFluid = targetFluidInstance.getFluid(); - if(currentFluid == Fluids.EMPTY || currentFluid == itemFluidInfo.getFluid(inputStack)) { + if(targetFluidInstance.isEmpty() || currentFluid == itemFluidInfo.getFluid(inputStack)) { int freeSpace = target.getCapacity(null) - targetFluidInstance.getAmount(); if(!outputStack.isEmpty()){