diff options
author | Ineusia <[email protected]> | 2020-07-27 22:05:54 -0500 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-27 23:05:54 -0400 |
commit | 115972651ac48cbd6da111fdbd10bc32fe0fee1e (patch) | |
tree | 052afff5ba97dca026fc0d2a381b69c93b3a2913 | |
parent | 5aaf1c514af9670b2d98cfd875b5a3ec295ae578 (diff) | |
download | Paper-115972651ac48cbd6da111fdbd10bc32fe0fee1e.tar.gz Paper-115972651ac48cbd6da111fdbd10bc32fe0fee1e.zip |
Expand MaterialTags v2 (#4009)
-rw-r--r-- | Spigot-API-Patches/0154-Add-Material-Tags.patch | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/Spigot-API-Patches/0154-Add-Material-Tags.patch b/Spigot-API-Patches/0154-Add-Material-Tags.patch index 56794485d4..d88b7647b0 100644 --- a/Spigot-API-Patches/0154-Add-Material-Tags.patch +++ b/Spigot-API-Patches/0154-Add-Material-Tags.patch @@ -204,10 +204,10 @@ index 0000000000000000000000000000000000000000..c91ea2a0679a7f3a5627b5a008e0b39d +} diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java new file mode 100644 -index 0000000000000000000000000000000000000000..4932bd60d30b73e03fecc75f57212f46881d2843 +index 0000000000000000000000000000000000000000..62313883aa183003726f268c8d9f210d83428f59 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java -@@ -0,0 +1,497 @@ +@@ -0,0 +1,512 @@ +/* + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License + * @@ -700,6 +700,21 @@ index 0000000000000000000000000000000000000000..4932bd60d30b73e03fecc75f57212f46 + .endsWith("_BOOTS") + .ensureSize("BOOTS", 6); + ++ /** ++ * Covers the variants of bows. ++ */ ++ public static final MaterialSetTag BOWS = new MaterialSetTag(keyFor("bows")) ++ .add(Material.BOW) ++ .add(Material.CROSSBOW) ++ .ensureSize("BOWS", 2); ++ ++ /** ++ * Covers the variants of player-throwable projectiles (not requiring a bow or any other "assistance"). ++ */ ++ public static final MaterialSetTag THROWABLE_PROJECTILES = new MaterialSetTag(keyFor("throwable_projectiles")) ++ .add(Material.EGG, Material.SNOWBALL, Material.SPLASH_POTION, Material.TRIDENT, Material.ENDER_PEARL, Material.EXPERIENCE_BOTTLE, Material.FIREWORK_ROCKET) ++ .ensureSize("THROWABLE_PROJECTILES", 2); ++ + @SuppressWarnings("unchecked") + public static final MaterialSetTag COLORABLE = new MaterialSetTag(keyFor("colorable")) + .add(Tag.WOOL, Tag.CARPETS).add(SHULKER_BOXES, STAINED_GLASS, STAINED_GLASS_PANES, CONCRETES, BEDS); |