Move to RC's fluid instance, closes #1826

This commit is contained in:
modmuss50 2019-09-15 13:59:46 +01:00
parent fcfd387bc0
commit 2f9b154e22
8 changed files with 15 additions and 15 deletions

View file

@ -76,7 +76,6 @@ dependencies {
modCompile "net.fabricmc.fabric-api:fabric-api:0.3.1+build.208" 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: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") { modCompile ("me.shedaniel:RoughlyEnoughItems:3.0-pre+build.1") {
//Thanks for moving the project breaking gradle... //Thanks for moving the project breaking gradle...
exclude group: 'io.github.prospector.modmenu', module: 'ModMenu' exclude group: 'io.github.prospector.modmenu', module: 'ModMenu'
@ -97,10 +96,13 @@ dependencies {
include rcVersion 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' compile 'org.checkerframework:checker-qual:2.10.0'
compileOnly "com.google.code.findbugs:jsr305:+" compileOnly "com.google.code.findbugs:jsr305:+"
modCompile ('com.github.Virtuoel:Towelette:519538e54b') { modCompileOnly ('com.github.Virtuoel:Towelette:519538e54b') {
transitive = false transitive = false
} }
} }

View file

@ -32,11 +32,11 @@ import org.apache.commons.lang3.Validate;
import reborncore.api.IToolDrop; import reborncore.api.IToolDrop;
import reborncore.api.blockentity.InventoryProvider; import reborncore.api.blockentity.InventoryProvider;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.fluid.container.FluidInstance;
import reborncore.common.fluid.container.ItemFluidInfo; import reborncore.common.fluid.container.ItemFluidInfo;
import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.powerSystem.PowerAcceptorBlockEntity;
import reborncore.common.util.RebornInventory; import reborncore.common.util.RebornInventory;
import reborncore.common.util.Tank; import reborncore.common.util.Tank;
import io.github.prospector.silk.fluid.FluidInstance;
import techreborn.api.generator.EFluidGenerator; import techreborn.api.generator.EFluidGenerator;
import techreborn.api.generator.FluidGeneratorRecipe; import techreborn.api.generator.FluidGeneratorRecipe;
import techreborn.api.generator.FluidGeneratorRecipeList; import techreborn.api.generator.FluidGeneratorRecipeList;

View file

@ -24,11 +24,11 @@
package techreborn.client.gui; package techreborn.client.gui;
import io.github.prospector.silk.fluid.FluidInstance;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.BuiltContainer;
import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.GuiBase;
import reborncore.common.fluid.FluidUtil; import reborncore.common.fluid.FluidUtil;
import reborncore.common.fluid.container.FluidInstance;
import techreborn.blockentity.machine.tier3.QuantumTankBlockEntity; import techreborn.blockentity.machine.tier3.QuantumTankBlockEntity;
public class GuiQuantumTank extends GuiBase<BuiltContainer> { public class GuiQuantumTank extends GuiBase<BuiltContainer> {

View file

@ -38,6 +38,7 @@ import net.minecraft.text.TranslatableText;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipe;
import reborncore.common.crafting.RebornRecipeType; import reborncore.common.crafting.RebornRecipeType;
import reborncore.common.fluid.container.FluidInstance;
import reborncore.common.util.StringUtils; import reborncore.common.util.StringUtils;
import java.util.Collections; import java.util.Collections;
@ -45,8 +46,6 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.function.Supplier; import java.util.function.Supplier;
import io.github.prospector.silk.fluid.FluidInstance;
public class MachineRecipeCategory<R extends RebornRecipe> implements RecipeCategory<MachineRecipeDisplay<R>> { public class MachineRecipeCategory<R extends RebornRecipe> implements RecipeCategory<MachineRecipeDisplay<R>> {
private final RebornRecipeType<R> rebornRecipeType; private final RebornRecipeType<R> rebornRecipeType;

View file

@ -28,6 +28,7 @@ import me.shedaniel.rei.api.RecipeDisplay;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import reborncore.common.crafting.ingredient.RebornIngredient; import reborncore.common.crafting.ingredient.RebornIngredient;
import reborncore.common.fluid.container.FluidInstance;
import techreborn.api.recipe.recipes.BlastFurnaceRecipe; import techreborn.api.recipe.recipes.BlastFurnaceRecipe;
import reborncore.common.crafting.RebornFluidRecipe; import reborncore.common.crafting.RebornFluidRecipe;
import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipe;
@ -36,8 +37,6 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import io.github.prospector.silk.fluid.FluidInstance;
public class MachineRecipeDisplay<R extends RebornRecipe> implements RecipeDisplay { public class MachineRecipeDisplay<R extends RebornRecipe> implements RecipeDisplay {
private final R recipe; private final R recipe;

View file

@ -4,7 +4,6 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.function.Supplier; import java.util.function.Supplier;
import io.github.prospector.silk.fluid.FluidInstance;
import me.shedaniel.math.api.Point; import me.shedaniel.math.api.Point;
import me.shedaniel.math.api.Rectangle; import me.shedaniel.math.api.Rectangle;
import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.api.RecipeCategory;
@ -21,6 +20,7 @@ import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText; import net.minecraft.text.TranslatableText;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import reborncore.common.crafting.RebornRecipeType; import reborncore.common.crafting.RebornRecipeType;
import reborncore.common.fluid.container.FluidInstance;
import reborncore.common.util.StringUtils; import reborncore.common.util.StringUtils;
import techreborn.api.recipe.recipes.FluidReplicatorRecipe; import techreborn.api.recipe.recipes.FluidReplicatorRecipe;
import techreborn.compat.rei.ReiPlugin; import techreborn.compat.rei.ReiPlugin;

View file

@ -28,7 +28,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; 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 me.shedaniel.rei.api.RecipeDisplay;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;

View file

@ -24,7 +24,7 @@
package techreborn.utils; package techreborn.utils;
import io.github.prospector.silk.fluid.FluidInstance; import reborncore.common.fluid.container.FluidInstance;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluid;
import net.minecraft.fluid.Fluids; import net.minecraft.fluid.Fluids;
@ -66,7 +66,7 @@ public class FluidUtils {
FluidInstance targetFluidInstance = target.getFluidInstance(null); FluidInstance targetFluidInstance = target.getFluidInstance(null);
Fluid currentFluid = targetFluidInstance.getFluid(); 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(); int freeSpace = target.getCapacity(null) - targetFluidInstance.getAmount();
if(!outputStack.isEmpty()){ if(!outputStack.isEmpty()){