Skip to content

Commit 7115980

Browse files
committed
Added the creaking spawner
1 parent a0f0d6f commit 7115980

9 files changed

Lines changed: 119 additions & 123 deletions

File tree

core/src/main/resources/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ custom_economy:
128128
# Shop plugin integration
129129
shop_integration:
130130
enabled: true
131-
# Supported shop plugins: auto, EconomyShopGUI, ShopGUIPlus, zShop, ExcellentShop
131+
# Supported shop plugins: auto, EconomyShopGUI, EconomyShopGUI-Premium, ShopGUIPlus, zShop, ExcellentShop
132132
# 'auto' will attempt to detect your installed shop plugin automatically
133133
preferred_plugin: auto
134134

Lines changed: 95 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,104 @@
1-
# ---------------------------------------------------
1+
#---------------------------------------------------
22
# Number Formatting
3-
# ---------------------------------------------------
3+
#---------------------------------------------------
44
# Controls how large numbers are displayed in-game
5-
# ---------------------------------------------------
5+
#---------------------------------------------------
66
format_number:
7-
thousand: '%s%K' # Example: 5000 → 5K
8-
million: '%s%M' # Example: 2000000 → 2M
9-
billion: '%s%B' # Example: 1500000000 → 1.5B
10-
trillion: '%s%T' # Example: 1000000000000 → 1T
11-
default: '%s%' # Fallback format when no other rule matches
7+
thousand: "%s%K" # Example: 5000 → 5K
8+
million: "%s%M" # Example: 2000000 → 2M
9+
billion: "%s%B" # Example: 1500000000 → 1.5B
10+
trillion: "%s%T" # Example: 1000000000000 → 1T
11+
default: "%s%" # Fallback format when no other rule matches
1212

