upstream/ForbiddenMagic
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ForbiddenMagic.git synced 2026-11-12 08:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

More Wrath Cage support

Browse Source
This commit is contained in:
Jeremy Diamond committed 2015-02-08 22:20:49 -08:00
1 parent d40acd53e6
commit 83ff2cf913
2 files changed
+56
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/fox/spiteful/forbidden/Config.java
+11
View File
@@ -49,6 +49,7 @@ public class Config {
public static boolean tt = true;
public static boolean tc = true;
public static boolean special = true;
public static boolean twilight = true;
public static int wrathCost = 5;
public static int wrathEff = 4;
@@ -93,6 +94,7 @@ public class Config {
tt = conf.get("compatibility", "Thaumic Tinkerer Interaction", tt).getBoolean(true);
tc = conf.get("compatibility", "Tinkers Construct Interaction", tc).getBoolean(true);
special = conf.get("compatibility", "Special Mobs Interaction", special).getBoolean(true);
twilight = conf.get("compatibility", "Twilight Forest Interaction", twilight).getBoolean(true);
} catch (Exception e) {
LogHandler.log(Level.ERROR, e, "Had a problem loading its configuration.");
} finally {
@@ -143,6 +145,7 @@ public class Config {
spawnerMobs.put("Thaumcraft.Wisp", Aspect.AURA);
spawnerMobs.put("Thaumcraft.ThaumSlime", Aspect.TAINT);
spawnerMobs.put("Thaumcraft.BrainyZombie", Aspect.MIND);
spawnerMobs.put("Thaumcraft.GiantBrainyZombie", Aspect.MIND);
spawnerMobs.put("Thaumcraft.TaintSpider", Aspect.TAINT);
spawnerMobs.put("Thaumcraft.TaintSwarm", Aspect.TAINT);
spawnerMobs.put("Thaumcraft.TaintedPig", Aspect.TAINT);
@@ -150,6 +153,14 @@ public class Config {
spawnerMobs.put("Thaumcraft.TaintedCow", Aspect.TAINT);
spawnerMobs.put("Thaumcraft.TaintedChicken", Aspect.TAINT);
spawnerMobs.put("Thaumcraft.TaintedVillager", Aspect.TAINT);
spawnerMobs.put("Thaumcraft.CultistKnight", Aspect.ELDRITCH);
spawnerMobs.put("Thaumcraft.CultistCleric", Aspect.ELDRITCH);
spawnerMobs.put("Thaumcraft.EldritchCrab", Aspect.ELDRITCH);
spawnerMobs.put("Thaumcraft.InhabitedZombie", Aspect.ELDRITCH);
spawnerMobs.put("Thaumcraft.Pech", Aspect.GREED);
spawnerMobs.put("Thaumcraft.Pech.1", Aspect.GREED);
spawnerMobs.put("Thaumcraft.Pech.2", Aspect.GREED);
spawnerMobs.put("Thaumcraft.EldritchGuardian", Aspect.ELDRITCH);
// spawnerMobs.put("Taintacle", DarkAspects.LUST);
}
}
src/main/java/fox/spiteful/forbidden/compat/Compat.java
+45
View File
@@ -46,6 +46,7 @@ public class Compat {
public static boolean am2 = false;
public static boolean botan = false;
public static boolean special = false;
public static boolean twilight = false;
public static void initiate() {
if(!Config.crossMod)
@@ -57,6 +58,7 @@ public class Compat {
am2 = Config.am2 && Loader.isModLoaded("arsmagica2");
botan = Config.botan && Loader.isModLoaded("Botania");
special = Config.wrathCage && Config.special && Loader.isModLoaded("SpecialMobs");
twilight = Config.wrathCage && Config.twilight && Loader.isModLoaded("TwilightForest");
}
public static void compatify() {
@@ -262,6 +264,49 @@ public class Compat {
Config.spawnerMobs.put("SpecialMobs.PlagueZombie", Aspect.FLESH);
}
if(twilight){
Config.spawnerMobs.put("TwilightForest.Wild Boar", Aspect.BEAST);
Config.spawnerMobs.put("TwilightForest.Bighorn Sheep", Aspect.CLOTH);
Config.spawnerMobs.put("TwilightForest.Wild Deer", Aspect.BEAST);
Config.spawnerMobs.put("TwilightForest.Redcap", Aspect.METAL);
Config.spawnerMobs.put("TwilightForest.Swarm Spider", Aspect.CLOTH);
Config.spawnerMobs.put("TwilightForest.Skeleton Druid", Aspect.DEATH);
Config.spawnerMobs.put("TwilightForest.Hostile Wolf", Aspect.BEAST);
Config.spawnerMobs.put("TwilightForest.Twilight Wraith", Aspect.UNDEAD);
Config.spawnerMobs.put("TwilightForest.Hedge Spider", Aspect.CLOTH);
Config.spawnerMobs.put("TwilightForest.Penguin", Aspect.FLIGHT);
Config.spawnerMobs.put("TwilightForest.Tiny Bird", Aspect.FLIGHT);
Config.spawnerMobs.put("TwilightForest.Forest Squirrel", Aspect.BEAST);
Config.spawnerMobs.put("TwilightForest.Forest Bunny", Aspect.BEAST);
Config.spawnerMobs.put("TwilightForest.Forest Raven", Aspect.FLIGHT);
Config.spawnerMobs.put("TwilightForest.Twilight Kobold", Aspect.GREED);
Config.spawnerMobs.put("TwilightForest.Mosquito Swarm", DarkAspects.GLUTTONY);
Config.spawnerMobs.put("TwilightForest.Death Tome", Aspect.MIND);
Config.spawnerMobs.put("TwilightForest.Minotaur", Aspect.BEAST);
Config.spawnerMobs.put("TwilightForest.Minoshroom", Aspect.PLANT);
Config.spawnerMobs.put("TwilightForest.Fire Beetle", Aspect.FIRE);
Config.spawnerMobs.put("TwilightForest.Slime Beetle", Aspect.SLIME);
if(!Config.noLust)
Config.spawnerMobs.put("TwilightForest.Pinch Beetle", DarkAspects.LUST);
else
Config.spawnerMobs.put("TwilightForest.Pinch Beetle", Aspect.BEAST);
Config.spawnerMobs.put("TwilightForest.Maze Slime", Aspect.SLIME);
Config.spawnerMobs.put("TwilightForest.Redcap Sapper", Aspect.METAL);
Config.spawnerMobs.put("TwilightForest.Mist Wolf", Aspect.BEAST);
Config.spawnerMobs.put("TwilightForest.King Spider", DarkAspects.PRIDE);
Config.spawnerMobs.put("TwilightForest.Mini Ghast", DarkAspects.NETHER);
Config.spawnerMobs.put("TwilightForest.Tower Ghast", DarkAspects.NETHER);
Config.spawnerMobs.put("TwilightForest.Tower Golem", Aspect.METAL);
Config.spawnerMobs.put("TwilightForest.Tower Termite", Aspect.MAGIC);
Config.spawnerMobs.put("TwilightForest.Block&Chain Goblin", Aspect.METAL);
Config.spawnerMobs.put("TwilightForest.Upper Goblin Knight", Aspect.METAL);
Config.spawnerMobs.put("TwilightForest.Lower Goblin Knight", Aspect.METAL);
Config.spawnerMobs.put("TwilightForest.Helmet Crab", Aspect.METAL);
Config.spawnerMobs.put("TwilightForest.Knight Phantom", Aspect.METAL);
Config.spawnerMobs.put("TwilightForest.Yeti", Aspect.COLD);
Config.spawnerMobs.put("TwilightForest.WinterWolf", Aspect.COLD);
}
}
public static Item getItem(String mod, String item) throws ItemNotFoundException {