abstract addon id

platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricAddon.java

@@ -0,0 +1,16 @@
+package com.dfsek.terra.fabric;
+
+import com.dfsek.terra.mod.MinecraftAddon;
+import com.dfsek.terra.mod.ModPlatform;
+
+public class FabricAddon extends MinecraftAddon {
+
+    public FabricAddon(ModPlatform modPlatform) {
+        super(modPlatform);
+    }
+
+    @Override
+    public String getID() {
+        return "terra-fabric";
+    }
+}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/PlatformImpl.java

@@ -143,4 +143,9 @@ public class PlatformImpl extends ModPlatform {
     public @NotNull ItemHandle getItemHandle() {
         return itemHandle;
     }
+
+    @Override
+    public BaseAddon getPlatformAddon() {
+        return new FabricAddon(this);
+    }
 }

platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeAddon.java

@@ -0,0 +1,16 @@
+package com.dfsek.terra.forge;
+
+import com.dfsek.terra.mod.MinecraftAddon;
+import com.dfsek.terra.mod.ModPlatform;
+
+public class ForgeAddon extends MinecraftAddon {
+
+    public ForgeAddon(ModPlatform modPlatform) {
+        super(modPlatform);
+    }
+
+    @Override
+    public String getID() {
+        return "terra-forge";
+    }
+}

platforms/forge/src/main/java/com/dfsek/terra/forge/PlatformImpl.java

@@ -49,33 +49,33 @@ public class PlatformImpl extends ModPlatform {
     private final ItemHandle itemHandle = new MinecraftItemHandle();
     private final WorldHandle worldHandle = new MinecraftWorldHandle();
     private final Lazy<File> dataFolder = Lazy.lazy(() -> new File("./config/Terra"));
-    
+
     public PlatformImpl() {
         CommonPlatform.initialize(this);
         load();
     }
-    
+
     @Override
     public MinecraftServer getServer() {
         return ServerLifecycleHooks.getCurrentServer();
     }
-    
+
     @Override
     public boolean reload() {
         getTerraConfig().load(this);
         getRawConfigRegistry().clear();
         boolean succeed = getRawConfigRegistry().loadAll(this);
-        
+
         MinecraftServer server = getServer();
-        
+
-        if(server != null) {
+        if (server != null) {
             server.reloadResources(server.getDataPackManager().getNames()).exceptionally(throwable -> {
                 LOGGER.warn("Failed to execute reload", throwable);
                 return null;
             }).join();
             //BiomeUtil.registerBiomes();
             server.getWorlds().forEach(world -> {
-                if(world.getChunkManager().getChunkGenerator() instanceof MinecraftChunkGeneratorWrapper chunkGeneratorWrapper) {
+                if (world.getChunkManager().getChunkGenerator() instanceof MinecraftChunkGeneratorWrapper chunkGeneratorWrapper) {
                     getConfigRegistry().get(chunkGeneratorWrapper.getPack().getRegistryKey()).ifPresent(pack -> {
                         chunkGeneratorWrapper.setPack(pack);
                         LOGGER.info("Replaced pack in chunk generator for world {}", world);
@@ -85,51 +85,57 @@ public class PlatformImpl extends ModPlatform {
         }
         return succeed;
     }
-    
+
     @Override
     protected Iterable<BaseAddon> platformAddon() {
         List<BaseAddon> addons = new ArrayList<>();
-    
+
         super.platformAddon().forEach(addons::add);
-        
+
         String mcVersion = MinecraftVersion.CURRENT.getReleaseTarget();
         try {
             addons.add(new EphemeralAddon(Versions.parseVersion(mcVersion), "minecraft"));
-        } catch(ParseException e) {
+        } catch (ParseException e) {
             try {
                 addons.add(new EphemeralAddon(Versions.parseVersion(mcVersion + ".0"), "minecraft"));
-            } catch(ParseException ex) {
+            } catch (ParseException ex) {
                 LOGGER.warn("Failed to parse Minecraft version", e);
             }
         }
-        
+
         FMLLoader.getLoadingModList().getMods().forEach(mod -> {
             String id = mod.getModId();
-            if(id.equals("terra") || id.equals("minecraft") || id.equals("java")) return;
+            if (id.equals("terra") || id.equals("minecraft") || id.equals("java")) return;
             Version version = Versions.getVersion(mod.getVersion().getMajorVersion(), mod.getVersion().getMinorVersion(), mod.getVersion().getIncrementalVersion());
             addons.add(new EphemeralAddon(version, "forge:" + id));
         });
-        
+
         return addons;
     }
-    
+
     @Override
     public @NotNull String platformName() {
         return "Forge";
     }
-    
+
     @Override
     public @NotNull WorldHandle getWorldHandle() {
         return worldHandle;
     }
-    
+
     @Override
     public @NotNull File getDataFolder() {
         return dataFolder.value();
     }
-    
+
     @Override
     public @NotNull ItemHandle getItemHandle() {
         return itemHandle;
     }
+
+
+    @Override
+    public BaseAddon getPlatformAddon() {
+        return new ForgeAddon(this);
+    }
 }

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/MinecraftAddon.java

@@ -33,7 +33,7 @@ import com.dfsek.terra.mod.config.PreLoadCompatibilityOptions;
 import com.dfsek.terra.mod.config.VanillaBiomeProperties;
 
 
-public final class MinecraftAddon implements BaseAddon {
+public abstract class MinecraftAddon implements BaseAddon {
     private static final Version VERSION = Versions.getVersion(1, 0, 0);
     private static final Logger logger = LoggerFactory.getLogger(MinecraftAddon.class);
     private final ModPlatform modPlatform;
@@ -72,9 +72,4 @@ public final class MinecraftAddon implements BaseAddon {
     public Version getVersion() {
         return VERSION;
     }
-    
-    @Override
-    public String getID() {
-        return "terra-mod";
-    }
 }

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java

@@ -86,9 +86,11 @@ public abstract class ModPlatform extends AbstractPlatform {
         if(BuiltinRegistries.BIOME.get(identifier) == null) throw new LoadException("Invalid Biome ID: " + identifier, tracker); // failure.
         return new ProtoPlatformBiome(identifier);
     }
-    
+
     @Override
     protected Iterable<BaseAddon> platformAddon() {
-        return List.of(new MinecraftAddon(this));
+        return List.of(getPlatformAddon());
     }
+
+    protected abstract BaseAddon getPlatformAddon();
 }