initial multiversion support and config subsystem reworking

Author: tildejustin

1.12/build.gradle

@@ -0,0 +1,16 @@
+plugins {
+    id "loom"
+    id "legacy-looming"
+}
+
+loom {
+    legacyLooming {
+        intermediaryVersion.set(2)
+    }
+}
+
+dependencies {
+    minecraft "com.mojang:minecraft:$minecraft_version"
+    mappings(legacy.yarn(minecraft_version, yarn_build))
+    include implementation(project(path: ":", configuration: "namedElements"))
+}

1.12/gradle.properties

@@ -0,0 +1,2 @@
+minecraft_version=1.12
+yarn_build=542

1.12/src/main/java/net/set/spawn/mod/mixin/MinecraftClientMixin.java

@@ -0,0 +1,26 @@
+package net.set.spawn.mod.mixin;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.sugar.Share;
+import com.llamalad7.mixinextras.sugar.ref.LocalBooleanRef;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.server.integrated.IntegratedServer;
+import net.minecraft.world.level.LevelInfo;
+import net.set.spawn.mod.interfaces.MinecraftServerExtended;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.*;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(MinecraftClient.class)
+public abstract class MinecraftClientMixin {
+    @Inject(method = "startIntegratedServer", at = @At("HEAD"))
+    private void markIfNewWorld(String worldName, String levelName, LevelInfo levelInfo, CallbackInfo ci, @Share("newWorld") LocalBooleanRef newWorld) {
+        newWorld.set(levelInfo != null);
+    }
+
+    @ModifyExpressionValue(method = "startIntegratedServer", at = @At(value = "NEW", target = "net/minecraft/server/integrated/IntegratedServer"))
+    private IntegratedServer createIntegratedServer(IntegratedServer original, @Share("newWorld") LocalBooleanRef newWorld) {
+        ((MinecraftServerExtended) original).setspawnmod$setShouldModifySpawn(newWorld.get());
+        return original;
+    }
+}

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

@@ -0,0 +1,21 @@
+package net.set.spawn.mod.mixin;
+
+import net.minecraft.server.MinecraftServer;
+import net.set.spawn.mod.interfaces.MinecraftServerExtended;
+import org.spongepowered.asm.mixin.*;
+
+@Mixin(MinecraftServer.class)
+public abstract class MinecraftServerMixin implements MinecraftServerExtended {
+    @Unique
+    private boolean shouldModifySpawn = false;
+
+    @Override
+    public boolean setspawnmod$shouldModifySpawn() {
+        return shouldModifySpawn;
+    }
+
+    @Override
+    public void setspawnmod$setShouldModifySpawn(boolean shouldModifySpawn) {
+        this.shouldModifySpawn = shouldModifySpawn;
+    }
+}

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

