diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java index cf839fe1d..f8661ff8a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java @@ -119,10 +119,12 @@ public final class InitBlocks{ public static Block blockBookletStand; public static Block blockDisplayStand; + public static Block blockShockSuppressor; public static void init(){ ModUtil.LOGGER.info("Initializing Blocks..."); + blockShockSuppressor = new BlockShockSuppressor("blockShockSuppressor"); blockDisplayStand = new BlockDisplayStand("blockDisplayStand"); blockPlayerInterface = new BlockPlayerInterface("blockPlayerInterface"); blockBookletStand = new BlockBookletStand("blockBookletStand"); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java index 7af74e59b..accdf5025 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java @@ -35,13 +35,11 @@ public class CreativeTab extends CreativeTabs{ super(ModUtil.MOD_ID); } - @Override public ItemStack getIconItemStack(){ return new ItemStack(this.getTabIconItem()); } - @Override public Item getTabIconItem(){ return InitItems.itemBooklet; @@ -75,6 +73,7 @@ public class CreativeTab extends CreativeTabs{ this.add(InitBlocks.blockXPSolidifier); this.add(InitBlocks.blockDisplayStand); + this.add(InitBlocks.blockShockSuppressor); this.add(InitBlocks.blockMiner); this.add(InitBlocks.blockGreenhouseGlass); this.add(InitBlocks.blockGrinder); @@ -135,6 +134,7 @@ public class CreativeTab extends CreativeTabs{ this.add(InitBlocks.blockTreasureChest); this.add(InitBlocks.blockBlackLotus); + this.add(InitBlocks.blockBookletStand); this.add(InitItems.itemColorLens); this.add(InitItems.itemExplosionLens); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java index 6bb2f8022..3ca67be11 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java @@ -36,7 +36,7 @@ public class GuiBreaker extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.breaker.getName()); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.breaker); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java index 73050816d..2d28853e6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java @@ -53,7 +53,7 @@ public class GuiCanolaPress extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.press.getName()); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.press); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java index 025ecb650..36ea1bb24 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java @@ -47,7 +47,7 @@ public class GuiCoalGenerator extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.generator.getName()); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.generator); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java index 2e01a67b2..e745b36d3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java @@ -81,7 +81,7 @@ public class GuiCoffeeMachine extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.machine.getName()); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.machine); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java index fb6e86771..5bb51f2ef 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java @@ -48,7 +48,7 @@ public class GuiDirectionalBreaker extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.breaker.getName()); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.breaker); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java index e4e08238d..ad94d37e7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java @@ -36,7 +36,7 @@ public class GuiDropper extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.dropper.getName()); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.dropper); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java index 2d1fde488..2e8251dc1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java @@ -47,7 +47,7 @@ public class GuiEnergizer extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.energizer.getName()); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.energizer); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java index 96ed0b201..49a30f393 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java @@ -47,7 +47,7 @@ public class GuiEnervator extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.enervator.getName()); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.enervator); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java index 761527709..fbb9bead4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java @@ -49,7 +49,7 @@ public class GuiFeeder extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tileFeeder.getName()); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tileFeeder); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java index 0f23fd9f3..9d45e29df 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java @@ -54,7 +54,7 @@ public class GuiFermentingBarrel extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.press.name); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.press); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java index abeebadc9..bcb33a796 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java @@ -49,7 +49,7 @@ public class GuiFluidCollector extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.collector.name); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.collector); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java index 9619ebc7e..9e97b5af5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java @@ -47,7 +47,7 @@ public class GuiFurnaceDouble extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tileFurnace.getName()); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tileFurnace); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java index 07d484697..769a80037 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java @@ -74,7 +74,7 @@ public class GuiGiantChest extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.chest.getName()); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.chest); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java index 04e289b8b..5336aa460 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java @@ -54,7 +54,7 @@ public class GuiGrinder extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tileGrinder.getName()); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tileGrinder); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java index 6e7058fa6..7e6dcd7b1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java @@ -157,7 +157,7 @@ public class GuiInputter extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tileInputter.getName()); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tileInputter); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java index f8efd24ad..52d43326c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java @@ -108,7 +108,7 @@ public class GuiLaserRelayItemWhitelist extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tile.name); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tile); String s1 = "INBOUND"; String s2 = "OUTBOUND"; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java index 770908793..026bc51a6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java @@ -53,7 +53,7 @@ public class GuiMiner extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.miner.getName()); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.miner); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java index f219d9e2c..0a6cf6942 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java @@ -52,7 +52,7 @@ public class GuiOilGenerator extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.generator.name); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.generator); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java index a603f2edb..95016976e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java @@ -36,7 +36,7 @@ public class GuiPhantomPlacer extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.placer.getName()); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.placer); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java index 7b0ff8806..25ab78282 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java @@ -75,7 +75,7 @@ public class GuiRangedCollector extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.collector.getName()); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.collector); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java index 1348641c1..530df742b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java @@ -47,7 +47,7 @@ public class GuiRepairer extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tileRepairer.getName()); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.tileRepairer); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java index 8d97b7cd2..089ffc6f1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java @@ -76,7 +76,7 @@ public class GuiXPSolidifier extends GuiContainer{ @Override public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.solidifier.getName()); + AssetUtil.displayNameString(this.fontRendererObj, this.xSize, -10, this.solidifier); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java index 093ba8037..6250ad729 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java @@ -16,6 +16,7 @@ import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; import de.ellpeck.actuallyadditions.mod.network.PacketHandler; import de.ellpeck.actuallyadditions.mod.network.PacketServerToClient; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import de.ellpeck.actuallyadditions.mod.util.compat.TeslaUtil; import net.minecraft.block.state.IBlockState; @@ -27,6 +28,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; @@ -38,69 +41,70 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public abstract class TileEntityBase extends TileEntity implements ITickable{ public static boolean teslaLoaded; - public final String name; public boolean isRedstonePowered; public boolean isPulseMode; protected int ticksElapsed; + public final String name; public TileEntityBase(String name){ - this.name = "container."+ModUtil.MOD_ID+"."+name; + this.name = name; } //TODO Change for next major update to use the name variable automatically public static void init(){ ModUtil.LOGGER.info("Registering TileEntities..."); - GameRegistry.registerTileEntity(TileEntityCompost.class, ModUtil.MOD_ID+":tileEntityCompost"); - GameRegistry.registerTileEntity(TileEntityFeeder.class, ModUtil.MOD_ID+":tileEntityFeeder"); - GameRegistry.registerTileEntity(TileEntityGiantChest.class, ModUtil.MOD_ID+":tileEntityGiantChest"); - GameRegistry.registerTileEntity(TileEntityGiantChestMedium.class, ModUtil.MOD_ID+":tileEntityGiantChestMedium"); - GameRegistry.registerTileEntity(TileEntityGiantChestLarge.class, ModUtil.MOD_ID+":tileEntityGiantChestLarge"); - GameRegistry.registerTileEntity(TileEntityGrinder.class, ModUtil.MOD_ID+":tileEntityGrinder"); - GameRegistry.registerTileEntity(TileEntityFurnaceDouble.class, ModUtil.MOD_ID+":tileEntityFurnaceDouble"); - GameRegistry.registerTileEntity(TileEntityInputter.class, ModUtil.MOD_ID+":tileEntityInputter"); - GameRegistry.registerTileEntity(TileEntityFishingNet.class, ModUtil.MOD_ID+":tileEntityFishingNet"); - GameRegistry.registerTileEntity(TileEntityFurnaceSolar.class, ModUtil.MOD_ID+":tileEntityFurnaceSolar"); - GameRegistry.registerTileEntity(TileEntityHeatCollector.class, ModUtil.MOD_ID+":tileEntityHeatCollector"); - GameRegistry.registerTileEntity(TileEntityItemRepairer.class, ModUtil.MOD_ID+":tileEntityRepairer"); - GameRegistry.registerTileEntity(TileEntityGreenhouseGlass.class, ModUtil.MOD_ID+":tileEntityGreenhouseGlass"); - GameRegistry.registerTileEntity(TileEntityBreaker.class, ModUtil.MOD_ID+":tileEntityBreaker"); - GameRegistry.registerTileEntity(TileEntityDropper.class, ModUtil.MOD_ID+":tileEntityDropper"); - GameRegistry.registerTileEntity(TileEntityInputterAdvanced.class, ModUtil.MOD_ID+":tileEntityInputterAdvanced"); - GameRegistry.registerTileEntity(TileEntityPlacer.class, ModUtil.MOD_ID+":tileEntityPlacer"); - GameRegistry.registerTileEntity(TileEntityGrinderDouble.class, ModUtil.MOD_ID+":tileEntityGrinderDouble"); - GameRegistry.registerTileEntity(TileEntityCanolaPress.class, ModUtil.MOD_ID+":tileEntityCanolaPress"); - GameRegistry.registerTileEntity(TileEntityFermentingBarrel.class, ModUtil.MOD_ID+":tileEntityFermentingBarrel"); - GameRegistry.registerTileEntity(TileEntityOilGenerator.class, ModUtil.MOD_ID+":tileEntityOilGenerator"); - GameRegistry.registerTileEntity(TileEntityCoalGenerator.class, ModUtil.MOD_ID+":tileEntityCoalGenerator"); - GameRegistry.registerTileEntity(TileEntityPhantomItemface.class, ModUtil.MOD_ID+":tileEntityPhantomItemface"); - GameRegistry.registerTileEntity(TileEntityPhantomLiquiface.class, ModUtil.MOD_ID+":tileEntityPhantomLiquiface"); - GameRegistry.registerTileEntity(TileEntityPhantomEnergyface.class, ModUtil.MOD_ID+":tileEntityPhantomEnergyface"); - GameRegistry.registerTileEntity(TileEntityPlayerInterface.class, ModUtil.MOD_ID+":tileEntityPlayerInterface"); - GameRegistry.registerTileEntity(TileEntityPhantomPlacer.class, ModUtil.MOD_ID+":tileEntityPhantomPlacer"); - GameRegistry.registerTileEntity(TileEntityPhantomBreaker.class, ModUtil.MOD_ID+":tileEntityPhantomBreaker"); - GameRegistry.registerTileEntity(TileEntityFluidCollector.class, ModUtil.MOD_ID+":tileEntityFluidCollector"); - GameRegistry.registerTileEntity(TileEntityFluidPlacer.class, ModUtil.MOD_ID+":tileEntityFluidPlacer"); - GameRegistry.registerTileEntity(TileEntityLavaFactoryController.class, ModUtil.MOD_ID+":tileEntityLavaFactoryController"); - GameRegistry.registerTileEntity(TileEntityCoffeeMachine.class, ModUtil.MOD_ID+":tileEntityCoffeeMachine"); - GameRegistry.registerTileEntity(TileEntityPhantomBooster.class, ModUtil.MOD_ID+":tileEntityPhantomBooster"); - GameRegistry.registerTileEntity(TileEntityEnergizer.class, ModUtil.MOD_ID+":tileEntityEnergizer"); - GameRegistry.registerTileEntity(TileEntityEnervator.class, ModUtil.MOD_ID+":tileEntityEnervator"); - GameRegistry.registerTileEntity(TileEntityXPSolidifier.class, ModUtil.MOD_ID+":tileEntityXPSolidifier"); - GameRegistry.registerTileEntity(TileEntitySmileyCloud.class, ModUtil.MOD_ID+":tileEntityCloud"); - GameRegistry.registerTileEntity(TileEntityLeafGenerator.class, ModUtil.MOD_ID+":tileEntityLeafGenerator"); - GameRegistry.registerTileEntity(TileEntityDirectionalBreaker.class, ModUtil.MOD_ID+":tileEntityDirectionalBreaker"); - GameRegistry.registerTileEntity(TileEntityRangedCollector.class, ModUtil.MOD_ID+":tileEntityRangedCollector"); - GameRegistry.registerTileEntity(TileEntityAtomicReconstructor.class, ModUtil.MOD_ID+":tileEntityAtomicReconstructor"); - GameRegistry.registerTileEntity(TileEntityMiner.class, ModUtil.MOD_ID+":tileEntityMiner"); - GameRegistry.registerTileEntity(TileEntityFireworkBox.class, ModUtil.MOD_ID+":tileEntityFireworkBox"); - GameRegistry.registerTileEntity(TileEntityPhantomRedstoneface.class, ModUtil.MOD_ID+":tileEntityPhantomRedstoneface"); - GameRegistry.registerTileEntity(TileEntityLaserRelayItem.class, ModUtil.MOD_ID+":tileEntityLaserRelayItem"); - GameRegistry.registerTileEntity(TileEntityLaserRelayEnergy.class, ModUtil.MOD_ID+":tileEntityLaserRelay"); - GameRegistry.registerTileEntity(TileEntityLaserRelayItemWhitelist.class, ModUtil.MOD_ID+":tileEntityLaserRelayItemWhitelist"); - GameRegistry.registerTileEntity(TileEntityItemViewer.class, ModUtil.MOD_ID+":tileItemViewer"); - GameRegistry.registerTileEntity(TileEntityBookletStand.class, ModUtil.MOD_ID+":tileEntityBookletStand"); - GameRegistry.registerTileEntity(TileEntityDisplayStand.class, ModUtil.MOD_ID+":tileEntityDisplayStand"); + register(TileEntityCompost.class, "Compost"); + register(TileEntityFeeder.class, "Feeder"); + register(TileEntityGiantChest.class, "GiantChest"); + register(TileEntityGiantChestMedium.class, "GiantChestMedium"); + register(TileEntityGiantChestLarge.class, "GiantChestLarge"); + register(TileEntityGrinder.class, "Grinder"); + register(TileEntityFurnaceDouble.class, "FurnaceDouble"); + register(TileEntityInputter.class, "Inputter"); + register(TileEntityFishingNet.class, "FishingNet"); + register(TileEntityFurnaceSolar.class, "FurnaceSolar"); + register(TileEntityHeatCollector.class, "HeatCollector"); + register(TileEntityItemRepairer.class, "Repairer"); + register(TileEntityGreenhouseGlass.class, "GreenhouseGlass"); + register(TileEntityBreaker.class, "Breaker"); + register(TileEntityDropper.class, "Dropper"); + register(TileEntityInputterAdvanced.class, "InputterAdvanced"); + register(TileEntityPlacer.class, "Placer"); + register(TileEntityGrinderDouble.class, "GrinderDouble"); + register(TileEntityCanolaPress.class, "CanolaPress"); + register(TileEntityFermentingBarrel.class, "FermentingBarrel"); + register(TileEntityOilGenerator.class, "OilGenerator"); + register(TileEntityCoalGenerator.class, "CoalGenerator"); + register(TileEntityPhantomItemface.class, "PhantomItemface"); + register(TileEntityPhantomLiquiface.class, "PhantomLiquiface"); + register(TileEntityPhantomEnergyface.class, "PhantomEnergyface"); + register(TileEntityPlayerInterface.class, "PlayerInterface"); + register(TileEntityPhantomPlacer.class, "PhantomPlacer"); + register(TileEntityPhantomBreaker.class, "PhantomBreaker"); + register(TileEntityFluidCollector.class, "FluidCollector"); + register(TileEntityFluidPlacer.class, "FluidPlacer"); + register(TileEntityLavaFactoryController.class, "LavaFactoryController"); + register(TileEntityCoffeeMachine.class, "CoffeeMachine"); + register(TileEntityPhantomBooster.class, "PhantomBooster"); + register(TileEntityEnergizer.class, "Energizer"); + register(TileEntityEnervator.class, "Enervator"); + register(TileEntityXPSolidifier.class, "XPSolidifier"); + register(TileEntitySmileyCloud.class, "Cloud"); + register(TileEntityLeafGenerator.class, "LeafGenerator"); + register(TileEntityDirectionalBreaker.class, "DirectionalBreaker"); + register(TileEntityRangedCollector.class, "RangedCollector"); + register(TileEntityAtomicReconstructor.class, "AtomicReconstructor"); + register(TileEntityMiner.class, "Miner"); + register(TileEntityFireworkBox.class, "FireworkBox"); + register(TileEntityPhantomRedstoneface.class, "PhantomRedstoneface"); + register(TileEntityLaserRelayItem.class, "LaserRelayItem"); + register(TileEntityLaserRelayEnergy.class, "LaserRelay"); + register(TileEntityLaserRelayItemWhitelist.class, "LaserRelayItemWhitelist"); + register(TileEntityItemViewer.class, "ItemViewer"); + register(TileEntityBookletStand.class, "BookletStand"); + register(TileEntityDisplayStand.class, "DisplayStand"); + register(TileEntityShockSuppressor.class, "ShockSuppressor"); if(ModAPIManager.INSTANCE.hasAPI("Tesla|API")){ ModUtil.LOGGER.info("Tesla API loaded... Activating Tesla Power System integration..."); @@ -111,13 +115,24 @@ public abstract class TileEntityBase extends TileEntity implements ITickable{ } } + private static void register(Class tileClass, String legacyName){ + try{ + //This is hacky and dirty but it works so whatever + String name = ModUtil.MOD_ID+":"+tileClass.newInstance().name; + String oldName = ModUtil.MOD_ID+":tileEntity"+legacyName; + GameRegistry.registerTileEntityWithAlternatives(tileClass, name, oldName); + } + catch(Exception e){ + ModUtil.LOGGER.fatal("Registering a TileEntity failed!", e); + } + } + @Override public void readFromNBT(NBTTagCompound compound){ super.readFromNBT(compound); this.readSyncableNBT(compound, NBTType.SAVE_TILE); } - @Override public NBTTagCompound writeToNBT(NBTTagCompound compound){ compound = super.writeToNBT(compound); @@ -173,6 +188,11 @@ public abstract class TileEntityBase extends TileEntity implements ITickable{ } } + @Override + public ITextComponent getDisplayName(){ + return new TextComponentTranslation("container."+ModUtil.MOD_ID+"."+this.name+".name"); + } + public void readSyncableNBT(NBTTagCompound compound, NBTType type){ if(type == NBTType.SAVE_TILE){ this.isRedstonePowered = compound.getBoolean("Redstone"); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java index 1aa15f62c..9dfc862d9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChest.java @@ -20,12 +20,12 @@ import net.minecraft.util.EnumFacing; public class TileEntityGiantChest extends TileEntityInventoryBase implements IButtonReactor{ - public TileEntityGiantChest(int slotAmount){ - super(slotAmount, "giantChest"); + public TileEntityGiantChest(int slotAmount, String name){ + super(slotAmount, name); } public TileEntityGiantChest(){ - this(9*13); + this(9*13, "giantChest"); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChestLarge.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChestLarge.java index c87183508..364577a8b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChestLarge.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChestLarge.java @@ -13,6 +13,6 @@ package de.ellpeck.actuallyadditions.mod.tile; public class TileEntityGiantChestLarge extends TileEntityGiantChest{ public TileEntityGiantChestLarge(){ - super(9*13*3); + super(9*13*3, "giantChestLarge"); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChestMedium.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChestMedium.java index 02f5ab3f7..1af9a8bfd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChestMedium.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGiantChestMedium.java @@ -13,6 +13,6 @@ package de.ellpeck.actuallyadditions.mod.tile; public class TileEntityGiantChestMedium extends TileEntityGiantChest{ public TileEntityGiantChestMedium(){ - super(9*13*2); + super(9*13*2, "giantChestMedium"); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java index 758f83c92..a47733d38 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java @@ -191,7 +191,6 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements return stack; } - @Override public String getName(){ return this.name; @@ -202,12 +201,6 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements return false; } - - @Override - public ITextComponent getDisplayName(){ - return new TextComponentTranslation(this.getName()); - } - @Override public T getCapability(Capability capability, EnumFacing facing){ if(this.hasInvWrapperCapabilities() && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java index 34c5e9711..9c4f8b099 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java @@ -24,6 +24,7 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformT import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; @@ -44,9 +45,12 @@ public final class AssetUtil{ return new ResourceLocation(ModUtil.MOD_ID, "textures/gui/booklet/"+file+".png"); } - public static void displayNameString(FontRenderer font, int xSize, int yPositionOfMachineText, String machineName){ - String localMachineName = StringUtil.localize(machineName+".name"); - font.drawString(localMachineName, xSize/2-font.getStringWidth(localMachineName)/2, yPositionOfMachineText, StringUtil.DECIMAL_COLOR_WHITE); + public static void displayNameString(FontRenderer font, int xSize, int yPositionOfMachineText, String text){ + font.drawString(text, xSize/2-font.getStringWidth(text)/2, yPositionOfMachineText, StringUtil.DECIMAL_COLOR_WHITE); + } + + public static void displayNameString(FontRenderer font, int xSize, int yPositionOfMachineText, TileEntity tile){ + displayNameString(font, xSize, yPositionOfMachineText, tile.getDisplayName().getFormattedText()); } @SideOnly(Side.CLIENT) diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index babc62068..476ac608d 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -568,7 +568,9 @@ container.actuallyadditions.grinder.name=Crusher container.actuallyadditions.grinderDouble.name=Double Crusher container.actuallyadditions.furnaceDouble.name=Double Furnace container.actuallyadditions.feeder.name=Feeder -container.actuallyadditions.giantChest.name=Storage Crate +container.actuallyadditions.giantChest.name=Small Storage Crate +container.actuallyadditions.giantChestMedium.name=Medium Storage Crate +container.actuallyadditions.giantChestLarge.name=Large Storage Crate container.actuallyadditions.repairer.name=Repairer container.actuallyadditions.placer.name=Placer container.actuallyadditions.breaker.name=Breaker