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 06e65d9a..7fd9784e 100644 Binary files a/resources/assemblyline/textures/blocks.png and b/resources/assemblyline/textures/blocks.png differ 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);