From f18cc1c8369e4d6456f4027100066e183c093cfd Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 25 May 2021 17:24:14 -0300 Subject: [PATCH] more thread safe carpet globs --- src/main/java/carpet/CarpetServer.java | 4 +--- src/main/java/carpet/CarpetSettings.java | 6 ++---- src/main/java/carpet/commands/DrawCommand.java | 16 ++++++++-------- src/main/java/carpet/commands/ScriptCommand.java | 8 ++++---- src/main/java/carpet/helpers/BlockRotator.java | 4 ++-- .../java/carpet/helpers/FeatureGenerator.java | 8 ++++---- .../BlockStateArgument_fillUpdatesMixin.java | 2 +- src/main/java/carpet/mixins/ChunkMixin.java | 2 +- .../mixins/ChunkRegion_scarpetPlopMixin.java | 4 ++-- .../java/carpet/mixins/CommandManagerMixin.java | 4 ++-- ...ayNetworkHandler_interactionUpdatesMixin.java | 12 ++++++------ ...ructureBlockBlockEntity_fillUpdatesMixin.java | 4 ++-- .../carpet/mixins/StructureFeatureMixin.java | 4 ++-- .../mixins/StructurePiece_scarpetPlopMixin.java | 2 +- .../mixins/Structure_fillUpdatesMixin.java | 4 ++-- .../mixins/WorldChunk_fillUpdatesMixin.java | 4 ++-- .../carpet/mixins/World_fillUpdatesMixin.java | 4 ++-- .../carpet/mixins/World_scarpetPlopMixin.java | 2 +- src/main/java/carpet/script/api/WorldAccess.java | 6 +++--- 19 files changed, 48 insertions(+), 52 deletions(-) diff --git a/src/main/java/carpet/CarpetServer.java b/src/main/java/carpet/CarpetServer.java index a847a9fa..a2887fa8 100644 --- a/src/main/java/carpet/CarpetServer.java +++ b/src/main/java/carpet/CarpetServer.java @@ -117,9 +117,7 @@ public class CarpetServer implements ClientModInitializer,DedicatedServerModInit scriptServer.tick(); //in case something happens - CarpetSettings.impendingFillSkipUpdates = false; - CarpetSettings.currentTelepotingEntityBox = null; - CarpetSettings.fixedPosition = null; + CarpetSettings.impendingFillSkipUpdates.set(false); extensions.forEach(e -> e.onTick(server)); } diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index eb7723e8..dfbe04c5 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -45,10 +45,8 @@ public class CarpetSettings { public static final String carpetVersion = "1.4.37+v210519"; public static final Logger LOG = LogManager.getLogger("carpet"); - public static boolean skipGenerationChecks = false; - public static boolean impendingFillSkipUpdates = false; - public static Box currentTelepotingEntityBox = null; - public static Vec3d fixedPosition = null; + public static ThreadLocal skipGenerationChecks = ThreadLocal.withInitial(() -> false); + public static ThreadLocal impendingFillSkipUpdates = ThreadLocal.withInitial(() -> false); public static int runPermissionLevel = 2; public static boolean doChainStone = false; public static boolean chainStoneStickToAll = false; diff --git a/src/main/java/carpet/commands/DrawCommand.java b/src/main/java/carpet/commands/DrawCommand.java index 0644d88d..db4ac981 100644 --- a/src/main/java/carpet/commands/DrawCommand.java +++ b/src/main/java/carpet/commands/DrawCommand.java @@ -224,7 +224,7 @@ public class DrawCommand continue; } - CarpetSettings.impendingFillSkipUpdates = !CarpetSettings.fillUpdates; + CarpetSettings.impendingFillSkipUpdates.set(!CarpetSettings.fillUpdates); for (int xmod = -1; xmod < 2; xmod += 2) { for (int ymod = -1; ymod < 2; ymod += 2) @@ -238,7 +238,7 @@ public class DrawCommand } } } - CarpetSettings.impendingFillSkipUpdates = false; + CarpetSettings.impendingFillSkipUpdates.set(false); } } } @@ -274,7 +274,7 @@ public class DrawCommand ServerWorld world = source.getWorld(); - CarpetSettings.impendingFillSkipUpdates = !CarpetSettings.fillUpdates; + CarpetSettings.impendingFillSkipUpdates.set(!CarpetSettings.fillUpdates); for (int r = 0; r < radius; ++r) { @@ -290,7 +290,7 @@ public class DrawCommand } } - CarpetSettings.impendingFillSkipUpdates = false; + CarpetSettings.impendingFillSkipUpdates.set(false); if (CarpetSettings.fillUpdates) { @@ -377,7 +377,7 @@ public class DrawCommand ServerWorld world = source.getWorld(); - CarpetSettings.impendingFillSkipUpdates = !CarpetSettings.fillUpdates; + CarpetSettings.impendingFillSkipUpdates.set(!CarpetSettings.fillUpdates); boolean isSquare = base.equalsIgnoreCase("square"); @@ -387,7 +387,7 @@ public class DrawCommand affected+= fillFlat(world, pos, i, r, isSquare, orientation, block, replacement, list, mbpos); } - CarpetSettings.impendingFillSkipUpdates = false; + CarpetSettings.impendingFillSkipUpdates.set(false); if (CarpetSettings.fillUpdates) { @@ -429,7 +429,7 @@ public class DrawCommand ServerWorld world = source.getWorld(); - CarpetSettings.impendingFillSkipUpdates = !CarpetSettings.fillUpdates; + CarpetSettings.impendingFillSkipUpdates.set(!CarpetSettings.fillUpdates); boolean isSquare = base.equalsIgnoreCase("square"); @@ -438,7 +438,7 @@ public class DrawCommand affected+= fillFlat(world, pos, i, radius, isSquare, orientation, block, replacement, list, mbpos); } - CarpetSettings.impendingFillSkipUpdates = false; + CarpetSettings.impendingFillSkipUpdates.set(false); if (CarpetSettings.fillUpdates) { diff --git a/src/main/java/carpet/commands/ScriptCommand.java b/src/main/java/carpet/commands/ScriptCommand.java index 43416970..9b0a8a44 100644 --- a/src/main/java/carpet/commands/ScriptCommand.java +++ b/src/main/java/carpet/commands/ScriptCommand.java @@ -508,7 +508,7 @@ public class ScriptCommand return 1; } int successCount = 0; - CarpetSettings.impendingFillSkipUpdates = !CarpetSettings.fillUpdates; + CarpetSettings.impendingFillSkipUpdates.set(!CarpetSettings.fillUpdates); try { for (int x = area.minX; x <= area.maxX; x++) @@ -535,7 +535,7 @@ public class ScriptCommand } finally { - CarpetSettings.impendingFillSkipUpdates = false; + CarpetSettings.impendingFillSkipUpdates.set(false); } Messenger.m(source, "w Expression successful in " + successCount + " out of " + int_1 + " blocks"); return successCount; @@ -618,7 +618,7 @@ public class ScriptCommand } int affected = 0; - CarpetSettings.impendingFillSkipUpdates = !CarpetSettings.fillUpdates; + CarpetSettings.impendingFillSkipUpdates.set(!CarpetSettings.fillUpdates); for (int x = 0; x <= maxx; x++) { for (int y = 0; y <= maxy; y++) @@ -643,7 +643,7 @@ public class ScriptCommand } } } - CarpetSettings.impendingFillSkipUpdates = false; + CarpetSettings.impendingFillSkipUpdates.set(false); if (CarpetSettings.fillUpdates && block != null) { diff --git a/src/main/java/carpet/helpers/BlockRotator.java b/src/main/java/carpet/helpers/BlockRotator.java index da8b09bd..543afb33 100644 --- a/src/main/java/carpet/helpers/BlockRotator.java +++ b/src/main/java/carpet/helpers/BlockRotator.java @@ -53,9 +53,9 @@ public class BlockRotator { return false; } - CarpetSettings.impendingFillSkipUpdates = true; + CarpetSettings.impendingFillSkipUpdates.set(true); boolean retval = flip_block(state, world, player, hand, hit); - CarpetSettings.impendingFillSkipUpdates = false; + CarpetSettings.impendingFillSkipUpdates.set(false); return retval; } diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java index 2a9ac747..c82077a6 100644 --- a/src/main/java/carpet/helpers/FeatureGenerator.java +++ b/src/main/java/carpet/helpers/FeatureGenerator.java @@ -61,14 +61,14 @@ public class FeatureGenerator ConfiguredFeature feature = world.getRegistryManager().get(Registry.CONFIGURED_FEATURE_WORLDGEN).get(id); if (feature != null) { - CarpetSettings.skipGenerationChecks = true; + CarpetSettings.skipGenerationChecks.set(true); try { return feature.generate(world, world.getChunkManager().getChunkGenerator(), world.random, pos); } finally { - CarpetSettings.skipGenerationChecks = false; + CarpetSettings.skipGenerationChecks.set(false); } } return null; @@ -99,14 +99,14 @@ public class FeatureGenerator private static Thing simplePlop(ConfiguredFeature feature) { return (w, p) -> { - CarpetSettings.skipGenerationChecks=true; + CarpetSettings.skipGenerationChecks.set(true); try { return feature.generate(w, w.getChunkManager().getChunkGenerator(), w.random, p); } finally { - CarpetSettings.skipGenerationChecks = false; + CarpetSettings.skipGenerationChecks.set(false); } }; } diff --git a/src/main/java/carpet/mixins/BlockStateArgument_fillUpdatesMixin.java b/src/main/java/carpet/mixins/BlockStateArgument_fillUpdatesMixin.java index 0e432022..0cd7abaa 100644 --- a/src/main/java/carpet/mixins/BlockStateArgument_fillUpdatesMixin.java +++ b/src/main/java/carpet/mixins/BlockStateArgument_fillUpdatesMixin.java @@ -20,7 +20,7 @@ public class BlockStateArgument_fillUpdatesMixin )) private BlockState postProcessStateProxy(BlockState state, WorldAccess serverWorld, BlockPos blockPos) { - if (CarpetSettings.impendingFillSkipUpdates) + if (CarpetSettings.impendingFillSkipUpdates.get()) { return state; } diff --git a/src/main/java/carpet/mixins/ChunkMixin.java b/src/main/java/carpet/mixins/ChunkMixin.java index b1a9b128..5ae9c74e 100644 --- a/src/main/java/carpet/mixins/ChunkMixin.java +++ b/src/main/java/carpet/mixins/ChunkMixin.java @@ -16,6 +16,6 @@ public abstract class ChunkMixin at =@At("HEAD"), cancellable = true) private void squashWarnings(BlockPos blockPos_1, CallbackInfo ci) { - if (CarpetSettings.skipGenerationChecks) ci.cancel(); + if (CarpetSettings.skipGenerationChecks.get()) ci.cancel(); } } diff --git a/src/main/java/carpet/mixins/ChunkRegion_scarpetPlopMixin.java b/src/main/java/carpet/mixins/ChunkRegion_scarpetPlopMixin.java index fb06e695..f4a11509 100644 --- a/src/main/java/carpet/mixins/ChunkRegion_scarpetPlopMixin.java +++ b/src/main/java/carpet/mixins/ChunkRegion_scarpetPlopMixin.java @@ -11,9 +11,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(ChunkRegion.class) public class ChunkRegion_scarpetPlopMixin { - @Inject(method = "markBlockForPostProcessing", at = @At("HEAD")) + @Inject(method = "markBlockForPostProcessing", at = @At("HEAD"), cancellable = true) private void markOrNot(BlockPos blockPos, CallbackInfo ci) { - if (CarpetSettings.skipGenerationChecks) ci.cancel(); + if (CarpetSettings.skipGenerationChecks.get()) ci.cancel(); } } diff --git a/src/main/java/carpet/mixins/CommandManagerMixin.java b/src/main/java/carpet/mixins/CommandManagerMixin.java index eb96d12b..0b3ef549 100644 --- a/src/main/java/carpet/mixins/CommandManagerMixin.java +++ b/src/main/java/carpet/mixins/CommandManagerMixin.java @@ -33,13 +33,13 @@ public abstract class CommandManagerMixin private void onExecuteBegin(ServerCommandSource serverCommandSource_1, String string_1, CallbackInfoReturnable cir) { if (!CarpetSettings.fillUpdates) - CarpetSettings.impendingFillSkipUpdates = true; + CarpetSettings.impendingFillSkipUpdates.set(true); } @Inject(method = "execute", at = @At("RETURN")) private void onExecuteEnd(ServerCommandSource serverCommandSource_1, String string_1, CallbackInfoReturnable cir) { - CarpetSettings.impendingFillSkipUpdates = false; + CarpetSettings.impendingFillSkipUpdates.set(false); } @SuppressWarnings("UnresolvedMixinReference") diff --git a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_interactionUpdatesMixin.java b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_interactionUpdatesMixin.java index a277e303..5009f83d 100644 --- a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_interactionUpdatesMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_interactionUpdatesMixin.java @@ -21,7 +21,7 @@ public class ServerPlayNetworkHandler_interactionUpdatesMixin private void beforeBlockInteracted(PlayerInteractBlockC2SPacket playerInteractBlockC2SPacket_1, CallbackInfo ci) { if (!CarpetSettings.interactionUpdates) - CarpetSettings.impendingFillSkipUpdates = true; + CarpetSettings.impendingFillSkipUpdates.set(true); } @Inject(method = "onPlayerInteractBlock", at = @At( @@ -32,7 +32,7 @@ public class ServerPlayNetworkHandler_interactionUpdatesMixin private void afterBlockInteracted(PlayerInteractBlockC2SPacket playerInteractBlockC2SPacket_1, CallbackInfo ci) { if (!CarpetSettings.interactionUpdates) - CarpetSettings.impendingFillSkipUpdates = false; + CarpetSettings.impendingFillSkipUpdates.set(false); } @Inject(method = "onPlayerInteractItem", at = @At( @@ -43,7 +43,7 @@ public class ServerPlayNetworkHandler_interactionUpdatesMixin private void beforeItemInteracted(PlayerInteractItemC2SPacket packet, CallbackInfo ci) { if (!CarpetSettings.interactionUpdates) - CarpetSettings.impendingFillSkipUpdates = true; + CarpetSettings.impendingFillSkipUpdates.set(true); } @Inject(method = "onPlayerInteractItem", at = @At( @@ -54,7 +54,7 @@ public class ServerPlayNetworkHandler_interactionUpdatesMixin private void afterItemInteracted(PlayerInteractItemC2SPacket packet, CallbackInfo ci) { if (!CarpetSettings.interactionUpdates) - CarpetSettings.impendingFillSkipUpdates = false; + CarpetSettings.impendingFillSkipUpdates.set(false); } @Inject(method = "onPlayerAction", at = @At( value = "INVOKE", @@ -64,7 +64,7 @@ public class ServerPlayNetworkHandler_interactionUpdatesMixin private void beforeBlockBroken(PlayerActionC2SPacket packet, CallbackInfo ci) { if (!CarpetSettings.interactionUpdates) - CarpetSettings.impendingFillSkipUpdates = true; + CarpetSettings.impendingFillSkipUpdates.set(true); } @Inject(method = "onPlayerAction", at = @At( @@ -75,7 +75,7 @@ public class ServerPlayNetworkHandler_interactionUpdatesMixin private void afterBlockBroken(PlayerActionC2SPacket packet, CallbackInfo ci) { if (!CarpetSettings.interactionUpdates) - CarpetSettings.impendingFillSkipUpdates = false; + CarpetSettings.impendingFillSkipUpdates.set(false); } } diff --git a/src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java b/src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java index 2832f969..e660c97a 100644 --- a/src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java +++ b/src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java @@ -22,14 +22,14 @@ public abstract class StructureBlockBlockEntity_fillUpdatesMixin private void onStructurePlacen(Structure structure, ServerWorldAccess serverWorldAccess, BlockPos pos, StructurePlacementData placementData, Random random) { if(!CarpetSettings.fillUpdates) - CarpetSettings.impendingFillSkipUpdates = true; + CarpetSettings.impendingFillSkipUpdates.set(true); try { structure.place(serverWorldAccess, pos, placementData, random); } finally { - CarpetSettings.impendingFillSkipUpdates = false; + CarpetSettings.impendingFillSkipUpdates.set(false); } } } \ No newline at end of file diff --git a/src/main/java/carpet/mixins/StructureFeatureMixin.java b/src/main/java/carpet/mixins/StructureFeatureMixin.java index 2bbf8667..b43a9c3c 100644 --- a/src/main/java/carpet/mixins/StructureFeatureMixin.java +++ b/src/main/java/carpet/mixins/StructureFeatureMixin.java @@ -35,7 +35,7 @@ public abstract class StructureFeatureMixin implements { if (world.isClient()) return false; - CarpetSettings.skipGenerationChecks = true; + CarpetSettings.skipGenerationChecks.set(true); try { Random rand = new Random(world.getRandom().nextInt()); @@ -79,7 +79,7 @@ public abstract class StructureFeatureMixin implements } finally { - CarpetSettings.skipGenerationChecks = false; + CarpetSettings.skipGenerationChecks.set(false); } return true; } diff --git a/src/main/java/carpet/mixins/StructurePiece_scarpetPlopMixin.java b/src/main/java/carpet/mixins/StructurePiece_scarpetPlopMixin.java index 94b2cfc1..8c49bd91 100644 --- a/src/main/java/carpet/mixins/StructurePiece_scarpetPlopMixin.java +++ b/src/main/java/carpet/mixins/StructurePiece_scarpetPlopMixin.java @@ -17,6 +17,6 @@ public class StructurePiece_scarpetPlopMixin )) private void markOrNot(Chunk chunk, BlockPos pos) { - if (!CarpetSettings.skipGenerationChecks) chunk.markBlockForPostProcessing(pos); + if (!CarpetSettings.skipGenerationChecks.get()) chunk.markBlockForPostProcessing(pos); } } diff --git a/src/main/java/carpet/mixins/Structure_fillUpdatesMixin.java b/src/main/java/carpet/mixins/Structure_fillUpdatesMixin.java index 65515491..11b5216e 100644 --- a/src/main/java/carpet/mixins/Structure_fillUpdatesMixin.java +++ b/src/main/java/carpet/mixins/Structure_fillUpdatesMixin.java @@ -19,7 +19,7 @@ public class Structure_fillUpdatesMixin )) private void skipUpdateNeighbours(ServerWorldAccess serverWorldAccess, BlockPos pos, Block block) { - if (!CarpetSettings.impendingFillSkipUpdates) + if (!CarpetSettings.impendingFillSkipUpdates.get()) serverWorldAccess.updateNeighbors(pos, block); } @@ -29,6 +29,6 @@ public class Structure_fillUpdatesMixin )) private boolean skipPostprocess(StructurePlacementData structurePlacementData) { - return structurePlacementData.shouldUpdateNeighbors() || CarpetSettings.impendingFillSkipUpdates; + return structurePlacementData.shouldUpdateNeighbors() || CarpetSettings.impendingFillSkipUpdates.get(); } } diff --git a/src/main/java/carpet/mixins/WorldChunk_fillUpdatesMixin.java b/src/main/java/carpet/mixins/WorldChunk_fillUpdatesMixin.java index cab107b8..1aeac766 100644 --- a/src/main/java/carpet/mixins/WorldChunk_fillUpdatesMixin.java +++ b/src/main/java/carpet/mixins/WorldChunk_fillUpdatesMixin.java @@ -19,7 +19,7 @@ public class WorldChunk_fillUpdatesMixin )) private void onAdded(BlockState blockState, World world_1, BlockPos blockPos_1, BlockState blockState_1, boolean boolean_1) { - if (!CarpetSettings.impendingFillSkipUpdates) + if (!CarpetSettings.impendingFillSkipUpdates.get()) blockState.onBlockAdded(world_1, blockPos_1, blockState_1, boolean_1); } @@ -29,7 +29,7 @@ public class WorldChunk_fillUpdatesMixin )) private void onRemovedBlock(BlockState blockState, World world, BlockPos pos, BlockState state, boolean moved) { - if (CarpetSettings.impendingFillSkipUpdates) // doing due dilligence from AbstractBlock onStateReplaced + if (CarpetSettings.impendingFillSkipUpdates.get()) // doing due dilligence from AbstractBlock onStateReplaced { if (blockState.getBlock().hasBlockEntity() && !blockState.isOf(state.getBlock())) { diff --git a/src/main/java/carpet/mixins/World_fillUpdatesMixin.java b/src/main/java/carpet/mixins/World_fillUpdatesMixin.java index 8e9c6e1e..23cffe19 100644 --- a/src/main/java/carpet/mixins/World_fillUpdatesMixin.java +++ b/src/main/java/carpet/mixins/World_fillUpdatesMixin.java @@ -16,7 +16,7 @@ public abstract class World_fillUpdatesMixin @ModifyConstant(method = "setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;II)Z", //setBlockState main constant = @Constant(intValue = 16)) private int addFillUpdatesInt(int original) { - if (CarpetSettings.impendingFillSkipUpdates) + if (CarpetSettings.impendingFillSkipUpdates.get()) return -1; return original; } @@ -27,7 +27,7 @@ public abstract class World_fillUpdatesMixin )) private void updateNeighborsMaybe(World world, BlockPos blockPos, Block block) { - if (!CarpetSettings.impendingFillSkipUpdates) world.updateNeighbors(blockPos, block); + if (!CarpetSettings.impendingFillSkipUpdates.get()) world.updateNeighbors(blockPos, block); } } diff --git a/src/main/java/carpet/mixins/World_scarpetPlopMixin.java b/src/main/java/carpet/mixins/World_scarpetPlopMixin.java index 284ff0e3..aed0e49e 100644 --- a/src/main/java/carpet/mixins/World_scarpetPlopMixin.java +++ b/src/main/java/carpet/mixins/World_scarpetPlopMixin.java @@ -18,7 +18,7 @@ public class World_scarpetPlopMixin )) private int fixSampleHeightmap(WorldChunk chunk, Heightmap.Type type, int x, int z) { - if (CarpetSettings.skipGenerationChecks) + if (CarpetSettings.skipGenerationChecks.get()) { Heightmap.Type newType = type; if (type == Heightmap.Type.OCEAN_FLOOR_WG) newType = Heightmap.Type.OCEAN_FLOOR; diff --git a/src/main/java/carpet/script/api/WorldAccess.java b/src/main/java/carpet/script/api/WorldAccess.java index a04908ad..1f636619 100644 --- a/src/main/java/carpet/script/api/WorldAccess.java +++ b/src/main/java/carpet/script/api/WorldAccess.java @@ -688,19 +688,19 @@ public class WorldAccess { // lazy cause its parked execution expression.addLazyFunction("without_updates", 1, (c, t, lv) -> { - boolean previous = CarpetSettings.impendingFillSkipUpdates; + boolean previous = CarpetSettings.impendingFillSkipUpdates.get(); if (previous) return lv.get(0); Value [] result = new Value[]{Value.NULL}; ((CarpetContext)c).s.getMinecraftServer().submitAndJoin( () -> { try { - CarpetSettings.impendingFillSkipUpdates = true; + CarpetSettings.impendingFillSkipUpdates.set(true); result[0] = lv.get(0).evalValue(c, t); } finally { - CarpetSettings.impendingFillSkipUpdates = previous; + CarpetSettings.impendingFillSkipUpdates.set(previous); } }); return (cc, tt) -> result[0];