From 4c2ce65cdcd9e955ef1c4034a9765046054c8c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Wed, 9 Jul 2025 16:41:53 -0600 Subject: [PATCH] Some fixes to biome config --- .../bukkit/nms/v1_21_7/config/SpawnEntryConfig.java | 2 +- .../nms/v1_21_7/config/SpawnSettingsTemplate.java | 2 +- .../src/main/java/com/dfsek/terra/mod/ModPlatform.java | 2 +- .../com/dfsek/terra/mod/config/SpawnEntryConfig.java | 10 +++++++--- .../dfsek/terra/mod/config/SpawnSettingsTemplate.java | 4 ++-- .../com/dfsek/terra/mod/config/SpawnTypeConfig.java | 6 +++--- .../dfsek/terra/mod/config/VillagerTypeTemplate.java | 4 ++-- 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnEntryConfig.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnEntryConfig.java index e7e61d1c1..674fa0795 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnEntryConfig.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnEntryConfig.java @@ -28,7 +28,7 @@ public class SpawnEntryConfig implements ObjectTemplate { return weight; } - public SpawnerData getSpawnerData() { + public SpawnerData getSpawnEntry() { return new SpawnerData(type, minGroupSize, maxGroupSize); } diff --git a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnSettingsTemplate.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnSettingsTemplate.java index 1e155074a..5b0420f1f 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnSettingsTemplate.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnSettingsTemplate.java @@ -33,7 +33,7 @@ public class SpawnSettingsTemplate implements ObjectTemplate { for(SpawnTypeConfig spawn : spawns) { MobCategory group = spawn.getGroup(); for(SpawnEntryConfig entry : spawn.getEntries()) { - builder.addSpawn(group, entry.getWeight(), entry.getSpawnerData()); + builder.addSpawn(group, entry.getWeight(), entry.getSpawnEntry()); } } for(SpawnCostConfig cost : costs) { diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java index 2054d864b..3f3296f10 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java @@ -90,7 +90,7 @@ public abstract class ModPlatform extends AbstractPlatform { .registerLoader(MusicSound.class, MusicSoundTemplate::new) .registerLoader(EntityType.class, EntityTypeTemplate::new) .registerLoader(SpawnCostConfig.class, SpawnCostConfig::new) - .registerLoader(SpawnEntry.class, SpawnEntryConfig::new) + .registerLoader(SpawnEntryConfig.class, SpawnEntryConfig::new) .registerLoader(SpawnTypeConfig.class, SpawnTypeConfig::new) .registerLoader(SpawnSettings.class, SpawnSettingsTemplate::new) .registerLoader(VillagerType.class, VillagerTypeTemplate::new); diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryConfig.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryConfig.java index dd33bc163..058437303 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryConfig.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryConfig.java @@ -7,7 +7,7 @@ import net.minecraft.entity.EntityType; import net.minecraft.world.biome.SpawnSettings.SpawnEntry; -public class SpawnEntryConfig implements ObjectTemplate { +public class SpawnEntryConfig implements ObjectTemplate { @Value("type") @Default private EntityType type = null; @@ -28,8 +28,12 @@ public class SpawnEntryConfig implements ObjectTemplate { return weight; } - @Override - public SpawnEntry get() { + public SpawnEntry getSpawnEntry() { return new SpawnEntry(type, minGroupSize, maxGroupSize); } + + @Override + public SpawnEntryConfig get() { + return this; + } } diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnSettingsTemplate.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnSettingsTemplate.java index 7c42342ab..b4be04e03 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnSettingsTemplate.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnSettingsTemplate.java @@ -27,8 +27,8 @@ public class SpawnSettingsTemplate implements ObjectTemplate { SpawnSettings.Builder builder = new SpawnSettings.Builder(); for(SpawnTypeConfig spawn : spawns) { SpawnGroup group = spawn.getGroup(); - for(SpawnEntryConfig entry : spawn.getEntry()) { - builder.spawn(group, entry.getWeight(), entry.get()); + for(SpawnEntryConfig entry : spawn.getEntries()) { + builder.spawn(group, entry.getWeight(), entry.getSpawnEntry()); } } for(SpawnCostConfig cost : costs) { diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnTypeConfig.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnTypeConfig.java index 8fc5d8656..9d518c5c0 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnTypeConfig.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnTypeConfig.java @@ -15,14 +15,14 @@ public class SpawnTypeConfig implements ObjectTemplate { @Value("entries") @Default - private List entry = null; + private List entries = null; public SpawnGroup getGroup() { return group; } - public List getEntry() { - return entry; + public List getEntries() { + return entries; } @Override diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VillagerTypeTemplate.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VillagerTypeTemplate.java index 66a8951f2..bca0a30b1 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VillagerTypeTemplate.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VillagerTypeTemplate.java @@ -13,10 +13,10 @@ import net.minecraft.village.VillagerType; public class VillagerTypeTemplate implements ObjectTemplate> { @Value("id") @Default - private String id = null; + private Identifier id = null; @Override public RegistryKey get() { - return RegistryKey.of(RegistryKeys.VILLAGER_TYPE, Identifier.ofVanilla(id)); + return RegistryKey.of(RegistryKeys.VILLAGER_TYPE, id); } }