use Ranges

gradle.properties

@@ -8,5 +8,4 @@ terra.license=MIT
 # Gradle options
 org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC
 org.gradle.warning.mode=all
-#org.gradle.parallel=true
 

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

@@ -17,35 +17,16 @@
 
 package com.dfsek.terra.fabric;
 
-import cloud.commandframework.execution.CommandExecutionCoordinator;
-import cloud.commandframework.fabric.FabricServerCommandManager;
 import net.fabricmc.api.ModInitializer;
-import net.minecraft.server.command.ServerCommandSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.dfsek.terra.api.command.CommandSender;
-import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
+import com.dfsek.terra.lifecycle.LifecycleEntryPoint;
 
 
-public class FabricEntryPoint implements ModInitializer {
-    private static final Logger logger = LoggerFactory.getLogger(FabricEntryPoint.class);
-    
+public class FabricEntryPoint extends LifecycleEntryPoint implements ModInitializer {
     private static final FabricPlatform TERRA_PLUGIN = new FabricPlatform();
     
     @Override
     public void onInitialize() {
-        logger.info("Initializing Terra Fabric mod...");
-        
-        FabricServerCommandManager<CommandSender> manager = new FabricServerCommandManager<>(
-                CommandExecutionCoordinator.simpleCoordinator(),
-                serverCommandSource -> (CommandSender) serverCommandSource,
-                commandSender -> (ServerCommandSource) commandSender
-        );
-        
-        
-        manager.brigadierManager().setNativeNumberSuggestions(false);
-        
-        TERRA_PLUGIN.getEventManager().callEvent(new CommandRegistrationEvent(manager));
+        initialize("Fabric", TERRA_PLUGIN);
     }
 }

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

@@ -17,43 +17,24 @@
 
 package com.dfsek.terra.fabric;
 
-import ca.solostudios.strata.Versions;
-import ca.solostudios.strata.parser.tokenizer.ParseException;
-import ca.solostudios.strata.version.Version;
 import net.fabricmc.loader.api.FabricLoader;
 import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.Collection;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
-import com.dfsek.terra.addon.EphemeralAddon;
 import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.lifecycle.LifecyclePlatform;
 
 
 public class FabricPlatform extends LifecyclePlatform {
-    private static final Logger LOGGER = LoggerFactory.getLogger(FabricPlatform.class);
     
     @Override
     protected Collection<BaseAddon> getPlatformMods() {
-        return FabricLoader.getInstance().getAllMods().stream().flatMap(mod -> {
-            String id = mod.getMetadata().getId();
-            if(id.equals("terra") || id.equals("minecraft") || id.equals("java")) return Stream.empty();
-            try {
-                Version version = Versions.parseVersion(mod.getMetadata().getVersion().getFriendlyString());
-                return Stream.<BaseAddon>of(new EphemeralAddon(version, "fabric:" + id));
-            } catch(ParseException e) {
-                LOGGER.warn(
-                        "Mod {}, version {} does not follow semantic versioning specification, Terra addons will be unable to depend on " +
-                        "it.",
-                        id, mod.getMetadata().getVersion().getFriendlyString());
-            }
-            return Stream.empty();
-        }).collect(Collectors.toList());
+        return FabricLoader.getInstance().getAllMods().stream().flatMap(
+                mod -> parseModData(mod.getMetadata().getId(), mod.getMetadata().getVersion().getFriendlyString())).collect(
+                Collectors.toList());
     }
     
     @Override

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

@@ -50,7 +50,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;
@@ -88,6 +87,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)
@@ -96,7 +96,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/MusicSoundTemplate.java

@@ -3,6 +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 com.dfsek.terra.api.util.Range;
+
 import net.minecraft.registry.Registries;
 import net.minecraft.sound.MusicSound;
 import net.minecraft.sound.SoundEvent;
@@ -13,13 +16,9 @@ public class MusicSoundTemplate implements ObjectTemplate<MusicSound> {
     @Default
     private SoundEvent sound = null;
     
-    @Value("min-delay")
+    @Value("delay")
     @Default
-    private Integer minDelay = null;
-    
-    @Value("max-delay")
-    @Default
-    private Integer maxDelay = null;
+    private Range delay = null;
     
     @Value("replace-current-music")
     @Default
@@ -27,10 +26,10 @@ public class MusicSoundTemplate implements ObjectTemplate<MusicSound> {
     
     @Override
     public MusicSound get() {
-        if(sound == null || minDelay == null || maxDelay == null || replaceCurrentMusic == null) {
+        if(sound == null || delay == null || replaceCurrentMusic == null) {
             return null;
         } else {
-            return new MusicSound(Registries.SOUND_EVENT.getEntry(sound), minDelay, maxDelay, replaceCurrentMusic);
+            return new MusicSound(Registries.SOUND_EVENT.getEntry(sound), delay.getMin(), delay.getMax(), replaceCurrentMusic);
         }
     }
 }

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

@@ -3,6 +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 com.dfsek.terra.api.util.Range;
+
 import net.minecraft.entity.EntityType;
 import net.minecraft.world.biome.SpawnSettings.SpawnEntry;
 
@@ -16,16 +19,12 @@ public class SpawnEntryTemplate implements ObjectTemplate<SpawnEntry> {
     @Default
     private Integer weight = null;
     
-    @Value("min-group-size")
+    @Value("group-size")
     @Default
-    private Integer minGroupSize = null;
-    
-    @Value("max-group-size")
-    @Default
-    private Integer maxGroupSize = null;
+    private Range groupSize = null;
     
     @Override
     public SpawnEntry get() {
-        return new SpawnEntry(type, weight, minGroupSize, maxGroupSize);
+        return new SpawnEntry(type, weight, groupSize.getMin(), groupSize.getMax());
     }
 }

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;
     }
     

platforms/mixin-lifecycle/build.gradle.kts

@@ -15,6 +15,11 @@ dependencies {
     
     minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
     mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
+    
+    modImplementation("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud) {
+        exclude("net.fabricmc")
+        exclude("net.fabricmc.fabric-api")
+    }
 }
 
 loom {

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecycleEntryPoint.java

@@ -0,0 +1,34 @@
+package com.dfsek.terra.lifecycle;
+
+import cloud.commandframework.execution.CommandExecutionCoordinator;
+
+import cloud.commandframework.fabric.FabricServerCommandManager;
+
+import com.dfsek.terra.api.command.CommandSender;
+import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
+
+import com.dfsek.terra.mod.MinecraftAddon;
+
+import net.minecraft.server.command.ServerCommandSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class LifecycleEntryPoint {
+    private static final Logger logger = LoggerFactory.getLogger(LifecycleEntryPoint.class);
+    
+    protected static void initialize(String modName, LifecyclePlatform platform) {
+        logger.info("Initializing Terra {} mod...", modName);
+    
+        FabricServerCommandManager<CommandSender> manager = new FabricServerCommandManager<>(
+                CommandExecutionCoordinator.simpleCoordinator(),
+                serverCommandSource -> (CommandSender) serverCommandSource,
+                commandSender -> (ServerCommandSource) commandSender
+        );
+    
+    
+        manager.brigadierManager().setNativeNumberSuggestions(false);
+    
+        platform.getEventManager().callEvent(new CommandRegistrationEvent(manager));
+    }
+}

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java

@@ -2,6 +2,7 @@ package com.dfsek.terra.lifecycle;
 
 import ca.solostudios.strata.Versions;
 import ca.solostudios.strata.parser.tokenizer.ParseException;
+import ca.solostudios.strata.version.Version;
 
 import com.dfsek.terra.lifecycle.util.BiomeUtil;
 
@@ -20,6 +21,7 @@ import org.slf4j.LoggerFactory;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.stream.Stream;
 import java.util.concurrent.atomic.AtomicReference;
 
 import com.dfsek.terra.addon.EphemeralAddon;
@@ -103,12 +105,26 @@ public abstract class LifecyclePlatform extends ModPlatform {
                 LOGGER.warn("Failed to parse Minecraft version", e);
             }
         }
-        
+    
         addons.addAll(getPlatformMods());
-        
+    
         return addons;
     }
     
+    protected Stream<EphemeralAddon> parseModData(String id, String modVersion) {
+        if(id.equals("terra") || id.equals("minecraft") || id.equals("java")) return Stream.empty();
+        try {
+            Version version = Versions.parseVersion(modVersion);
+            return Stream.of(new EphemeralAddon(version, "quilt:" + id));
+        } catch(ParseException e) {
+            LOGGER.warn(
+                    "Mod {}, version {} does not follow semantic versioning specification, Terra addons will be unable to depend on " +
+                    "it.",
+                    id, modVersion);
+        }
+        return Stream.empty();
+    }
+    
     @Override
     public Registry<DimensionType> dimensionTypeRegistry() {
         return DIMENSIONS.get();

platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltEntryPoint.java

@@ -17,36 +17,17 @@
 
 package com.dfsek.terra.quilt;
 
-import cloud.commandframework.execution.CommandExecutionCoordinator;
-import cloud.commandframework.fabric.FabricServerCommandManager;
-import net.minecraft.server.command.ServerCommandSource;
 import org.quiltmc.loader.api.ModContainer;
 import org.quiltmc.qsl.base.api.entrypoint.ModInitializer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.dfsek.terra.api.command.CommandSender;
-import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
+import com.dfsek.terra.lifecycle.LifecycleEntryPoint;
 
 
-public class QuiltEntryPoint implements ModInitializer {
-    private static final Logger logger = LoggerFactory.getLogger(QuiltEntryPoint.class);
-    
+public class QuiltEntryPoint extends LifecycleEntryPoint implements ModInitializer {
     private static final QuiltPlatform TERRA_PLUGIN = new QuiltPlatform();
-
+    
     @Override
     public void onInitialize(ModContainer container) {
-        logger.info("Initializing Terra Quilt mod...");
-        
-        FabricServerCommandManager<CommandSender> manager = new FabricServerCommandManager<>(
-                CommandExecutionCoordinator.simpleCoordinator(),
-                serverCommandSource -> (CommandSender) serverCommandSource,
-                commandSender -> (ServerCommandSource) commandSender
-        );
-        
-        
-        manager.brigadierManager().setNativeNumberSuggestions(false);
-        
-        TERRA_PLUGIN.getEventManager().callEvent(new CommandRegistrationEvent(manager));
+        initialize("Quilt", TERRA_PLUGIN);
     }
 }

platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java

@@ -17,43 +17,23 @@
 
 package com.dfsek.terra.quilt;
 
-import ca.solostudios.strata.Versions;
-import ca.solostudios.strata.parser.tokenizer.ParseException;
-import ca.solostudios.strata.version.Version;
 import org.jetbrains.annotations.NotNull;
 import org.quiltmc.loader.api.QuiltLoader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.Collection;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
-import com.dfsek.terra.addon.EphemeralAddon;
 import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.lifecycle.LifecyclePlatform;
 
 
 public class QuiltPlatform extends LifecyclePlatform {
-    private static final Logger LOGGER = LoggerFactory.getLogger(QuiltPlatform.class);
     
     @Override
     protected Collection<BaseAddon> getPlatformMods() {
-        return QuiltLoader.getAllMods().stream().flatMap(mod -> {
-            String id = mod.metadata().id();
-            if(id.equals("terra") || id.equals("minecraft") || id.equals("java")) return Stream.empty();
-            try {
-                Version version = Versions.parseVersion(mod.metadata().version().raw());
-                return Stream.of(new EphemeralAddon(version, "quilt:" + id));
-            } catch(ParseException e) {
-                LOGGER.warn(
-                        "Mod {}, version {} does not follow semantic versioning specification, Terra addons will be unable to depend on " +
-                        "it.",
-                        id, mod.metadata().version().raw());
-            }
-            return Stream.empty();
-        }).collect(Collectors.toList());
+        return QuiltLoader.getAllMods().stream().flatMap(mod -> parseModData(mod.metadata().id(), mod.metadata().version().raw())).collect(
+                Collectors.toList());
     }
     
     @Override