xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

made tank corrosion seamless

Browse Source
This commit is contained in:
Boblet 2020-08-06 11:26:27 +02:00
parent 2019d59e15
commit 752df423fb
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/hbm/blocks/machine/BlockFluidBarrel.java
View File

@ -79,8 +79,7 @@ public class BlockFluidBarrel extends BlockContainer {
}
private final Random field_149933_a = new Random();
private Random rand;
private static boolean keepInventory;
public static boolean keepInventory;
@Spaghetti("stop doing that and make a base class for fuck's sake")
@Override

20
src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java
View File

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import com.hbm.blocks.ModBlocks;
import com.hbm.blocks.machine.BlockFluidBarrel;
import com.hbm.handler.FluidTypeHandler.FluidType;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidSource;
@ -59,28 +60,27 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc
Block b = this.getBlockType();
//for when you fill antimatter into a matter tank
if(b != ModBlocks.barrel_antimatter && tank.getTankType().isAntimatter()) {
worldObj.func_147480_a(xCoord, yCoord, zCoord, false);
worldObj.newExplosion(null, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 5, true, true);
}
//for when you fill hot or corrosive liquids into a plastic tank
if(b == ModBlocks.barrel_plastic && (tank.getTankType().isCorrosive() || tank.getTankType().isHot())) {
worldObj.func_147480_a(xCoord, yCoord, zCoord, false);
worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "random.fizz", 1.0F, 1.0F);
}
//TODO: rip off furnace code and make transition more seamless
//for when you fill corrosive liquid into an iron tank
if(b == ModBlocks.barrel_iron && tank.getTankType().isCorrosive()) {
ItemStack[] copy = this.slots.clone();
this.slots = new ItemStack[6];
worldObj.setBlock(xCoord, yCoord, zCoord, ModBlocks.barrel_corroded);
TileEntityBarrel barrel = (TileEntityBarrel)worldObj.getTileEntity(xCoord, yCoord, zCoord);
if(barrel != null) {
barrel.tank.setTankType(tank.getTankType());
barrel.tank.setFill(Math.min(barrel.tank.getMaxFill(), tank.getFill()));
barrel.slots = copy;
}
BlockFluidBarrel.keepInventory = true;
worldObj.setBlock(xCoord, yCoord, zCoord, ModBlocks.barrel_corroded);
worldObj.setTileEntity(xCoord, yCoord, zCoord, this);
this.validate();
BlockFluidBarrel.keepInventory = false;
worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "random.fizz", 1.0F, 1.0F);
}