13-
# ---------------------------------------------------
13+
#---------------------------------------------------
1414
# Mob Display Names
15-
# ---------------------------------------------------
15+
#---------------------------------------------------
1616
# Defines how mob names appear in spawner GUIs, items, holograms and messages
17-
# ---------------------------------------------------
17+
#---------------------------------------------------
1818
mob_names:
1919
# Passive Mobs
20-
# -------------------------
21-
ALLAY: Allay
22-
ARMADILLO: Armadillo
23-
AXOLOTL: Axolotl
24-
BAT: Bat
25-
BEE: Bee
26-
CAMEL: Camel
27-
CAT: Cat
28-
CHICKEN: Chicken
29-
COD: Cod
30-
COW: Cow
31-
DOLPHIN: Dolphin
32-
DONKEY: Donkey
33-
FOX: Fox
34-
FROG: Frog
35-
GLOW_SQUID: Glow Squid
36-
GOAT: Goat
37-
HORSE: Horse
38-
IRON_GOLEM: Iron Golem
39-
LLAMA: Llama
40-
MOOSHROOM: Mooshroom
41-
MUSHROOM_COW: Mooshroom # Fallback for 1.20 version compatibility
42-
MULE: Mule
43-
OCELOT: Ocelot
44-
PANDA: Panda
45-
PARROT: Parrot
46-
PIG: Pig
47-
POLAR_BEAR: Polar Bear
48-
PUFFERFISH: Pufferfish
49-
RABBIT: Rabbit
50-
SALMON: Salmon
51-
SHEEP: Sheep
52-
SNIFFER: Sniffer
53-
SNOW_GOLEM: Snow Golem
54-
SNOWMAN: Snow Golem # Fallback for 1.20 version compatibility
55-
SQUID: Squid
56-
STRIDER: Strider
57-
TADPOLE: Tadpole
58-
TRADER_LLAMA: Trader Llama
59-
TROPICAL_FISH: Tropical Fish
60-
TURTLE: Turtle
61-
VILLAGER: Villager
62-
WANDERING_TRADER: Wandering Trader
63-
WOLF: Wolf
64-
20+
#-------------------------
21+
ALLAY: "Allay"
22+
ARMADILLO: "Armadillo"
23+
AXOLOTL: "Axolotl"
24+
BAT: "Bat"
25+
BEE: "Bee"
26+
CAMEL: "Camel"
27+
CAT: "Cat"
28+
CHICKEN: "Chicken"
29+
COD: "Cod"
30+
COW: "Cow"
31+
DOLPHIN: "Dolphin"
32+
DONKEY: "Donkey"
33+
FOX: "Fox"
34+
FROG: "Frog"
35+
GLOW_SQUID: "Glow Squid"
36+
GOAT: "Goat"
37+
HORSE: "Horse"
38+
IRON_GOLEM: "Iron Golem"
39+
LLAMA: "Llama"
40+
MOOSHROOM: "Mooshroom"
41+
MUSHROOM_COW: "Mooshroom" # Fallback for 1.20 version compatibility
42+
MULE: "Mule"
43+
OCELOT: "Ocelot"
44+
PANDA: "Panda"
45+
PARROT: "Parrot"
46+
PIG: "Pig"
47+
POLAR_BEAR: "Polar Bear"
48+
PUFFERFISH: "Pufferfish"
49+
RABBIT: "Rabbit"
50+
SALMON: "Salmon"
51+
SHEEP: "Sheep"
52+
SNIFFER: "Sniffer"
53+
SNOW_GOLEM: "Snow Golem"
54+
SNOWMAN: "Snow Golem" # Fallback for 1.20 version compatibility
55+
SQUID: "Squid"
56+
STRIDER: "Strider"
57+
TADPOLE: "Tadpole"
58+
TRADER_LLAMA: "Trader Llama"
59+
TROPICAL_FISH: "Tropical Fish"
60+
TURTLE: "Turtle"
61+
VILLAGER: "Villager"
62+
WANDERING_TRADER: "Wandering Trader"
63+
WOLF: "Wolf"
64+
6565
# Hostile Mobs
66-
# -------------------------
67-
BLAZE: Blaze
68-
BOGGED: Bogged
69-
BREEZE: Breeze
70-
CAVE_SPIDER: Cave Spider
71-
CREEPER: Creeper
72-
DROWNED: Drowned
73-
ELDER_GUARDIAN: Elder Guardian
74-
ENDERMAN: Enderman
75-
ENDERMITE: Endermite
76-
EVOKER: Evoker
77-
GHAST: Ghast
78-
GUARDIAN: Guardian
79-
HOGLIN: Hoglin
80-
HUSK: Husk
81-
MAGMA_CUBE: Magma Cube
82-
PHANTOM: Phantom
83-
PIGLIN: Piglin
84-
PIGLIN_BRUTE: Piglin Brute
85-
PILLAGER: Pillager
86-
RAVAGER: Ravager
87-
SHULKER: Shulker
88-
SILVERFISH: Silverfish
89-
SKELETON: Skeleton
90-
SKELETON_HORSE: Skeleton Horse
91-
SLIME: Slime
92-
SPIDER: Spider
93-
STRAY: Stray
94-
VEX: Vex
95-
VINDICATOR: Vindicator
96-
WARDEN: Warden
97-
WITCH: Witch
98-
WITHER_SKELETON: Wither Skeleton
99-
ZOGLIN: Zoglin
100-
ZOMBIE: Zombie
101-
ZOMBIE_HORSE: Zombie Horse
102-
ZOMBIE_VILLAGER: Zombie Villager
103-
ZOMBIFIED_PIGLIN: Zombified Piglin
66+
#-------------------------
67+
BLAZE: "Blaze"
68+
BOGGED: "Bogged"
69+
BREEZE: "Breeze"
70+
CAVE_SPIDER: "Cave Spider"
71+
CREAKING: "Creaking"
72+
CREEPER: "Creeper"
73+
DROWNED: "Drowned"
74+
ELDER_GUARDIAN: "Elder Guardian"
75+
ENDERMAN: "Enderman"
76+
ENDERMITE: "Endermite"
77+
EVOKER: "Evoker"
78+
GHAST: "Ghast"
79+
GUARDIAN: "Guardian"
80+
HOGLIN: "Hoglin"
81+
HUSK: "Husk"
82+
MAGMA_CUBE: "Magma Cube"
83+
PHANTOM: "Phantom"
84+
PIGLIN: "Piglin"
85+
PIGLIN_BRUTE: "Piglin Brute"
86+
PILLAGER: "Pillager"
87+
RAVAGER: "Ravager"
88+
SHULKER: "Shulker"
89+
SILVERFISH: "Silverfish"
90+
SKELETON: "Skeleton"
91+
SKELETON_HORSE: "Skeleton Horse"
92+
SLIME: "Slime"
93+
SPIDER: "Spider"
94+
STRAY: "Stray"
95+
VEX: "Vex"
96+
VINDICATOR: "Vindicator"
97+
WARDEN: "Warden"
98+
WITCH: "Witch"
99+
WITHER_SKELETON: "Wither Skeleton"
100+
ZOGLIN: "Zoglin"
101+
ZOMBIE: "Zombie"
102+
ZOMBIE_HORSE: "Zombie Horse"
103+
ZOMBIE_VILLAGER: "Zombie Villager"
104+
ZOMBIFIED_PIGLIN: "Zombified Piglin"

