Update to minecraft version 1.9.4

This commit is contained in:
modmuss50 2016-05-18 16:53:54 +01:00
parent 7d95dea783
commit 74d500a2fd
47 changed files with 176 additions and 151 deletions

View file

@ -131,13 +131,14 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable
return dropStack;
}
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
tagCompound.setDouble("euChange", euChange);
tagCompound.setDouble("euLastTick", euLastTick);
tagCompound.setInteger("output", OUTPUT);
inventory.writeToNBT(tagCompound);
return tagCompound;
}
public void readFromNBT(NBTTagCompound nbttagcompound)

View file

@ -91,10 +91,11 @@ public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable,I
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
// @Override

View file

@ -155,10 +155,11 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable,I
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
writeUpdateToNBT(tagCompound);
return tagCompound;
}
public void writeUpdateToNBT(NBTTagCompound tagCompound)

View file

@ -115,10 +115,11 @@ public class TileCentrifuge extends TilePowerAcceptor
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
@Override

View file

@ -85,10 +85,11 @@ public class TileChemicalReactor extends TilePowerAcceptor implements IWrenchabl
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
// ISidedInventory

View file

@ -127,13 +127,14 @@ public class TileDigitalChest extends TileMachineBase implements IInventoryProvi
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
writeToNBTWithoutCoords(tagCompound);
return tagCompound;
}
public void writeToNBTWithoutCoords(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound)
{
if (storedItem != null)
{
@ -141,6 +142,7 @@ public class TileDigitalChest extends TileMachineBase implements IInventoryProvi
tagCompound.setInteger("storedQuantity", storedItem.stackSize);
} else
tagCompound.setInteger("storedQuantity", 0);
return tagCompound;
}
@Override

View file

@ -118,10 +118,11 @@ public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenc
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
// @Override

View file

@ -88,10 +88,11 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor implements IWr
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
// @Override

View file

@ -128,11 +128,12 @@ public class TileIndustrialGrinder extends TilePowerAcceptor
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
tank.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
@Override

View file

@ -135,11 +135,12 @@ public class TileIndustrialSawmill extends TilePowerAcceptor
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
tank.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
/* IFluidHandler */

View file

@ -118,9 +118,10 @@ public class TilePlayerDectector extends TilePowerAcceptor
}
@Override
public void writeToNBT(NBTTagCompound tag)
public NBTTagCompound writeToNBT(NBTTagCompound tag)
{
super.writeToNBT(tag);
tag.setString("ownerID", owenerUdid);
return tag;
}
}

View file

@ -121,15 +121,17 @@ public class TilePump extends TilePowerAcceptor implements IFluidHandler {
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
writeToNBTWithoutCoords(tagCompound);
return tagCompound;
}
public void writeToNBTWithoutCoords(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound)
{
tank.writeToNBT(tagCompound);
return tagCompound;
}
// IFluidHandler

View file

@ -129,20 +129,24 @@ public class TileQuantumChest extends TileMachineBase
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
writeToNBTWithoutCoords(tagCompound);
return tagCompound;
}
public void writeToNBTWithoutCoords(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound)
{
if (storedItem != null)
{
tagCompound.setTag("storedStack", storedItem.writeToNBT(new NBTTagCompound()));
tagCompound.setInteger("storedQuantity", storedItem.stackSize);
} else
} else{
tagCompound.setInteger("storedQuantity", 0);
}
return tagCompound;
}
@Override

View file

@ -42,15 +42,17 @@ public class TileQuantumTank extends TileMachineBase
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
writeToNBTWithoutCoords(tagCompound);
return tagCompound;
}
public void writeToNBTWithoutCoords(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound)
{
tank.writeToNBT(tagCompound);
return tagCompound;
}
public Packet getDescriptionPacket()

View file

@ -183,11 +183,12 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
ItemUtils.writeInvToNBT(craftMatrix, "Crafting", tagCompound);
writeUpdateToNBT(tagCompound);
return tagCompound;
}
public void writeUpdateToNBT(NBTTagCompound tagCompound)

View file

@ -130,10 +130,11 @@ public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable,
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
public int getProgressScaled(int scale)

View file

@ -90,7 +90,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
@ -110,6 +110,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn
tagCompound.setInteger("finalTickTime", finalTickTime);
tagCompound.setInteger("neededPower", neededPower);
tagCompound.setBoolean("hasStartedCrafting", hasStartedCrafting);
return tagCompound;
}

View file

@ -115,10 +115,11 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
tank.writeToNBT(tagCompound);
return tagCompound;
}
public Packet getDescriptionPacket()

View file

@ -128,10 +128,11 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IF
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
tank.writeToNBT(tagCompound);
return tagCompound;
}
public Packet getDescriptionPacket()

View file

@ -134,10 +134,11 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
tank.writeToNBT(tagCompound);
return tagCompound;
}
public Packet getDescriptionPacket()

View file

@ -120,10 +120,11 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
tank.writeToNBT(tagCompound);
return tagCompound;
}
public Packet getDescriptionPacket()

View file

@ -61,12 +61,6 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable
}
@Override
public void writeToNBTWithoutCoords(NBTTagCompound tag)
{
}
@Override
public double getMaxPower()
{
@ -120,14 +114,15 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable
this.ownerUdid = nbttagcompound.getString("ownerUdid");
}
public void writeToNBT(NBTTagCompound nbttagcompound)
public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound)
{
super.writeToNBT(nbttagcompound);
if (ownerUdid == null && StringUtils.isBlank(ownerUdid) || StringUtils.isEmpty(ownerUdid))
{
return;
return nbttagcompound;
}
nbttagcompound.setString("ownerUdid", this.ownerUdid);
return nbttagcompound;
}
public void updateEntity()

View file

@ -84,10 +84,11 @@ public class TileExtractor extends TilePowerAcceptor implements IWrenchable,IInv
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
// ISidedInventory

View file

@ -92,10 +92,11 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable,IInven
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
public int getProgressScaled(int scale)