Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SimpleEntityData - add new MC 1.20.3 entities #6367

Merged
merged 2 commits into from Feb 1, 2024
Merged

SimpleEntityData - add new MC 1.20.3 entities #6367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37f9cd8
SimpleEntityData - add new MC 1.20.3 entities
ShaneBeee Jan 27, 2024
8a00485
Merge branch 'dev/patch' into master
APickledWalrus Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/main/java/ch/njol/skript/entity/SimpleEntityData.java
View file
Open in desktop
Expand Up @@ -32,6 +32,7 @@
import org.bukkit.entity.Bat;
import org.bukkit.entity.Blaze;
import org.bukkit.entity.BlockDisplay;
import org.bukkit.entity.Breeze;
import org.bukkit.entity.Camel;
import org.bukkit.entity.CaveSpider;
import org.bukkit.entity.ChestedHorse;
Expand Down Expand Up @@ -130,6 +131,7 @@
import org.bukkit.entity.WanderingTrader;
import org.bukkit.entity.Warden;
import org.bukkit.entity.WaterMob;
import org.bukkit.entity.WindCharge;
import org.bukkit.entity.Witch;
import org.bukkit.entity.Wither;
import org.bukkit.entity.WitherSkeleton;
Expand Down Expand Up @@ -310,6 +312,11 @@ private static void addSuperEntity(String codeName, Class<? extends Entity> enti
addSuperEntity("display", Display.class);
}

if (Skript.isRunningMinecraft(1, 20, 3)) {
addSimpleEntity("breeze", Breeze.class);
addSimpleEntity("wind charge", WindCharge.class);
}

// Register zombie after Husk and Drowned to make sure both work
addSimpleEntity("zombie", Zombie.class);
// Register squid after glow squid to make sure both work
Expand Down
7 changes: 7 additions & 0 deletions src/main/resources/lang/default.lang
View file
Open in desktop
Expand Up @@ -1241,6 +1241,13 @@ entities:
text display:
name: text display¦s
pattern: text display(|1¦s)
# 1.20.3 Entities
breeze:
name: breeze¦s
pattern: breeze(|1¦s)
wind charge:
name: wind charge¦s
pattern: wind charge(|1¦s)

# -- Heal Reasons --
heal reasons:
Expand Down