From f877f861cfc481972dfef73a28901df8c11c9ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= <duplexsys@protonmail.com>
Date: Fri, 5 Jan 2024 14:47:26 -0700
Subject: [PATCH] use Ranges

---
 .../terra/mod/config/MusicSoundTemplate.java  | 19 +++++++++----------
 .../terra/mod/config/SpawnEntryTemplate.java  | 17 ++++++++---------
 2 files changed, 17 insertions(+), 19 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 83a2f20ec..94a6341b3 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;
@@ -12,25 +15,21 @@ public class MusicSoundTemplate implements ObjectTemplate<MusicSound> {
     @Value("sound")
     @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
     private Boolean replaceCurrentMusic = null;
 
     @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 4fdf390d9..f7aa770bd 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;
 
@@ -15,17 +18,13 @@ public class SpawnEntryTemplate implements ObjectTemplate<SpawnEntry> {
     @Value("weight")
     @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());
     }
 }