ConfigPack interfaceification

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java

@@ -9,6 +9,7 @@ import com.dfsek.terra.api.addon.annotations.Version;
 import com.dfsek.terra.api.command.CommandManager;
 import com.dfsek.terra.api.command.TerraCommandManager;
 import com.dfsek.terra.api.command.exception.MalformedCommandException;
+import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.EventManager;
 import com.dfsek.terra.api.event.EventManagerImpl;
 import com.dfsek.terra.api.block.BlockData;
@@ -40,7 +41,6 @@ import com.dfsek.terra.config.GenericLoaders;
 import com.dfsek.terra.config.PluginConfig;
 import com.dfsek.terra.config.lang.LangUtil;
 import com.dfsek.terra.config.lang.Language;
-import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.api.profiler.Profiler;
 import com.dfsek.terra.profiler.ProfilerImpl;
 import com.dfsek.terra.registry.master.AddonRegistry;

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

@@ -11,6 +11,7 @@ import com.dfsek.terra.api.addon.annotations.Version;
 import com.dfsek.terra.api.command.CommandManager;
 import com.dfsek.terra.api.command.TerraCommandManager;
 import com.dfsek.terra.api.command.exception.MalformedCommandException;
+import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.EventListener;
 import com.dfsek.terra.api.event.EventManager;
 import com.dfsek.terra.api.event.EventManagerImpl;
@@ -36,7 +37,6 @@ import com.dfsek.terra.config.PluginConfig;
 import com.dfsek.terra.config.builder.BiomeBuilder;
 import com.dfsek.terra.config.lang.LangUtil;
 import com.dfsek.terra.config.lang.Language;
-import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
 import com.dfsek.terra.fabric.generation.PopulatorFeature;
 import com.dfsek.terra.fabric.generation.TerraBiomeSource;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java

@@ -1,5 +1,6 @@
 package com.dfsek.terra.fabric.generation;
 
+import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.generator.ChunkData;
 import com.dfsek.terra.api.world.generator.GeneratorWrapper;
@@ -7,7 +8,7 @@ import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.generation.Chunkified;
 import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
 import com.dfsek.terra.api.world.locate.AsyncStructureFinder;
-import com.dfsek.terra.config.pack.ConfigPack;
+import com.dfsek.terra.config.pack.ConfigPackImpl;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.fabric.block.FabricBlockData;
 import com.dfsek.terra.fabric.mixin.StructureAccessorAccessor;
@@ -71,10 +72,10 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Gener
     private final DefaultChunkGenerator3D delegate;
     private final TerraBiomeSource biomeSource;
 
-    private final ConfigPack pack;
+    private final ConfigPackImpl pack;
     private DimensionType dimensionType;
 
