diff options
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
8 files changed, 37 insertions, 27 deletions
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java index 05128ee255..28cfc4e5a8 100644 --- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java +++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java @@ -35,7 +35,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.RecipeMapWorkable; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_SpecialFilter; import gregtech.api.multitileentity.MultiTileEntityContainer; -import gregtech.api.multitileentity.MultiTileEntityItemInternal; +import gregtech.api.multitileentity.MultiTileEntityItem; import gregtech.api.recipe.RecipeMap; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Utility; @@ -75,7 +75,7 @@ public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFil IMetaTileEntity metaTileEntity = GT_Item_Machines.getMetaTileEntity(stack); if (metaTileEntity != null) { return getMetaTileEntityRecipeMap(metaTileEntity); - } else if (stack.getItem() instanceof MultiTileEntityItemInternal) { + } else if (stack.getItem() instanceof MultiTileEntityItem) { return getMuTeRecipeMap(stack); } } @@ -93,7 +93,7 @@ public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFil MultiTileEntityContainer muTeEntityContainer = GT_Loader_MultiTileEntities.MACHINE_REGISTRY .getNewTileEntityContainer(stack); if (muTeEntityContainer != null - && muTeEntityContainer.mTileEntity instanceof RecipeMapWorkable recipeMapWorkable) { + && muTeEntityContainer.tileEntity instanceof RecipeMapWorkable recipeMapWorkable) { return recipeMapWorkable.getRecipeMap(); } return null; 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(); } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/CokeOven.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/CokeOven.java index 06fc7b42b1..e8e31ba32c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multiblock/CokeOven.java +++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/CokeOven.java @@ -142,7 +142,11 @@ public class CokeOven extends Controller<CokeOven, CokeOvenProcessingLogic> { @Override public String getLocalName() { - return StatCollector.translateToLocal("gt.multiBlock.controller.cokeOven"); + return StatCollector.translateToLocal(getTileEntityName()); + } + + public String getTileEntityName() { + return "gt.multitileentity.multiblock.cokeOven"; } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java index 326bfcc9ee..a34246e045 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java +++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java @@ -20,6 +20,7 @@ import gregtech.api.multitileentity.multiblock.base.StackableController; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_StructureUtility; import gregtech.common.tileentities.machines.multiblock.logic.DistillationTowerProcessingLogic; +import net.minecraft.util.StatCollector; public class DistillationTower extends StackableController<DistillationTower, DistillationTowerProcessingLogic> { @@ -158,9 +159,14 @@ public class DistillationTower extends StackableController<DistillationTower, Di @Override public String getLocalName() { - return "Distillation Tower"; + return StatCollector.translateToLocal(getTileEntityName()); } +// @Override +// public String getLocalName() { +// return "Distillation Tower"; +// } +// @Override protected String getStackableMiddle(int stackIndex) { return stackIndex % 2 == 0 ? STACKABLE_MIDDLE_1 : STACKABLE_MIDDLE_2; |