From ba8eb3d4b738d13616788b3d16c0ed3680e7e72d Mon Sep 17 00:00:00 2001 From: HexedHero <6012891+HexedHero@users.noreply.github.com> Date: Fri, 23 Apr 2021 15:11:30 +0100 Subject: [PATCH] Add missing Javadoc for COLORABLE MaterialTag (#5376) * Add buttons materialtag and comment for colorable with some format fixes --- Spigot-API-Patches/0154-Add-Material-Tags.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Spigot-API-Patches/0154-Add-Material-Tags.patch b/Spigot-API-Patches/0154-Add-Material-Tags.patch index 0e163a9c31..7fa999bf70 100644 --- a/Spigot-API-Patches/0154-Add-Material-Tags.patch +++ b/Spigot-API-Patches/0154-Add-Material-Tags.patch @@ -113,10 +113,10 @@ index 0000000000000000000000000000000000000000..a02a02aa0c87e0f0ed9e509e4dcab015 +} 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..3f36165d89ae4aaa153dcb9ddbb8c58a9b1a046f +index 0000000000000000000000000000000000000000..2b5a61a8afa8f73006676cdcb8a34640b43de1c3 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java -@@ -0,0 +1,556 @@ +@@ -0,0 +1,558 @@ +/* + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License + * @@ -286,7 +286,6 @@ index 0000000000000000000000000000000000000000..3f36165d89ae4aaa153dcb9ddbb8c58a + .endsWith("TERRACOTTA") + .ensureSize("TERRACOTTA", 33); + -+ + /** + * Covers both golden apples. + */ @@ -638,6 +637,9 @@ index 0000000000000000000000000000000000000000..3f36165d89ae4aaa153dcb9ddbb8c58a + 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); + ++ /** ++ * Covers materials that can be colored, such as wool, shulker boxes, stained glass etc. ++ */ + @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); @@ -657,7 +659,7 @@ index 0000000000000000000000000000000000000000..3f36165d89ae4aaa153dcb9ddbb8c58a + .endsWith("_CORAL_FAN") + .endsWith("_CORAL_WALL_FAN") + .ensureSize("CORAL_FANS", 20); -+ ++ + /** + * Covers the variants of coral blocks. + */