Merge remote-tracking branch 'remotes/origin/master' into 1.8.8

# Conflicts:
#	src/main/java/techreborn/client/gui/GuiGrinder.java
#	src/main/java/techreborn/tiles/TileGrinder.java
This commit is contained in:
Modmuss50 2015-12-16 16:06:33 +00:00
commit eedabb9e7d
5 changed files with 54 additions and 20 deletions

View file

@ -120,16 +120,16 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable {
return dropStack;
}
public void writeToNBTWithoutCoords(NBTTagCompound tagCompound) {
super.writeToNBTWithoutCoords(tagCompound);
public void writeToNBT(NBTTagCompound tagCompound) {
super.writeToNBT(tagCompound);
tagCompound.setDouble("euChange", euChange);
tagCompound.setDouble("euLastTick", euLastTick);
tagCompound.setInteger("output", OUTPUT);
inventory.writeToNBT(tagCompound);
}
public void readFromNBTWithoutCoords(NBTTagCompound nbttagcompound) {
super.readFromNBTWithoutCoords(nbttagcompound);
public void readFromNBT(NBTTagCompound nbttagcompound) {
super.readFromNBT(nbttagcompound);
this.euChange = nbttagcompound.getDouble("euChange");
this.euLastTick = nbttagcompound.getDouble("euLastTick");
this.OUTPUT = nbttagcompound.getInteger("output");

View file

@ -29,6 +29,7 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable, IFlui
public Inventory inventory = new Inventory(6, "TileGrinder", 64, this);
public Tank tank = new Tank("TileGrinder", 16000, this);
public RecipeCrafter crafter;
public int connectionStatus;
public TileGrinder() {
super(ConfigTechReborn.CentrifugeTier);
@ -85,21 +86,13 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable, IFlui
for (EnumFacing direction : EnumFacing.values()) {
TileEntity tileEntity = worldObj.getTileEntity(new BlockPos(getPos().getX() + direction.getFrontOffsetX(), getPos().getY() + direction.getFrontOffsetY(), getPos().getZ() + direction.getFrontOffsetZ()));
if (tileEntity instanceof TileMachineCasing) {
if(!((TileMachineCasing) tileEntity).isConnected()){
return false;
}
if ((tileEntity.getBlockType() instanceof BlockMachineCasing)) {
BlockMachineCasing machineCasing = (BlockMachineCasing) tileEntity.getBlockType();
int heat = machineCasing.getHeatFromState(tileEntity.getWorld().getBlockState(tileEntity.getPos()));
Location location = new Location(getPos().getX(), getPos().getY(), getPos().getZ(), direction);
location.modifyPositionFromSide(direction, 1);
if (worldObj.getBlockState(new BlockPos(location.getX(), location.getY(), location.getZ())).getBlock().getUnlocalizedName().equals("tile.lava")) {
heat += 500;
}
if(((TileMachineCasing) tileEntity).isConnected() && ((TileMachineCasing) tileEntity).getMultiblockController().isAssembled() && ((TileMachineCasing) tileEntity).getMultiblockController().height == 3){
connectionStatus = 1;
return true;
}
}
}
connectionStatus = 0;
return false;
}
@ -220,7 +213,6 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable, IFlui
inventory.closeInventory(player);
}
@Override
public int getField(int id) {
return inventory.getField(id);