From dbdf81601bd61beb84820d04b66013f0870f31c7 Mon Sep 17 00:00:00 2001 From: Henry Mao Date: Tue, 25 Dec 2012 02:12:28 +0800 Subject: [PATCH] Texture Update --- buildnumber.txt | 2 +- info.txt | 3 ++- resources/assemblyline/language/en_US.properties | 2 +- resources/assemblyline/textures/Thumbs.db | Bin 3072 -> 0 bytes resources/assemblyline/textures/blocks.png | Bin 0 -> 6637 bytes .../assemblyline/client/ClientProxy.java | 2 +- .../assemblyline/common/AssemblyLine.java | 11 ++++++----- .../assemblyline/common/block/BlockCrate.java | 9 +++++---- ...chitectTable.java => BlockEngineerTable.java} | 6 +++--- .../machine/belt/TileEntityConveyorBelt.java | 2 +- 10 files changed, 20 insertions(+), 17 deletions(-) delete mode 100644 resources/assemblyline/textures/Thumbs.db create mode 100644 resources/assemblyline/textures/blocks.png rename src/minecraft/assemblyline/common/block/{BlockArchitectTable.java => BlockEngineerTable.java} (89%) diff --git a/buildnumber.txt b/buildnumber.txt index f0b1f063..d5804783 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -29 +30 diff --git a/info.txt b/info.txt index 65395ff2..2c5f5a16 100644 --- a/info.txt +++ b/info.txt @@ -23,4 +23,5 @@ x AssemblyLine_v0.1.6.23.jar AssemblyLine_v0.1.6.23_api.zip * AssemblyLine_v0.1.7.26.jar AssemblyLine_v0.1.7.26_api.zip * AssemblyLine_v0.1.7.27.jar AssemblyLine_v0.1.7.27_api.zip @ AssemblyLine_v0.1.8.28.jar AssemblyLine_v0.1.8.28_api.zip -* AssemblyLine_v0.1.8.29.jar AssemblyLine_v0.1.8.29_api.zip +@ AssemblyLine_v0.1.8.29.jar AssemblyLine_v0.1.8.29_api.zip +* AssemblyLine_v0.1.8.30.jar AssemblyLine_v0.1.8.30_api.zip diff --git a/resources/assemblyline/language/en_US.properties b/resources/assemblyline/language/en_US.properties index 0beaa3ed..112b44a9 100644 --- a/resources/assemblyline/language/en_US.properties +++ b/resources/assemblyline/language/en_US.properties @@ -4,7 +4,7 @@ # Blocks tile.crate.name=Crate tile.conveyorBelt.name=Conveyor Belt -tile.architectTable.name=Architect's Table +tile.engineerTable.name=Engineer's Table # Items # item.battery.name=Battery \ No newline at end of file diff --git a/resources/assemblyline/textures/Thumbs.db b/resources/assemblyline/textures/Thumbs.db deleted file mode 100644 index 1205833b5bbe78f4b83d44a1013218056a1e8283..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3072 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 literal 0 HcmV?d00001 diff --git a/src/minecraft/assemblyline/client/ClientProxy.java b/src/minecraft/assemblyline/client/ClientProxy.java index f5dd5e87..992f227d 100644 --- a/src/minecraft/assemblyline/client/ClientProxy.java +++ b/src/minecraft/assemblyline/client/ClientProxy.java @@ -24,7 +24,7 @@ public class ClientProxy extends CommonProxy @Override public void preInit() { - MinecraftForgeClient.preloadTexture(AssemblyLine.TEXTURE_PATH + "/Items.png"); + MinecraftForgeClient.preloadTexture(AssemblyLine.BLOCK_TEXTURE_PATH); RenderingRegistry.registerBlockHandler(new RenderHelper()); } diff --git a/src/minecraft/assemblyline/common/AssemblyLine.java b/src/minecraft/assemblyline/common/AssemblyLine.java index a37d5b38..691aca48 100644 --- a/src/minecraft/assemblyline/common/AssemblyLine.java +++ b/src/minecraft/assemblyline/common/AssemblyLine.java @@ -12,8 +12,8 @@ import universalelectricity.core.UniversalElectricity; import universalelectricity.prefab.UETab; import universalelectricity.prefab.UpdateNotifier; import universalelectricity.prefab.network.PacketManager; -import assemblyline.common.block.BlockArchitectTable; import assemblyline.common.block.BlockCrate; +import assemblyline.common.block.BlockEngineerTable; import assemblyline.common.block.ItemBlockCrate; import assemblyline.common.machine.BlockMulti; import assemblyline.common.machine.BlockMulti.MachineType; @@ -51,6 +51,7 @@ public class AssemblyLine public static final String RESOURCE_PATH = "/assemblyline/"; public static final String TEXTURE_PATH = RESOURCE_PATH + "textures/"; public static final String LANGUAGE_PATH = RESOURCE_PATH + "language/"; + public static final String BLOCK_TEXTURE_PATH = TEXTURE_PATH + "blocks.png"; private static final String[] LANGUAGES_SUPPORTED = new String[] { "en_US" }; @@ -60,7 +61,7 @@ public class AssemblyLine public static Block blockConveyorBelt; public static Block blockMulti; - public static Block blockArchitectTable; + public static Block blockEngineerTable; public static Block blockCrate; @PreInit @@ -72,15 +73,15 @@ public class AssemblyLine CONFIGURATION.load(); blockConveyorBelt = new BlockConveyorBelt(CONFIGURATION.getBlock("Conveyor Belt", BLOCK_ID_PREFIX).getInt()); blockMulti = new BlockMulti(CONFIGURATION.getBlock("Machine", BLOCK_ID_PREFIX + 1).getInt()); - blockArchitectTable = new BlockArchitectTable(CONFIGURATION.getBlock("Architect's Table", BLOCK_ID_PREFIX + 2).getInt()); - blockCrate = new BlockCrate(CONFIGURATION.getBlock("Crate", BLOCK_ID_PREFIX + 3).getInt()); + blockEngineerTable = new BlockEngineerTable(CONFIGURATION.getBlock("Architect's Table", BLOCK_ID_PREFIX + 2).getInt()); + blockCrate = new BlockCrate(CONFIGURATION.getBlock("Crate", BLOCK_ID_PREFIX + 3).getInt(), 0); CONFIGURATION.save(); NetworkRegistry.instance().registerGuiHandler(this, this.proxy); GameRegistry.registerBlock(blockConveyorBelt, "Conveyor Belt"); - GameRegistry.registerBlock(blockArchitectTable, "Architect's Table"); GameRegistry.registerBlock(blockCrate, ItemBlockCrate.class, "Crate"); GameRegistry.registerBlock(blockMulti, ItemBlockMulti.class, "Machine"); + // GameRegistry.registerBlock(blockArchitectTable, "Engineer's Table"); UpdateNotifier.INSTANCE.checkUpdate(NAME, VERSION, "http://calclavia.com/downloads/al/recommendedversion.txt"); diff --git a/src/minecraft/assemblyline/common/block/BlockCrate.java b/src/minecraft/assemblyline/common/block/BlockCrate.java index d372e75d..b6a392c6 100644 --- a/src/minecraft/assemblyline/common/block/BlockCrate.java +++ b/src/minecraft/assemblyline/common/block/BlockCrate.java @@ -1,6 +1,5 @@ package assemblyline.common.block; -import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -9,6 +8,7 @@ import net.minecraft.world.World; import universalelectricity.core.UniversalElectricity; import universalelectricity.prefab.BlockMachine; import universalelectricity.prefab.UETab; +import assemblyline.common.AssemblyLine; /** * A block that allows the placement of mass amount of a specific item within it. It will be allowed @@ -19,11 +19,12 @@ import universalelectricity.prefab.UETab; */ public class BlockCrate extends BlockMachine { - public BlockCrate(int par1) + public BlockCrate(int id, int texture) { - super("crate", par1, UniversalElectricity.machine); - this.blockIndexInTexture = Block.blockSteel.blockIndexInTexture; + super("crate", id, UniversalElectricity.machine); + this.blockIndexInTexture = texture; this.setCreativeTab(UETab.INSTANCE); + this.setTextureFile(AssemblyLine.BLOCK_TEXTURE_PATH); } /** diff --git a/src/minecraft/assemblyline/common/block/BlockArchitectTable.java b/src/minecraft/assemblyline/common/block/BlockEngineerTable.java similarity index 89% rename from src/minecraft/assemblyline/common/block/BlockArchitectTable.java rename to src/minecraft/assemblyline/common/block/BlockEngineerTable.java index 5d351b22..3d2cbd4a 100644 --- a/src/minecraft/assemblyline/common/block/BlockArchitectTable.java +++ b/src/minecraft/assemblyline/common/block/BlockEngineerTable.java @@ -6,13 +6,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import universalelectricity.prefab.UETab; -public class BlockArchitectTable extends Block +public class BlockEngineerTable extends Block { - public BlockArchitectTable(int par1) + public BlockEngineerTable(int par1) { super(par1, Material.wood); this.blockIndexInTexture = 59; - this.setBlockName("architectTable"); + this.setBlockName("engineerTable"); this.setCreativeTab(UETab.INSTANCE); } diff --git a/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java b/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java index c759cc28..d2bc7117 100644 --- a/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java +++ b/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java @@ -72,7 +72,7 @@ public class TileEntityConveyorBelt extends TileEntityAssemblyNetwork implements } } } - + for (int d = 0; d <= 1; d++) { ForgeDirection direction = this.getDirection();