move to silk fluids
This commit is contained in:
parent
85554bcfe2
commit
9b46e3237e
18 changed files with 52 additions and 50 deletions
|
@ -25,7 +25,7 @@
|
|||
package techreborn.api.fluidreplicator;
|
||||
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import reborncore.common.fluid.Fluid;
|
||||
import net.minecraft.fluid.Fluid;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.blockentity.machine.multiblock.FluidReplicatorBlockEntity;
|
||||
import techreborn.utils.FluidUtils;
|
||||
|
|
|
@ -29,8 +29,8 @@ import net.minecraft.item.ItemStack;
|
|||
import reborncore.common.recipes.RecipeCrafter;
|
||||
import reborncore.common.util.RebornInventory;
|
||||
import reborncore.common.util.Tank;
|
||||
import reborncore.common.fluid.Fluid;
|
||||
import reborncore.common.fluid.FluidStack;
|
||||
import net.minecraft.fluid.Fluid;
|
||||
import io.github.prospector.silk.fluid.FluidInstance;
|
||||
import techreborn.init.ModRecipes;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.blockentity.machine.multiblock.FluidReplicatorBlockEntity;
|
||||
|
@ -75,7 +75,7 @@ public class FluidReplicatorRecipeCrafter extends RecipeCrafter {
|
|||
}
|
||||
|
||||
private boolean canFit(Fluid fluid, Tank tank) {
|
||||
if (tank.fill(new FluidStack(fluid, 1000), false) != 1000) {
|
||||
if (tank.fill(new FluidInstance(fluid, 1000), false) != 1000) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
@ -118,7 +118,7 @@ public class FluidReplicatorRecipeCrafter extends RecipeCrafter {
|
|||
// Checks to see if it can fit the output
|
||||
// And fill tank with replicated fluid
|
||||
if (canFit(currentRecipe.getFluid(), blockEntityFluidReplicator.tank) && currentRecipe.onCraft(blockEntityFluidReplicator)) {
|
||||
blockEntityFluidReplicator.tank.fill(new FluidStack(currentRecipe.getFluid(), 1000), true);
|
||||
blockEntityFluidReplicator.tank.fill(new FluidInstance(currentRecipe.getFluid(), 1000), true);
|
||||
// This uses all the inputs
|
||||
useAllInputs();
|
||||
// Reset
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
package techreborn.api.fluidreplicator;
|
||||
|
||||
import org.apache.commons.lang3.Validate;
|
||||
import reborncore.common.fluid.Fluid;
|
||||
import net.minecraft.fluid.Fluid;
|
||||
import techreborn.utils.FluidUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
package techreborn.api.generator;
|
||||
|
||||
|
||||
import reborncore.common.fluid.Fluid;
|
||||
import net.minecraft.fluid.Fluid;
|
||||
import techreborn.utils.FluidUtils;
|
||||
|
||||
public class FluidGeneratorRecipe {
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
package techreborn.api.generator;
|
||||
|
||||
import com.google.common.collect.Sets;
|
||||
import reborncore.common.fluid.Fluid;
|
||||
import net.minecraft.fluid.Fluid;
|
||||
import techreborn.utils.FluidUtils;
|
||||
|
||||
import java.util.HashSet;
|
||||
|
|
|
@ -26,7 +26,7 @@ package techreborn.api.generator;
|
|||
|
||||
|
||||
|
||||
import reborncore.common.fluid.Fluid;
|
||||
import net.minecraft.fluid.Fluid;
|
||||
|
||||
import java.util.EnumMap;
|
||||
import java.util.Optional;
|
||||
|
|
|
@ -28,13 +28,13 @@ import net.minecraft.block.entity.BlockEntity;
|
|||
import net.minecraft.util.Identifier;
|
||||
import reborncore.common.crafting.RebornRecipe;
|
||||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import reborncore.common.fluid.FluidStack;
|
||||
import io.github.prospector.silk.fluid.FluidInstance;
|
||||
import techreborn.blockentity.machine.multiblock.IndustrialGrinderBlockEntity;
|
||||
|
||||
public class IndustrialGrinderRecipe extends RebornRecipe {
|
||||
|
||||
//TODO 1.14 fluids
|
||||
FluidStack fluidStack = null;
|
||||
FluidInstance fluidStack = null;
|
||||
|
||||
public IndustrialGrinderRecipe(RebornRecipeType<?> type, Identifier name) {
|
||||
super(type, name);
|
||||
|
@ -46,16 +46,16 @@ public class IndustrialGrinderRecipe extends RebornRecipe {
|
|||
if (!blockEntity.getMultiBlock()) {
|
||||
return false;
|
||||
}
|
||||
final FluidStack recipeFluid = fluidStack;
|
||||
final FluidStack tankFluid = blockEntity.tank.getFluid();
|
||||
final FluidInstance recipeFluid = fluidStack;
|
||||
final FluidInstance tankFluid = blockEntity.tank.getFluid();
|
||||
if (fluidStack == null) {
|
||||
return true;
|
||||
}
|
||||
if (tankFluid == null) {
|
||||
return false;
|
||||
}
|
||||
if (tankFluid.isFluidEqual(recipeFluid)) {
|
||||
if (tankFluid.amount >= recipeFluid.amount) {
|
||||
if (tankFluid.getFluid().equals(recipeFluid.getFluid())) {
|
||||
if (tankFluid.getAmount() >= recipeFluid.getAmount()) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
@ -65,21 +65,21 @@ public class IndustrialGrinderRecipe extends RebornRecipe {
|
|||
@Override
|
||||
public boolean onCraft(final BlockEntity be) {
|
||||
IndustrialGrinderBlockEntity blockEntity = (IndustrialGrinderBlockEntity) be;
|
||||
final FluidStack recipeFluid = fluidStack;
|
||||
final FluidStack tankFluid = blockEntity.tank.getFluid();
|
||||
final FluidInstance recipeFluid = fluidStack;
|
||||
final FluidInstance tankFluid = blockEntity.tank.getFluid();
|
||||
if (fluidStack == null) {
|
||||
return true;
|
||||
}
|
||||
if (tankFluid == null) {
|
||||
return false;
|
||||
}
|
||||
if (tankFluid.isFluidEqual(recipeFluid)) {
|
||||
if (tankFluid.amount >= recipeFluid.amount) {
|
||||
if (tankFluid.amount == recipeFluid.amount) {
|
||||
if (tankFluid.getFluid().equals(recipeFluid.getFluid())) {
|
||||
if (tankFluid.getAmount() >= recipeFluid.getAmount()) {
|
||||
if (tankFluid.getAmount() == recipeFluid.getAmount()) {
|
||||
blockEntity.tank.setFluid(null);
|
||||
}
|
||||
else {
|
||||
tankFluid.amount -= recipeFluid.amount;
|
||||
tankFluid.subtractAmount(recipeFluid.getAmount());
|
||||
}
|
||||
blockEntity.syncWithAll();
|
||||
return true;
|
||||
|
|
|
@ -24,17 +24,17 @@
|
|||
|
||||
package techreborn.api.recipe.recipes;
|
||||
|
||||
import io.github.prospector.silk.fluid.FluidInstance;
|
||||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.util.Identifier;
|
||||
import reborncore.common.crafting.RebornRecipe;
|
||||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import reborncore.common.fluid.FluidStack;
|
||||
import techreborn.blockentity.machine.multiblock.IndustrialSawmillBlockEntity;
|
||||
|
||||
public class IndustrialSawmillRecipe extends RebornRecipe {
|
||||
|
||||
//TODO 1.14 fluids
|
||||
FluidStack fluidStack = null;
|
||||
FluidInstance fluidStack = null;
|
||||
|
||||
public IndustrialSawmillRecipe(RebornRecipeType<?> type, Identifier name) {
|
||||
super(type, name);
|
||||
|
@ -46,16 +46,16 @@ public class IndustrialSawmillRecipe extends RebornRecipe {
|
|||
if (!blockEntity.getMutliBlock()) {
|
||||
return false;
|
||||
}
|
||||
final FluidStack recipeFluid = fluidStack;
|
||||
final FluidStack tankFluid = blockEntity.tank.getFluid();
|
||||
final FluidInstance recipeFluid = fluidStack;
|
||||
final FluidInstance tankFluid = blockEntity.tank.getFluid();
|
||||
if (fluidStack == null) {
|
||||
return true;
|
||||
}
|
||||
if (tankFluid == null) {
|
||||
return false;
|
||||
}
|
||||
if (tankFluid.isFluidEqual(recipeFluid)) {
|
||||
if (tankFluid.amount >= recipeFluid.amount) {
|
||||
if (tankFluid.getFluid().equals(recipeFluid.getFluid())) {
|
||||
if (tankFluid.getAmount() >= recipeFluid.getAmount()) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
@ -65,20 +65,20 @@ public class IndustrialSawmillRecipe extends RebornRecipe {
|
|||
@Override
|
||||
public boolean onCraft(BlockEntity be) {
|
||||
IndustrialSawmillBlockEntity blockEntity = (IndustrialSawmillBlockEntity) be;
|
||||
final FluidStack recipeFluid = fluidStack;
|
||||
final FluidStack tankFluid = blockEntity.tank.getFluid();
|
||||
final FluidInstance recipeFluid = fluidStack;
|
||||
final FluidInstance tankFluid = blockEntity.tank.getFluid();
|
||||
if (fluidStack == null) {
|
||||
return true;
|
||||
}
|
||||
if (tankFluid == null) {
|
||||
return false;
|
||||
}
|
||||
if (tankFluid.isFluidEqual(recipeFluid)) {
|
||||
if (tankFluid.amount >= recipeFluid.amount) {
|
||||
if (tankFluid.amount == recipeFluid.amount) {
|
||||
if (tankFluid.getFluid().equals(recipeFluid.getFluid())) {
|
||||
if (tankFluid.getAmount() >= recipeFluid.getAmount()) {
|
||||
if (tankFluid.getAmount() == recipeFluid.getAmount()) {
|
||||
blockEntity.tank.setFluid(null);
|
||||
} else {
|
||||
tankFluid.amount -= recipeFluid.amount;
|
||||
tankFluid.subtractAmount(recipeFluid.getAmount());
|
||||
}
|
||||
blockEntity.syncWithAll();
|
||||
return true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue