Revert "Rewrite to use new RebornCore Power API. Texture fixes."

This reverts commit b292fdd352.

# Conflicts:
#	src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
#	src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java
#	src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
#	src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
#	src/main/java/techreborn/tiles/TileAlloyFurnace.java
#	src/main/java/techreborn/tiles/TileAlloySmelter.java
#	src/main/java/techreborn/tiles/TileAssemblingMachine.java
#	src/main/java/techreborn/tiles/TileImplosionCompressor.java
#	src/main/java/techreborn/tiles/TileIndustrialSawmill.java
#	src/main/java/techreborn/tiles/TileVacuumFreezer.java
#	src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java
#	src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java
#	src/main/java/techreborn/tiles/teir1/TileCompressor.java
#	src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java
#	src/main/java/techreborn/tiles/teir1/TileExtractor.java
#	src/main/java/techreborn/tiles/teir1/TileGrinder.java
#	src/main/java/techreborn/tiles/teir1/TileRecycler.java
This commit is contained in:
modmuss50 2016-08-10 00:45:07 +01:00
parent 9b882e75ce
commit cdae866b2d
87 changed files with 3721 additions and 1277 deletions

View file

@ -22,49 +22,60 @@ import techreborn.init.ModBlocks;
import java.util.List;
public class TileQuantumTank extends TileMachineBase implements IFluidHandler,IInventoryProvider, IWrenchable, IListInfoProvider {
public class TileQuantumTank extends TileMachineBase
implements IFluidHandler,IInventoryProvider, IWrenchable, IListInfoProvider
{
public Tank tank = new Tank("TileQuantumTank", Integer.MAX_VALUE, this);
public Inventory inventory = new Inventory(3, "TileQuantumTank", 64, this);
@Override
public void readFromNBT(NBTTagCompound tagCompound) {
public void readFromNBT(NBTTagCompound tagCompound)
{
super.readFromNBT(tagCompound);
readFromNBTWithoutCoords(tagCompound);
}
public void readFromNBTWithoutCoords(NBTTagCompound tagCompound) {
public void readFromNBTWithoutCoords(NBTTagCompound tagCompound)
{
tank.readFromNBT(tagCompound);
}
@Override
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound) {
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
writeToNBTWithoutCoords(tagCompound);
return tagCompound;
}
public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound) {
public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound)
{
tank.writeToNBT(tagCompound);
return tagCompound;
}
@Override
public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) {
public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet)
{
worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(),
getPos().getY(), getPos().getZ());
readFromNBT(packet.getNbtCompound());
}
@Override
public void update() {
super.update();
if (!worldObj.isRemote) {
public void updateEntity()
{
super.updateEntity();
if (!worldObj.isRemote)
{
FluidUtils.drainContainers(this, inventory, 0, 1);
FluidUtils.fillContainers(this, inventory, 0, 1, tank.getFluidType());
if (tank.getFluidType() != null && getStackInSlot(2) == null) {
if (tank.getFluidType() != null && getStackInSlot(2) == null)
{
// inventory.setInventorySlotContents(2, new ItemStack(tank.getFluidType().getBlock()));
} else if (tank.getFluidType() == null && getStackInSlot(2) != null) {
} else if (tank.getFluidType() == null && getStackInSlot(2) != null)
{
setInventorySlotContents(2, null);
}
tank.compareAndUpdate();
@ -73,67 +84,79 @@ public class TileQuantumTank extends TileMachineBase implements IFluidHandler,II
// IFluidHandler
@Override
public int fill(EnumFacing from, FluidStack resource, boolean doFill) {
public int fill(EnumFacing from, FluidStack resource, boolean doFill)
{
int fill = tank.fill(resource, doFill);
tank.compareAndUpdate();
return fill;
}
@Override
public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) {
public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain)
{
FluidStack drain = tank.drain(resource.amount, doDrain);
tank.compareAndUpdate();
return drain;
}
@Override
public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) {
public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain)
{
FluidStack drain = tank.drain(maxDrain, doDrain);
tank.compareAndUpdate();
return drain;
}
@Override
public boolean canFill(EnumFacing from, Fluid fluid) {
public boolean canFill(EnumFacing from, Fluid fluid)
{
return tank.getFluid() == null || tank.getFluid().getFluid() == fluid;
}
@Override
public boolean canDrain(EnumFacing from, Fluid fluid) {
public boolean canDrain(EnumFacing from, Fluid fluid)
{
return tank.getFluid() == null || tank.getFluid().getFluid() == fluid;
}
@Override
public FluidTankInfo[] getTankInfo(EnumFacing from) {
return new FluidTankInfo[]{tank.getInfo()};
public FluidTankInfo[] getTankInfo(EnumFacing from)
{
return new FluidTankInfo[] { tank.getInfo() };
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side)
{
return false;
}
@Override
public EnumFacing getFacing() {
public EnumFacing getFacing()
{
return getFacingEnum();
}
@Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) {
public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{
return entityPlayer.isSneaking();
}
@Override
public float getWrenchDropRate() {
public float getWrenchDropRate()
{
return 1F;
}
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
public ItemStack getWrenchDrop(EntityPlayer entityPlayer)
{
return getDropWithNBT();
}
public ItemStack getDropWithNBT() {
public ItemStack getDropWithNBT()
{
NBTTagCompound tileEntity = new NBTTagCompound();
ItemStack dropStack = new ItemStack(ModBlocks.quantumTank, 1);
writeToNBTWithoutCoords(tileEntity);
@ -143,11 +166,15 @@ public class TileQuantumTank extends TileMachineBase implements IFluidHandler,II
}
@Override
public void addInfo(List<String> info, boolean isRealTile) {
if (isRealTile) {
if (tank.getFluid() != null) {
public void addInfo(List<String> info, boolean isRealTile)
{
if (isRealTile)
{
if (tank.getFluid() != null)
{
info.add(tank.getFluidAmount() + " of " + tank.getFluidType().getName());
} else {
} else
{
info.add("Empty");
}
}
@ -159,5 +186,4 @@ public class TileQuantumTank extends TileMachineBase implements IFluidHandler,II
public Inventory getInventory() {
return inventory;
}
}