diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 1a631601..1b2cb3fa 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -7,7 +7,7 @@ Changes - Left clicking XP obelisk takes one level from player (tterrag) - WAILA support on all IInternalPowerReceptor and IConduitBundle (tterrag) - WAILA support for photovoltaic panels (efficiency %) (tterrag) -- Allow killer joe's sword to charge from wireless chargers, this means that onUpdate() is called each tick (tterrag) +- Allow killer joe's sword to charge from wireless chargers (tterrag) - Localize tile.blockConduitBundle.name to Conduit Connector (tterrag) - Fix WAILA tooltip for dim.trans., was showing channel types even with no channels assigned to them (tterrag) - Dimensional Transceiver send/receive item buffers will only accept one stack per item type @@ -29,9 +29,6 @@ Bugs - #1128 Server crashes with cauldron when teleporting - #1129 Server crash on placement of Painting Machine - - - ------------------------------------------------------ Version 2.1.2 diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index 9e9a5941..685e920b 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -31,6 +31,7 @@ import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.generator.zombie.NutrientTank; +import crazypants.enderio.machine.wireless.WirelessChargerController; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.xp.ExperienceContainer; import crazypants.enderio.xp.IHaveExperience; @@ -429,10 +430,6 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle } else { fuelTank.setFluid(null); } - - // experienceLevel = nbtRoot.getInteger("experienceLevel"); - // experienceTotal = nbtRoot.getInteger("experienceTotal"); - // experience = nbtRoot.getFloat("experience"); xpCon.readFromNBT(nbtRoot); } @@ -444,12 +441,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle fuelTank.writeToNBT(tankRoot); nbtRoot.setTag("fuelTank", tankRoot); } - - // nbtRoot.setInteger("experienceLevel", experienceLevel); - // nbtRoot.setInteger("experienceTotal", experienceTotal); - // nbtRoot.setFloat("experience", experience); xpCon.writeToNBT(nbtRoot); - } private class Attackera extends FakePlayer { @@ -478,7 +470,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle } prevWeapon = cur == null ? null : cur.copy(); } - FMLCommonHandler.instance().bus().post(new PlayerTickEvent(Phase.END, this)); + WirelessChargerController.instance.chargePlayersItems(this); } } } diff --git a/src/main/java/crazypants/enderio/machine/wireless/PacketStoredEnergy.java b/src/main/java/crazypants/enderio/machine/wireless/PacketStoredEnergy.java index ed528d24..1b81d05b 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/PacketStoredEnergy.java +++ b/src/main/java/crazypants/enderio/machine/wireless/PacketStoredEnergy.java @@ -55,7 +55,6 @@ public class PacketStoredEnergy implements IMessage, IMessageHandler 0 && message.storedEnergy <= 0); me.storedEnergyRF = message.storedEnergy; if(doRender) { - System.out.println("PacketStoredEnergy.onMessage: "); player.worldObj.markBlockRangeForRenderUpdate(message.x, message.y, message.z, message.x, message.y, message.z); } diff --git a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java index 247dc59d..a740e631 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java +++ b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java @@ -59,14 +59,18 @@ public class WirelessChargerController { if(event.side == Side.CLIENT || event.phase != TickEvent.Phase.END) { return; } - Map chargers = getChargersForWorld(event.player.worldObj); + chargePlayersItems(event.player); + } + + public void chargePlayersItems(EntityPlayer player) { + Map chargers = getChargersForWorld(player.worldObj); if(chargers.isEmpty()) { return; } - BlockCoord bc = new BlockCoord((int) event.player.posX, (int) event.player.posY, (int) event.player.posZ); + BlockCoord bc = new BlockCoord((int) player.posX, (int) player.posY, (int) player.posZ); for (IWirelessCharger capBank : chargers.values()) { if(capBank.getLocation().distanceSquared(bc) <= RANGE_SQ) { - boolean done = chargeFromCapBank(event.player, capBank); + boolean done = chargeFromCapBank(player, capBank); if(done) { return; }