Merge pull request #32 from dima-dencep/patform

Remove `PlatformUtils`

common/src/main/java/io/github/kosmx/bendylib/compat/tr7zw/TDSkinCompat.java

@@ -17,9 +17,7 @@
 import java.util.function.Consumer;
 
 public class TDSkinCompat {
-    public static void init(Logger logger) throws ClassNotFoundException, NoClassDefFoundError {
-        logger.info("Initializing 3D Skin Layers compatibility");
-
+    public static void init() throws ClassNotFoundException, NoClassDefFoundError {
         SkinLayersAPI.setupMeshTransformerProvider(modelPart -> {
             var sourceCuboidOptional = ModelPartAccessor.optionalGetCuboid(modelPart, 0);
             if (sourceCuboidOptional.isPresent()

fabric/src/main/java/io/github/kosmx/bendylib/fabric/Init.java

@@ -1,8 +1,8 @@
 package io.github.kosmx.bendylib.fabric;
 
-import io.github.kosmx.bendylib.PlatformUtils;
 import io.github.kosmx.bendylib.compat.tr7zw.TDSkinCompat;
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.loader.api.FabricLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -11,9 +11,11 @@ public class Init implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
-        if (PlatformUtils.isSkinLayersPresent()) {
+        if (FabricLoader.getInstance().isModLoaded("skinlayers")) {
+            LOGGER.info("Initializing 3D Skin Layers compatibility");
+
             try {
-                TDSkinCompat.init(LOGGER);
+                TDSkinCompat.init();
             } catch(NoClassDefFoundError|ClassNotFoundException e) {
                 LOGGER.error("Failed to initialize 3D Skin Layers compatibility");
             }

forge/src/main/java/io/github/kosmx/bendylib/neoforge/ForgeModInterface.java

@@ -1,37 +1,29 @@
 package io.github.kosmx.bendylib.neoforge;
 
-import io.github.kosmx.bendylib.PlatformUtils;
 import io.github.kosmx.bendylib.compat.tr7zw.TDSkinCompat;
-import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.ModList;
 import net.neoforged.fml.common.Mod;
-import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 import net.neoforged.fml.loading.FMLLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Mod("bendylib")
 public class ForgeModInterface {
-
     public static Logger LOGGER = LoggerFactory.getLogger("bendy-lib");
+
     public ForgeModInterface() {
         if (!FMLLoader.getDist().isClient()) {
-            System.out.println("[bendy-lib] You're loading a client-only mod on server-side");
-            System.out.println("[bendy-lib] Most likely it won't be a problem");
+            LOGGER.warn("You're loading a client-only mod on server-side");
+            LOGGER.warn("Most likely it won't be a problem");
         }
-    }
 
-    @Mod.EventBusSubscriber(modid = "bendylib", bus = Mod.EventBusSubscriber.Bus.MOD)
-    public static class ClientModEvents
-    {
-        @SubscribeEvent
-        public static void onClientSetup(FMLClientSetupEvent event)
-        {
-            if (PlatformUtils.isSkinLayersPresent()) {
-                try {
-                    TDSkinCompat.init(LOGGER);
-                } catch(NoClassDefFoundError|ClassNotFoundException e) {
-                    LOGGER.error("Failed to initialize 3D Skin Layers compatibility");
-                }
+        if (ModList.get().isLoaded("skinlayers3d")) {
+            LOGGER.info("Initializing 3D Skin Layers compatibility");
+
+            try {
+                TDSkinCompat.init();
+            } catch(NoClassDefFoundError|ClassNotFoundException e) {
+                LOGGER.error("Failed to initialize 3D Skin Layers compatibility");
             }
         }
     }