diff --git a/buildnumber.txt b/buildnumber.txt index f0b1f0636..d58047831 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -29 +30 diff --git a/info.txt b/info.txt index 65395ff2f..2c5f5a165 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 0beaa3ed6..112b44a90 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 1205833b5..000000000 Binary files a/resources/assemblyline/textures/Thumbs.db and /dev/null differ diff --git a/resources/assemblyline/textures/blocks.png b/resources/assemblyline/textures/blocks.png new file mode 100644 index 000000000..6aa517afc Binary files /dev/null and b/resources/assemblyline/textures/blocks.png differ diff --git a/src/minecraft/assemblyline/client/ClientProxy.java b/src/minecraft/assemblyline/client/ClientProxy.java index f5dd5e87e..992f227d0 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 a37d5b384..691aca487 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 d372e75d1..b6a392c64 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 5d351b225..3d2cbd4ae 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 c759cc287..d2bc7117b 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();