Attempt 2

Author: yikerman

build.gradle

@@ -23,7 +23,7 @@ repositories {
 
 dependencies {
     implementation "com.github.wearblackallday:JavaUtils:bd58640372"
-    include"com.github.wearblackallday:JavaUtils:bd58640372"
+    include "com.github.wearblackallday:JavaUtils:bd58640372"
 
     // To change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
 minecraft_version=1.18.2
-yarn_mappings=1.18.2+build.2
+yarn_mappings=1.18.2+build.3
 loader_version=0.13.3
 # Mod Properties
-mod_version=1.2.6-1.18.2-sand-duper-fix
+mod_version=1.2.6-1.18.2-sand-duper-fix.2
 maven_group=wearblackallday
 archives_base_name=DimThread
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.48.0+1.18.2
+fabric_version=0.51.1+1.18.2
 #fabric_game_rule_v1_version=1.0.9+e77d3ea6cb
 

src/main/java/wearblackallday/dimthread/mixin/EntityMixin.java

@@ -12,16 +12,10 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import wearblackallday.dimthread.DimThread;
 
-@Mixin(Entity.class)
-public abstract class EntityMixin {
-
-	@Shadow public abstract Entity moveToWorld(ServerWorld destination);
-
-	@Shadow @Final public abstract boolean isRemoved();
-
-	@Shadow private Entity.RemovalReason removalReason;
+import org.slf4j.LoggerFactory;
 
-	private boolean duped = false;
+@Mixin(Entity.class)
+public abstract class EntityMixin implements Cloneable {
 
 	/**
 	 * Schedules moving entities between dimensions to the server thread. Once all
@@ -38,26 +32,21 @@ public void moveToWorld(ServerWorld destination, CallbackInfoReturnable<Entity>
 			return;
 
 		if (DimThread.owns(Thread.currentThread())) {
-			destination.getServer().execute(() -> this.moveToWorld(destination));
+			Entity snapshot = null;
+			try {
+				snapshot = (Entity) (this.clone());
+			} catch (CloneNotSupportedException e) {
+				throw new RuntimeException(e);
+			}
+			final Entity finalSnapshot = snapshot;
+			destination.getServer().execute(
+					() -> finalSnapshot.moveToWorld(destination)
+			);
 			ci.setReturnValue(null);
 		}
 	}
 
-	/**
-	 * If in the moveToWorld method removalReason is DISCARDED, then we assume its
-	 * caused by a sand duplicator.
-	 */
-	@Redirect(method = "moveToWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;isRemoved()Z"))
-	public final boolean forceNotRemoved(Entity self) {
-		Entity.RemovalReason reason = this.removalReason;
-		if (
-			self instanceof FallingBlockEntity &&
-			reason == Entity.RemovalReason.DISCARDED &&
-			!duped
-		) {
-			duped = true;
-			return false;
-		}
-		return self.isRemoved();
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
 	}
 }

src/main/resources/dimthread.accesswidener

@@ -1,2 +1,2 @@
 accessWidener v1 named
-accessible class net/minecraft/server/world/ServerChunkManager$MainThreadExecutor
+accessible class net/minecraft/server/world/ServerChunkManager$MainThreadExecutor