Procházet zdrojové kódy

Code fixes and improvements

Lortseam před 4 roky
rodič
revize
2d32d23a79

+ 12 - 11
src/main/java/me/lortseam/completeconfig/CompleteConfig.java

@@ -2,19 +2,28 @@ package me.lortseam.completeconfig;
 
 import me.lortseam.completeconfig.extensions.CompleteConfigExtension;
 import me.lortseam.completeconfig.extensions.clothbasicmath.ClothBasicMathExtension;
-import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.entrypoint.EntrypointContainer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
-public final class CompleteConfig implements ModInitializer {
+public final class CompleteConfig {
 
     private static final Logger LOGGER = LogManager.getLogger();
     private static final Map<String, CompleteConfigExtension> extensions = new HashMap<>();
 
+    static {
+        registerExternalExtension("cloth-basic-math", ClothBasicMathExtension.class);
+        for (EntrypointContainer<CompleteConfigExtension> entrypoint : FabricLoader.getInstance().getEntrypointContainers("completeconfig-extension", CompleteConfigExtension.class)) {
+            extensions.put(entrypoint.getProvider().getMetadata().getId(), entrypoint.getEntrypoint());
+        }
+    }
+
     public static void registerExternalExtension(String modID, Class<? extends CompleteConfigExtension> extensionClass) {
         if(!FabricLoader.getInstance().isModLoaded(modID)) return;
         try {
@@ -28,12 +37,4 @@ public final class CompleteConfig implements ModInitializer {
         return Collections.unmodifiableCollection(extensions.values());
     }
 
-    @Override
-    public void onInitialize() {
-        registerExternalExtension("cloth-basic-math", ClothBasicMathExtension.class);
-        for (EntrypointContainer<CompleteConfigExtension> entrypoint : FabricLoader.getInstance().getEntrypointContainers("completeconfig-extension", CompleteConfigExtension.class)) {
-            extensions.put(entrypoint.getProvider().getMetadata().getId(), entrypoint.getEntrypoint());
-        }
-    }
-
 }

+ 3 - 0
src/main/java/me/lortseam/completeconfig/extensions/CompleteConfigExtension.java

@@ -2,6 +2,8 @@ package me.lortseam.completeconfig.extensions;
 
 import me.lortseam.completeconfig.data.entry.Transformation;
 import me.lortseam.completeconfig.gui.cloth.extensions.CompleteConfigGuiExtension;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import org.spongepowered.configurate.serialize.TypeSerializerCollection;
 
 import java.util.Collection;
@@ -16,6 +18,7 @@ public interface CompleteConfigExtension {
         return null;
     }
 
+    @Environment(EnvType.CLIENT)
     default CompleteConfigGuiExtension gui() {
         return null;
     }

+ 1 - 5
src/main/resources/fabric.mod.json

@@ -17,11 +17,7 @@
   "license": "Apache-2.0",
 
   "environment": "*",
-  "entrypoints": {
-    "main": [
-      "me.lortseam.completeconfig.CompleteConfig"
-    ]
-  },
+  "entrypoints": {},
   "depends": {
     "fabricloader": ">=0.9.0"
   },