core/src/main/resources/language/en_US/formatting.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ mob_names:
6868
BOGGED: "Bogged"
6969
BREEZE: "Breeze"
7070
CAVE_SPIDER: "Cave Spider"
71+
CREAKING: "Creaking"
7172
CREEPER: "Creeper"
7273
DROWNED: "Drowned"
7374
ELDER_GUARDIAN: "Elder Guardian"

core/src/main/resources/language/vi_VN/formatting.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ mob_names:
6868
BOGGED: "Quái Đầm Lầy"
6969
BREEZE: "Quỷ Gió"
7070
CAVE_SPIDER: "Nhện Hang"
71+
CREAKING: "Quái cọt kẹt"
7172
CREEPER: "Creeper"
7273
DROWNED: "Kẻ Đuối Nước"
7374
ELDER_GUARDIAN: "Giám Hộ Cổ"

core/src/main/resources/mob_drops.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,13 @@ CREEPER:
267267
amount: 0-2
268268
chance: 100.0
269269

270+
#---------------------------------------
271+
# CREAKING
272+
#---------------------------------------
273+
# Reference: https://minecraft.wiki/w/Creaking#Drops
274+
CREAKING:
275+
experience: 0
276+
270277
#---------------------------------------
271278
# DROWNED
272279
#---------------------------------------
Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
package github.nighter.smartspawner.v1_20;
22

33
import github.nighter.smartspawner.nms.SpawnerWrapper;
4+
import org.bukkit.entity.EntityType;
5+
46
import java.util.Arrays;
57

68
public class SpawnerInitializer {
79
public static void init() {
8-
SpawnerWrapper.SUPPORTED_MOBS = Arrays.asList(
9-
"ALLAY", "AXOLOTL", "BAT", "BEE", "BLAZE", "CAMEL", "CAT", "CAVE_SPIDER",
10-
"CHICKEN", "COD", "COW", "CREEPER", "DOLPHIN", "DONKEY", "DROWNED",
11-
"ELDER_GUARDIAN", "ENDERMAN", "ENDERMITE", "EVOKER", "FOX", "FROG", "GHAST",
12-
"GLOW_SQUID", "GOAT", "GUARDIAN", "HOGLIN", "HORSE", "HUSK", "IRON_GOLEM",
13-
"LLAMA", "MAGMA_CUBE", "MULE", "MUSHROOM_COW", "OCELOT", "PANDA", "PARROT",
14-
"PHANTOM", "PIG", "PIGLIN", "PIGLIN_BRUTE", "PILLAGER", "POLAR_BEAR", "PUFFERFISH",
15-
"RABBIT", "RAVAGER", "SALMON", "SHEEP", "SHULKER", "SILVERFISH", "SKELETON",
16-
"SKELETON_HORSE", "SLIME", "SNIFFER", "SNOWMAN", "SPIDER", "SQUID", "STRAY",
17-
"STRIDER", "TADPOLE", "TRADER_LLAMA", "TROPICAL_FISH", "TURTLE", "VEX",
18-
"VILLAGER", "VINDICATOR", "WANDERING_TRADER", "WARDEN", "WITCH", "WITHER_SKELETON",
19-
"WOLF", "ZOGLIN", "ZOMBIE", "ZOMBIE_HORSE", "ZOMBIE_VILLAGER", "ZOMBIFIED_PIGLIN"
20-
);
10+
SpawnerWrapper.SUPPORTED_MOBS = Arrays.stream(EntityType.values())
11+
.map(EntityType::name)
12+
.toList();
2113
}
2214
}

