worldpreview 6.0.0 support

Author: tildejustin

1.14-1.18.2/src/main/java/net/set/spawn/mod/mixin/PlayerManagerMixin.java

@@ -0,0 +1,21 @@
+package net.set.spawn.mod.mixin;
+
+import net.minecraft.network.ClientConnection;
+import net.minecraft.server.*;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.set.spawn.mod.interfaces.MinecraftServerExtended;
+import org.spongepowered.asm.mixin.*;
+import org.spongepowered.asm.mixin.injection.*;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(PlayerManager.class)
+public abstract class PlayerManagerMixin {
+    @Shadow
+    @Final
+    private MinecraftServer server;
+
+    @Inject(method = "onPlayerConnect", at = @At("TAIL"))
+    private void onPlayerConnect(ClientConnection connection, ServerPlayerEntity player, CallbackInfo ci) {
+        ((MinecraftServerExtended) this.server).setspawnmod$setShouldModifySpawn(false);
+    }
+}

1.14-1.18.2/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java

@@ -36,7 +36,6 @@ private int setSpawn(Random random, int bounds, Operation<Integer> original, @Lo
         int originalResult = original.call(random, bounds);
 
         if (((MinecraftServerExtended) this.server).setspawnmod$shouldModifySpawn()) {
-            ((MinecraftServerExtended) this.server).setspawnmod$setShouldModifySpawn(false);
             seed.set(SetSpawn.findSeedObjectFromLong(this.getServerWorld().getSeed()));
         }
         Seed seedObject = seed.get();

1.14-1.18.2/src/main/resources/fabric.mod.json

@@ -30,6 +30,6 @@
     "minecraft": ">1.13.2 <1.19"
   },
   "breaks": {
-    "worldpreview": "*"
+    "worldpreview": "<6.0"
   }
 }

1.14-1.18.2/src/main/resources/setspawnmod.mixins.json

@@ -5,6 +5,7 @@
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "MinecraftServerMixin",
+    "PlayerManagerMixin",
     "ServerPlayerEntityMixin"
   ],
   "injectors": {

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs = -Xmx2G
 org.gradle.parallel = true
 org.gradle.caching = true
 
-mod_version = 4.0.0
+mod_version = 4.1.0
 archives_name = setspawnmod
 base_archives_name = setspawnmod-common
 maven_group = me.bdamja

src/main/resources/fabric.mod.json

@@ -30,8 +30,5 @@
   "depends": {
     "fabricloader": ">=0.15.0",
     "minecraft": "*"
-  },
-  "breaks": {
-    "worldpreview": "*"
   }
 }