diff --git a/austri3Fix.md b/austri3Fix.md index a5028b2..5d6e59b 100644 --- a/austri3Fix.md +++ b/austri3Fix.md @@ -6,6 +6,5 @@ - can push explosive entities - flying blocks dont properly render - black hole doesn't suck in blocks -- remote detonator doesnt work - see `// TODO: WTF` diff --git a/src/main/java/icbm/zhapin/ItemUsePacketHandler.java b/src/main/java/icbm/zhapin/ItemUsePacketHandler.java index b678de8..af9846c 100644 --- a/src/main/java/icbm/zhapin/ItemUsePacketHandler.java +++ b/src/main/java/icbm/zhapin/ItemUsePacketHandler.java @@ -5,9 +5,12 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import icbm.zhapin.dianqi.ItLaserDesignator; import icbm.zhapin.dianqi.ItRadarGun; +import icbm.zhapin.zhapin.BExplosives; +import icbm.zhapin.zhapin.TExplosive; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; import universalelectricity.core.electricity.ElectricityPack; import universalelectricity.core.vector.Vector3; @@ -65,12 +68,23 @@ public class ItemUsePacketHandler implements IMessageHandler 1500.0) { - // TODO: WTF - //PacketDispatcher.sendPacketToServer( - // PacketManager.getPacket("ICBM|E", tileEntity, - // 2)); + ICBMExplosion.channel.sendToServer(new ItemUsePacket( + ItemUsePacket.Type.REMOTE, new Vector3(tileEntity) + )); return itemStack; } @@ -143,12 +142,9 @@ public class ItRemoteDetonator extends ItElectricICBM { = this.getSavedCoord(itemStack).getTileEntity((IBlockAccess) world); if (this.nengZha(tileEntity2)) { - // TODO: WTF - //PacketDispatcher.sendPacketToServer( - // PacketManager.getPacket("ICBM|E", tileEntity2, 2)); - ICBMExplosion.channel.sendToServer( - new ItemUsePacket(ItemUsePacket.Type.REMOTE, new Vector3()) - ); + ICBMExplosion.channel.sendToServer(new ItemUsePacket( + ItemUsePacket.Type.REMOTE, new Vector3(tileEntity2) + )); } } else { entityPlayer.addChatMessage( diff --git a/src/main/java/icbm/zhapin/gui/GRadarTower.java b/src/main/java/icbm/zhapin/gui/GRadarTower.java index cca3f73..6c992a2 100644 --- a/src/main/java/icbm/zhapin/gui/GRadarTower.java +++ b/src/main/java/icbm/zhapin/gui/GRadarTower.java @@ -174,7 +174,6 @@ public class GRadarTower extends GuiBase { int range = 4; for (final Entity entity : this.tileEntity.entitiesInRange) { - System.out.println("AAAAAAAAAALEC: " + entity.getCommandSenderName()); final Vector2 position = new Vector2( this.radarCenter.x + (entity.posX - this.tileEntity.xCoord) / this.radarMapRadius, diff --git a/src/main/java/icbm/zhapin/zhapin/ex/ExEmpSignal.java b/src/main/java/icbm/zhapin/zhapin/ex/ExEmpSignal.java index 3023a13..aa62ba0 100644 --- a/src/main/java/icbm/zhapin/zhapin/ex/ExEmpSignal.java +++ b/src/main/java/icbm/zhapin/zhapin/ex/ExEmpSignal.java @@ -32,11 +32,9 @@ public class ExEmpSignal extends ZhaPin { final List entitiesNearby = RadarRegistry.getEntitiesWithinRadius(position.toVector2(), radius); - System.out.println("AAAAAAALEC: " + entitiesNearby.size()); for (final Entity entity : entitiesNearby) { if (entity instanceof IMissile && !entity.isEntityEqual(explosionSource) && ((IMissile) entity).getTicksInAir() > -1) { - System.out.println("AAAAAAALEC: dropMissileAsItem"); ((IMissile) entity).dropMissileAsItem(); } }