From e9b145b6c3942cf294f94fad4d742eaa3e42b05d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Sat, 30 Sep 2023 11:50:15 -0600 Subject: [PATCH] unbreaking via deprecation --- .../terra/mod/config/SpawnSettingsTemplate.java | 8 ++++++-- .../dfsek/terra/mod/config/SpawnTypeConfig.java | 15 +++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) 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 dbb8dd037..4a81deecd 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 @@ -28,8 +28,12 @@ public class SpawnSettingsTemplate implements ObjectTemplate { SpawnSettings.Builder builder = new SpawnSettings.Builder(); for(SpawnTypeConfig spawn : spawns) { SpawnGroup group = spawn.getGroup(); - for (SpawnEntry entry : spawn.getEntry()) { - builder.spawn(group, entry); + if (spawn.getEntries() != null) { + for (SpawnEntry entry : spawn.getEntries()) { + builder.spawn(group, entry); + } + } else if (spawn.getEntry() != null) { + builder.spawn(group, spawn.getEntry()); } } 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 02ee2bf60..d2470dad6 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 @@ -16,13 +16,24 @@ public class SpawnTypeConfig implements ObjectTemplate { @Value("entries") @Default - private List entry = null; + private List entries = null; + + + @Value("entry") + @Default + @Deprecated + private SpawnEntry entry = null; public SpawnGroup getGroup() { return group; } - public List getEntry() { + public List getEntries() { + return entries; + } + + @Deprecated + public SpawnEntry getEntry() { return entry; }