v1_21/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ plugins {
55
dependencies {
66
implementation project(':core')
77
implementation project(':api')
8-
compileOnly 'io.papermc.paper:paper-api:1.21.3-R0.1-SNAPSHOT'
8+
compileOnly 'io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT'
99
}
Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
11
package github.nighter.smartspawner.v1_21;
2-
2+
import org.bukkit.entity.EntityType;
33
import github.nighter.smartspawner.nms.SpawnerWrapper;
44
import java.util.Arrays;
55

66
public class SpawnerInitializer {
77
public static void init() {
8-
SpawnerWrapper.SUPPORTED_MOBS = Arrays.asList(
9-
"ALLAY", "ARMADILLO", "AXOLOTL", "BAT", "BEE", "BLAZE", "BOGGED", "BREEZE", "CAMEL", "CAT", "CAVE_SPIDER",
10-
"CHICKEN", "COD", "COW", "CREEPER", "DOLPHIN", "DONKEY", "DROWNED",
11-
"ELDER_GUARDIAN", "ENDERMAN", "ENDERMITE", "EVOKER", "FOX", "FROG", "GHAST",
12-
"GLOW_SQUID", "GOAT", "GUARDIAN", "HOGLIN", "HORSE", "HUSK", "IRON_GOLEM",
13-
"LLAMA", "MAGMA_CUBE", "MOOSHROOM", "MULE", "OCELOT", "PANDA", "PARROT",
14-
"PHANTOM", "PIG", "PIGLIN", "PIGLIN_BRUTE", "PILLAGER", "POLAR_BEAR", "PUFFERFISH",
15-
"RABBIT", "RAVAGER", "SALMON", "SHEEP", "SHULKER", "SILVERFISH", "SKELETON",
16-
"SKELETON_HORSE", "SLIME", "SNIFFER", "SNOW_GOLEM", "SPIDER", "SQUID", "STRAY",
17-
"STRIDER", "TADPOLE", "TRADER_LLAMA", "TROPICAL_FISH", "TURTLE", "VEX",
18-
"VILLAGER", "VINDICATOR", "WANDERING_TRADER", "WARDEN", "WITCH", "WITHER_SKELETON",
19-
"WOLF", "ZOGLIN", "ZOMBIE", "ZOMBIE_HORSE", "ZOMBIE_VILLAGER", "ZOMBIFIED_PIGLIN"
20-
);
8+
SpawnerWrapper.SUPPORTED_MOBS = Arrays.stream(EntityType.values())
9+
.map(EntityType::name)
10+
.toList();
2111
}
2212
}

v1_21/src/main/java/github/nighter/smartspawner/v1_21/TextureInitializer.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,9 @@ public static void init() {
2525
EntityType.SNOW_GOLEM,
2626
"1fdfd1f7538c040258be7a91446da89ed845cc5ef728eb5e690543378fcf4"
2727
);
28+
TextureWrapper.addVersionSpecificTexture(
29+
EntityType.CREAKING,
30+
"ac91c87bbe7f4c586e0f8b60f9b76d173a41daa302944531703be9ff4fd117f8"
31+
);
2832
}
2933
}

0 commit comments

Comments
 (0)