Merge branch 'master' into 1.17

# Conflicts:
#	src/main/resources/carpet.mixins.json

src/main/java/carpet/CarpetServer.java

@@ -1,6 +1,5 @@
 package carpet;
 
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
@@ -39,8 +38,11 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.dedicated.command.PerfCommand;
 import net.minecraft.server.network.ServerPlayerEntity;
 
-public class CarpetServer implements ClientModInitializer,DedicatedServerModInitializer // static for now - easier to handle all around the code, its one anyways
+public class CarpetServer // static for now - easier to handle all around the code, its one anyways
 {
+    public static final ClientModInitializer CLIENT_INITIALIZER = CarpetServer::onGameStarted;
+    public static final DedicatedServerModInitializer SERVER_INITIALIZER = CarpetServer::onGameStarted;
+
     public static final Random rand = new Random();
     public static MinecraftServer minecraft_server;
     private static CommandDispatcher<ServerCommandSource> currentCommandDispatcher;
@@ -48,17 +50,6 @@ public class CarpetServer implements ClientModInitializer,DedicatedServerModInit
     public static SettingsManager settingsManager;
     public static final List<CarpetExtension> extensions = new ArrayList<>();
 
-    @Override
-    public void onInitializeClient()
-    {
-    	CarpetServer.onGameStarted();
-    }
-    @Override
-    public void onInitializeServer()
-    {
-    	CarpetServer.onGameStarted();
-    }
-    
     // Separate from onServerLoaded, because a server can be loaded multiple times in singleplayer
     /**
      * Registers a {@link CarpetExtension} to be managed by Carpet.<br>