EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 18:24:43 +02:00
Code Issues Projects Releases Wiki Activity

Add Amethyst related blocks to experience.yml and update Super Breaker

Browse Source
This commit is contained in:
nossr50
2021-06-03 14:04:08 -07:00
parent 6dbc7adf48
commit e74e1e6829
3 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/gmail/nossr50/util/MaterialMapStore.java
View File

@ -307,10 +307,6 @@ public class MaterialMapStore {
intendedToolPickAxe.add("stone_button");
intendedToolPickAxe.add("stone_pressure_plate");
intendedToolPickAxe.add("terracotta");
intendedToolPickAxe.add("amethyst_bud");
intendedToolPickAxe.add("amethyst_cluster");
intendedToolPickAxe.add("block_of_amethyst");
intendedToolPickAxe.add("budding_amethyst");
intendedToolPickAxe.add("ancient_debris");
intendedToolPickAxe.add("crying_obsidian");
intendedToolPickAxe.add("glowing_obsidian"); //be
@ -395,6 +391,16 @@ public class MaterialMapStore {
intendedToolPickAxe.add("waxed_cut_copper_stairs");
intendedToolPickAxe.add("waxed_lightly_weathered_cut_copper_stairs");
//1.17
intendedToolPickAxe.add("calcite");
intendedToolPickAxe.add("smooth_basalt");
intendedToolPickAxe.add("block_of_amethyst");
intendedToolPickAxe.add("small_amethyst_bud");
intendedToolPickAxe.add("medium_amethyst_bud");
intendedToolPickAxe.add("large_amethyst_bud");
intendedToolPickAxe.add("amethyst_cluster");
intendedToolPickAxe.add("budding_amethyst");
}
private void fillArmors() {
@ -1269,11 +1275,11 @@ public class MaterialMapStore {
toolBlackList.add("sweet_berry_bush");
}
public boolean isIntendedToolPickaxe(Material material) {
public boolean isIntendedToolPickaxe(@NotNull Material material) {
return intendedToolPickAxe.contains(material.getKey().getKey());
}
public boolean isIntendedToolPickaxe(String string) {
public boolean isIntendedToolPickaxe(@NotNull String string) {
return intendedToolPickAxe.contains(string);
}

8
src/main/resources/experience.yml
View File

@ -380,6 +380,14 @@ Experience_Values:
Lily_Of_The_Valley: 150
Wither_Rose: 500
Mining:
Calcite: 400
Smooth_Basalt: 300
Block_Of_Amethyst: 500
Budding_Amethyst: 400
Small_Amethyst_Bud: 10
Medium_Amethyst_Bud: 20
Large_Amethyst_Bud: 30
Amethyst_Cluster: 60
Bone_Block: 500
Crying_Obsidian: 3000
Chain: 100