Skip to content

Commit db985bc

Browse files
authored
Add spears to fill<Material>ToolsWhiteList() methods (#5254)
These methods fill the matching `<material>Tools` HashSets. Adding corresponding spear items will allow the `is<Material>Tool()` methods to return `true` if checking a spear of the matching material. This is to support the Repair and Salvage configurations pulling the appropriate repair/salvage material type if one is not specified in the plugin's configuration files.
1 parent 1b8897b commit db985bc

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/main/java/com/gmail/nossr50/util/MaterialMapStore.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -673,6 +673,7 @@ private void fillWoodToolsWhiteList() {
673673
woodTools.add("wooden_hoe");
674674
woodTools.add("wooden_pickaxe");
675675
woodTools.add("wooden_shovel");
676+
woodTools.add("wooden_spear");
676677
}
677678

678679
private void fillStoneToolsWhiteList() {
@@ -681,6 +682,7 @@ private void fillStoneToolsWhiteList() {
681682
stoneTools.add("stone_hoe");
682683
stoneTools.add("stone_pickaxe");
683684
stoneTools.add("stone_shovel");
685+
stoneTools.add("stone_spear");
684686
}
685687

686688
private void fillCopperToolsWhiteList() {
@@ -689,6 +691,7 @@ private void fillCopperToolsWhiteList() {
689691
copperTools.add("copper_hoe");
690692
copperTools.add("copper_pickaxe");
691693
copperTools.add("copper_shovel");
694+
copperTools.add("copper_spear");
692695
}
693696

694697
private void fillIronToolsWhiteList() {
@@ -697,6 +700,7 @@ private void fillIronToolsWhiteList() {
697700
ironTools.add("iron_hoe");
698701
ironTools.add("iron_pickaxe");
699702
ironTools.add("iron_shovel");
703+
ironTools.add("iron_spear");
700704

701705
//Used for repair, remove in 2.2
702706
//TODO: Remove in config update
@@ -718,6 +722,7 @@ private void fillGoldToolsWhiteList() {
718722
goldTools.add("golden_hoe");
719723
goldTools.add("golden_pickaxe");
720724
goldTools.add("golden_shovel");
725+
goldTools.add("golden_spear");
721726
}
722727

723728
private void fillDiamondToolsWhiteList() {
@@ -726,6 +731,7 @@ private void fillDiamondToolsWhiteList() {
726731
diamondTools.add("diamond_hoe");
727732
diamondTools.add("diamond_pickaxe");
728733
diamondTools.add("diamond_shovel");
734+
diamondTools.add("diamond_spear");
729735
}
730736

731737
private void fillNetheriteToolsWhiteList() {
@@ -734,6 +740,7 @@ private void fillNetheriteToolsWhiteList() {
734740
netheriteTools.add("netherite_hoe");
735741
netheriteTools.add("netherite_pickaxe");
736742
netheriteTools.add("netherite_shovel");
743+
netheriteTools.add("netherite_spear");
737744
}
738745

739746
private void fillGlassBlockWhiteList() {

0 commit comments

Comments
 (0)