From 7574747c4688e8c985aead6e8fdbb50d43394bdd Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Wed, 23 Dec 2015 15:32:38 +0100 Subject: [PATCH] rename storage proxy to external storage --- src/main/java/storagecraft/StorageCraft.java | 2 +- .../java/storagecraft/StorageCraftBlocks.java | 4 +- ...geProxy.java => BlockExternalStorage.java} | 16 +++---- ...oxy.java => ContainerExternalStorage.java} | 4 +- .../storagecraft/gui/GuiExternalStorage.java | 43 ++++++++++++++++++ .../java/storagecraft/gui/GuiHandler.java | 12 ++--- .../storagecraft/gui/GuiStorageProxy.java | 43 ------------------ .../java/storagecraft/proxy/CommonProxy.java | 10 ++-- ...ageProxy.java => TileExternalStorage.java} | 2 +- .../assets/storagecraft/lang/en_US.lang | 4 +- .../{storageProxy.png => externalStorage.png} | Bin .../{storageProxy.png => externalStorage.png} | Bin 12 files changed, 70 insertions(+), 70 deletions(-) rename src/main/java/storagecraft/block/{BlockStorageProxy.java => BlockExternalStorage.java} (68%) rename src/main/java/storagecraft/container/{ContainerStorageProxy.java => ContainerExternalStorage.java} (52%) create mode 100644 src/main/java/storagecraft/gui/GuiExternalStorage.java delete mode 100644 src/main/java/storagecraft/gui/GuiStorageProxy.java rename src/main/java/storagecraft/tile/{TileStorageProxy.java => TileExternalStorage.java} (91%) rename src/main/resources/assets/storagecraft/textures/blocks/{storageProxy.png => externalStorage.png} (100%) rename src/main/resources/assets/storagecraft/textures/gui/{storageProxy.png => externalStorage.png} (100%) diff --git a/src/main/java/storagecraft/StorageCraft.java b/src/main/java/storagecraft/StorageCraft.java index 491ac963d..22f24cb9c 100644 --- a/src/main/java/storagecraft/StorageCraft.java +++ b/src/main/java/storagecraft/StorageCraft.java @@ -21,7 +21,7 @@ public class StorageCraft public static final int CONTROLLER = 0; public static final int GRID = 1; public static final int DRIVE = 2; - public static final int STORAGE_PROXY = 3; + public static final int EXTERNAL_STORAGE = 3; public static final int IMPORTER = 4; public static final int EXPORTER = 5; public static final int DETECTOR = 6; diff --git a/src/main/java/storagecraft/StorageCraftBlocks.java b/src/main/java/storagecraft/StorageCraftBlocks.java index e10079260..2cc782023 100644 --- a/src/main/java/storagecraft/StorageCraftBlocks.java +++ b/src/main/java/storagecraft/StorageCraftBlocks.java @@ -9,7 +9,7 @@ import storagecraft.block.BlockGrid; import storagecraft.block.BlockImporter; import storagecraft.block.BlockMachineCasing; import storagecraft.block.BlockSolderer; -import storagecraft.block.BlockStorageProxy; +import storagecraft.block.BlockExternalStorage; public class StorageCraftBlocks { @@ -17,7 +17,7 @@ public class StorageCraftBlocks public static final BlockCable CABLE = new BlockCable(); public static final BlockGrid GRID = new BlockGrid(); public static final BlockDrive DRIVE = new BlockDrive(); - public static final BlockStorageProxy STORAGE_PROXY = new BlockStorageProxy(); + public static final BlockExternalStorage EXTERNAL_STORAGE = new BlockExternalStorage(); public static final BlockImporter IMPORTER = new BlockImporter(); public static final BlockExporter EXPORTER = new BlockExporter(); public static final BlockDetector DETECTOR = new BlockDetector(); diff --git a/src/main/java/storagecraft/block/BlockStorageProxy.java b/src/main/java/storagecraft/block/BlockExternalStorage.java similarity index 68% rename from src/main/java/storagecraft/block/BlockStorageProxy.java rename to src/main/java/storagecraft/block/BlockExternalStorage.java index 1daabffbf..74b3e9f68 100644 --- a/src/main/java/storagecraft/block/BlockStorageProxy.java +++ b/src/main/java/storagecraft/block/BlockExternalStorage.java @@ -8,22 +8,22 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import storagecraft.StorageCraft; -import storagecraft.tile.TileStorageProxy; +import storagecraft.tile.TileExternalStorage; -public class BlockStorageProxy extends BlockBase implements ITileEntityProvider +public class BlockExternalStorage extends BlockBase implements ITileEntityProvider { private IIcon frontIcon; private IIcon sideIcon; - public BlockStorageProxy() + public BlockExternalStorage() { - super("storageProxy"); + super("externalStorage"); } @Override public TileEntity createNewTileEntity(World world, int meta) { - return new TileStorageProxy(); + return new TileExternalStorage(); } @Override @@ -31,7 +31,7 @@ public class BlockStorageProxy extends BlockBase implements ITileEntityProvider { if (!world.isRemote) { - player.openGui(StorageCraft.INSTANCE, StorageCraft.GUI.STORAGE_PROXY, world, x, y, z); + player.openGui(StorageCraft.INSTANCE, StorageCraft.GUI.EXTERNAL_STORAGE, world, x, y, z); } return true; @@ -40,14 +40,14 @@ public class BlockStorageProxy extends BlockBase implements ITileEntityProvider @Override public void registerBlockIcons(IIconRegister register) { - frontIcon = register.registerIcon("storagecraft:storageProxy"); + frontIcon = register.registerIcon("storagecraft:externalStorage"); sideIcon = register.registerIcon("storagecraft:generic"); } @Override public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - TileStorageProxy tile = (TileStorageProxy) world.getTileEntity(x, y, z); + TileExternalStorage tile = (TileExternalStorage) world.getTileEntity(x, y, z); if (side == tile.getDirection().ordinal()) { diff --git a/src/main/java/storagecraft/container/ContainerStorageProxy.java b/src/main/java/storagecraft/container/ContainerExternalStorage.java similarity index 52% rename from src/main/java/storagecraft/container/ContainerStorageProxy.java rename to src/main/java/storagecraft/container/ContainerExternalStorage.java index b64bb6334..5ef928417 100644 --- a/src/main/java/storagecraft/container/ContainerStorageProxy.java +++ b/src/main/java/storagecraft/container/ContainerExternalStorage.java @@ -2,9 +2,9 @@ package storagecraft.container; import net.minecraft.entity.player.EntityPlayer; -public class ContainerStorageProxy extends ContainerBase +public class ContainerExternalStorage extends ContainerBase { - public ContainerStorageProxy(EntityPlayer player) + public ContainerExternalStorage(EntityPlayer player) { super(player); diff --git a/src/main/java/storagecraft/gui/GuiExternalStorage.java b/src/main/java/storagecraft/gui/GuiExternalStorage.java new file mode 100644 index 000000000..d586a2d3b --- /dev/null +++ b/src/main/java/storagecraft/gui/GuiExternalStorage.java @@ -0,0 +1,43 @@ +package storagecraft.gui; + +import storagecraft.container.ContainerExternalStorage; +import storagecraft.gui.sidebutton.SideButtonRedstoneMode; +import storagecraft.tile.TileExternalStorage; + +public class GuiExternalStorage extends GuiBase +{ + private TileExternalStorage externalStorage; + + public GuiExternalStorage(ContainerExternalStorage container, TileExternalStorage externalStorage) + { + super(container, 176, 131); + + this.externalStorage = externalStorage; + } + + @Override + public void init(int x, int y) + { + addSideButton(new SideButtonRedstoneMode(externalStorage)); + } + + @Override + public void update(int x, int y) + { + } + + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) + { + bindTexture("gui/externalStorage.png"); + + drawTexturedModalRect(x, y, 0, 0, xSize, ySize); + } + + @Override + public void drawForeground(int mouseX, int mouseY) + { + drawString(7, 7, t("gui.storagecraft:externalStorage")); + drawString(7, 39, t("container.inventory")); + } +} diff --git a/src/main/java/storagecraft/gui/GuiHandler.java b/src/main/java/storagecraft/gui/GuiHandler.java index c5d37070f..238974f5f 100644 --- a/src/main/java/storagecraft/gui/GuiHandler.java +++ b/src/main/java/storagecraft/gui/GuiHandler.java @@ -13,7 +13,7 @@ import storagecraft.container.ContainerExporter; import storagecraft.container.ContainerGrid; import storagecraft.container.ContainerImporter; import storagecraft.container.ContainerSolderer; -import storagecraft.container.ContainerStorageProxy; +import storagecraft.container.ContainerExternalStorage; import storagecraft.tile.TileController; import storagecraft.tile.TileDetector; import storagecraft.tile.TileDrive; @@ -21,7 +21,7 @@ import storagecraft.tile.TileExporter; import storagecraft.tile.TileGrid; import storagecraft.tile.TileImporter; import storagecraft.tile.TileSolderer; -import storagecraft.tile.TileStorageProxy; +import storagecraft.tile.TileExternalStorage; public class GuiHandler implements IGuiHandler { @@ -35,8 +35,8 @@ public class GuiHandler implements IGuiHandler return new ContainerGrid(player, (TileGrid) tile); case StorageCraft.GUI.DRIVE: return new ContainerDrive(player, (TileDrive) tile); - case StorageCraft.GUI.STORAGE_PROXY: - return new ContainerStorageProxy(player); + case StorageCraft.GUI.EXTERNAL_STORAGE: + return new ContainerExternalStorage(player); case StorageCraft.GUI.IMPORTER: return new ContainerImporter(player, (TileImporter) tile); case StorageCraft.GUI.EXPORTER: @@ -69,8 +69,8 @@ public class GuiHandler implements IGuiHandler return new GuiGrid((ContainerGrid) getContainer(ID, player, tile), (TileGrid) tile); case StorageCraft.GUI.DRIVE: return new GuiDrive((ContainerDrive) getContainer(ID, player, tile), (TileDrive) tile); - case StorageCraft.GUI.STORAGE_PROXY: - return new GuiStorageProxy((ContainerStorageProxy) getContainer(ID, player, tile), (TileStorageProxy) tile); + case StorageCraft.GUI.EXTERNAL_STORAGE: + return new GuiExternalStorage((ContainerExternalStorage) getContainer(ID, player, tile), (TileExternalStorage) tile); case StorageCraft.GUI.IMPORTER: return new GuiImporter((ContainerImporter) getContainer(ID, player, tile), (TileImporter) tile); case StorageCraft.GUI.EXPORTER: diff --git a/src/main/java/storagecraft/gui/GuiStorageProxy.java b/src/main/java/storagecraft/gui/GuiStorageProxy.java deleted file mode 100644 index b8b8d7504..000000000 --- a/src/main/java/storagecraft/gui/GuiStorageProxy.java +++ /dev/null @@ -1,43 +0,0 @@ -package storagecraft.gui; - -import storagecraft.container.ContainerStorageProxy; -import storagecraft.gui.sidebutton.SideButtonRedstoneMode; -import storagecraft.tile.TileStorageProxy; - -public class GuiStorageProxy extends GuiBase -{ - private TileStorageProxy storageProxy; - - public GuiStorageProxy(ContainerStorageProxy container, TileStorageProxy storageProxy) - { - super(container, 176, 131); - - this.storageProxy = storageProxy; - } - - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(storageProxy)); - } - - @Override - public void update(int x, int y) - { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/storageProxy.png"); - - drawTexturedModalRect(x, y, 0, 0, xSize, ySize); - } - - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.storagecraft:storageProxy")); - drawString(7, 39, t("container.inventory")); - } -} diff --git a/src/main/java/storagecraft/proxy/CommonProxy.java b/src/main/java/storagecraft/proxy/CommonProxy.java index 218d8f4f3..5e38ac97d 100644 --- a/src/main/java/storagecraft/proxy/CommonProxy.java +++ b/src/main/java/storagecraft/proxy/CommonProxy.java @@ -37,7 +37,7 @@ import storagecraft.tile.TileExporter; import storagecraft.tile.TileGrid; import storagecraft.tile.TileImporter; import storagecraft.tile.TileSolderer; -import storagecraft.tile.TileStorageProxy; +import storagecraft.tile.TileExternalStorage; import storagecraft.tile.solderer.SoldererRecipeCraftingGrid; import storagecraft.tile.solderer.SoldererRecipeDrive; import storagecraft.tile.solderer.SoldererRecipePrintedProcessor; @@ -65,7 +65,7 @@ public class CommonProxy GameRegistry.registerTileEntity(TileCable.class, "cable"); GameRegistry.registerTileEntity(TileGrid.class, "grid"); GameRegistry.registerTileEntity(TileDrive.class, "drive"); - GameRegistry.registerTileEntity(TileStorageProxy.class, "storageProxy"); + GameRegistry.registerTileEntity(TileExternalStorage.class, "externalStorage"); GameRegistry.registerTileEntity(TileImporter.class, "importer"); GameRegistry.registerTileEntity(TileExporter.class, "exporter"); GameRegistry.registerTileEntity(TileDetector.class, "detector"); @@ -75,7 +75,7 @@ public class CommonProxy GameRegistry.registerBlock(StorageCraftBlocks.CABLE, ItemBlockCable.class, "cable"); GameRegistry.registerBlock(StorageCraftBlocks.GRID, ItemBlockGrid.class, "grid"); GameRegistry.registerBlock(StorageCraftBlocks.DRIVE, "drive"); - GameRegistry.registerBlock(StorageCraftBlocks.STORAGE_PROXY, "storageProxy"); + GameRegistry.registerBlock(StorageCraftBlocks.EXTERNAL_STORAGE, "externalStorage"); GameRegistry.registerBlock(StorageCraftBlocks.IMPORTER, "importer"); GameRegistry.registerBlock(StorageCraftBlocks.EXPORTER, "exporter"); GameRegistry.registerBlock(StorageCraftBlocks.DETECTOR, "detector"); @@ -198,8 +198,8 @@ public class CommonProxy 'A', new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED) ); - // Storage Proxy - GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.STORAGE_PROXY), + // External Storage + GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.EXTERNAL_STORAGE), "CED", "HMH", "EPE", diff --git a/src/main/java/storagecraft/tile/TileStorageProxy.java b/src/main/java/storagecraft/tile/TileExternalStorage.java similarity index 91% rename from src/main/java/storagecraft/tile/TileStorageProxy.java rename to src/main/java/storagecraft/tile/TileExternalStorage.java index 5437dd21a..de2bb14d6 100644 --- a/src/main/java/storagecraft/tile/TileStorageProxy.java +++ b/src/main/java/storagecraft/tile/TileExternalStorage.java @@ -9,7 +9,7 @@ import storagecraft.storage.IStorageProvider; import storagecraft.storage.StorageItem; import storagecraft.util.InventoryUtils; -public class TileStorageProxy extends TileMachine implements IStorageProvider, IStorage +public class TileExternalStorage extends TileMachine implements IStorageProvider, IStorage { public IInventory getInventory() { diff --git a/src/main/resources/assets/storagecraft/lang/en_US.lang b/src/main/resources/assets/storagecraft/lang/en_US.lang index 1faab2cbe..79a145b01 100644 --- a/src/main/resources/assets/storagecraft/lang/en_US.lang +++ b/src/main/resources/assets/storagecraft/lang/en_US.lang @@ -3,7 +3,7 @@ itemGroup.storagecraft=StorageCraft gui.storagecraft:controller=Controller gui.storagecraft:grid=Grid gui.storagecraft:drive=Drive -gui.storagecraft:storageProxy=Storage Proxy +gui.storagecraft:externalStorage=External Storage gui.storagecraft:importer=Importer gui.storagecraft:exporter=Exporter gui.storagecraft:detector=Detector @@ -56,7 +56,7 @@ block.storagecraft:cable.1.name=Sensitive Cable block.storagecraft:grid.0.name=Grid block.storagecraft:grid.1.name=Crafting Grid block.storagecraft:drive.name=Drive -block.storagecraft:storageProxy.name=Storage Proxy +block.storagecraft:externalStorage.name=External Storage block.storagecraft:importer.name=Importer block.storagecraft:exporter.name=Exporter block.storagecraft:detector.name=Detector diff --git a/src/main/resources/assets/storagecraft/textures/blocks/storageProxy.png b/src/main/resources/assets/storagecraft/textures/blocks/externalStorage.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/blocks/storageProxy.png rename to src/main/resources/assets/storagecraft/textures/blocks/externalStorage.png diff --git a/src/main/resources/assets/storagecraft/textures/gui/storageProxy.png b/src/main/resources/assets/storagecraft/textures/gui/externalStorage.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/gui/storageProxy.png rename to src/main/resources/assets/storagecraft/textures/gui/externalStorage.png