updated to 1.20. Almost total rewrite. Cleaned up mixins. Ability to …

…specify yaw when spawning

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.0-SNAPSHOT'
+	id 'fabric-loom' version '1.2-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -11,8 +11,9 @@ version = project.mod_version
 group = project.maven_group
 
 repositories {
-	maven { url "https://maven.shedaniel.me/" }
-	maven { url "https://maven.terraformersmc.com/" }
+	maven { url "https://maven.shedaniel.me/" } // cloth config
+	maven { url "https://maven.terraformersmc.com/" } // mod menu
+	maven { url 'https://jitpack.io' } // mixin extras
 }
 
 dependencies {
@@ -27,6 +28,9 @@ dependencies {
 		exclude(group: "net.fabricmc.fabric-api")
 	}
 	modApi("com.terraformersmc:modmenu:${project.modmenu_version}")
+
+	implementation include("com.github.LlamaLad7:MixinExtras:${project.mixin_extras_version}")
+	annotationProcessor("com.github.LlamaLad7:MixinExtras:${project.mixin_extras_version}")
 }
 
 processResources {

gradle.properties

@@ -2,17 +2,18 @@
 org.gradle.jvmargs = -Xmx2G
 
 # Fabric Properties
-minecraft_version=1.19.3
-yarn_mappings=1.19.3+build.5
-loader_version=0.14.12
+minecraft_version=1.20
+yarn_mappings=1.20+build.1
+loader_version=0.14.21
 
 # Mod Properties
-mod_version = 1.6.1-1.19.3
+mod_version = 1.7.0
 maven_group = de.dafuqs.globalspawn
 archives_base_name = globalspawn
 
 # Dependencies
-fabric_version=0.70.0+1.19.3
+fabric_version=0.83.0+1.20
 # https://shedaniel.gitbook.io/cloth-config/setup-cloth-config/cloth-config-fabric
-cloth_config_version=9.0.93
-modmenu_version=5.0.2
+cloth_config_version=11.0.99
+modmenu_version=7.0.1
+mixin_extras_version=0.1.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/de/dafuqs/globalspawn/GlobalSpawnCommon.java

@@ -1,18 +1,12 @@
 package de.dafuqs.globalspawn;
 
-import de.dafuqs.globalspawn.command.GlobalSpawnCommand;
-import de.dafuqs.globalspawn.command.InitialSpawnCommand;
-import de.dafuqs.globalspawn.config.GlobalSpawnConfig;
-import me.shedaniel.autoconfig.AutoConfig;
-import me.shedaniel.autoconfig.ConfigHolder;
-import me.shedaniel.autoconfig.ConfigManager;
-import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer;
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
-import net.minecraft.server.MinecraftServer;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import de.dafuqs.globalspawn.command.*;
+import de.dafuqs.globalspawn.config.*;
+import me.shedaniel.autoconfig.*;
+import me.shedaniel.autoconfig.serializer.*;
+import net.fabricmc.api.*;
+import net.fabricmc.fabric.api.event.lifecycle.v1.*;
+import org.apache.logging.log4j.*;
 
 public class GlobalSpawnCommon implements ModInitializer {
 
@@ -21,8 +15,6 @@ public class GlobalSpawnCommon implements ModInitializer {
 	public static GlobalSpawnConfig GLOBAL_SPAWN_CONFIG;
 	private static final Logger LOGGER = LogManager.getLogger(MOD_ID);
 
-	public static MinecraftServer minecraftServer;
-
 	@Override
 	public void onInitialize() {
 		//Set up config
@@ -34,12 +26,8 @@ public void onInitialize() {
 		log(Level.INFO, "Registering Spawn Override...");
 		GlobalSpawnCommand.register();
 		InitialSpawnCommand.register();
-		GlobalSpawnManager.initialize();
 
-		ServerWorldEvents.LOAD.register((server, world) -> {
-			GlobalSpawnCommon.minecraftServer = server;
-			GlobalSpawnManager.addWorld(world);
-		});
+		ServerLifecycleEvents.SERVER_STARTED.register(server -> GlobalSpawnManager.initialize(server));
 
 		log(Level.INFO, "Startup finished.");
 	}