Delete brute forcing of items to generate Thaumcraft aspects (#214)

Co-authored-by: Alexdoru <[email protected]>

dependencies.gradle

@@ -1,24 +1,24 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:EnderCore:0.5.0:dev') {transitive = false}
+    api('com.github.GTNewHorizons:EnderCore:0.4.8:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.17:dev')
-    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.8.19-GTNH:dev')
-    api("com.github.GTNewHorizons:GTNHLib:0.7.0:dev")
+    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.91-GTNH:dev')
+    api("com.github.GTNewHorizons:GTNHLib:0.6.40:dev")
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:dev')
     api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
     shadowImplementation('cglib:cglib-nodep:3.3.0')
-    api("com.github.GTNewHorizons:TinkersConstruct:1.14.6-GTNH:dev")
+    api("com.github.GTNewHorizons:TinkersConstruct:1.13.54-GTNH:dev")
 
-    compileOnly('com.github.GTNewHorizons:waila:1.9.2:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-717-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.1-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.60:dev') {transitive = false}
-    compileOnly("com.github.GTNewHorizons:ModularUI2:2.3.4-1.7.10:dev") {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.17.0:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.2.0-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Chisel:2.17.0-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.2-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.8.14:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-691-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.1.16-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.474:dev') {transitive = false}
+    compileOnly("com.github.GTNewHorizons:ModularUI2:2.2.10-1.7.10:dev") {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.16.33:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.9-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Chisel:2.16.14-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.20-GTNH:api') {transitive = false}
     compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
     compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023

src/main/java/crazypants/enderio/CommonProxy.java

@@ -1,5 +1,7 @@
 package crazypants.enderio;
 
+import java.text.DecimalFormat;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
@@ -7,27 +9,20 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
-import cpw.mods.fml.common.event.FMLServerStartedEvent;
-import cpw.mods.fml.common.event.FMLServerStoppedEvent;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.Phase;
 import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
-import crazypants.enderio.conduit.ConduitNetworkTickHandler;
 import crazypants.enderio.conduit.IConduit;
 import crazypants.enderio.conduit.render.ConduitRenderer;
-import crazypants.enderio.machine.hypercube.HyperCubeRegister;
-import crazypants.enderio.machine.transceiver.ServerChannelRegister;
-import crazypants.enderio.machine.wireless.WirelessChargerController;
 
 public class CommonProxy {
 
+    private static final DecimalFormat FORMAT = new DecimalFormat("########0.000");
+
     protected long serverTickCount = 0;
     protected long clientTickCount = 0;
     protected final TickTimer tickTimer = new TickTimer();
-    public ConduitNetworkTickHandler conduitNetworkTickHandler = null;
-    public WirelessChargerController wirelessChargerController = null;
 
     public CommonProxy() {}
 
@@ -49,7 +44,7 @@ public class CommonProxy {
     }
 
     public void loadIcons() {
-
+        ;
     }
 
     public void load() {
@@ -81,26 +76,6 @@ public class CommonProxy {
         return new ResourceLocation(EnderIO.DOMAIN + TEXTURE_PATH + name + TEXTURE_EXT);
     }
 
-    public void onServerAboutToStart(FMLServerAboutToStartEvent event) {
-        conduitNetworkTickHandler = new ConduitNetworkTickHandler();
-        FMLCommonHandler.instance().bus().register(conduitNetworkTickHandler);
-        wirelessChargerController = new WirelessChargerController();
-        FMLCommonHandler.instance().bus().register(wirelessChargerController);
-    }
-
-    public void onServerStarted(FMLServerStartedEvent event) {
-        HyperCubeRegister.load();
-        ServerChannelRegister.load();
-    }
-
-    public void onServerStopped(FMLServerStoppedEvent event) {
-        HyperCubeRegister.unload();
-        FMLCommonHandler.instance().bus().unregister(conduitNetworkTickHandler);
-        conduitNetworkTickHandler = null;
-        FMLCommonHandler.instance().bus().unregister(wirelessChargerController);
-        wirelessChargerController = null;
-    }
-
     public final class TickTimer {
 
         @SubscribeEvent

src/main/java/crazypants/enderio/EnderIO.java

@@ -38,7 +38,6 @@ import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
 import cpw.mods.fml.common.event.FMLServerStartedEvent;
 import cpw.mods.fml.common.event.FMLServerStoppedEvent;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -112,6 +111,7 @@ import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockEnd
 import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockFrankenZombieGenerator;
 import crazypants.enderio.machine.generator.zombie.PacketNutrientTank;
 import crazypants.enderio.machine.hypercube.BlockHyperCube;
+import crazypants.enderio.machine.hypercube.HyperCubeRegister;
 import crazypants.enderio.machine.invpanel.BlockInventoryPanel;
 import crazypants.enderio.machine.killera.BlockKillerJoe;
 import crazypants.enderio.machine.light.BlockElectricLight;
@@ -894,18 +894,22 @@ public class EnderIO {
     }
 
     @EventHandler
-    public void onServerAboutToStart(FMLServerAboutToStartEvent event) {
-        proxy.onServerAboutToStart(event);
+    public void serverStarted(FMLServerStartedEvent event) {
+        HyperCubeRegister.load();
+        ServerChannelRegister.load();
+    }
+
+    @SubscribeEvent
+    public void worldSaved(WorldEvent.Save event) {
+        // Only save together with the overworld, because this gets called for every dimension separately
+        if (event.world.provider != null && event.world.provider.dimensionId == 0) {
+            ServerChannelRegister.store();
+        }
     }
 
     @EventHandler
-    public void onServerStarted(FMLServerStartedEvent event) {
-        proxy.onServerStarted(event);
-    }
-
-    @EventHandler
-    public void onServerStopped(FMLServerStoppedEvent event) {
-        proxy.onServerStopped(event);
+    public void serverStopped(FMLServerStoppedEvent event) {
+        HyperCubeRegister.unload();
     }
 
     @EventHandler
@@ -917,12 +921,4 @@ public class EnderIO {
             }
         }
     }
-
-    @SubscribeEvent
-    public void worldSaved(WorldEvent.Save event) {
-        // Only save together with the overworld, because this gets called for every dimension separately
-        if (event.world.provider != null && event.world.provider.dimensionId == 0) {
-            ServerChannelRegister.store();
-        }
-    }
 }

src/main/java/crazypants/enderio/conduit/AbstractConduitNetwork.java

@@ -7,8 +7,6 @@ import java.util.List;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
-import crazypants.enderio.EnderIO;
-
 // I=base type, I is the base class of the implementations accepted by the network
 public abstract class AbstractConduitNetwork<T extends IConduit, I extends T> {
 
@@ -66,7 +64,7 @@ public abstract class AbstractConduitNetwork<T extends IConduit, I extends T> {
     public void addConduit(I con) {
         if (!conduits.contains(con)) {
             if (conduits.isEmpty()) {
-                EnderIO.proxy.conduitNetworkTickHandler.registerNetwork(this);
+                ConduitNetworkTickHandler.instance.registerNetwork(this);
             }
             conduits.add(con);
         }
@@ -77,7 +75,7 @@ public abstract class AbstractConduitNetwork<T extends IConduit, I extends T> {
             con.setNetwork(null);
         }
         conduits.clear();
-        EnderIO.proxy.conduitNetworkTickHandler.unregisterNetwork(this);
+        ConduitNetworkTickHandler.instance.unregisterNetwork(this);
     }
 
     public List<I> getConduits() {

src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java

@@ -32,6 +32,7 @@ import com.enderio.core.client.render.BoundingBox;
 import com.enderio.core.common.util.BlockCoord;
 import com.enderio.core.common.util.Util;
 
+import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.Optional.Interface;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -92,6 +93,9 @@ public class BlockConduitBundle extends BlockEio
 
     public static BlockConduitBundle create() {
 
+        MinecraftForge.EVENT_BUS.register(ConduitNetworkTickHandler.instance);
+        FMLCommonHandler.instance().bus().register(ConduitNetworkTickHandler.instance);
+
         PacketHandler.INSTANCE
                 .registerMessage(PacketFluidLevel.class, PacketFluidLevel.class, PacketHandler.nextID(), Side.CLIENT);
         PacketHandler.INSTANCE

src/main/java/crazypants/enderio/conduit/ConduitNetworkTickHandler.java

@@ -10,15 +10,18 @@ import cpw.mods.fml.common.gameevent.TickEvent.Phase;
 
 public class ConduitNetworkTickHandler {
 
-    public interface TickListener {
+    public static final ConduitNetworkTickHandler instance = new ConduitNetworkTickHandler();
 
-        void tickStart(TickEvent.ServerTickEvent evt);
+    public static interface TickListener {
 
-        void tickEnd(TickEvent.ServerTickEvent evt);
+        public void tickStart(TickEvent.ServerTickEvent evt);
+
+        public void tickEnd(TickEvent.ServerTickEvent evt);
     }
 
-    private final List<TickListener> listeners = new ArrayList<>();
-    private final IdentityHashMap<AbstractConduitNetwork<?, ?>, Boolean> networks = new IdentityHashMap<>();
+    private final List<TickListener> listeners = new ArrayList<TickListener>();
+
+    private final IdentityHashMap<AbstractConduitNetwork<?, ?>, Boolean> networks = new IdentityHashMap<AbstractConduitNetwork<?, ?>, Boolean>();
 
     public void addListener(TickListener listener) {
         listeners.add(listener);

src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java

@@ -10,6 +10,7 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityChest;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -40,8 +41,8 @@ public class NetworkedInventory {
 
     int tickDeficit;
 
-    private TileEntity connectedTileEntity;
-
+    // work around for a vanilla chest changing into a double chest without doing unneeded checks all the time
+    boolean recheckInv = false;
     // Hack for TiC crafting station not working correctly when setting output slot to null
     boolean ticHack = false;
 
@@ -60,13 +61,19 @@ public class NetworkedInventory {
         this.location = location;
         world = con.getBundle().getWorld();
 
+        TileEntity te = world.getTileEntity(location.x, location.y, location.z);
+        if (te.getClass().getName().equals("tconstruct.tools.logic.CraftingStationLogic")) {
+            ticHack = true;
+        } else if (te.getClass().getName().contains("cpw.mods.ironchest")) {
+            recheckInv = true;
+        } else if (te instanceof TileEntityChest) {
+            recheckInv = true;
+        } else if (te instanceof TileInventoryPanel) {
+            inventoryPanel = true;
+        }
         updateInventory();
     }
 
-    public boolean isInvalid() {
-        return connectedTileEntity == null || connectedTileEntity.isInvalid();
-    }
-
     public boolean hasTarget(IItemConduit conduit, ForgeDirection dir) {
         for (Target t : sendPriority) {
             if (t.inv.con == conduit && t.inv.conDir == dir) {
@@ -103,13 +110,6 @@ public class NetworkedInventory {
     }
 
     public void onTick() {
-        if (isInvalid()) {
-            updateInventory();
-            if (isInvalid()) {
-                return;
-            }
-        }
-
         if (tickDeficit > 0 || !canExtract() || !con.isExtractionRedstoneConditionMet(conDir)) {
             // do nothing
         } else {
@@ -144,6 +144,11 @@ public class NetworkedInventory {
     }
 
     private boolean transferItems() {
+
+        if (recheckInv) {
+            updateInventory();
+        }
+
         int[] slotIndices = getInventory().getAccessibleSlotsFromSide(inventorySide);
         if (slotIndices == null) {
             return false;
@@ -252,6 +257,9 @@ public class NetworkedInventory {
                 matchedStickyInput = of != null && of.isValid() && of.doesItemPassFilter(this, toExtract);
             }
             if (target.stickyInput || !matchedStickyInput) {
+                if (target.inv.recheckInv) {
+                    target.inv.updateInventory();
+                }
                 int inserted = target.inv.insertItem(toExtract);
                 if (inserted > 0) {
                     toExtract.stackSize -= inserted;
@@ -273,38 +281,15 @@ public class NetworkedInventory {
     }
 
     public final void updateInventory() {
-        TileEntity newTe = world.getTileEntity(location.x, location.y, location.z);
-        if (newTe != connectedTileEntity) {
-            connectedTileEntity = newTe;
-            ticHack = false;
-            inventoryPanel = false;
-            if (connectedTileEntity != null) {
-                if (connectedTileEntity.getClass().getName().equals("tconstruct.tools.logic.CraftingStationLogic")) {
-                    ticHack = true;
-                } else if (connectedTileEntity instanceof TileInventoryPanel) {
-                    inventoryPanel = true;
-                }
-            }
-            network.routesChanged();
-        }
-
-        if (connectedTileEntity instanceof ISidedInventory) {
-            inv = (ISidedInventory) connectedTileEntity;
-        } else if (connectedTileEntity instanceof IInventory) {
-            inv = new InventoryWrapper((IInventory) connectedTileEntity);
-        } else {
-            inv = null;
+        TileEntity te = world.getTileEntity(location.x, location.y, location.z);
+        if (te instanceof ISidedInventory) {
+            inv = (ISidedInventory) te;
+        } else if (te instanceof IInventory) {
+            inv = new InventoryWrapper((IInventory) te);
         }
     }
 
     private int insertItem(ItemStack item) {
-        if (isInvalid()) {
-            updateInventory();
-            if (isInvalid()) {
-                return 0;
-            }
-        }
-
         if (!canInsert() || item == null) {
             return 0;
         }
@@ -425,7 +410,7 @@ public class NetworkedInventory {
     }
 
     public ISidedInventory getInventoryRecheck() {
-        if (isInvalid()) {
+        if (recheckInv) {
             updateInventory();
         }
         return inv;

src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java

@@ -16,7 +16,7 @@ import com.enderio.core.common.util.RoundRobinIterator;
 
 import cofh.api.energy.IEnergyContainerItem;
 import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
-import crazypants.enderio.EnderIO;
+import crazypants.enderio.conduit.ConduitNetworkTickHandler;
 import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener;
 import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.power.IPowerConduit;
@@ -212,7 +212,7 @@ public class CapBankNetwork implements ICapBankNetwork {
         long curTime = world.getTotalWorldTime();
         if (curTime != timeAtLastApply) {
             timeAtLastApply = curTime;
-            EnderIO.proxy.conduitNetworkTickHandler.addListener(tickListener);
+            ConduitNetworkTickHandler.instance.addListener(tickListener);
         }
     }
 

src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java

@@ -6,7 +6,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import cofh.api.energy.IEnergyContainerItem;
-import crazypants.enderio.EnderIO;
 import crazypants.enderio.TileEntityEio;
 import crazypants.enderio.network.PacketHandler;
 import crazypants.enderio.power.IInternalPowerReceiver;
@@ -29,7 +28,7 @@ public class TileWirelessCharger extends TileEntityEio implements IInternalPower
     @Override
     public void invalidate() {
         super.invalidate();
-        EnderIO.proxy.wirelessChargerController.deregisterCharger(this);
+        WirelessChargerController.instance.deregisterCharger(this);
         registered = false;
     }
 
@@ -41,7 +40,7 @@ public class TileWirelessCharger extends TileEntityEio implements IInternalPower
         }
 
         if (!registered) {
-            EnderIO.proxy.wirelessChargerController.registerCharger(this);
+            WirelessChargerController.instance.registerCharger(this);
             registered = true;
         }
 

src/main/java/crazypants/enderio/machine/wireless/WirelessChargedLocation.java

@@ -1,6 +1,8 @@
 package crazypants.enderio.machine.wireless;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import net.minecraft.item.ItemStack;
@@ -8,8 +10,6 @@ import net.minecraft.tileentity.TileEntity;
 
 import com.enderio.core.common.util.BlockCoord;
 
-import crazypants.enderio.EnderIO;
-
 public class WirelessChargedLocation {
 
     private final TileEntity te;
@@ -18,30 +18,34 @@ public class WirelessChargedLocation {
 
     public WirelessChargedLocation(TileEntity te) {
         this.te = te;
-        this.chargers = new ArrayList<>();
+        this.chargers = new ArrayList<IWirelessCharger>();
         /*
          * Set lastChangeCount to one less than the current change count so that the charger list is updated on first
          * use (unless ~4B changes happen in between). Do this instead directly updating so that WirelessChargedLocation
          * can be used while the TileEntity is still in construction (or loading).
          */
-        this.lastChangeCount = EnderIO.proxy.wirelessChargerController.getChangeCount() - 1;
+        this.lastChangeCount = WirelessChargerController.instance.getChangeCount() - 1;
     }
 
     private void updateChargers() {
-        WirelessChargerController wcc = EnderIO.proxy.wirelessChargerController;
+        WirelessChargerController wcc = WirelessChargerController.instance;
         chargers.clear();
         lastChangeCount = wcc.getChangeCount();
         final BlockCoord bc = new BlockCoord(te);
         wcc.getChargers(te.getWorldObj(), bc, chargers);
-        chargers.sort((o1, o2) -> {
-            int dist1 = o1.getLocation().getDistSq(bc);
-            int dist2 = o2.getLocation().getDistSq(bc);
-            return dist1 - dist2;
+        Collections.sort(chargers, new Comparator<IWirelessCharger>() {
+
+            @Override
+            public int compare(IWirelessCharger o1, IWirelessCharger o2) {
+                int dist1 = o1.getLocation().getDistSq(bc);
+                int dist2 = o2.getLocation().getDistSq(bc);
+                return dist1 - dist2;
+            }
         });
     }
 
     private void checkChangeCount() {
-        if (lastChangeCount != EnderIO.proxy.wirelessChargerController.getChangeCount()) {
+        if (lastChangeCount != WirelessChargerController.instance.getChangeCount()) {
             updateChargers();
         }
     }

src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java

@@ -8,9 +8,11 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
 
 import com.enderio.core.common.util.BlockCoord;
 
+import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.relauncher.Side;
@@ -19,17 +21,20 @@ import crazypants.util.BaublesUtil;
 
 public class WirelessChargerController {
 
-    private static final int RANGE = Config.wirelessChargerRange;
-    private static final int RANGE_SQ = RANGE * RANGE;
+    public static WirelessChargerController instance = new WirelessChargerController();
+
+    public static final int RANGE = Config.wirelessChargerRange;
+    public static final int RANGE_SQ = RANGE * RANGE;
+
+    static {
+        FMLCommonHandler.instance().bus().register(WirelessChargerController.instance);
+        MinecraftForge.EVENT_BUS.register(WirelessChargerController.instance);
+    }
+
     private final Map<Integer, Map<BlockCoord, IWirelessCharger>> perWorldChargers = new HashMap<Integer, Map<BlockCoord, IWirelessCharger>>();
     private int changeCount;
 
-    @SubscribeEvent
-    public void onPlayerTick(TickEvent.PlayerTickEvent event) {
-        if (event.side != Side.CLIENT && event.phase == TickEvent.Phase.END) {
-            chargePlayersItems(event.player);
-        }
-    }
+    private WirelessChargerController() {}
 
     public void registerCharger(IWirelessCharger charger) {
         if (charger == null) {
@@ -49,7 +54,28 @@ public class WirelessChargerController {
         changeCount++;
     }
 
-    private void chargePlayersItems(EntityPlayer player) {
+    @SubscribeEvent
+    public void onPlayerTick(TickEvent.PlayerTickEvent event) {
+        if (event.side == Side.CLIENT || event.phase != TickEvent.Phase.END) {
+            return;
+        }
+        chargePlayersItems(event.player);
+    }
+
+    public int getChangeCount() {
+        return changeCount;
+    }
+
+    public void getChargers(World world, BlockCoord bc, Collection<IWirelessCharger> res) {
+        Map<BlockCoord, IWirelessCharger> chargers = getChargersForWorld(world);
+        for (IWirelessCharger wc : chargers.values()) {
+            if (wc.getLocation().getDistSq(bc) <= RANGE_SQ) {
+                res.add(wc);
+            }
+        }
+    }
+
+    public void chargePlayersItems(EntityPlayer player) {
         Map<BlockCoord, IWirelessCharger> chargers = getChargersForWorld(player.worldObj);
         if (chargers.isEmpty()) {
             return;
@@ -82,21 +108,13 @@ public class WirelessChargerController {
         return res;
     }
 
-    public int getChangeCount() {
-        return changeCount;
-    }
-
-    public void getChargers(World world, BlockCoord bc, Collection<IWirelessCharger> res) {
-        Map<BlockCoord, IWirelessCharger> chargers = getChargersForWorld(world);
-        for (IWirelessCharger wc : chargers.values()) {
-            if (wc.getLocation().getDistSq(bc) <= RANGE_SQ) {
-                res.add(wc);
-            }
-        }
-    }
-
     private Map<BlockCoord, IWirelessCharger> getChargersForWorld(World world) {
-        return perWorldChargers.computeIfAbsent(world.provider.dimensionId, k -> new HashMap<>());
+        Map<BlockCoord, IWirelessCharger> res = perWorldChargers.get(world.provider.dimensionId);
+        if (res == null) {
+            res = new HashMap<BlockCoord, IWirelessCharger>();
+            perWorldChargers.put(world.provider.dimensionId, res);
+        }
+        return res;
     }
 
     public Collection<IWirelessCharger> getChargers(World world) {