From cb22292c9a415d16b4b1f7ce64cb161a11789547 Mon Sep 17 00:00:00 2001 From: Henry Mao Date: Sun, 6 Jan 2013 02:22:42 +0800 Subject: [PATCH] Encoder Texture Update --- buildnumber.txt | 2 +- info.txt | 3 ++- resources/assemblyline/textures/blocks.png | Bin 15036 -> 19554 bytes .../assemblyline/client/gui/GuiEncoder.java | 2 +- .../assemblyline/common/AssemblyLine.java | 4 ++-- .../common/machine/encoder/BlockEncoder.java | 2 +- .../machine/imprinter/BlockImprinter.java | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/buildnumber.txt b/buildnumber.txt index 58c549c0..0e91b872 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -43 +44 diff --git a/info.txt b/info.txt index f1a5575f..39e38aa5 100644 --- a/info.txt +++ b/info.txt @@ -38,4 +38,5 @@ Minecraft 1.4.5 * AssemblyLine_v0.2.1.40.jar AssemblyLine_v0.2.1.40_api.zip @ AssemblyLine_v0.2.2.41.jar AssemblyLine_v0.2.2.41_api.zip @ AssemblyLine_v0.2.2.42.jar AssemblyLine_v0.2.2.42_api.zip -* AssemblyLine_v0.2.2.43.jar AssemblyLine_v0.2.2.43_api.zip +@ AssemblyLine_v0.2.2.43.jar AssemblyLine_v0.2.2.43_api.zip +* AssemblyLine_v0.2.2.44.jar AssemblyLine_v0.2.2.44_api.zip diff --git a/resources/assemblyline/textures/blocks.png b/resources/assemblyline/textures/blocks.png index 06e65d9a3e35db66a99e0781a0b7cd539c173b62..7fd9784e0c0810e936cc005f4aac4f1574d31268 100644 GIT binary patch delta 14868 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≦K*joW=5FN4uCq7wkJ+~ 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 Q{^XE_sqLRw<9iAJ2lrLQcK`qY delta 10297 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 E05VhH2><{9 diff --git a/src/minecraft/assemblyline/client/gui/GuiEncoder.java b/src/minecraft/assemblyline/client/gui/GuiEncoder.java index e79499b9..5e9a0d5d 100644 --- a/src/minecraft/assemblyline/client/gui/GuiEncoder.java +++ b/src/minecraft/assemblyline/client/gui/GuiEncoder.java @@ -140,7 +140,7 @@ public class GuiEncoder extends GuiContainer implements IInventoryWatcher { glColor4f(1, 1, 1, 1); glDisable(GL_LIGHTING); - this.fontRenderer.drawString(TranslationHelper.getLocal("tile.encoder.name"), 68, 6 + ContainerEncoder.Y_OFFSET, 4210752); + this.fontRenderer.drawString(TranslationHelper.getLocal("tile.encoder.name"), 68, 8 + ContainerEncoder.Y_OFFSET, 4210752); this.fontRenderer.drawString("Disk:", 56, 28 + ContainerEncoder.Y_OFFSET, 4210752); // render page up and page down buttons diff --git a/src/minecraft/assemblyline/common/AssemblyLine.java b/src/minecraft/assemblyline/common/AssemblyLine.java index 0a4f5807..ab28ddda 100644 --- a/src/minecraft/assemblyline/common/AssemblyLine.java +++ b/src/minecraft/assemblyline/common/AssemblyLine.java @@ -85,10 +85,10 @@ public class AssemblyLine blockConveyorBelt = new BlockConveyorBelt(CONFIGURATION.getBlock("Conveyor Belt", BLOCK_ID_PREFIX).getInt()); blockManipulator = new BlockManipulator(CONFIGURATION.getBlock("Manipulator", BLOCK_ID_PREFIX + 1).getInt()); blockCrate = new BlockCrate(CONFIGURATION.getBlock("Crate", BLOCK_ID_PREFIX + 3).getInt(), 0); - blockImprinter = new BlockImprinter(CONFIGURATION.getBlock("Imprinter", BLOCK_ID_PREFIX + 4).getInt(), 0); + blockImprinter = new BlockImprinter(CONFIGURATION.getBlock("Imprinter", BLOCK_ID_PREFIX + 4).getInt(), 4); blockDetector = new BlockDetector(CONFIGURATION.getBlock("Detector", BLOCK_ID_PREFIX + 5).getInt(), 1); blockRejector = new BlockRejector(CONFIGURATION.getBlock("Rejector", BLOCK_ID_PREFIX + 6).getInt()); - blockEncoder = new BlockEncoder(CONFIGURATION.getBlock("Programmer", BLOCK_ID_PREFIX + 7).getInt(), 0); + blockEncoder = new BlockEncoder(CONFIGURATION.getBlock("Encoder", BLOCK_ID_PREFIX + 7).getInt(), 7); itemImprint = new ItemImprinter(CONFIGURATION.getBlock("Imprint", ITEM_ID_PREFIX).getInt()); itemDisk = new ItemDisk(CONFIGURATION.getBlock("Disk", ITEM_ID_PREFIX + 1).getInt()); diff --git a/src/minecraft/assemblyline/common/machine/encoder/BlockEncoder.java b/src/minecraft/assemblyline/common/machine/encoder/BlockEncoder.java index db7546e3..af55dfef 100644 --- a/src/minecraft/assemblyline/common/machine/encoder/BlockEncoder.java +++ b/src/minecraft/assemblyline/common/machine/encoder/BlockEncoder.java @@ -14,7 +14,7 @@ public class BlockEncoder extends BlockMachine public BlockEncoder(int id, int texture) { super(id, Material.wood); - this.blockIndexInTexture = 4; + this.blockIndexInTexture = texture; this.setBlockName("encoder"); this.setCreativeTab(TabAssemblyLine.INSTANCE); this.setTextureFile(AssemblyLine.BLOCK_TEXTURE_PATH); diff --git a/src/minecraft/assemblyline/common/machine/imprinter/BlockImprinter.java b/src/minecraft/assemblyline/common/machine/imprinter/BlockImprinter.java index 5b3e65cc..cb4fd50c 100644 --- a/src/minecraft/assemblyline/common/machine/imprinter/BlockImprinter.java +++ b/src/minecraft/assemblyline/common/machine/imprinter/BlockImprinter.java @@ -13,7 +13,7 @@ public class BlockImprinter extends BlockMachine public BlockImprinter(int id, int texture) { super(id, Material.wood); - this.blockIndexInTexture = 4; + this.blockIndexInTexture = texture; this.setBlockName("imprinter"); this.setCreativeTab(TabAssemblyLine.INSTANCE); this.setTextureFile(AssemblyLine.BLOCK_TEXTURE_PATH);