EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Add support for Tuff

Browse Source
This commit is contained in:
nossr50 2021-06-06 20:41:00 -07:00
parent b569b9456e
commit c3d86ba6c5
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.txt
View File

@ -12,6 +12,7 @@ Version 2.1.197
Added Rooted Dirt to experience.yml for Excavation Added Rooted Dirt to experience.yml for Excavation
Added Moss Block to experience.yml for Herbalism Added Moss Block to experience.yml for Herbalism
Added Tuff to experience.yml for Mining
Added Calcite to experience.yml for Mining Added Calcite to experience.yml for Mining
Added Smooth Basalt to experience.yml for Mining Added Smooth Basalt to experience.yml for Mining
Added Block_Of_Amethyst to experience.yml for Mining Added Block_Of_Amethyst to experience.yml for Mining
@ -34,6 +35,7 @@ Version 2.1.197
Added Lapis Lazuli Ore to experience.yml for Mining (was missing) Added Lapis Lazuli Ore to experience.yml for Mining (was missing)
Added Moss Block to Bonus Drops for Herbalism in config.yml Added Moss Block to Bonus Drops for Herbalism in config.yml
Added Tuff to Bonus Drops for Mining in config.yml
Added Amethyst Shard to Bonus Drops for Mining in config.yml Added Amethyst Shard to Bonus Drops for Mining in config.yml
Added Calcite to Bonus Drops for Mining in config.yml Added Calcite to Bonus Drops for Mining in config.yml
Added Smooth Basalt to Bonus Drops for Mining in config.yml Added Smooth Basalt to Bonus Drops for Mining in config.yml

8
src/main/java/com/gmail/nossr50/util/BlockUtils.java
View File

@ -159,7 +159,7 @@ public final class BlockUtils {
* @return true if the block should affected by Giga Drill Breaker, false * @return true if the block should affected by Giga Drill Breaker, false
* otherwise * otherwise
*/ */
public static boolean affectedByGigaDrillBreaker(BlockState blockState) { public static boolean affectedByGigaDrillBreaker(@NotNull BlockState blockState) {
if (ExperienceConfig.getInstance().doesBlockGiveSkillXP(PrimarySkillType.EXCAVATION, blockState.getBlockData())) if (ExperienceConfig.getInstance().doesBlockGiveSkillXP(PrimarySkillType.EXCAVATION, blockState.getBlockData()))
return true; return true;
return mcMMO.getModManager().isCustomExcavationBlock(blockState); return mcMMO.getModManager().isCustomExcavationBlock(blockState);
@ -171,7 +171,7 @@ public final class BlockUtils {
* @param blockState The {@link BlockState} of the block to check * @param blockState The {@link BlockState} of the block to check
* @return true if the block is a log, false otherwise * @return true if the block is a log, false otherwise
*/ */
public static boolean hasWoodcuttingXP(BlockState blockState) { public static boolean hasWoodcuttingXP(@NotNull BlockState blockState) {
return ExperienceConfig.getInstance().doesBlockGiveSkillXP(PrimarySkillType.WOODCUTTING, blockState.getBlockData()); return ExperienceConfig.getInstance().doesBlockGiveSkillXP(PrimarySkillType.WOODCUTTING, blockState.getBlockData());
} }
@ -181,11 +181,11 @@ public final class BlockUtils {
* @param blockState The {@link BlockState} of the block to check * @param blockState The {@link BlockState} of the block to check
* @return true if the block is a leaf, false otherwise * @return true if the block is a leaf, false otherwise
*/ */
public static boolean isNonWoodPartOfTree(BlockState blockState) { public static boolean isNonWoodPartOfTree(@NotNull BlockState blockState) {
return mcMMO.getMaterialMapStore().isTreeFellerDestructible(blockState.getType()); return mcMMO.getMaterialMapStore().isTreeFellerDestructible(blockState.getType());
} }
public static boolean isNonWoodPartOfTree(Material material) { public static boolean isNonWoodPartOfTree(@NotNull Material material) {
return mcMMO.getMaterialMapStore().isTreeFellerDestructible(material); return mcMMO.getMaterialMapStore().isTreeFellerDestructible(material);
} }

1
src/main/resources/config.yml
View File

@ -514,6 +514,7 @@ Bonus_Drops:
Peony: true Peony: true
Lily_Of_The_Valley: true Lily_Of_The_Valley: true
Mining: Mining:
Tuff: true
Deepslate_Redstone_Ore: true Deepslate_Redstone_Ore: true
Deepslate_Copper_Ore: true Deepslate_Copper_Ore: true
Deepslate_Coal_Ore: true Deepslate_Coal_Ore: true

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

@ -382,6 +382,7 @@ Experience_Values:
Lily_Of_The_Valley: 150 Lily_Of_The_Valley: 150
Wither_Rose: 500 Wither_Rose: 500
Mining: Mining:
Tuff: 10
Copper_Ore: 1400 Copper_Ore: 1400
Deepslate_Copper_Ore: 1900 Deepslate_Copper_Ore: 1900
Deepslate: 30 Deepslate: 30