Merge branch '1.19-1.20' into 1.19-1.20.4

Author: tildejustin

build.gradle

@@ -1,35 +1,13 @@
 plugins {
 	id 'fabric-loom' version '1.3-SNAPSHOT'
 	id 'io.github.juuxel.loom-vineflower' version '1.11.0'
-	id 'org.ajoberstar.grgit' version '4.1.0'
 }
 
 sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
 
-def getVersionMetadata() {
-	// CI builds version numbers
-	def build_id = System.getenv("RELEASE_TAG")
-	if (build_id != null) {
-		return build_id
-	}
-
-	// Development builds
-	if (grgit == null) {
-		return "dev"
-	}
-
-	// Named development builds
-	def id = grgit.head().abbreviatedId
-	if (!grgit.status().clean) {
-		id += "-dirty"
-	}
-
-	return "rev.${id}"
-}
-
-archivesBaseName = "${project.mod_id}-${project.target_version}"
-version = "${getVersionMetadata()}"
+archivesBaseName = mod_id
+version = "$mod_version+$target_version"
 
 dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"

gradle.properties

@@ -5,7 +5,8 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://fabricmc.net/develop
 mod_id=setspawnmod
-target_version=1.19-1.20
-minecraft_version=23w31a
-yarn_mappings=23w31a+build.4
+mod_version=1.0.0
+target_version=1.19-1.20.4
+minecraft_version=23w13a_or_b
+yarn_mappings=23w13a_or_b+build.5
 loader_version=0.14.22

src/main/java/net/set/spawn/mod/SetSpawn.java

@@ -16,7 +16,6 @@ public class SetSpawn implements ClientModInitializer {
     public static final String MOD_ID = "setspawnmod";
     public static final String subDir = SetSpawn.MOD_ID + "_global";
     public static Logger LOGGER = LogManager.getLogger();
-    public static boolean shouldModifySpawn;
     public static boolean shouldSendErrorMessage;
     public static String errorMessage;
     public static File localConfigFile;
@@ -44,7 +43,8 @@ private static void loadProperties() throws IOException, NumberFormatException,
     }
 
     private static void writeDefaultProperties(File file) throws IOException {
-        Seed[] seedsToWrite = new Seed[]{};
+        Seed iceBoat = new Seed("-8724539567136308488", "23w13aorb Iceboat Seed", -22, -10);
+        Seed[] seedsToWrite = new Seed[]{iceBoat};
         Config config = new Config(true, false, seedsToWrite);
 
         try (Writer writer = new FileWriter(file)) {

src/main/java/net/set/spawn/mod/mixin/MinecraftServerMixin.java

@@ -12,8 +12,12 @@
 public class PlayerManagerMixin {
     @Redirect(
             method = {
-                    "Lnet/minecraft/server/PlayerManager;onPlayerConnect(Lnet/minecraft/network/ClientConnection;Lnet/minecraft/server/network/ServerPlayerEntity;)V",
-                    "Lnet/minecraft/server/PlayerManager;onPlayerConnect(Lnet/minecraft/network/ClientConnection;Lnet/minecraft/server/network/ServerPlayerEntity;I)V"
+                    // 1.19 - 23w18a
+                    "Lnet/minecraft/server/PlayerManager;method_14570(Lnet/minecraft/network/ClientConnection;Lnet/minecraft/server/network/ServerPlayerEntity;)V",
+                    // 23w31a - 23w35a
+                    "Lnet/minecraft/server/PlayerManager;method_14570(Lnet/minecraft/network/ClientConnection;Lnet/minecraft/server/network/ServerPlayerEntity;I)V",
+                    // 23w41a - present
+                    "Lnet/minecraft/server/PlayerManager;method_14570(Lnet/minecraft/network/ClientConnection;Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/class_8792;)V"
             },
             at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;onSpawn()V"),
             require = 0

src/main/java/net/set/spawn/mod/mixin/PlayerManagerMixin.java

@@ -6,30 +6,25 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.*;
 import net.minecraft.world.World;
-import net.set.spawn.mod.Seed;
-import net.set.spawn.mod.SetSpawn;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
+import net.set.spawn.mod.*;
+import org.spongepowered.asm.mixin.*;
+import org.spongepowered.asm.mixin.injection.*;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerPlayerEntity.class)
 public abstract class ServerPlayerEntityMixin extends PlayerEntity implements ScreenHandlerListener {
-
-    @Shadow @Final public MinecraftServer server;
+    @Shadow
+    @Final
+    public MinecraftServer server;
 
     public ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile profile) {
         super(world, pos, yaw, profile);
     }
     @Inject(method = "moveToSpawn", at = @At("HEAD"), cancellable = true)
     public void setspawnmod_setSpawn(ServerWorld world, CallbackInfo ci) {
-        if (SetSpawn.shouldModifySpawn) {
-            SetSpawn.shouldModifySpawn = false;
+        if (SetSpawn.config.isEnabled() && this.server.getSaveProperties().getPlayerData() == null) {
             Seed seedObject = SetSpawn.findSeedObjectFromLong(world.getSeed());
             String response;
             if (seedObject != null ) {
@@ -65,5 +60,4 @@ public void setspawnmod_setSpawn(ServerWorld world, CallbackInfo ci) {
             }
         }
     }
-
-}
+}

src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java

@@ -4,7 +4,6 @@
   "package": "net.set.spawn.mod.mixin",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
-    "MinecraftServerMixin",
     "PlayerManagerMixin",
     "ServerPlayerEntityMixin",
     "SpawnLocatingAccessor"