From b78edacd8072cc21bfaed93e71fe235b29133e6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= <duplexsys@protonmail.com>
Date: Wed, 13 Sep 2023 16:18:39 -0600
Subject: [PATCH] use Ranges

---
 .../terra/mod/config/MusicSoundTemplate.java      | 15 +++++++--------
 .../terra/mod/config/SpawnEntryTemplate.java      | 13 ++++++-------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/MusicSoundTemplate.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/MusicSoundTemplate.java
index b9f563621..6664e48e9 100644
--- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/MusicSoundTemplate.java
+++ b/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);
         }
     }
 }
diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryTemplate.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryTemplate.java
index 7c203b62e..a0cfa92b2 100644
--- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryTemplate.java
+++ b/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());
     }
 }