move service related code to platform

Common/src/main/java/com/almostreliable/unified/AlmostUnifiedPlatform.java

@@ -6,11 +6,12 @@ import net.minecraft.world.item.Item;
 
 import java.nio.file.Path;
 import java.util.List;
+import java.util.ServiceLoader;
 import java.util.Set;
 
 public interface AlmostUnifiedPlatform {
 
-    AlmostUnifiedPlatform INSTANCE = PlatformLoader.load(AlmostUnifiedPlatform.class);
+    AlmostUnifiedPlatform INSTANCE = load(AlmostUnifiedPlatform.class);
 
     /**
      * Gets the current platform
@@ -27,13 +28,6 @@ public interface AlmostUnifiedPlatform {
      */
     boolean isModLoaded(String modId);
 
-    /**
-     * Check if the game is currently in a development environment.
-     *
-     * @return True if in a development environment, false otherwise.
-     */
-    boolean isDevelopmentEnvironment();
-
     boolean isClient();
 
     Path getConfigPath();
@@ -43,4 +37,17 @@ public interface AlmostUnifiedPlatform {
     void bindRecipeHandlers(RecipeHandlerFactory factory);
 
     Set<UnifyTag<Item>> getStoneStrataTags(List<String> stoneStrataIds);
+
+    static <T> T load(Class<T> clazz) {
+        T loadedService = ServiceLoader.load(clazz)
+                .findFirst()
+                .orElseThrow(() -> new NullPointerException("Failed to load service for " + clazz.getName()));
+        AlmostUnified.LOG.debug("Loaded {} for service {}", loadedService, clazz);
+        return loadedService;
+    }
+
+    enum Platform {
+        FORGE,
+        FABRIC;
+    }
 }

Common/src/main/java/com/almostreliable/unified/Platform.java

@@ -1,6 +0,0 @@
-package com.almostreliable.unified;
-
-public enum Platform {
-    FORGE,
-    FABRIC
-}

Common/src/main/java/com/almostreliable/unified/PlatformLoader.java

@@ -1,14 +0,0 @@
-package com.almostreliable.unified;
-
-import java.util.ServiceLoader;
-
-@SuppressWarnings("UtilityClassWithoutPrivateConstructor")
-public final class PlatformLoader {
-    static <T> T load(Class<T> clazz) {
-        final T loadedService = ServiceLoader.load(clazz)
-                .findFirst()
-                .orElseThrow(() -> new NullPointerException("Failed to load service for " + clazz.getName()));
-        AlmostUnified.LOG.debug("Loaded {} for service {}", loadedService, clazz);
-        return loadedService;
-    }
-}

Common/src/main/java/com/almostreliable/unified/config/Defaults.java

@@ -1,6 +1,6 @@
 package com.almostreliable.unified.config;
 
-import com.almostreliable.unified.Platform;
+import com.almostreliable.unified.AlmostUnifiedPlatform;
 import com.almostreliable.unified.utils.JsonCompare;
 import net.minecraft.resources.ResourceLocation;
 
@@ -70,7 +70,7 @@ public final class Defaults {
 
     private Defaults() {}
 
-    public static List<String> getModPriorities(Platform platform) {
+    public static List<String> getModPriorities(AlmostUnifiedPlatform.Platform platform) {
         return switch (platform) {
             case FORGE -> List.of(
                     "minecraft",
@@ -93,7 +93,7 @@ public final class Defaults {
         };
     }
 
-    public static List<String> getTags(Platform platform) {
+    public static List<String> getTags(AlmostUnifiedPlatform.Platform platform) {
         return switch (platform) {
             case FORGE -> List.of(
                     "forge:nuggets/{material}",
@@ -129,13 +129,13 @@ public final class Defaults {
         };
     }
 
-    public static List<String> getIgnoredRecipeTypes(Platform platform) {
+    public static List<String> getIgnoredRecipeTypes(AlmostUnifiedPlatform.Platform platform) {
         return switch (platform) {
             default -> List.of("cucumber:shaped_tag");
         };
     }
 
-    public static JsonCompare.CompareSettings getDefaultDuplicateRules(Platform platform) {
+    public static JsonCompare.CompareSettings getDefaultDuplicateRules(AlmostUnifiedPlatform.Platform platform) {
         JsonCompare.CompareSettings result = new JsonCompare.CompareSettings();
         result.ignoreField(switch (platform) {
             case FORGE -> "conditions";
@@ -148,7 +148,7 @@ public final class Defaults {
         return result;
     }
 
-    public static LinkedHashMap<ResourceLocation, JsonCompare.CompareSettings> getDefaultDuplicateOverrides(Platform platform) {
+    public static LinkedHashMap<ResourceLocation, JsonCompare.CompareSettings> getDefaultDuplicateOverrides(AlmostUnifiedPlatform.Platform platform) {
         JsonCompare.CompareSettings result = new JsonCompare.CompareSettings();
         result.ignoreField(switch (platform) {
             case FORGE -> "conditions";

Common/src/test/java/com/almostreliable/unified/TestUtils.java

@@ -38,7 +38,7 @@ public final class TestUtils {
     public static final UnifyConfig DEFAULT_UNIFY_CONFIG = new UnifyConfig(
             Defaults.STONE_STRATA,
             Defaults.MATERIALS,
-            Defaults.getTags(Platform.FORGE),
+            Defaults.getTags(AlmostUnifiedPlatform.Platform.FORGE),
             TEST_MOD_PRIORITIES,
             new HashMap<>(),
             new HashMap<>(),
@@ -55,11 +55,13 @@ public final class TestUtils {
     private TestUtils() {}
 
     public static JsonCompare.CompareSettings getDefaultCompareSettings() {
-        return Defaults.getDefaultDuplicateRules(Platform.FORGE);
+        return Defaults.getDefaultDuplicateRules(AlmostUnifiedPlatform.Platform.FORGE);
     }
 
     public static JsonCompare.CompareSettings getDefaultShapedCompareSettings() {
-        return Defaults.getDefaultDuplicateOverrides(Platform.FORGE).get(new ResourceLocation("crafting_shaped"));
+        return Defaults
+                .getDefaultDuplicateOverrides(AlmostUnifiedPlatform.Platform.FORGE)
+                .get(new ResourceLocation("crafting_shaped"));
     }
 
     public static final ResourceKey<Registry<Item>> FAKE_ITEM_REGISTRY = FakeResourceKeyRegistry.create("item");

Fabric/src/main/java/com/almostreliable/unified/AlmostUnifiedPlatformFabric.java

@@ -28,11 +28,6 @@ public class AlmostUnifiedPlatformFabric implements AlmostUnifiedPlatform {
         return FabricLoader.getInstance().isModLoaded(modId);
     }
 
-    @Override
-    public boolean isDevelopmentEnvironment() {
-        return FabricLoader.getInstance().isDevelopmentEnvironment();
-    }
-
     @Override
     public boolean isClient() {
         return FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT;

Forge/src/main/java/com/almostreliable/unified/AlmostUnifiedPlatformForge.java

@@ -38,11 +38,6 @@ public class AlmostUnifiedPlatformForge implements AlmostUnifiedPlatform {
         return ModList.get().isLoaded(modId);
     }
 
-    @Override
-    public boolean isDevelopmentEnvironment() {
-        return !FMLLoader.isProduction();
-    }
-
     @Override
     public boolean isClient() {
         return FMLLoader.getDist() == Dist.CLIENT;