diff options
Diffstat (limited to 'YWD/src/main/java/fyresmodjam/blessings/BlessingUtils.java')
| -rwxr-xr-x | YWD/src/main/java/fyresmodjam/blessings/BlessingUtils.java | 63 |
1 files changed, 22 insertions, 41 deletions
diff --git a/YWD/src/main/java/fyresmodjam/blessings/BlessingUtils.java b/YWD/src/main/java/fyresmodjam/blessings/BlessingUtils.java index c240a7a..ec29a1a 100755 --- a/YWD/src/main/java/fyresmodjam/blessings/BlessingUtils.java +++ b/YWD/src/main/java/fyresmodjam/blessings/BlessingUtils.java @@ -12,12 +12,13 @@ import fyresmodjam.blessings.standard.*; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.config.Configuration; public class BlessingUtils { - public final static Map<String, Blessing> playerBlessings; - public final static Map<String, Blessing> mobBlessings; + public static Map<String, Blessing> playerBlessings; + public static Map<String, Blessing> mobBlessings; - static { + public static void loadBlessings(Configuration cfg) { playerBlessings = new HashMap<String, Blessing>(); mobBlessings = new HashMap<String, Blessing>(); @@ -31,14 +32,14 @@ public class BlessingUtils { GuardingMark guardingMark = new GuardingMark(); HuntingMark huntingMark = new HuntingMark(); ScoutingMark scoutingMark = new ScoutingMark(); - VampirismMark vampirismMark = new VampirismMark(); + // VampirismMark vampirismMark = new VampirismMark(); WarMark warMark = new WarMark(); addOmniBlessing("MarkBerserking", berserkingMark); addOmniBlessing("MarkFalseLife", falseLifeMark); addOmniBlessing("MarkGuarding", guardingMark); addOmniBlessing("MarkHunting", huntingMark); - addOmniBlessing("MarkVampirism", vampirismMark); + // addOmniBlessing("MarkVampirism", vampirismMark); addOmniBlessing("MarkWar", warMark); playerBlessings.put("MarkScouting", scoutingMark); @@ -73,22 +74,17 @@ public class BlessingUtils { addOmniBlessing("BlessingVampire", vampireBlessing); addOmniBlessing("BlessingInferno", infernoBlessing); addOmniBlessing("BlessingLoner", lonerBlessing); - addOmniBlessing("BlessingParatrooper", - paratrooperBlessing); + addOmniBlessing("BlessingParatrooper", paratrooperBlessing); addOmniBlessing("BlessingPorcupine", porcupineBlessing); - addOmniBlessing("BlessingThick-Skinned", - thickSkinnedBlessing); + addOmniBlessing("BlessingThick-Skinned", thickSkinnedBlessing); PaladinBlessing paladinBlessing = new PaladinBlessing(); - playerBlessings.put("BlessingAlchemist", - alchemistBlessing); - playerBlessings.put("BlessingBerserker", - berserkerBlessing); + playerBlessings.put("BlessingAlchemist", alchemistBlessing); + playerBlessings.put("BlessingBerserker", berserkerBlessing); playerBlessings.put("BlessingDiver", diverBlessing); playerBlessings.put("BlessingLooter", looterBlessing); - playerBlessings.put("BlessingLumberjack", - lumberjackBlessing); + playerBlessings.put("BlessingLumberjack", lumberjackBlessing); playerBlessings.put("BlessingMechanic", mechanicBlessing); playerBlessings.put("BlessingMiner", minerBlessing); playerBlessings.put("BlessingNinja", ninjaBlessing); @@ -97,20 +93,16 @@ public class BlessingUtils { playerBlessings.put("BlessingThief", thiefBlessing); } - private static void addOmniBlessing(String blessName, - Blessing blessInst) { + private static void addOmniBlessing(String blessName, Blessing blessInst) { playerBlessings.put(blessName, blessInst); mobBlessings.put(blessName, blessInst); } public static boolean hasDisadvantage() { if (CommonTickHandler.worldData != null) { - String currentDisadvantage = CommonTickHandler.worldData - .getDisadvantage(); + String currentDisadvantage = CommonTickHandler.worldData.getDisadvantage(); - return currentDisadvantage != null - && !(currentDisadvantage - .equals("")); + return currentDisadvantage != null && !(currentDisadvantage.equals("")); } return false; @@ -118,9 +110,7 @@ public class BlessingUtils { public static boolean hasDisadvantage(String disadvantage) { if (hasDisadvantage()) { - return CommonTickHandler.worldData - .getDisadvantage() - .equals(disadvantage); + return CommonTickHandler.worldData.getDisadvantage().equals(disadvantage); } return false; @@ -137,14 +127,12 @@ public class BlessingUtils { public static boolean hasBlessing(Entity ent) { NBTTagCompound entityData = ent.getEntityData(); - return entityData.hasKey("Blessing") && !(entityData - .getString("Blessing").equals("")); + return entityData.hasKey("Blessing") && !(entityData.getString("Blessing").equals("")); } public static boolean hasBlessing(Entity ent, String blessing) { if (hasBlessing(ent)) { - return ent.getEntityData().getString("Blessing") - .equals(blessing); + return ent.getEntityData().getString("Blessing").equals(blessing); } return false; @@ -155,23 +143,18 @@ public class BlessingUtils { } public static int getBlessingCounter(Entity ent) { - return Integer.parseInt(EntityStatHelper.getStat(ent, - "BlessingCounter")); + return Integer.parseInt(EntityStatHelper.getStat(ent, "BlessingCounter")); } public static boolean isBlessingActive(Entity ent) { - return ent.getEntityData().hasKey("BlessingActive") - && ent.getEntityData().getBoolean( - "BlessingActive"); + return ent.getEntityData().hasKey("BlessingActive") && ent.getEntityData().getBoolean("BlessingActive"); } public static Blessing getBlessingInstance(String blessing) { if (playerBlessings.containsKey(blessing)) { return playerBlessings.get(blessing); } else { - System.err.printf( - "ERROR: Blessing '%s' not found, using default blessing\n", - blessing); + System.err.printf("ERROR: Blessing '%s' not found, using default blessing\n", blessing); return playerBlessings.get("BlessingGuardian"); } } @@ -188,8 +171,7 @@ public class BlessingUtils { i += 1; } - System.err.println( - "ERROR: Couldn't get blessing for player; using default."); + System.err.println("ERROR: Couldn't get blessing for player; using default."); return "BlessingGuardian"; } @@ -205,8 +187,7 @@ public class BlessingUtils { i += 1; } - System.err.println( - "ERROR: Couldn't get blessing for mob; using default."); + System.err.println("ERROR: Couldn't get blessing for mob; using default."); return "BlessingGuardian"; } |