Broken share button

- Fix Mixin trying to share across methods
Fabricators-of-Create · Dec 1, 2024 · 08500bf · 08500bf
1 parent bf96ad7
commit 08500bf
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/...java/io/github/fabricators_of_create/porting_lib/mixin/common/StructureTemplateMixin.java b/...java/io/github/fabricators_of_create/porting_lib/mixin/common/StructureTemplateMixin.java
@@ -47,6 +47,9 @@ public abstract class StructureTemplateMixin implements StructureTemplateExtensi
 	@Shadow
 	protected abstract void placeEntities(ServerLevelAccessor serverLevelAccessor, BlockPos blockPos, Mirror mirror, Rotation rotation, BlockPos blockPos2, @Nullable BoundingBox boundingBox, boolean bl);
 
+	@Unique
+	private static final ThreadLocal<StructurePlaceSettings> currentSettings = new ThreadLocal<>();
+
 	@Inject(
 			method = "placeInWorld",
 			at = @At(
@@ -55,7 +58,7 @@ public abstract class StructureTemplateMixin implements StructureTemplateExtensi
 			)
 	)
 	private void grabSettings(ServerLevelAccessor level, BlockPos pos, BlockPos pivot, StructurePlaceSettings settings,
-							  RandomSource random, int i, CallbackInfoReturnable<Boolean> cir, @Share("currentSettings") LocalRef<StructurePlaceSettings> currentSettings) {
+							  RandomSource random, int i, CallbackInfoReturnable<Boolean> cir) {
 		currentSettings.set(settings);
 	}
 
@@ -68,7 +71,7 @@ private void grabSettings(ServerLevelAccessor level, BlockPos pos, BlockPos pivo
 	)
 	private List<StructureEntityInfo> processEntityInfos(List<StructureEntityInfo> original,
 														 ServerLevelAccessor level, BlockPos pos, Mirror mirror, Rotation rotation,
-														 BlockPos pivot, @Nullable BoundingBox bounds, boolean finalizeMobs, @Share("currentSettings") LocalRef<StructurePlaceSettings> currentSettings) {
+														 BlockPos pivot, @Nullable BoundingBox bounds, boolean finalizeMobs) {
 		StructurePlaceSettings settings = currentSettings.get();
 
 		if (PortingLib.DEBUG)
@@ -89,14 +92,19 @@ private List<StructureEntityInfo> processEntityInfos(List<StructureEntityInfo> o
 					target = "Lnet/minecraft/core/BlockPos;offset(Lnet/minecraft/core/Vec3i;)Lnet/minecraft/core/BlockPos;"
 			)
 	)
-	private BlockPos dontProcessBlockPosTwice(BlockPos original, @Local StructureEntityInfo info, @Share("currentSettings") LocalRef<StructurePlaceSettings> currentSettings) {
+	private BlockPos dontProcessBlockPosTwice(BlockPos original, @Local StructureEntityInfo info) {
 		StructurePlaceSettings settings = currentSettings.get();
 		if (settings != null) { // pos was already processed.
 			return info.blockPos;
 		}
 		return original;
 	}
 
+	@Inject(method = "placeEntities", at = @At("RETURN"))
+	private void clearGrabbedSettings(CallbackInfo ci) {
+		currentSettings.remove(); // clear the settings when done to avoid leaking it
+	}
+
 	@ModifyExpressionValue(
 			method = "placeEntities",
 			at = @At(