@@ -0,0 +1,76 @@
+package net.set.spawn.mod.mixin;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.injector.wrapoperation.*;
+import com.llamalad7.mixinextras.sugar.*;
+import com.llamalad7.mixinextras.sugar.ref.*;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.*;
+import net.minecraft.util.Formatting;
+import net.minecraft.util.math.*;
+import net.set.spawn.mod.*;
+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;
+
+import java.util.Random;
+
+@Mixin(ServerPlayerEntity.class)
+public abstract class ServerPlayerEntityMixin {
+    @Unique
+    private String setSpawnError;
+
+    @Shadow
+    public abstract void sendMessage(Text text);
+
+    @WrapOperation(method = "<init>", at = @At(value = "INVOKE", target = "Ljava/util/Random;nextInt(I)I", ordinal = 0))
+    private int setSpawnX(Random random, int bounds, Operation<Integer> original, @Local(argsOnly = true) MinecraftServer server, @Local BlockPos worldSpawn, @Local int spawnRadius, @Share("seed") LocalRef<Seed> seed, @Share("zCoord") LocalRef<Integer> zCoord, @Share("isRandomSpawn") LocalBooleanRef isRandomSpawn) {
+        isRandomSpawn.set(true);
+        int originalResult = original.call(random, bounds);
+
+        if (((MinecraftServerExtended) server).setspawnmod$shouldModifySpawn()) {
+            ((MinecraftServerExtended) server).setspawnmod$setShouldModifySpawn(false);
+            seed.set(SetSpawn.findSeedObjectFromLong(server.method_0_6351().method_8412()));
+        }
+        Seed seedObject = seed.get();
+        if (seedObject == null) {
+            return originalResult;
+        }
+
+        // Transform x and z coordinates into correct Random#nextInt result.
+        int resultX = MathHelper.floor(seedObject.getX()) - worldSpawn.getX() + spawnRadius;
+        int resultZ = MathHelper.floor(seedObject.getZ()) - worldSpawn.getZ() + spawnRadius;
+
+        if (resultX >= 0 && resultX < bounds && resultZ >= 0 && resultZ < bounds) {
+            zCoord.set(resultZ);
+            System.out.println("Setting spawn");
+            return resultX;
+        } else {
+            this.setSpawnError = "The X or Z coordinates given (" + seed.get().getX() + ", " + seed.get().getZ() + ") are more than the worlds spawn radius (" + spawnRadius + " blocks) away from the world spawn. Not overriding player spawnpoint.";
+        }
+        return originalResult;
+    }
+
+    @ModifyExpressionValue(method = "<init>", at = @At(value = "INVOKE", target = "Ljava/util/Random;nextInt(I)I", ordinal = 1))
+    private int setSpawnZ(int original, @Share("zCoord") LocalRef<Integer> zCoord) {
+        // if zCoord is not null, it has been validated in the method
+        return zCoord.get() != null ? zCoord.get() : original;
+    }
+
+    @Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;refreshPositionAndAngles(Lnet/minecraft/util/math/BlockPos;FF)V"))
+    private void failOnNonRandomSpawns(CallbackInfo ci, @Share("seed") LocalRef<Seed> seed, @Share("isRandomSpawn") LocalBooleanRef isRandomSpawn) {
+        if (!isRandomSpawn.get() && seed.get() != null) {
+            this.setSpawnError = "Failed to apply SetSpawn configuration because the spawn was not random. Not overriding player spawnpoint.";
+        }
+    }
+
+    @Inject(method = "onSpawn", at = @At("TAIL"))
+    private void sendErrorMessage(CallbackInfo ci) {
+        if (this.setSpawnError != null) {
+            this.sendMessage(new LiteralTextContent(this.setSpawnError + " This run is not verifiable.").setStyle(new Style().withColor(Formatting.RED)));
+            this.setSpawnError = null;
+        }
+    }
+}

1.12/src/main/resources/assets/setspawnmod/icon.png

@@ -0,0 +1,38 @@
+{
+  "schemaVersion": 1,
+  "id": "setspawnmod",
+  "version": "${version}",
+  "name": "Set Spawn",
+  "description": "Sets the player's spawnpoint in SSG to specified coordinates.",
+  "authors": [
+    {
+      "name": "bdamja",
+      "contact": {
+        "homepage": "https://github.com/bdamja"
+      }
+    }
+  ],
+  "contributors": [
+    "Void_X_Walker",
+    "jan-leila",
+    "RedLime",
+    "tildejustin",
+    "contaria"
+  ],
+  "license": "LGPL-3.0-only",
+  "icon": "assets/setspawnmod/icon.png",
+  "environment": "*",
+  "mixins": [
+    "setspawnmod.mixins.json"
+  ],
+  "depends": {
+    "fabricloader": ">=0.15.0",
+    "minecraft": [
+      "1.12",
+      "1.9.2-rv+trendy"
+    ]
+  },
+  "breaks": {
+    "worldpreview": "*"
+  }
+}

1.12/src/main/resources/fabric.mod.json

@@ -0,0 +1,20 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "package": "net.set.spawn.mod.mixin",
+  "compatibilityLevel": "JAVA_8",
+  "mixins": [
+    "MinecraftServerMixin",
+    "ServerPlayerEntityMixin"
+  ],
+  "client": [
+    "MinecraftClientMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "overwrites": {
+    "conformVisibility": true,
+    "requireAnnotations": true
+  }
+}

1.12/src/main/resources/setspawnmod.mixins.json

@@ -0,0 +1,10 @@
+plugins {
+    id "loom"
+    id "legacy-looming"
+}
+
+dependencies {
+    minecraft "com.mojang:minecraft:$minecraft_version"
+    mappings(legacy.yarn(minecraft_version, yarn_build))
+    include implementation(project(path: ":", configuration: "namedElements"))
+}

1.13.x/build.gradle

@@ -0,0 +1,2 @@
+minecraft_version=1.13.2
+yarn_build=541