diff --git a/src/main/java/techreborn/blockentity/generator/BaseFluidGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/BaseFluidGeneratorBlockEntity.java index 0cb9d4590..291061175 100644 --- a/src/main/java/techreborn/blockentity/generator/BaseFluidGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/BaseFluidGeneratorBlockEntity.java @@ -27,6 +27,7 @@ package techreborn.blockentity.generator; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.Direction; +import org.apache.commons.lang3.Validate; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; import reborncore.common.blocks.BlockMachineBase; @@ -62,6 +63,7 @@ public abstract class BaseFluidGeneratorBlockEntity extends PowerAcceptorBlockEn public BaseFluidGeneratorBlockEntity(BlockEntityType blockEntityType, EFluidGenerator type, String blockEntityName, int tankCapacity, int euTick) { super(blockEntityType); recipes = GeneratorRecipeHelper.getFluidRecipesForGenerator(type); + Validate.notNull(recipes, "null recipe list for " + type.getRecipeID()); tank = new Tank(blockEntityName, tankCapacity, this); inventory = new RebornInventory<>(3, blockEntityName, 64, this); this.euTick = euTick; diff --git a/src/main/java/techreborn/blockentity/generator/advanced/DieselGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/advanced/DieselGeneratorBlockEntity.java index 4192da1f3..bef8a75da 100644 --- a/src/main/java/techreborn/blockentity/generator/advanced/DieselGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/advanced/DieselGeneratorBlockEntity.java @@ -62,6 +62,7 @@ public class DieselGeneratorBlockEntity extends BaseFluidGeneratorBlockEntity im .addInventory().blockEntity(this).slot(0, 25, 35).outputSlot(1, 25, 55).syncEnergyValue() .syncIntegerValue(this::getTicksSinceLastChange, this::setTicksSinceLastChange) .syncIntegerValue(this::getTankAmount, this::setTankAmount) + .sync(tank) .addInventory().create(this, syncID); } } diff --git a/src/main/java/techreborn/blockentity/generator/advanced/GasTurbineBlockEntity.java b/src/main/java/techreborn/blockentity/generator/advanced/GasTurbineBlockEntity.java index d427afccc..416d37220 100644 --- a/src/main/java/techreborn/blockentity/generator/advanced/GasTurbineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/advanced/GasTurbineBlockEntity.java @@ -62,6 +62,7 @@ public class GasTurbineBlockEntity extends BaseFluidGeneratorBlockEntity impleme .addInventory().blockEntity(this).slot(0, 25, 35).outputSlot(1, 25, 55).syncEnergyValue() .syncIntegerValue(this::getTicksSinceLastChange, this::setTicksSinceLastChange) .syncIntegerValue(this::getTankAmount, this::setTankAmount) + .sync(tank) .addInventory().create(this, syncID); } } diff --git a/src/main/java/techreborn/blockentity/generator/advanced/SemiFluidGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/advanced/SemiFluidGeneratorBlockEntity.java index e17efe255..5857583ee 100644 --- a/src/main/java/techreborn/blockentity/generator/advanced/SemiFluidGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/advanced/SemiFluidGeneratorBlockEntity.java @@ -62,6 +62,7 @@ public class SemiFluidGeneratorBlockEntity extends BaseFluidGeneratorBlockEntity .addInventory().blockEntity(this).slot(0, 25, 35).outputSlot(1, 25, 55).syncEnergyValue() .syncIntegerValue(this::getTicksSinceLastChange, this::setTicksSinceLastChange) .syncIntegerValue(this::getTankAmount, this::setTankAmount) + .sync(tank) .addInventory().create(this, syncID); } } diff --git a/src/main/java/techreborn/blockentity/generator/advanced/ThermalGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/advanced/ThermalGeneratorBlockEntity.java index ba74170d9..f16b1decd 100644 --- a/src/main/java/techreborn/blockentity/generator/advanced/ThermalGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/advanced/ThermalGeneratorBlockEntity.java @@ -62,6 +62,7 @@ public class ThermalGeneratorBlockEntity extends BaseFluidGeneratorBlockEntity i .addInventory().blockEntity(this).slot(0, 25, 35).outputSlot(1, 25, 55).syncEnergyValue() .syncIntegerValue(this::getTicksSinceLastChange, this::setTicksSinceLastChange) .syncIntegerValue(this::getTankAmount, this::setTankAmount) + .sync(tank) .addInventory().create(this, syncID); } } diff --git a/src/main/java/techreborn/init/FluidGeneratorRecipes.java b/src/main/java/techreborn/init/FluidGeneratorRecipes.java index 4121932cc..214366222 100644 --- a/src/main/java/techreborn/init/FluidGeneratorRecipes.java +++ b/src/main/java/techreborn/init/FluidGeneratorRecipes.java @@ -26,6 +26,7 @@ package techreborn.init; import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.Fluids; import techreborn.api.generator.EFluidGenerator; import techreborn.api.generator.GeneratorRecipeHelper; import techreborn.init.ModFluids; @@ -44,8 +45,7 @@ public class FluidGeneratorRecipes { register(EFluidGenerator.SEMIFLUID, ModFluids.LITHIUM.getFluid(), 60); register(EFluidGenerator.SEMIFLUID, ModFluids.OIL.getFluid(), 16); - //TODO 1.13 forge and mc fluids are 2 diffrent things, fix later - //register(EFluidGenerator.THERMAL, Fluids.LAVA, 60); + register(EFluidGenerator.THERMAL, Fluids.LAVA, 60); register(EFluidGenerator.GAS, ModFluids.HYDROGEN.getFluid(), 15); register(EFluidGenerator.GAS, ModFluids.METHANE.getFluid(), 45);