UX tweaks to biome config

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

@@ -40,7 +40,6 @@ import com.dfsek.terra.mod.config.ProtoPlatformBiome;
 import com.dfsek.terra.mod.config.SoundEventTemplate;
 import com.dfsek.terra.mod.config.SpawnCostConfig;
 import com.dfsek.terra.mod.config.SpawnEntryTemplate;
-import com.dfsek.terra.mod.config.SpawnGroupTemplate;
 import com.dfsek.terra.mod.config.SpawnSettingsTemplate;
 import com.dfsek.terra.mod.config.SpawnTypeConfig;
 import com.dfsek.terra.mod.config.VillagerTypeTemplate;
@@ -78,6 +77,7 @@ public abstract class ModPlatform extends AbstractPlatform {
                 .registerLoader(GrassColorModifier.class,
                                 (type, o, loader, depthTracker) -> TemperatureModifier.valueOf(((String) o).toUpperCase(
                                         Locale.ROOT)))
+                .registerLoader(SpawnGroup.class,(type, o, loader, depthTracker) ->  SpawnGroup.valueOf((String) o))
                 .registerLoader(BiomeParticleConfig.class, BiomeParticleConfigTemplate::new)
                 .registerLoader(SoundEvent.class, SoundEventTemplate::new)
                 .registerLoader(BiomeMoodSound.class, BiomeMoodSoundTemplate::new)
@@ -86,7 +86,6 @@ public abstract class ModPlatform extends AbstractPlatform {
                 .registerLoader(EntityType.class, EntityTypeTemplate::new)
                 .registerLoader(SpawnCostConfig.class, SpawnCostConfig::new)
                 .registerLoader(SpawnEntry.class, SpawnEntryTemplate::new)
-                .registerLoader(SpawnGroup.class, SpawnGroupTemplate::new)
                 .registerLoader(SpawnTypeConfig.class, SpawnTypeConfig::new)
                 .registerLoader(SpawnSettings.class, SpawnSettingsTemplate::new)
                 .registerLoader(VillagerType.class, VillagerTypeTemplate::new);

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

@@ -1,18 +0,0 @@
-package com.dfsek.terra.mod.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import net.minecraft.entity.SpawnGroup;
-
-
-public class SpawnGroupTemplate implements ObjectTemplate<SpawnGroup> {
-    @Value("group")
-    @Default
-    private String group = null;
-    
-    @Override
-    public SpawnGroup get() {
-        return SpawnGroup.valueOf(group);
-    }
-}

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

@@ -3,7 +3,9 @@ package com.dfsek.terra.mod.config;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+import net.minecraft.entity.SpawnGroup;
 import net.minecraft.world.biome.SpawnSettings;
+import net.minecraft.world.biome.SpawnSettings.SpawnEntry;
 
 import java.util.List;
 
@@ -25,7 +27,10 @@ public class SpawnSettingsTemplate implements ObjectTemplate<SpawnSettings> {
     public SpawnSettings get() {
         SpawnSettings.Builder builder = new SpawnSettings.Builder();
         for(SpawnTypeConfig spawn : spawns) {
-            builder.spawn(spawn.getGroup(), spawn.getEntry());
+            SpawnGroup group = spawn.getGroup();
+            for (SpawnEntry entry : spawn.getEntry()) {
+                builder.spawn(group, entry);
+            }
         }
         for(SpawnCostConfig cost : costs) {
             builder.spawnCost(cost.getType(), cost.getMass(), cost.getGravity());

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

@@ -6,21 +6,23 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import net.minecraft.entity.SpawnGroup;
 import net.minecraft.world.biome.SpawnSettings.SpawnEntry;
 
+import java.util.List;
+
 
 public class SpawnTypeConfig implements ObjectTemplate<SpawnTypeConfig> {
     @Value("group")
     @Default
     private SpawnGroup group = null;
     
-    @Value("entry")
+    @Value("entries")
     @Default
-    private SpawnEntry entry = null;
+    private List<SpawnEntry> entry = null;
     
     public SpawnGroup getGroup() {
         return group;
     }
     
-    public SpawnEntry getEntry() {
+    public List<SpawnEntry> getEntry() {
         return entry;
     }