Skip to content

Commit 4e21ddb

Browse files
committed
add creaking
1 parent 0448a95 commit 4e21ddb

File tree

2 files changed

+19
-130
lines changed

2 files changed

+19
-130
lines changed

src/main/java/ch/njol/skript/entity/SimpleEntityData.java

Lines changed: 13 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -18,138 +18,19 @@
1818
*/
1919
package ch.njol.skript.entity;
2020

21-
import java.io.NotSerializableException;
22-
import java.io.StreamCorruptedException;
23-
import java.util.ArrayList;
24-
import java.util.List;
25-
26-
import ch.njol.util.Kleenean;
27-
import org.bukkit.World;
28-
import org.bukkit.entity.AbstractHorse;
29-
import org.bukkit.entity.Allay;
30-
import org.bukkit.entity.Animals;
31-
import org.bukkit.entity.AreaEffectCloud;
32-
import org.bukkit.entity.Armadillo;
33-
import org.bukkit.entity.ArmorStand;
34-
import org.bukkit.entity.Arrow;
35-
import org.bukkit.entity.Bat;
36-
import org.bukkit.entity.Blaze;
37-
import org.bukkit.entity.BlockDisplay;
38-
import org.bukkit.entity.Bogged;
39-
import org.bukkit.entity.Breeze;
40-
import org.bukkit.entity.Camel;
41-
import org.bukkit.entity.CaveSpider;
42-
import org.bukkit.entity.ChestedHorse;
43-
import org.bukkit.entity.Chicken;
44-
import org.bukkit.entity.Cod;
45-
import org.bukkit.entity.Cow;
46-
import org.bukkit.entity.Creature;
47-
import org.bukkit.entity.Damageable;
48-
import org.bukkit.entity.Display;
49-
import org.bukkit.entity.Dolphin;
50-
import org.bukkit.entity.Donkey;
51-
import org.bukkit.entity.DragonFireball;
52-
import org.bukkit.entity.Drowned;
53-
import org.bukkit.entity.Egg;
54-
import org.bukkit.entity.ElderGuardian;
55-
import org.bukkit.entity.EnderCrystal;
56-
import org.bukkit.entity.EnderDragon;
57-
import org.bukkit.entity.EnderPearl;
58-
import org.bukkit.entity.EnderSignal;
59-
import org.bukkit.entity.Endermite;
60-
import org.bukkit.entity.Enemy;
61-
import org.bukkit.entity.Entity;
62-
import org.bukkit.entity.Evoker;
63-
import org.bukkit.entity.EvokerFangs;
64-
import org.bukkit.entity.Fireball;
65-
import org.bukkit.entity.Firework;
66-
import org.bukkit.entity.Fish;
67-
import org.bukkit.entity.FishHook;
68-
import org.bukkit.entity.Ghast;
69-
import org.bukkit.entity.Giant;
70-
import org.bukkit.entity.GlowItemFrame;
71-
import org.bukkit.entity.GlowSquid;
72-
import org.bukkit.entity.Golem;
73-
import org.bukkit.entity.Guardian;
74-
import org.bukkit.entity.Hoglin;
75-
import org.bukkit.entity.Horse;
76-
import org.bukkit.entity.HumanEntity;
77-
import org.bukkit.entity.Husk;
78-
import org.bukkit.entity.Illager;
79-
import org.bukkit.entity.Illusioner;
80-
import org.bukkit.entity.Interaction;
81-
import org.bukkit.entity.IronGolem;
82-
import org.bukkit.entity.ItemDisplay;
83-
import org.bukkit.entity.ItemFrame;
84-
import org.bukkit.entity.LargeFireball;
85-
import org.bukkit.entity.LeashHitch;
86-
import org.bukkit.entity.LightningStrike;
87-
import org.bukkit.entity.LivingEntity;
88-
import org.bukkit.entity.Llama;
89-
import org.bukkit.entity.LlamaSpit;
90-
import org.bukkit.entity.MagmaCube;
91-
import org.bukkit.entity.Marker;
92-
import org.bukkit.entity.Mob;
93-
import org.bukkit.entity.Monster;
94-
import org.bukkit.entity.Mule;
95-
import org.bukkit.entity.MushroomCow;
96-
import org.bukkit.entity.Painting;
97-
import org.bukkit.entity.Phantom;
98-
import org.bukkit.entity.PigZombie;
99-
import org.bukkit.entity.Piglin;
100-
import org.bukkit.entity.PiglinBrute;
101-
import org.bukkit.entity.Pillager;
102-
import org.bukkit.entity.Player;
103-
import org.bukkit.entity.PolarBear;
104-
import org.bukkit.entity.Projectile;
105-
import org.bukkit.entity.PufferFish;
106-
import org.bukkit.entity.Raider;
107-
import org.bukkit.entity.Ravager;
108-
import org.bukkit.entity.Salmon;
109-
import org.bukkit.entity.Shulker;
110-
import org.bukkit.entity.ShulkerBullet;
111-
import org.bukkit.entity.Silverfish;
112-
import org.bukkit.entity.Skeleton;
113-
import org.bukkit.entity.SkeletonHorse;
114-
import org.bukkit.entity.Slime;
115-
import org.bukkit.entity.SmallFireball;
116-
import org.bukkit.entity.Sniffer;
117-
import org.bukkit.entity.Snowball;
118-
import org.bukkit.entity.Snowman;
119-
import org.bukkit.entity.SpectralArrow;
120-
import org.bukkit.entity.Spellcaster;
121-
import org.bukkit.entity.Spider;
122-
import org.bukkit.entity.Squid;
123-
import org.bukkit.entity.Stray;
124-
import org.bukkit.entity.Strider;
125-
import org.bukkit.entity.TNTPrimed;
126-
import org.bukkit.entity.Tadpole;
127-
import org.bukkit.entity.TextDisplay;
128-
import org.bukkit.entity.ThrownExpBottle;
129-
import org.bukkit.entity.TippedArrow;
130-
import org.bukkit.entity.Trident;
131-
import org.bukkit.entity.TropicalFish;
132-
import org.bukkit.entity.Turtle;
133-
import org.bukkit.entity.Vex;
134-
import org.bukkit.entity.Vindicator;
135-
import org.bukkit.entity.WanderingTrader;
136-
import org.bukkit.entity.Warden;
137-
import org.bukkit.entity.WaterMob;
138-
import org.bukkit.entity.WindCharge;
139-
import org.bukkit.entity.Witch;
140-
import org.bukkit.entity.Wither;
141-
import org.bukkit.entity.WitherSkeleton;
142-
import org.bukkit.entity.WitherSkull;
143-
import org.bukkit.entity.Zoglin;
144-
import org.bukkit.entity.Zombie;
145-
import org.bukkit.entity.ZombieHorse;
146-
147-
import org.jetbrains.annotations.Nullable;
148-
14921
import ch.njol.skript.Skript;
15022
import ch.njol.skript.lang.Literal;
15123
import ch.njol.skript.lang.SkriptParser.ParseResult;
24+
import ch.njol.util.Kleenean;
15225
import ch.njol.yggdrasil.Fields;
26+
import org.bukkit.World;
27+
import org.bukkit.entity.*;
28+
import org.jetbrains.annotations.Nullable;
29+
30+
import java.io.NotSerializableException;
31+
import java.io.StreamCorruptedException;
32+
import java.util.ArrayList;
33+
import java.util.List;
15334

15435
public class SimpleEntityData extends EntityData<Entity> {
15536

@@ -333,6 +214,10 @@ private static void addSuperEntity(String codeName, Class<? extends Entity> enti
333214
addSimpleEntity("bogged", Bogged.class);
334215
}
335216

217+
if (Skript.isRunningMinecraft(1,21,3)) {
218+
addSimpleEntity("creaking", Creaking.class);
219+
}
220+
336221
// Register zombie after Husk and Drowned to make sure both work
337222
addSimpleEntity("zombie", Zombie.class);
338223
// Register squid after glow squid to make sure both work

src/main/resources/lang/default.lang

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,8 +1267,12 @@ entities:
12671267
name: armadillo¦s @an
12681268
pattern: <age> armadillo(|1¦s)|(4¦)armadillo (kid(|1¦s)|child(|1¦ren))
12691269
bogged:
1270-
name: bogged
1271-
pattern: bogged
1270+
name: bogged¦s
1271+
pattern: bogged[1:s]
1272+
# 1.21.3 Entities
1273+
creaking:
1274+
name: creaking¦s
1275+
pattern: creaking[1:s]
12721276

12731277
# -- Heal Reasons --
12741278
heal reasons:

0 commit comments

Comments
 (0)