EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-02 20:45:28 +02:00
Code Issues Projects Releases Wiki 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);
}
}

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

@@ -28,7 +28,8 @@ public final class ItemUtils {
return true;
default:
return mcMMO.getModManager().isCustomBow(type);
return false;
//return mcMMO.getModManager().isCustomBow(type);
}
}
@@ -50,7 +51,8 @@ public final class ItemUtils {
return true;
default:
return mcMMO.getModManager().isCustomSword(type);
return false;
//return mcMMO.getModManager().isCustomSword(type);
}
}
@@ -72,7 +74,8 @@ public final class ItemUtils {
return true;
default:
return mcMMO.getModManager().isCustomHoe(type);
return false;
//return mcMMO.getModManager().isCustomHoe(type);
}
}
@@ -94,7 +97,8 @@ public final class ItemUtils {
return true;
default:
return mcMMO.getModManager().isCustomShovel(type);
return false;
//return mcMMO.getModManager().isCustomShovel(type);
}
}
@@ -116,7 +120,8 @@ public final class ItemUtils {
return true;
default:
return mcMMO.getModManager().isCustomAxe(type);
return false;
//return mcMMO.getModManager().isCustomAxe(type);
}
}
@@ -138,7 +143,8 @@ public final class ItemUtils {
return true;
default:
return mcMMO.getModManager().isCustomPickaxe(type);
return false;
//return mcMMO.getModManager().isCustomPickaxe(type);
}
}
@@ -174,7 +180,8 @@ public final class ItemUtils {
return true;
default:
return mcMMO.getModManager().isCustomHelmet(type);
return false;
//return mcMMO.getModManager().isCustomHelmet(type);
}
}
@@ -196,7 +203,8 @@ public final class ItemUtils {
return true;
default:
return mcMMO.getModManager().isCustomChestplate(type);
return false;
//return mcMMO.getModManager().isCustomChestplate(type);
}
}
@@ -218,7 +226,8 @@ public final class ItemUtils {
return true;
default:
return mcMMO.getModManager().isCustomLeggings(type);
return false;
//return mcMMO.getModManager().isCustomLeggings(type);
}
}
@@ -240,7 +249,8 @@ public final class ItemUtils {
return true;
default:
return mcMMO.getModManager().isCustomBoots(type);
return false;
//return mcMMO.getModManager().isCustomBoots(type);
}
}

4
src/main/java/com/gmail/nossr50/util/MaterialUtils.java
View File

@@ -18,7 +18,9 @@ public final class MaterialUtils {
case EMERALD_ORE:
return true;
default:
return mcMMO.getModManager().isCustomOre(data);
return false;
/*default:
return mcMMO.getModManager().isCustomOre(data);*/
}
}
}

12
src/main/java/com/gmail/nossr50/util/ModManager.java
View File

@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.List;
public class ModManager {
private List<Repairable> repairables = new ArrayList<Repairable>();
/*private List<Repairable> repairables = new ArrayList<Repairable>();
// Armor Mods
private List<Material> customBoots = new ArrayList<Material>();
@@ -164,22 +164,22 @@ public class ModManager {
return customBlockMap.get(data);
}
/**
*//**
* Checks to see if an item is a custom tool.
*
* @param item Item to check
* @return true if the item is a custom tool, false otherwise
*/
*//*
public boolean isCustomTool(ItemStack item) {
return MainConfig.getInstance().getToolModsEnabled() && item != null && customToolMap.containsKey(item.getType());
}
/**
*//**
* Get the custom tool associated with an item.
*
* @param item The item to check
* @return the tool if it exists, null otherwise
*/
*//*
public CustomTool getTool(ItemStack item) {
return item == null ? null : customToolMap.get(item.getType());
}
@@ -278,5 +278,5 @@ public class ModManager {
catch (Exception e) {
e.printStackTrace();
}
}
}*/
}

14
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@@ -1,5 +1,6 @@
package com.gmail.nossr50.util.skills;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
@@ -560,10 +561,11 @@ public final class CombatUtils {
}
}
else {
if (mcMMO.getModManager().isCustomEntity(target)) {
/*if (mcMMO.getModManager().isCustomEntity(target)) {
baseXP = mcMMO.getModManager().getEntity(target).getXpMultiplier();
}
else if (target instanceof Animals) {
}*/
//else if (target instanceof Animals) {
if (target instanceof Animals) {
EntityType type = target.getType();
baseXP = ExperienceConfig.getInstance().getAnimalsXP(type);
}
@@ -590,7 +592,7 @@ public final class CombatUtils {
else
{
baseXP = 1.0;
mcMMO.getModManager().addCustomEntity(target);
//mcMMO.getModManager().addCustomEntity(target);
}
}
@@ -819,9 +821,9 @@ public final class CombatUtils {
else if (ItemUtils.isDiamondTool(inHand)) {
tier = 4;
}
else if (mcMMO.getModManager().isCustomTool(inHand)) {
/*else if (mcMMO.getModManager().isCustomTool(inHand)) {
tier = mcMMO.getModManager().getTool(inHand).getTier();
}
}*/
return tier;
}