-    public FabricChunkGeneratorWrapper(TerraBiomeSource biomeSource, long seed, ConfigPack configPack) {
+    public FabricChunkGeneratorWrapper(TerraBiomeSource biomeSource, long seed, ConfigPackImpl configPack) {
         super(biomeSource, new StructuresConfig(false));
         this.pack = configPack;
 
@@ -96,7 +97,7 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Gener
         return new FabricChunkGeneratorWrapper((TerraBiomeSource) this.biomeSource.withSeed(seed), seed, pack);
     }
 
-    public ConfigPack getPack() {
+    public ConfigPackImpl getPack() {
         return pack;
     }
 

platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java

@@ -1,8 +1,9 @@
 package com.dfsek.terra.fabric.generation;
 
+import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.config.pack.ConfigPack;
+import com.dfsek.terra.config.pack.ConfigPackImpl;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.fabric.util.FabricUtil;
 import com.mojang.serialization.Codec;
@@ -29,9 +30,9 @@ public class TerraBiomeSource extends BiomeSource {
     private final Registry<Biome> biomeRegistry;
     private final long seed;
     private final BiomeProvider grid;
-    private final ConfigPack pack;
+    private final ConfigPackImpl pack;
 
-    public TerraBiomeSource(Registry<Biome> biomes, long seed, ConfigPack pack) {
+    public TerraBiomeSource(Registry<Biome> biomes, long seed, ConfigPackImpl pack) {
         super(biomes.stream()
                 .filter(biome -> Objects.requireNonNull(biomes.getId(biome)).getNamespace().equals("terra")) // Filter out non-Terra biomes.
                 .collect(Collectors.toList()));

platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraGeneratorType.java

@@ -1,13 +1,11 @@
 package com.dfsek.terra.fabric.generation;
 
-import com.dfsek.terra.config.pack.ConfigPack;
+import com.dfsek.terra.config.pack.ConfigPackImpl;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.fabric.event.BiomeRegistrationEvent;
-import com.dfsek.terra.fabric.util.FabricUtil;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.world.GeneratorType;
-import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.DynamicRegistryManager;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.world.biome.Biome;
@@ -17,9 +15,9 @@ import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
 
 @Environment(EnvType.CLIENT)
 public class TerraGeneratorType extends GeneratorType {
-    private final ConfigPack pack;
+    private final ConfigPackImpl pack;
 
-    public TerraGeneratorType(ConfigPack pack) {
+    public TerraGeneratorType(ConfigPackImpl pack) {
         super("terra." + pack.getTemplate().getID());
         this.pack = pack;
     }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java

@@ -1,13 +1,11 @@
 package com.dfsek.terra.fabric.mixin.lifecycle.server;
 
-import com.dfsek.terra.config.pack.ConfigPack;
+import com.dfsek.terra.config.pack.ConfigPackImpl;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.fabric.event.BiomeRegistrationEvent;
 import com.dfsek.terra.fabric.generation.TerraBiomeSource;
 import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
-import com.dfsek.terra.fabric.util.FabricUtil;
 import com.google.common.base.MoreObjects;
-import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.DynamicRegistryManager;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.util.registry.SimpleRegistry;
@@ -58,7 +56,7 @@ public abstract class GeneratorOptionsMixin {
 
             prop = prop.substring(prop.indexOf(":") + 1);
 
-            ConfigPack config = main.getConfigRegistry().get(prop);
+            ConfigPackImpl config = main.getConfigRegistry().get(prop);
 
             if(config == null) throw new IllegalArgumentException("No such pack " + prop);
 

platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java

@@ -2,7 +2,7 @@ package com.dfsek.terra.fabric.util;
 
 import com.dfsek.terra.api.util.generic.pair.Pair;
 import com.dfsek.terra.config.builder.BiomeBuilder;
-import com.dfsek.terra.config.pack.ConfigPack;
+import com.dfsek.terra.config.pack.ConfigPackImpl;
 import com.dfsek.terra.config.templates.BiomeTemplate;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.fabric.config.PostLoadCompatibilityOptions;
@@ -29,7 +29,7 @@ import java.util.Map;
 import java.util.function.Supplier;
 
 public final class FabricUtil {
-    public static String createBiomeID(ConfigPack pack, String biomeID) {
+    public static String createBiomeID(ConfigPackImpl pack, String biomeID) {
         return pack.getTemplate().getID().toLowerCase() + "/" + biomeID.toLowerCase(Locale.ROOT);
     }
 
@@ -40,7 +40,7 @@ public final class FabricUtil {
      * @param pack        The ConfigPack this biome belongs to.
      * @return The Minecraft delegate biome.
      */
-    public static Biome createBiome(BiomeBuilder biome, ConfigPack pack, DynamicRegistryManager registryManager) {
+    public static Biome createBiome(BiomeBuilder biome, ConfigPackImpl pack, DynamicRegistryManager registryManager) {
         BiomeTemplate template = biome.getTemplate();
         Map<String, Integer> colors = template.getColors();
 

platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java

@@ -3,6 +3,7 @@ package com.dfsek.terra;
 import com.dfsek.tectonic.loading.TypeRegistry;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.addon.TerraAddon;
+import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.EventManager;
 import com.dfsek.terra.api.event.EventManagerImpl;
 import com.dfsek.terra.api.block.BlockData;
@@ -18,7 +19,6 @@ import com.dfsek.terra.config.GenericLoaders;
 import com.dfsek.terra.config.PluginConfig;
 import com.dfsek.terra.config.lang.LangUtil;
 import com.dfsek.terra.config.lang.Language;
-import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.platform.RawBiome;
 import com.dfsek.terra.platform.RawWorldHandle;
 import com.dfsek.terra.api.profiler.Profiler;

platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java

@@ -3,6 +3,7 @@ package com.dfsek.terra.sponge;
 import com.dfsek.tectonic.loading.TypeRegistry;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.addon.TerraAddon;
+import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.EventManager;
 import com.dfsek.terra.api.event.EventManagerImpl;
 import com.dfsek.terra.api.handle.ItemHandle;
@@ -13,7 +14,6 @@ import com.dfsek.terra.api.registry.LockedRegistry;
 import com.dfsek.terra.api.util.logging.DebugLogger;
 import com.dfsek.terra.config.PluginConfig;
 import com.dfsek.terra.config.lang.Language;
-import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.api.profiler.Profiler;
 import com.dfsek.terra.registry.master.AddonRegistry;
 import com.dfsek.terra.registry.master.ConfigRegistry;