Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed laser texture and jumping TileLaser.

Browse source
This commit is contained in:
Kyprus 2012-06-11 10:19:42 -04:00
parent d9a34f0ab1
commit 8eb78d0e29
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/net/minecraft/src/BuildCraftCore.java
View file

@ -130,9 +130,9 @@ public class BuildCraftCore {
MinecraftForge.registerConnectionHandler(new ConnectionHandler());
//MinecraftForge.registerEntity(EntityBlock.class, mod_BuildCraftCore.instance, EntityIds.BLOCK, 64, 10, true);
MinecraftForge.registerEntity(EntityRobot.class, mod_BuildCraftCore.instance, EntityIds.ROBOT, 64, 3, true);
MinecraftForge.registerEntity(EntityLaser.class, mod_BuildCraftCore.instance, EntityIds.LASER, 64, 3, false);
MinecraftForge.registerEntity(EntityEnergyLaser.class, mod_BuildCraftCore.instance, EntityIds.LASER, 64, 3, false);
MinecraftForge.registerEntity(EntityRobot.class, mod_BuildCraftCore.instance, EntityIds.ROBOT, 64, 1, true);
MinecraftForge.registerEntity(EntityLaser.class, mod_BuildCraftCore.instance, EntityIds.LASER, 64, 1, false);
MinecraftForge.registerEntity(EntityEnergyLaser.class, mod_BuildCraftCore.instance, EntityIds.LASER, 64, 1, false);
}
public static void initialize() {

2
common/net/minecraft/src/buildcraft/core/EntityEnergyLaser.java
View file

@ -50,7 +50,7 @@ public class EntityEnergyLaser extends EntityLaser {
public String getTexture () {
if (getPowerAverage () <= 1.0)
return "/net/minecraft/src/buildcraft/core/gui/laser_1.png";
return DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_1.png";
else if (getPowerAverage() <= 2.0)
return DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_2.png";
else if (getPowerAverage() <= 3.0)

7
common/net/minecraft/src/buildcraft/silicon/TileLaser.java
View file

@ -83,6 +83,10 @@ public class TileLaser extends TileEntity implements IPowerReceptor {
}
public void aim() {
if (APIProxy.isClient(worldObj))
return;
int meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord);
int minX = xCoord - 5;
@ -136,9 +140,6 @@ public class TileLaser extends TileEntity implements IPowerReceptor {
BlockIndex b = targets.get(worldObj.rand.nextInt(targets.size()));
assemblyTable = (TileAssemblyTable) worldObj.getBlockTileEntity(b.i, b.j, b.k);
if (APIProxy.isClient(worldObj))
return;
if (laser == null) {
laser = new EntityEnergyLaser(worldObj, new Position(xCoord, yCoord, zCoord), new Position(xCoord, yCoord, zCoord));