diff options
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/casings')
5 files changed, 22 insertions, 22 deletions
diff --git a/src/main/java/gregtech/common/tileentities/casings/upgrade/Ampere.java b/src/main/java/gregtech/common/tileentities/casings/upgrade/Ampere.java index 1644f8fde0..b0f6afdc3a 100644 --- a/src/main/java/gregtech/common/tileentities/casings/upgrade/Ampere.java +++ b/src/main/java/gregtech/common/tileentities/casings/upgrade/Ampere.java @@ -31,12 +31,12 @@ public class Ampere extends UpgradeCasing { } @Override - public boolean breakBlock() { + public boolean onBlockBroken() { final IMultiBlockController controller = getTarget(false); if (controller != null) { controller.setMaxAmperage(2); } - return super.breakBlock(); + return super.onBlockBroken(); } @Override diff --git a/src/main/java/gregtech/common/tileentities/casings/upgrade/Cleanroom.java b/src/main/java/gregtech/common/tileentities/casings/upgrade/Cleanroom.java index 641327b427..224b74a993 100644 --- a/src/main/java/gregtech/common/tileentities/casings/upgrade/Cleanroom.java +++ b/src/main/java/gregtech/common/tileentities/casings/upgrade/Cleanroom.java @@ -16,11 +16,11 @@ public class Cleanroom extends UpgradeCasing { } @Override - public boolean breakBlock() { + public boolean onBlockBroken() { final IMultiBlockController controller = getTarget(false); if (controller != null) { controller.setCleanroom(false); } - return super.breakBlock(); + return super.onBlockBroken(); } } diff --git a/src/main/java/gregtech/common/tileentities/casings/upgrade/Inventory.java b/src/main/java/gregtech/common/tileentities/casings/upgrade/Inventory.java index 31294c7002..7e51b3441d 100644 --- a/src/main/java/gregtech/common/tileentities/casings/upgrade/Inventory.java +++ b/src/main/java/gregtech/common/tileentities/casings/upgrade/Inventory.java @@ -29,7 +29,7 @@ public class Inventory extends UpgradeCasing { } public String getInventoryID() { - return inventoryID.toString(); + return inventoryID != null ? inventoryID.toString() : ""; } public void setInventoryName(String aInventoryName) { @@ -58,30 +58,30 @@ public class Inventory extends UpgradeCasing { } @Override - public void readMultiTileNBT(NBTTagCompound aNBT) { - super.readMultiTileNBT(aNBT); - if (aNBT.hasKey(NBT.UPGRADE_INVENTORY_NAME)) { - inventoryName = aNBT.getString(NBT.UPGRADE_INVENTORY_NAME); + public void readMultiTileNBT(NBTTagCompound nbt) { + super.readMultiTileNBT(nbt); + if (nbt.hasKey(NBT.UPGRADE_INVENTORY_NAME)) { + inventoryName = nbt.getString(NBT.UPGRADE_INVENTORY_NAME); } else { inventoryName = "inventory"; } - inventorySize = aNBT.getInteger(NBT.UPGRADE_INVENTORY_SIZE); + inventorySize = nbt.getInteger(NBT.UPGRADE_INVENTORY_SIZE); } @Override - public void writeMultiTileNBT(NBTTagCompound aNBT) { - super.writeMultiTileNBT(aNBT); - aNBT.setString(NBT.UPGRADE_INVENTORY_UUID, inventoryID.toString()); - aNBT.setString(NBT.UPGRADE_INVENTORY_NAME, inventoryName); + public void writeMultiTileNBT(NBTTagCompound nbt) { + super.writeMultiTileNBT(nbt); + if (inventoryID != null) nbt.setString(NBT.UPGRADE_INVENTORY_UUID, inventoryID.toString()); + if (inventoryName != null) nbt.setString(NBT.UPGRADE_INVENTORY_NAME, inventoryName); } @Override - public boolean breakBlock() { + public boolean onBlockBroken() { final IMultiBlockController controller = getTarget(false); - if (controller != null) { + if (controller != null && inventoryID != null) { controller.unregisterItemInventory(inventoryID, type); } - return super.breakBlock(); + return super.onBlockBroken(); } @Override @@ -96,7 +96,7 @@ public class Inventory extends UpgradeCasing { .setSetter((val) -> { inventoryName = val; final IMultiBlockController controller = getTarget(false); - if (controller != null) { + if (controller != null && inventoryID != null) { controller.changeItemInventoryDisplayName(inventoryID, inventoryName, type); } }) diff --git a/src/main/java/gregtech/common/tileentities/casings/upgrade/Laser.java b/src/main/java/gregtech/common/tileentities/casings/upgrade/Laser.java index ab66281f54..b3ac810066 100644 --- a/src/main/java/gregtech/common/tileentities/casings/upgrade/Laser.java +++ b/src/main/java/gregtech/common/tileentities/casings/upgrade/Laser.java @@ -16,11 +16,11 @@ public class Laser extends UpgradeCasing { } @Override - public boolean breakBlock() { + public boolean onBlockBroken() { final IMultiBlockController controller = getTarget(false); if (controller != null) { controller.setLaserSupport(false); } - return super.breakBlock(); + return super.onBlockBroken(); } } diff --git a/src/main/java/gregtech/common/tileentities/casings/upgrade/Wireless.java b/src/main/java/gregtech/common/tileentities/casings/upgrade/Wireless.java index 0cb6a595bf..5603f0f8e8 100644 --- a/src/main/java/gregtech/common/tileentities/casings/upgrade/Wireless.java +++ b/src/main/java/gregtech/common/tileentities/casings/upgrade/Wireless.java @@ -16,11 +16,11 @@ public class Wireless extends UpgradeCasing { } @Override - public boolean breakBlock() { + public boolean onBlockBroken() { final IMultiBlockController controller = getTarget(false); if (controller != null) { controller.setWirelessSupport(false); } - return super.breakBlock(); + return super.onBlockBroken(); } } |