Mirrors/mcMMO
1
0
Fork 1
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2026-02-20 18:53:11 +01:00
Code Packages Releases Activity

mod configs are taking a break

Browse Source
This commit is contained in:
nossr50
2019-02-18 12:16:10 -08:00
parent 63aebd0454
commit e7d8e51722
25 changed files with 141 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,7 +157,8 @@ public final class BlockUtils {
return false;
default :
return !isMcMMOAnvil(blockState) && !mcMMO.getModManager().isCustomAbilityBlock(blockState);
return !isMcMMOAnvil(blockState);
//return !isMcMMOAnvil(blockState) && !mcMMO.getModManager().isCustomAbilityBlock(blockState);
}
}
@@ -283,7 +284,7 @@ public final class BlockUtils {
return false;
default :
return !isMcMMOAnvil(blockState) && !mcMMO.getModManager().isCustomAbilityBlock(blockState);
return !isMcMMOAnvil(blockState); // && !mcMMO.getModManager().isCustomAbilityBlock(blockState);
}
}
@@ -331,11 +332,13 @@ public final class BlockUtils {
* @return true if the block should affected by Green Terra, false otherwise
*/
public static boolean affectedByGreenTerra(BlockState blockState) {
if (ExperienceConfig.getInstance().doesBlockGiveSkillXP(PrimarySkillType.HERBALISM, blockState.getBlockData())) {
if (ExperienceConfig.getInstance().doesBlockGiveSkillXP(PrimarySkillType.HERBALISM, blockState.getType())) {
return true;
}
else
return false;
return mcMMO.getModManager().isCustomHerbalismBlock(blockState);
//return mcMMO.getModManager().isCustomHerbalismBlock(blockState);
}
/**
@@ -347,10 +350,10 @@ public final class BlockUtils {
* otherwise
*/
public static Boolean affectedBySuperBreaker(BlockState blockState) {
if (ExperienceConfig.getInstance().doesBlockGiveSkillXP(PrimarySkillType.MINING, blockState.getBlockData()))
if (ExperienceConfig.getInstance().doesBlockGiveSkillXP(PrimarySkillType.MINING, blockState.getType()))
return true;
return isOre(blockState) || mcMMO.getModManager().isCustomMiningBlock(blockState);
return isOre(blockState); //|| mcMMO.getModManager().isCustomMiningBlock(blockState);
}
/**
@@ -362,9 +365,11 @@ public final class BlockUtils {
* otherwise
*/
public static boolean affectedByGigaDrillBreaker(BlockState blockState) {
if (ExperienceConfig.getInstance().doesBlockGiveSkillXP(PrimarySkillType.EXCAVATION, blockState.getBlockData()))
if (ExperienceConfig.getInstance().doesBlockGiveSkillXP(PrimarySkillType.EXCAVATION, blockState.getType()))
return true;
return mcMMO.getModManager().isCustomExcavationBlock(blockState);
else
return false;
//return mcMMO.getModManager().isCustomExcavationBlock(blockState);
}
/**
@@ -375,9 +380,11 @@ public final class BlockUtils {
* @return true if the block is a log, false otherwise
*/
public static boolean isLog(BlockState blockState) {
if (ExperienceConfig.getInstance().doesBlockGiveSkillXP(PrimarySkillType.WOODCUTTING, blockState.getBlockData()))
if (ExperienceConfig.getInstance().doesBlockGiveSkillXP(PrimarySkillType.WOODCUTTING, blockState.getType()))
return true;
return mcMMO.getModManager().isCustomLog(blockState);
else
return false;
//return mcMMO.getModManager().isCustomLog(blockState);
}
/**
@@ -398,7 +405,8 @@ public final class BlockUtils {
return true;
default :
return mcMMO.getModManager().isCustomLeaf(blockState);
return false;
//return mcMMO.getModManager().isCustomLeaf(blockState);
}
}