Skip to content

Commit 5734755

Browse files
authored
Merge pull request #370 from Lotiny/update-xtag
[XTag] Fix shovel duplication and add new tools
2 parents 0f5eb5c + c57a014 commit 5734755

File tree

1 file changed

+56
-1
lines changed
  • core/src/main/java/com/cryptomorin/xseries

1 file changed

+56
-1
lines changed

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

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -985,6 +985,31 @@ public final class XTag<T extends XBase<?, ?>> {
985985
*/
986986
@NotNull
987987
public static final XTag<XMaterial> NETHERITE_TOOLS;
988+
/**
989+
* Tag representing all possible types of sword
990+
*/
991+
@NotNull
992+
public static final XTag<XMaterial> SWORD;
993+
/**
994+
* Tag representing all possible types of pickaxe
995+
*/
996+
@NotNull
997+
public static final XTag<XMaterial> PICKAXE;
998+
/**
999+
* Tag representing all possible types of axe
1000+
*/
1001+
@NotNull
1002+
public static final XTag<XMaterial> AXE;
1003+
/**
1004+
* Tag representing all possible types of shovel
1005+
*/
1006+
@NotNull
1007+
public static final XTag<XMaterial> SHOVEL;
1008+
/**
1009+
* Tag representing all possible types of hoe
1010+
*/
1011+
@NotNull
1012+
public static final XTag<XMaterial> HOE;
9881013
/**
9891014
* Tag representing all blocks that could harm a player.
9901015
*/
@@ -2123,12 +2148,42 @@ public final class XTag<T extends XBase<?, ?>> {
21232148
XMaterial.DIAMOND_AXE,
21242149
XMaterial.DIAMOND_HOE,
21252150
XMaterial.DIAMOND_SHOVEL,
2126-
XMaterial.DIAMOND_SHOVEL);
2151+
XMaterial.DIAMOND_SWORD);
21272152
NETHERITE_TOOLS = TagBuilder.simple(XMaterial.NETHERITE_PICKAXE,
21282153
XMaterial.NETHERITE_AXE,
21292154
XMaterial.NETHERITE_HOE,
21302155
XMaterial.NETHERITE_SHOVEL,
2156+
XMaterial.NETHERITE_SWORD);
2157+
SWORD = TagBuilder.simple(XMaterial.WOODEN_SWORD,
2158+
XMaterial.STONE_SWORD,
2159+
XMaterial.IRON_SWORD,
2160+
XMaterial.GOLDEN_SWORD,
2161+
XMaterial.DIAMOND_SWORD,
2162+
XMaterial.NETHERITE_SWORD);
2163+
PICKAXE = TagBuilder.simple(XMaterial.WOODEN_PICKAXE,
2164+
XMaterial.STONE_PICKAXE,
2165+
XMaterial.IRON_PICKAXE,
2166+
XMaterial.GOLDEN_PICKAXE,
2167+
XMaterial.DIAMOND_PICKAXE,
2168+
XMaterial.NETHERITE_PICKAXE);
2169+
AXE = TagBuilder.simple(XMaterial.WOODEN_AXE,
2170+
XMaterial.STONE_AXE,
2171+
XMaterial.IRON_AXE,
2172+
XMaterial.GOLDEN_AXE,
2173+
XMaterial.DIAMOND_AXE,
2174+
XMaterial.NETHERITE_AXE);
2175+
SHOVEL = TagBuilder.simple(XMaterial.WOODEN_SHOVEL,
2176+
XMaterial.STONE_SHOVEL,
2177+
XMaterial.IRON_SHOVEL,
2178+
XMaterial.GOLDEN_SHOVEL,
2179+
XMaterial.DIAMOND_SHOVEL,
21312180
XMaterial.NETHERITE_SHOVEL);
2181+
HOE = TagBuilder.simple(XMaterial.WOODEN_HOE,
2182+
XMaterial.STONE_HOE,
2183+
XMaterial.IRON_HOE,
2184+
XMaterial.GOLDEN_HOE,
2185+
XMaterial.DIAMOND_HOE,
2186+
XMaterial.NETHERITE_HOE);
21322187
ARMOR_PIECES = TagBuilder
21332188
.of(XMaterial.TURTLE_HELMET)
21342189
.inheritFrom(

0 commit comments

Comments
 (0)