More fluid work
This commit is contained in:
parent
739f4c21e8
commit
70279c1800
5 changed files with 89 additions and 52 deletions
|
@ -24,34 +24,43 @@
|
|||
|
||||
package techreborn.api.recipe.recipes;
|
||||
|
||||
import com.google.gson.JsonObject;
|
||||
import io.github.prospector.silk.fluid.FluidInstance;
|
||||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.fluid.Fluids;
|
||||
import net.minecraft.util.Identifier;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import reborncore.common.crafting.RebornRecipe;
|
||||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import techreborn.blockentity.machine.multiblock.IndustrialSawmillBlockEntity;
|
||||
|
||||
public class IndustrialSawmillRecipe extends RebornRecipe {
|
||||
|
||||
//TODO 1.14 fluids
|
||||
FluidInstance fluidStack = null;
|
||||
@NonNull
|
||||
private FluidInstance fluidInstance = FluidInstance.EMPTY;
|
||||
|
||||
public IndustrialSawmillRecipe(RebornRecipeType<?> type, Identifier name) {
|
||||
super(type, name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deserialize(JsonObject jsonObject) {
|
||||
super.deserialize(jsonObject);
|
||||
fluidInstance = new FluidInstance(Fluids.WATER, 1000);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canCraft(BlockEntity be) {
|
||||
IndustrialSawmillBlockEntity blockEntity = (IndustrialSawmillBlockEntity) be;
|
||||
if (!blockEntity.getMutliBlock()) {
|
||||
return false;
|
||||
}
|
||||
final FluidInstance recipeFluid = fluidStack;
|
||||
final FluidInstance recipeFluid = fluidInstance;
|
||||
final FluidInstance tankFluid = blockEntity.tank.getFluidInstance();
|
||||
if (fluidStack == null) {
|
||||
if (fluidInstance.isEmpty()) {
|
||||
return true;
|
||||
}
|
||||
if (tankFluid == null) {
|
||||
if (tankFluid.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
if (tankFluid.getFluid().equals(recipeFluid.getFluid())) {
|
||||
|
@ -65,22 +74,17 @@ public class IndustrialSawmillRecipe extends RebornRecipe {
|
|||
@Override
|
||||
public boolean onCraft(BlockEntity be) {
|
||||
IndustrialSawmillBlockEntity blockEntity = (IndustrialSawmillBlockEntity) be;
|
||||
final FluidInstance recipeFluid = fluidStack;
|
||||
final FluidInstance recipeFluid = fluidInstance;
|
||||
final FluidInstance tankFluid = blockEntity.tank.getFluidInstance();
|
||||
if (fluidStack == null) {
|
||||
if (fluidInstance.isEmpty()) {
|
||||
return true;
|
||||
}
|
||||
if (tankFluid == null) {
|
||||
if (tankFluid.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
if (tankFluid.getFluid().equals(recipeFluid.getFluid())) {
|
||||
if (tankFluid.getAmount() >= recipeFluid.getAmount()) {
|
||||
if (tankFluid.getAmount() == recipeFluid.getAmount()) {
|
||||
blockEntity.tank.setFluid(null);
|
||||
} else {
|
||||
tankFluid.subtractAmount(recipeFluid.getAmount());
|
||||
}
|
||||
blockEntity.syncWithAll();
|
||||
tankFluid.subtractAmount(recipeFluid.getAmount());
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue