From e826682eef2396a01b35eca221c7c96faf4b7b45 Mon Sep 17 00:00:00 2001 From: Tim Brust Date: Fri, 28 Jun 2024 12:13:38 +0200 Subject: [PATCH] feat: adds default 1.21 mobs --- .../dustplanet/silkspawners/configs/Mobs.java | 34 ++++++ .../SilkSpawners/src/main/resources/mobs.yml | 45 +++++++ tp | 111 ++++++++++++++++++ 3 files changed, 190 insertions(+) create mode 100644 tp diff --git a/modules/SilkSpawners/src/main/java/de/dustplanet/silkspawners/configs/Mobs.java b/modules/SilkSpawners/src/main/java/de/dustplanet/silkspawners/configs/Mobs.java index 003658b1..07789887 100644 --- a/modules/SilkSpawners/src/main/java/de/dustplanet/silkspawners/configs/Mobs.java +++ b/modules/SilkSpawners/src/main/java/de/dustplanet/silkspawners/configs/Mobs.java @@ -943,6 +943,34 @@ private void loadDefaultMobs() { config.addDefault("creatures.sniffer.displayName", "Sniffer"); config.options().copyDefaults(true); tempList = new ArrayList<>(); + // Armadillo + tempList.add("belt"); + config.addDefault("creatures.armadillo.aliases", tempList); + config.addDefault("creatures.armadillo.enable", true); + config.addDefault("creatures.armadillo.enableCraftingSpawner", true); + config.addDefault("creatures.armadillo.enableSpawnEggOverride", true); + config.addDefault("creatures.armadillo.displayName", "Armadillo"); + config.options().copyDefaults(true); + tempList = new ArrayList<>(); + // Bogged + tempList.add("swampskelly"); + tempList.add("sawmpskellington"); + config.addDefault("creatures.bogged.aliases", tempList); + config.addDefault("creatures.bogged.enable", true); + config.addDefault("creatures.bogged.enableCraftingSpawner", true); + config.addDefault("creatures.bogged.enableSpawnEggOverride", true); + config.addDefault("creatures.bogged.displayName", "Bogged"); + config.options().copyDefaults(true); + tempList = new ArrayList<>(); + // Breeze + tempList.add("wind"); + config.addDefault("creatures.breeze.aliases", tempList); + config.addDefault("creatures.breeze.enable", true); + config.addDefault("creatures.breeze.enableCraftingSpawner", true); + config.addDefault("creatures.breeze.enableSpawnEggOverride", true); + config.addDefault("creatures.breeze.displayName", "Breeze"); + config.options().copyDefaults(true); + tempList = new ArrayList<>(); // Non-mob vanilla entities below // Item @@ -1091,5 +1119,11 @@ private void loadDefaultMobs() { config.addDefault("creatures.item_display.enable", false); // text_display config.addDefault("creatures.text_display.enable", false); + // breeze_wind_charge + config.addDefault("creatures.breeze_wind_charge.enable", false); + // ominous_item_spawner + config.addDefault("creatures.ominous_item_spawner.enable", false); + // wind_charge + config.addDefault("creatures.wind_charge.enable", false); } } diff --git a/modules/SilkSpawners/src/main/resources/mobs.yml b/modules/SilkSpawners/src/main/resources/mobs.yml index fea41b46..7ab8bd01 100644 --- a/modules/SilkSpawners/src/main/resources/mobs.yml +++ b/modules/SilkSpawners/src/main/resources/mobs.yml @@ -851,6 +851,45 @@ creatures: enableCraftingSpawner: true enableSpawnEggOverride: true displayName: Warden + camel: + aliases: + - dromedary + enable: true + enableCraftingSpawner: true + enableSpawnEggOverride: true + displayName: Camel + sniffer: + aliases: + - snooper + - snoop + - sleuthhound + - shamus + enable: true + enableCraftingSpawner: true + enableSpawnEggOverride: true + displayName: Sniffer + armadillo: + aliases: + - belt + enable: true + enableCraftingSpawner: true + enableSpawnEggOverride: true + displayName: Armadillo + bogged: + aliases: + - swampskelly + - sawmpskellington + enable: true + enableCraftingSpawner: true + enableSpawnEggOverride: true + displayName: Bogged + breeze: + aliases: + - wind + enable: true + enableCraftingSpawner: true + enableSpawnEggOverride: true + displayName: Breeze # Non-mob vanilla entities # Enable on your own risk, some might work, some not! @@ -1038,3 +1077,9 @@ creatures: enable: false sniffer: enable: false + breeze_wind_charge: + enable: false + ominous_item_spawner: + enable: false + wind_charge: + enable: false diff --git a/tp b/tp new file mode 100644 index 00000000..89145435 --- /dev/null +++ b/tp @@ -0,0 +1,111 @@ +diff --git a/modules/SilkSpawners/src/main/java/de/dustplanet/silkspawners/configs/Mobs.java b/modules/SilkSpawners/src/main/java/de/dustplanet/silkspawners/configs/Mobs.java +index 003658b..0778988 100644 +--- a/modules/SilkSpawners/src/main/java/de/dustplanet/silkspawners/configs/Mobs.java ++++ b/modules/SilkSpawners/src/main/java/de/dustplanet/silkspawners/configs/Mobs.java +@@ -943,6 +943,34 @@ public class Mobs extends AbstractConfiguration { + config.addDefault("creatures.sniffer.displayName", "Sniffer"); + config.options().copyDefaults(true); + tempList = new ArrayList<>(); ++ // Armadillo ++ tempList.add("belt"); ++ config.addDefault("creatures.armadillo.aliases", tempList); ++ config.addDefault("creatures.armadillo.enable", true); ++ config.addDefault("creatures.armadillo.enableCraftingSpawner", true); ++ config.addDefault("creatures.armadillo.enableSpawnEggOverride", true); ++ config.addDefault("creatures.armadillo.displayName", "Armadillo"); ++ config.options().copyDefaults(true); ++ tempList = new ArrayList<>(); ++ // Bogged ++ tempList.add("swampskelly"); ++ tempList.add("sawmpskellington"); ++ config.addDefault("creatures.bogged.aliases", tempList); ++ config.addDefault("creatures.bogged.enable", true); ++ config.addDefault("creatures.bogged.enableCraftingSpawner", true); ++ config.addDefault("creatures.bogged.enableSpawnEggOverride", true); ++ config.addDefault("creatures.bogged.displayName", "Bogged"); ++ config.options().copyDefaults(true); ++ tempList = new ArrayList<>(); ++ // Breeze ++ tempList.add("wind"); ++ config.addDefault("creatures.breeze.aliases", tempList); ++ config.addDefault("creatures.breeze.enable", true); ++ config.addDefault("creatures.breeze.enableCraftingSpawner", true); ++ config.addDefault("creatures.breeze.enableSpawnEggOverride", true); ++ config.addDefault("creatures.breeze.displayName", "Breeze"); ++ config.options().copyDefaults(true); ++ tempList = new ArrayList<>(); +  + // Non-mob vanilla entities below + // Item +@@ -1091,5 +1119,11 @@ public class Mobs extends AbstractConfiguration { + config.addDefault("creatures.item_display.enable", false); + // text_display + config.addDefault("creatures.text_display.enable", false); ++ // breeze_wind_charge ++ config.addDefault("creatures.breeze_wind_charge.enable", false); ++ // ominous_item_spawner ++ config.addDefault("creatures.ominous_item_spawner.enable", false); ++ // wind_charge ++ config.addDefault("creatures.wind_charge.enable", false); + } + } +diff --git a/modules/SilkSpawners/src/main/resources/mobs.yml b/modules/SilkSpawners/src/main/resources/mobs.yml +index fea41b4..7ab8bd0 100644 +--- a/modules/SilkSpawners/src/main/resources/mobs.yml ++++ b/modules/SilkSpawners/src/main/resources/mobs.yml +@@ -851,6 +851,45 @@ creatures: + enableCraftingSpawner: true + enableSpawnEggOverride: true + displayName: Warden ++ camel: ++ aliases: ++ - dromedary ++ enable: true ++ enableCraftingSpawner: true ++ enableSpawnEggOverride: true ++ displayName: Camel ++ sniffer: ++ aliases: ++ - snooper ++ - snoop ++ - sleuthhound ++ - shamus ++ enable: true ++ enableCraftingSpawner: true ++ enableSpawnEggOverride: true ++ displayName: Sniffer ++ armadillo: ++ aliases: ++ - belt ++ enable: true ++ enableCraftingSpawner: true ++ enableSpawnEggOverride: true ++ displayName: Armadillo ++ bogged: ++ aliases: ++ - swampskelly ++ - sawmpskellington ++ enable: true ++ enableCraftingSpawner: true ++ enableSpawnEggOverride: true ++ displayName: Bogged ++ breeze: ++ aliases: ++ - wind ++ enable: true ++ enableCraftingSpawner: true ++ enableSpawnEggOverride: true ++ displayName: Breeze +  + # Non-mob vanilla entities + # Enable on your own risk, some might work, some not! +@@ -1038,3 +1077,9 @@ creatures: + enable: false + sniffer: + enable: false ++ breeze_wind_charge: ++ enable: false ++ ominous_item_spawner: ++ enable: false ++ wind_charge: ++ enable: false