Skip to content

Commit e654b3a

Browse files
CryptoMorinCryptoMorin
authored
Merge pull request #213 from thomasmny/add-missing-wood-types
[XTag] Add missing 1.20 wood types
2 parents 52b085b + d9e2f11 commit e654b3a

File tree

1 file changed

+91
-11
lines changed
  • src/main/java/com/cryptomorin/xseries

1 file changed

+91
-11
lines changed

‎src/main/java/com/cryptomorin/xseries/XTag.java‎

Lines changed: 91 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@ public final class XTag<T extends Enum<T>> {
9292
*/
9393
@Nonnull
9494
public static final XTag<XMaterial> AZALEA_ROOT_REPLACEABLE;
95+
/**
96+
* Tag representing all bamboo wood variants
97+
*/
98+
@Nonnull
99+
public static final XTag<XMaterial> BAMBOO_LOGS;
95100
/**
96101
* Tag representing all possible blocks bamboo may be planted on
97102
*/
@@ -172,6 +177,11 @@ public final class XTag<T extends Enum<T>> {
172177
*/
173178
@Nonnull
174179
public static final XTag<XMaterial> CAVE_VINES;
180+
/**
181+
* Tag representing all cherry log and bark variants
182+
*/
183+
@Nonnull
184+
public static final XTag<XMaterial> CHERRY_LOGS;
175185
/**
176186
* Tag representing all climbable blocks
177187
*/
@@ -364,6 +374,11 @@ public final class XTag<T extends Enum<T>> {
364374
*/
365375
@Nonnull
366376
public static final XTag<XMaterial> GUARDED_BY_PIGLINS;
377+
/**
378+
* Tag representing all possible types of hanging signs
379+
*/
380+
@Nonnull
381+
public static final XTag<XMaterial> HANGING_SIGNS;
367382
/**
368383
* Tag representing all block types that repel hoglins
369384
*/
@@ -626,6 +641,11 @@ public final class XTag<T extends Enum<T>> {
626641
*/
627642
@Nonnull
628643
public static final XTag<XMaterial> PORTALS;
644+
/**
645+
* Tag representing all possible pottery sherds
646+
*/
647+
@Nonnull
648+
public static final XTag<XMaterial> POTTERY_SHERDS;
629649
/**
630650
* Tag representing all possible variants of pressure plates
631651
*/
@@ -686,6 +706,11 @@ public final class XTag<T extends Enum<T>> {
686706
*/
687707
@Nonnull
688708
public static final XTag<XMaterial> SMALL_FLOWERS;
709+
/**
710+
* Tag representing all possible smithing templates
711+
*/
712+
@Nonnull
713+
public static final XTag<XMaterial> SMITHING_TEMPLATES;
689714
/**
690715
* Tag representing all possible variants of snow
691716
*/
@@ -776,8 +801,6 @@ public final class XTag<T extends Enum<T>> {
776801
*/
777802
@Nonnull
778803
public static final XTag<XMaterial> WALL_SIGNS;
779-
@Nonnull
780-
public static final XTag<XMaterial> HANGING_SIGNS;
781804
/**
782805
* Tag representing all different types of walls
783806
*/
@@ -1016,6 +1039,14 @@ public final class XTag<T extends Enum<T>> {
10161039
XMaterial.SPRUCE_LOG,
10171040
XMaterial.SPRUCE_WOOD,
10181041
XMaterial.STRIPPED_SPRUCE_WOOD);
1042+
CHERRY_LOGS = new XTag<>(XMaterial.STRIPPED_CHERRY_LOG,
1043+
XMaterial.CHERRY_LOG,
1044+
XMaterial.CHERRY_WOOD,
1045+
XMaterial.STRIPPED_CHERRY_WOOD);
1046+
BAMBOO_LOGS = new XTag<>(XMaterial.STRIPPED_BAMBOO_BLOCK,
1047+
XMaterial.BAMBOO_BLOCK,
1048+
XMaterial.BAMBOO_MOSAIC,
1049+
XMaterial.BAMBOO_PLANKS);
10191050
}
10201051

10211052
static { // colorable
@@ -1039,7 +1070,7 @@ public final class XTag<T extends Enum<T>> {
10391070
static { // wooded material
10401071
STANDING_SIGNS = new XTag<>(findAllWoodTypes("SIGN"));
10411072
WALL_SIGNS = new XTag<>(findAllWoodTypes("WALL_SIGN"));
1042-
HANGING_SIGNS = new XTag<>(findAllWoodTypes("WALL_HANGING_SIGN"));
1073+
HANGING_SIGNS = new XTag<>(findAllWoodTypes("HANGING_SIGN"));
10431074
WOODEN_PRESSURE_PLATES = new XTag<>(findAllWoodTypes("PRESSURE_PLATE"));
10441075
WOODEN_DOORS = new XTag<>(findAllWoodTypes("DOOR"));
10451076
WOODEN_FENCE_GATES = new XTag<>(findAllWoodTypes("FENCE_GATE"));
@@ -1273,7 +1304,8 @@ public final class XTag<T extends Enum<T>> {
12731304
XMaterial.POTTED_SPRUCE_SAPLING,
12741305
XMaterial.POTTED_JUNGLE_SAPLING,
12751306
XMaterial.POTTED_BIRCH_SAPLING,
1276-
XMaterial.POTTED_MANGROVE_PROPAGULE);
1307+
XMaterial.POTTED_MANGROVE_PROPAGULE,
1308+
XMaterial.POTTED_CHERRY_SAPLING);
12771309
FOX_FOOD = new XTag<>(XMaterial.GLOW_BERRIES,
12781310
XMaterial.SWEET_BERRIES);
12791311
FOXES_SPAWNABLE_ON = new XTag<>(XMaterial.SNOW,
@@ -1324,7 +1356,9 @@ public final class XTag<T extends Enum<T>> {
13241356
XMaterial.BIRCH_BOAT,
13251357
XMaterial.SPRUCE_BOAT,
13261358
XMaterial.JUNGLE_BOAT,
1327-
XMaterial.MANGROVE_BOAT);
1359+
XMaterial.MANGROVE_BOAT,
1360+
XMaterial.CHERRY_BOAT,
1361+
XMaterial.BAMBOO_RAFT);
13281362
ITEMS_COALS = new XTag<>(XMaterial.COAL,
13291363
XMaterial.CHARCOAL);
13301364
ITEMS_CREEPER_DROP_MUSIC_DISCS = new XTag<>(XMaterial.MUSIC_DISC_BLOCKS,
@@ -1359,7 +1393,8 @@ public final class XTag<T extends Enum<T>> {
13591393
XMaterial.FLOWERING_AZALEA_LEAVES,
13601394
XMaterial.BIRCH_LEAVES,
13611395
XMaterial.OAK_LEAVES,
1362-
XMaterial.MANGROVE_LEAVES);
1396+
XMaterial.MANGROVE_LEAVES,
1397+
XMaterial.CHERRY_LEAVES);
13631398
NON_WOODEN_STAIRS = new XTag<>(XMaterial.STONE_BRICK_STAIRS,
13641399
XMaterial.STONE_STAIRS,
13651400
XMaterial.POLISHED_BLACKSTONE_BRICK_STAIRS,
@@ -1445,6 +1480,26 @@ public final class XTag<T extends Enum<T>> {
14451480
XMaterial.WAXED_WEATHERED_CUT_COPPER_SLAB,
14461481
XMaterial.BRICK_SLAB,
14471482
XMaterial.POLISHED_GRANITE_SLAB);
1483+
POTTERY_SHERDS = new XTag<>(XMaterial.ANGLER_POTTERY_SHERD,
1484+
XMaterial.ARCHER_POTTERY_SHERD,
1485+
XMaterial.ARMS_UP_POTTERY_SHERD,
1486+
XMaterial.BLADE_POTTERY_SHERD,
1487+
XMaterial.BREWER_POTTERY_SHERD,
1488+
XMaterial.BURN_POTTERY_SHERD,
1489+
XMaterial.DANGER_POTTERY_SHERD,
1490+
XMaterial.EXPLORER_POTTERY_SHERD,
1491+
XMaterial.FRIEND_POTTERY_SHERD,
1492+
XMaterial.HEART_POTTERY_SHERD,
1493+
XMaterial.HEARTBREAK_POTTERY_SHERD,
1494+
XMaterial.HOWL_POTTERY_SHERD,
1495+
XMaterial.MINER_POTTERY_SHERD,
1496+
XMaterial.MOURNER_POTTERY_SHERD,
1497+
XMaterial.PLENTY_POTTERY_SHERD,
1498+
XMaterial.PRIZE_POTTERY_SHERD,
1499+
XMaterial.SHEAF_POTTERY_SHERD,
1500+
XMaterial.SHELTER_POTTERY_SHERD,
1501+
XMaterial.SKULL_POTTERY_SHERD,
1502+
XMaterial.SNORT_POTTERY_SHERD);
14481503
SOUL_FIRE_BASE_BLOCKS = new XTag<>(XMaterial.SOUL_SOIL,
14491504
XMaterial.SOUL_SAND);
14501505
SOUL_SPEED_BLOCKS = new XTag<>(XMaterial.SOUL_SOIL,
@@ -1468,7 +1523,8 @@ public final class XTag<T extends Enum<T>> {
14681523
XMaterial.OAK_SAPLING,
14691524
XMaterial.FLOWERING_AZALEA,
14701525
XMaterial.BIRCH_SAPLING,
1471-
XMaterial.MANGROVE_PROPAGULE);
1526+
XMaterial.MANGROVE_PROPAGULE,
1527+
XMaterial.CHERRY_SAPLING);
14721528
WOLVES_SPAWNABLE_ON = new XTag<>(XMaterial.GRASS_BLOCK,
14731529
XMaterial.SNOW,
14741530
XMaterial.SNOW_BLOCK);
@@ -1788,6 +1844,7 @@ public final class XTag<T extends Enum<T>> {
17881844
XMaterial.TARGET,
17891845
XMaterial.ACACIA_LEAVES,
17901846
XMaterial.MANGROVE_LEAVES,
1847+
XMaterial.CHERRY_LEAVES,
17911848
XMaterial.MOSS_BLOCK);
17921849

17931850
LAVA_POOL_STONE_CANNOT_REPLACE = new XTag<>(XMaterial.DARK_OAK_LEAVES,
@@ -1796,6 +1853,7 @@ public final class XTag<T extends Enum<T>> {
17961853
XMaterial.CRIMSON_HYPHAE,
17971854
XMaterial.JUNGLE_LEAVES,
17981855
XMaterial.MANGROVE_LEAVES,
1856+
XMaterial.CHERRY_LEAVES,
17991857
XMaterial.DARK_OAK_WOOD,
18001858
XMaterial.STRIPPED_ACACIA_LOG,
18011859
XMaterial.DARK_OAK_LOG,
@@ -1805,6 +1863,7 @@ public final class XTag<T extends Enum<T>> {
18051863
XMaterial.JUNGLE_LOG,
18061864
XMaterial.SPRUCE_LOG,
18071865
XMaterial.MANGROVE_LOG,
1866+
XMaterial.CHERRY_LOG,
18081867
XMaterial.STRIPPED_CRIMSON_HYPHAE,
18091868
XMaterial.SPRUCE_LEAVES,
18101869
XMaterial.STRIPPED_BIRCH_LOG,
@@ -1814,6 +1873,7 @@ public final class XTag<T extends Enum<T>> {
18141873
XMaterial.BIRCH_WOOD,
18151874
XMaterial.STRIPPED_JUNGLE_WOOD,
18161875
XMaterial.STRIPPED_MANGROVE_LOG,
1876+
XMaterial.STRIPPED_CHERRY_LOG,
18171877
XMaterial.WARPED_HYPHAE,
18181878
XMaterial.CHEST,
18191879
XMaterial.FLOWERING_AZALEA_LEAVES,
@@ -1825,6 +1885,7 @@ public final class XTag<T extends Enum<T>> {
18251885
XMaterial.OAK_LEAVES,
18261886
XMaterial.STRIPPED_BIRCH_WOOD,
18271887
XMaterial.STRIPPED_MANGROVE_WOOD,
1888+
XMaterial.STRIPPED_CHERRY_WOOD,
18281889
XMaterial.STRIPPED_JUNGLE_LOG,
18291890
XMaterial.WARPED_STEM,
18301891
XMaterial.END_PORTAL_FRAME,
@@ -1833,6 +1894,7 @@ public final class XTag<T extends Enum<T>> {
18331894
XMaterial.STRIPPED_SPRUCE_WOOD,
18341895
XMaterial.JUNGLE_WOOD,
18351896
XMaterial.MANGROVE_WOOD,
1897+
XMaterial.CHERRY_WOOD,
18361898
XMaterial.STRIPPED_OAK_WOOD,
18371899
XMaterial.STRIPPED_WARPED_STEM,
18381900
XMaterial.OAK_LOG,
@@ -1895,6 +1957,23 @@ public final class XTag<T extends Enum<T>> {
18951957
GOLDEN_ARMOR_PIECES,
18961958
DIAMOND_ARMOR_PIECES,
18971959
NETHERITE_ARMOR_PIECES);
1960+
SMITHING_TEMPLATES = new XTag<>(XMaterial.NETHERITE_UPGRADE_SMITHING_TEMPLATE,
1961+
XMaterial.COAST_ARMOR_TRIM_SMITHING_TEMPLATE,
1962+
XMaterial.DUNE_ARMOR_TRIM_SMITHING_TEMPLATE,
1963+
XMaterial.EYE_ARMOR_TRIM_SMITHING_TEMPLATE,
1964+
XMaterial.HOST_ARMOR_TRIM_SMITHING_TEMPLATE,
1965+
XMaterial.RAISER_ARMOR_TRIM_SMITHING_TEMPLATE,
1966+
XMaterial.RIB_ARMOR_TRIM_SMITHING_TEMPLATE,
1967+
XMaterial.SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE,
1968+
XMaterial.SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE,
1969+
XMaterial.SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE,
1970+
XMaterial.SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE,
1971+
XMaterial.SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE,
1972+
XMaterial.TIDE_ARMOR_TRIM_SMITHING_TEMPLATE,
1973+
XMaterial.VEX_ARMOR_TRIM_SMITHING_TEMPLATE,
1974+
XMaterial.WARD_ARMOR_TRIM_SMITHING_TEMPLATE,
1975+
XMaterial.WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE,
1976+
XMaterial.WILD_ARMOR_TRIM_SMITHING_TEMPLATE);
18981977

18991978
AZALEA_GROWS_ON = new XTag<>(XMaterial.SNOW_BLOCK, XMaterial.POWDER_SNOW);
19001979
AZALEA_GROWS_ON.inheritFrom(TERRACOTTA, SAND, DIRT);
@@ -1993,7 +2072,8 @@ public final class XTag<T extends Enum<T>> {
19932072
SPRUCE_LOGS,
19942073
JUNGLE_LOGS,
19952074
BIRCH_LOGS,
1996-
MANGROVE_LOGS);
2075+
MANGROVE_LOGS,
2076+
CHERRY_LOGS);
19972077
LOGS = new XTag<>(XMaterial.class,
19982078
LOGS_THAT_BURN,
19992079
CRIMSON_STEMS,
@@ -2180,7 +2260,7 @@ public final class XTag<T extends Enum<T>> {
21802260
FLUID = new XTag<>(XMaterial.LAVA, XMaterial.WATER);
21812261

21822262
INVENTORY_NOT_DISPLAYABLE = new XTag<>(XMaterial.class, AIR, FIRE, FLUID, PORTALS, WALL_SIGNS,
2183-
HANGING_SIGNS, CORAL_FANS, WALL_HEADS, CANDLE_CAKES, WALL_BANNERS, FLOWER_POTS,
2263+
CORAL_FANS, WALL_HEADS, CANDLE_CAKES, WALL_BANNERS, FLOWER_POTS,
21842264
new XTag<>(XMaterial.SWEET_BERRY_BUSH, XMaterial.CHORUS_PLANT, XMaterial.KELP_PLANT,
21852265
XMaterial.CAVE_VINES_PLANT, XMaterial.TWISTING_VINES_PLANT, XMaterial.WEEPING_VINES_PLANT));
21862266
}
@@ -2211,7 +2291,7 @@ private static XMaterial[] findAllColors(String material) {
22112291
}
22122292

22132293
private static XMaterial[] findAllWoodTypes(String material) {
2214-
String[] woodPrefixes = {"ACACIA", "DARK_OAK", "JUNGLE", "BIRCH", "WARPED", "OAK", "SPRUCE", "CRIMSON", "MANGROVE"};
2294+
String[] woodPrefixes = {"ACACIA", "DARK_OAK", "JUNGLE", "BIRCH", "WARPED", "OAK", "SPRUCE", "CRIMSON", "MANGROVE", "CHERRY", "BAMBOO"};
22152295
List<XMaterial> list = new ArrayList<>();
22162296
for (String wood : woodPrefixes) {
22172297
XMaterial.matchXMaterial(wood + '_' + material).ifPresent(list::add);
@@ -2540,4 +2620,4 @@ private final XTag<T> inheritFrom(@Nonnull XTag<T>... values) {
25402620
this.values = Collections.unmodifiableSet(newValues);
25412621
return this;
25422622
}
2543-
}
2623+
}

0 commit comments

Comments
 (0)