Remove capturing lambdas from acting as a fake player

Author: pupnewfster

src/main/java/mekanism/common/base/MekFakePlayer.java

@@ -54,6 +54,30 @@ public UUID getUUID() {
         return this.emulatingUUID == null ? super.getUUID() : this.emulatingUUID;
     }
 
+    public void cleanupFakePlayer(ServerLevel world) {
+        emulatingUUID = null;
+        //don't keep reference to the World, note we set it to the overworld to avoid any potential null pointers
+        setServerLevel(world.getServer().overworld());
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static MekFakePlayer setupFakePlayer(ServerLevel world) {
+        MekFakePlayer actual = INSTANCE == null ? null : INSTANCE.get();
+        if (actual == null) {
+            actual = new MekFakePlayer(world);
+            INSTANCE = new WeakReference<>(actual);
+        }
+        MekFakePlayer player = actual;
+        player.setServerLevel(world);
+        return player;
+    }
+
+    public static MekFakePlayer setupFakePlayer(ServerLevel world, double x, double y, double z) {
+        MekFakePlayer player = setupFakePlayer(world);
+        player.setPosRaw(x, y, z);
+        return player;
+    }
+
     /**
      * Acquire a Fake Player and call a function which makes use of the player. Afterwards, the Fake Player's world is nulled out to prevent GC issues. Emulated UUID is
      * also reset.
@@ -68,17 +92,9 @@ public UUID getUUID() {
      */
     @SuppressWarnings("WeakerAccess")
     public static <R> R withFakePlayer(ServerLevel world, Function<MekFakePlayer, R> fakePlayerConsumer) {
-        MekFakePlayer actual = INSTANCE == null ? null : INSTANCE.get();
-        if (actual == null) {
-            actual = new MekFakePlayer(world);
-            INSTANCE = new WeakReference<>(actual);
-        }
-        MekFakePlayer player = actual;
-        player.setServerLevel(world);
+        MekFakePlayer player = setupFakePlayer(world);
         R result = fakePlayerConsumer.apply(player);
-        player.emulatingUUID = null;
-        //don't keep reference to the World, note we set it to the overworld to avoid any potential null pointers
-        player.setServerLevel(world.getServer().overworld());
+        player.cleanupFakePlayer(world);
         return result;
     }
 

src/main/java/mekanism/common/tile/laser/TileEntityBasicLaser.java

@@ -294,23 +294,7 @@ protected boolean onUpdateServer() {
                         diggingProgress = diggingProgress.plusEqual(remainingEnergy);
                         if (diggingProgress.compareTo(MekanismConfig.general.laserEnergyNeededPerHardness.get().multiply(hardness)) >= 0) {
                             if (MekanismConfig.general.aestheticWorldDamage.get()) {
-                                MekFakePlayer.withFakePlayer((ServerLevel) level, to.x(), to.y(), to.z(), dummy -> {
-                                    dummy.setEmulatingUUID(getOwnerUUID());//pretend to be the owner
-                                    BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(level, hitPos, hitState, dummy);
-                                    if (!NeoForge.EVENT_BUS.post(event).isCanceled()) {
-                                        if (hitState.getBlock() instanceof TntBlock && hitState.isFlammable(level, hitPos, result.getDirection())) {
-                                            //Convert TNT that can be lit on fire into a tnt entity
-                                            //Note: We don't mark the fake player as the igniter as then when the tnt explodes if it hits a player
-                                            // there will be a crash as our fake player's level will be null
-                                            hitState.onCaughtFire(level, hitPos, result.getDirection(), null);
-                                            level.removeBlock(hitPos, false);
-                                        } else {
-                                            //Use the disassembler as the item to break the block with as that is marked as being the correct tool for drops
-                                            handleBreakBlock(hitState, hitPos, dummy, ItemAtomicDisassembler.fullyChargedStack());
-                                        }
-                                    }
-                                    return null;
-                                });
+                                withFakePlayer((ServerLevel) level, to.x(), to.y(), to.z(), hitPos, hitState, result.getDirection());
                             }
                             diggingProgress = FloatingLong.ZERO;
                         } else {
@@ -334,6 +318,25 @@ protected boolean onUpdateServer() {
         return sendUpdatePacket;
     }
 
+    private void withFakePlayer(ServerLevel level, double x, double y, double z, BlockPos hitPos, BlockState hitState, Direction hitSide) {
+        MekFakePlayer dummy = MekFakePlayer.setupFakePlayer(level, x, y, z);
+        dummy.setEmulatingUUID(getOwnerUUID());//pretend to be the owner
+        BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(level, hitPos, hitState, dummy);
+        if (!NeoForge.EVENT_BUS.post(event).isCanceled()) {
+            if (hitState.getBlock() instanceof TntBlock && hitState.isFlammable(level, hitPos, hitSide)) {
+                //Convert TNT that can be lit on fire into a tnt entity
+                //Note: We don't mark the fake player as the igniter as then when the tnt explodes if it hits a player
+                // there will be a crash as our fake player's level will be null
+                hitState.onCaughtFire(level, hitPos, hitSide, null);
+                level.removeBlock(hitPos, false);
+            } else {
+                //Use the disassembler as the item to break the block with as that is marked as being the correct tool for drops
+                handleBreakBlock(hitState, hitPos, dummy, ItemAtomicDisassembler.fullyChargedStack());
+            }
+        }
+        dummy.cleanupFakePlayer(level);
+    }
+
     /**
      * Based off of Player#hurtCurrentlyUsedShield
      */

src/main/java/mekanism/common/tile/machine/TileEntityDigitalMiner.java

@@ -563,7 +563,7 @@ private boolean setReplace(BlockState state, BlockPos pos, @Nullable MinerFilter
             missingStack = new ItemStack(replaceTarget);
             return false;
         }
-        BlockState newState = withFakePlayer(fakePlayer -> StackUtils.getStateForPlacement(stack, pos, fakePlayer));
+        BlockState newState = getStateForPlacement(stack, pos);
         if (newState == null || !newState.canSurvive(level, pos)) {
             //If the spot is not a valid position for the block, then we return that we were unsuccessful
             return false;
@@ -576,14 +576,19 @@ private boolean setReplace(BlockState state, BlockPos pos, @Nullable MinerFilter
     }
 
     private boolean canMine(BlockState state, BlockPos pos) {
-        return withFakePlayer(dummy -> !NeoForge.EVENT_BUS.post(new BlockEvent.BreakEvent(level, pos, state, dummy)).isCanceled());
+        MekFakePlayer dummy = MekFakePlayer.setupFakePlayer((ServerLevel) level, this.worldPosition.getX(), this.worldPosition.getY(), this.worldPosition.getZ())
+        dummy.setEmulatingUUID(getOwnerUUID());//pretend to be the owner
+        boolean canMine = !NeoForge.EVENT_BUS.post(new BlockEvent.BreakEvent(level, pos, state, dummy)).isCanceled();
+        dummy.cleanupFakePlayer((ServerLevel) level);
+        return canMine;
     }
 
-    private <R> R withFakePlayer(Function<MekFakePlayer, R> fakePlayerConsumer) {
-        return MekFakePlayer.withFakePlayer((ServerLevel) level, this.worldPosition.getX(), this.worldPosition.getY(), this.worldPosition.getZ(), dummy -> {
-            dummy.setEmulatingUUID(getOwnerUUID());//pretend to be the owner
-            return fakePlayerConsumer.apply(dummy);
-        });
+    private BlockState getStateForPlacement(ItemStack stack, BlockPos pos) {
+        MekFakePlayer dummy = MekFakePlayer.setupFakePlayer((ServerLevel) level, this.worldPosition.getX(), this.worldPosition.getY(), this.worldPosition.getZ())
+        dummy.setEmulatingUUID(getOwnerUUID());//pretend to be the owner
+        BlockState result = StackUtils.getStateForPlacement(stack, pos, dummy);
+        dummy.cleanupFakePlayer((ServerLevel) level);
+        return result;
     }
 
     private ItemStack getReplace(Item replaceTarget, Predicate<Item> replaceStackMatches) {
@@ -1283,7 +1288,11 @@ private List<ItemStack> getDrops(BlockState state, BlockPos pos) {
             stack.enchant(Enchantments.SILK_TOUCH, 1);
         }
         ServerLevel level = (ServerLevel) getWorldNN();
-        return withFakePlayer(fakePlayer -> Block.getDrops(state, level, pos, WorldUtils.getTileEntity(level, pos), fakePlayer, stack));
+        MekFakePlayer dummy = MekFakePlayer.setupFakePlayer(level, this.worldPosition.getX(), this.worldPosition.getY(), this.worldPosition.getZ())
+        dummy.setEmulatingUUID(getOwnerUUID());//pretend to be the owner
+        List<ItemStack> drops = Block.getDrops(state, level, pos, WorldUtils.getTileEntity(level, pos), dummy, stack);
+        dummy.cleanupFakePlayer(level);
+        return drops;
     }
 
     //Methods relating to IComputerTile