diff --git a/buildnumber.txt b/buildnumber.txt index 52a8c6d1..74701a15 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -10 +13 diff --git a/info.txt b/info.txt index 5fdffd0d..c755a93e 100644 --- a/info.txt +++ b/info.txt @@ -8,4 +8,6 @@ @ AssemblyLine_v0.0.6.10.jar AssemblyLine_v0.0.6.10_api.zip Minecraft 1.3.2 * AssemblyLine_v0.1.2.10.jar AssemblyLine_v0.1.2.10_api.zip -Minecraft 1.4.2 \ No newline at end of file +Minecraft 1.4.2 +@ AssemblyLine_v0.1.3.11.jar AssemblyLine_v0.1.3.11_api.zip +* AssemblyLine_v0.1.3.13.jar AssemblyLine_v0.1.3.13_api.zip diff --git a/resources/al_logo.png b/resources/al_logo.png new file mode 100644 index 00000000..b4f98774 Binary files /dev/null and b/resources/al_logo.png differ diff --git a/src/common/assemblyline/AssemblyLine.java b/src/common/assemblyline/AssemblyLine.java index fc20bc53..e43bce56 100644 --- a/src/common/assemblyline/AssemblyLine.java +++ b/src/common/assemblyline/AssemblyLine.java @@ -52,7 +52,7 @@ public class AssemblyLine public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir(), "UniversalElectricity/AssemblyLine.cfg")); - public static final int BLOCK_ID_PREFIX = 3003; + public static final int BLOCK_ID_PREFIX = 3020; public static final Block blockConveyorBelt = new BlockConveyorBelt(UEConfig.getBlockConfigID(CONFIGURATION, "Conveyor Belt", BLOCK_ID_PREFIX)); public static final Block blockInteraction = new BlockMulti(UEConfig.getBlockConfigID(CONFIGURATION, "Machine", BLOCK_ID_PREFIX + 1)); public static final Block blockArchitectTable = new BlockArchitectTable(UEConfig.getBlockConfigID(CONFIGURATION, "Architect's Table", BLOCK_ID_PREFIX + 2)); @@ -60,7 +60,7 @@ public class AssemblyLine @PreInit public void preInit(FMLPreInitializationEvent event) { - UniversalElectricity.register(this, 1, 1, 1, false); + UniversalElectricity.register(this, 1, 1, 3, false); instance = this; NetworkRegistry.instance().registerGuiHandler(this, this.proxy); GameRegistry.registerBlock(blockConveyorBelt); diff --git a/src/common/assemblyline/machine/belt/TileEntityConveyorBelt.java b/src/common/assemblyline/machine/belt/TileEntityConveyorBelt.java index 9a26475a..df248f62 100644 --- a/src/common/assemblyline/machine/belt/TileEntityConveyorBelt.java +++ b/src/common/assemblyline/machine/belt/TileEntityConveyorBelt.java @@ -83,6 +83,7 @@ public class TileEntityConveyorBelt extends TileEntityElectricityReceiver implem } this.powerTransferRange = rr - 1; + return false; } @@ -110,7 +111,7 @@ public class TileEntityConveyorBelt extends TileEntityElectricityReceiver implem if (!(worldObj.getBlockTileEntity(xCoord, yCoord - 1, zCoord) instanceof IConductor)) { - searchNeighborBelts(); + this.searchNeighborBelts(); } if (this.powerTransferRange > 0) @@ -165,22 +166,22 @@ public class TileEntityConveyorBelt extends TileEntityElectricityReceiver implem if (direction == 0) { entity.motionZ -= 1 * this.speed; - entity.posX = this.xCoord + 0.5D; + //entity.posX = this.xCoord + 0.5D; } if (direction == 1) { entity.motionX += 1 * this.speed; - entity.posZ = this.zCoord + 0.5D; + //entity.posZ = this.zCoord + 0.5D; } if (direction == 2) { entity.motionZ += 1 * this.speed; - entity.posX = this.xCoord + 0.5D; + //entity.posX = this.xCoord + 0.5D; } if (direction == 3) { entity.motionX -= 1 * this.speed; - entity.posZ = this.zCoord + 0.5D; + //entity.posZ = this.zCoord + 0.5D; } } }