From 1a925315540ec112f9c44b580075bbf6740d7170 Mon Sep 17 00:00:00 2001
From: altrisi <altrisi.trillosierra@gmail.com>
Date: Sun, 13 Jun 2021 04:02:33 +0200
Subject: [PATCH] Compact fabric initialization code (#918)

---
 src/main/java/carpet/CarpetServer.java | 17 ++++-------------
 src/main/resources/fabric.mod.json     |  4 ++--
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/main/java/carpet/CarpetServer.java b/src/main/java/carpet/CarpetServer.java
index 00b7ca93..276b9e8a 100644
--- a/src/main/java/carpet/CarpetServer.java
+++ b/src/main/java/carpet/CarpetServer.java
@@ -1,6 +1,5 @@
 package carpet;
 
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
@@ -37,8 +36,11 @@ import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.MinecraftServer;
 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;
@@ -46,17 +48,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>
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 863aef23..ecf360d9 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -20,10 +20,10 @@
   "environment": "*",
   "entrypoints": {
     "client": [
-      "carpet.CarpetServer"
+      "carpet.CarpetServer::CLIENT_INITIALIZER"
     ],
     "server": [
-      "carpet.CarpetServer"
+      "carpet.CarpetServer::SERVER_INITIALIZER"
     ]
   },
   "mixins": [