Bump version

Author: yikerman

build.gradle

@@ -31,8 +31,8 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     // Fabric API. This is technically optional, but you probably want it anyway.
-//    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-    modImplementation"net.fabricmc.fabric-api:fabric-game-rule-api-v1:${project.fabric_game_rule_v1_version}"
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+    // modImplementation"net.fabricmc.fabric-api:fabric-game-rule-api-v1:${project.fabric_game_rule_v1_version}"
     // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
     // You may need to force-disable transitiveness on them.
 }
@@ -58,7 +58,7 @@ tasks.withType(JavaCompile).configureEach {
     it.options.encoding = "UTF-8"
 
     // Minecraft 1.17 (21w19a) upwards uses Java 16.
-    it.options.release = 16
+    it.options.release = 17
 }
 
 java {

gradle.properties

@@ -6,11 +6,11 @@ minecraft_version=1.18.2
 yarn_mappings=1.18.2+build.2
 loader_version=0.13.3
 # Mod Properties
-mod_version=1.2.6-sand-duper-fix
+mod_version=1.2.6-1.18.2-sand-duper-fix
 maven_group=wearblackallday
 archives_base_name=DimThread
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-#fabric_version=0.44.0+1.18
-fabric_game_rule_v1_version=1.0.9+e77d3ea6cb
+fabric_version=0.48.0+1.18.2
+#fabric_game_rule_v1_version=1.0.9+e77d3ea6cb
 

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

@@ -48,16 +48,16 @@ public void moveToWorld(ServerWorld destination, CallbackInfoReturnable<Entity>
 	 * caused by a sand duplicator.
 	 */
 	@Redirect(method = "moveToWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;isRemoved()Z"))
-	public final boolean forceNotRemoved(Entity entity) {
+	public final boolean forceNotRemoved(Entity self) {
 		Entity.RemovalReason reason = this.removalReason;
 		if (
-			(Entity) (Object) this instanceof FallingBlockEntity &&
+			self instanceof FallingBlockEntity &&
 			reason == Entity.RemovalReason.DISCARDED &&
 			!duped
 		) {
 			duped = true;
 			return false;
 		}
-		return entity.isRemoved();
+		return self.isRemoved();
 	}
 }