Prelaunch backup

1 files changed, 121 insertions, 58 deletions

diff --git a/src/main/java/lance5057/tDefense/TD_Config.java b/src/main/java/lance5057/tDefense/TD_Config.java
index a235a4f..46f301d 100644
--- a/src/main/java/lance5057/tDefense/TD_Config.java
+++ b/src/main/java/lance5057/tDefense/TD_Config.java
@@ -1,11 +1,17 @@
 package lance5057.tDefense;
 
-import scala.Int;
 import net.minecraftforge.common.config.Configuration;
+import scala.Int;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 
 public class TD_Config
 {
+	public boolean	debug;
+	public boolean	ArmorAddon;
+	public boolean	transparency;
+	public boolean	mossEnabled;
+	public boolean	mossHard;
+
 	static int		count	= 18;
 	public int		AeonsteelMatID;
 	public int		QueensGoldMatID;
@@ -16,11 +22,26 @@ public class TD_Config
 	public int		SoulBoundID;
 	public int		DazeID;
 	public int		RainbowID;
-	public int		CrestFeathersID;
-	public int		CrestMirrorsID;
-	public int		CrestLegendsID;
-	public int		CrestBladesID;
 	public int		XPBoostID;
+	public int		ShearFortuneID;
+
+	public int[]	CrestFeathersID;
+	public int[]	CrestMirrorsID;
+	public int[]	CrestLegendsID;
+	public int[]	CrestBladesID;
+	public int[]	CrestGluttonyID;
+	public int[]	CrestPitchID;
+	public int[]	CrestThornsID;
+	public int[]	CrestSanguisugaID;
+	public int[]	CrestWindsID;
+	public int[]	CrestRetributionID;
+	public int[]	CrestLightID;
+
+	//public int		JokeInsultID;
+	public int		JokePyrotechID;
+	//public int		JokeCompensateID;
+
+	public int		SoulSteveID;
 
 	public int		ArmorProtectionID;
 	public int		ArmorFireProtectionID;
@@ -50,7 +71,7 @@ public class TD_Config
 	public boolean	BotaniaAddon;
 	public int		CorpseIvyModID;
 	public int		ManaRepairModID;
-	public int		TerraCoreIvyModID;
+	public int		TerraCoreModID;
 	public int		ArmorPixieCoreModID;
 	public int		ArmorManaDiscountModID;
 
@@ -61,67 +82,109 @@ public class TD_Config
 	//public int		SpellbindModID;
 
 	public boolean	BloodMagicAddon;
-	public int		BloodLustModID;
+	public int		SuppingModID;
 	public int		BloodOathModID;
 	public int		ScabbingModID;
+	public int		DivinationModID;
 
 	public TD_Config(FMLPreInitializationEvent e)
 	{
-		Configuration config = new Configuration(e.getSuggestedConfigurationFile());
+		final Configuration config = new Configuration(
+				e.getSuggestedConfigurationFile());
 
 		config.load();
 
-		MaterialIndex = config.getInt("Material Index","Highest material ID" , 206, 30, Int.MaxValue(), "TDefense - 206 MFR - 1001 ExtraTIC - 1024");
-
-		AeonsteelMatID = config.get("Material Configs", "Aeonsteel Material ID", 201).getInt();
-		QueensGoldMatID = config.get("Material Configs", "QueensGold Material ID", 202).getInt();
-		DogbeariumMatID = config.get("Material Configs", "Dogbearium Material ID", 203).getInt();
-		RedMintMatID = config.get("Material Configs", "RedMint Material ID", 204).getInt();
-		GreenMintMatID = config.get("Material Configs", "GreenMint Material ID", 205).getInt();
-
-		DazeID = config.get("Modifier Configs", "Daze ID", count++).getInt();
-		SoulBoundID = config.get("Modifier Configs", "Soulbound ID", count++).getInt();
-		RainbowID = config.get("Modifier Configs", "Rainbow ID", count++).getInt();
-		XPBoostID = config.get("Modifier Configs", "XPBoost ID", count++).getInt();
-		
-		CrestFeathersID = config.get("Modifier Configs", "Crest of Feathers ID", count++).getInt();
-		CrestMirrorsID = config.get("Modifier Configs", "Crest of Mirrors ID", count++).getInt();
-		CrestLegendsID = config.get("Modifier Configs", "Crest of Legends ID", count++).getInt();
-		CrestLegendsID = config.get("Modifier Configs", "Crest of Legends ID", count++).getInt();
-		
-
-		ArmorProtectionID = config.get("Armor Modifier Configs", "Protection ID", count++).getInt();
-		ArmorFireProtectionID = config.get("Armor Modifier Configs", "Fire Protection ID", count++).getInt();
-		ArmorBlastProtectionID = config.get("Armor Modifier Configs", "Blast Protection ID", count++).getInt();
-		ArmorProjectileProtectionID = config.get("Armor Modifier Configs", "Projectile Protection ID", count++).getInt();
-		ArmorFeatherfallID = config.get("Armor Modifier Configs", "Featherfall ID", count++).getInt();
-		ArmorGlowstepID = config.get("Armor Modifier Configs", "Glowstep ID", count++).getInt();
-		ArmorFrostwalkerID = config.get("Armor Modifier Configs", "Frostwalker ID", count++).getInt();
-		ArmorFirewalkerID = config.get("Armor Modifier Configs", "Firewalker ID", count++).getInt();
-		ArmorDepthstriderID = config.get("Armor Modifier Configs", "Depthstrider ID", count++).getInt();
-		ArmorRebreatherID = config.get("Armor Modifier Configs", "Rebreather ID", count++).getInt();
-		ArmorNightvisionID = config.get("Armor Modifier Configs", "Nightvision ID", count++).getInt();
-		ArmorAntiBlindnessID = config.get("Armor Modifier Configs", "Anti Blindness ID", count++).getInt();
-		ArmorPumpkinID = config.get("Armor Modifier Configs", "Pumpkin ID", count++).getInt();
-		ArmorDodgeID = config.get("Armor Modifier Configs", "Dodge ID", count++).getInt();
-		ArmorThornsID = config.get("Armor Modifier Configs", "Thorns ID", count++).getInt();
-		ArmorAbsorptionID = config.get("Armor Modifier Configs", "Absorbtion ID", count++).getInt();
-		ArmorJumpboostID = config.get("Armor Modifier Configs", "Jump Boost ID", count++).getInt();
-		ArmorSpeedID = config.get("Armor Modifier Configs", "Speed ID", count++).getInt();
-		ArmorHighstepID = config.get("Armor Modifier Configs", "High Step ID", count++).getInt();
-		ArmorKnockbackResistID = config.get("Armor Modifier Configs", "Knockback Resistance ID", count++).getInt();
-
-		MineAndBladeAddon = config.getBoolean("Integration", "Enable Mine and Blade Addon", true, "");
-
-		BotaniaAddon = config.getBoolean("Integration", "Enable Botania Addon", true, "");
-		CorpseIvyModID = config.get("Botania Addon", "Corpse Drinker Ivy Modifier ID", count++).getInt();
-
-		ThaumcraftAddon = config.getBoolean("Integration", "Enable Thaumcraft Addon", true, "Requires Thaumcraft to use");
-		RevealingModID = config.get("Thaumcraft Addon", "Revealing Modifier ID", count++).getInt();
-		VisDiscountModID = config.get("Thaumcraft Addon", "Vis Discount Modifier ID", count++).getInt();
-		CapsModID = config.get("Thaumcraft Addon", "Cap Repair Modifier ID", count++).getInt();
-		//SpellbindModID = config.getInt("Spellbinding Modifier ID", "Thaumcraft Addon", 73, 0, Integer.MAX_VALUE, "");
+		debug = config.getBoolean("Should debug mode be enabled?", "Debug Mode", false, null);
+		ArmorAddon = config.getBoolean("Should the armor addon be enabled?", "Armor Addon", true, null);
+		transparency = config.getBoolean("Should Transparent Textures be enabled?", "General Settings", true, "May help fps if disabled");
+		mossEnabled = config.getBoolean("Should the moss recipe be enabled?", "General Settings", true, null);
+		mossHard = config.getBoolean("Should the moss recipe be hard?", "General Settings", true, null);
+
+		MaterialIndex = config.getInt("Material Index", "Highest material ID", 206, 30, Int.MaxValue(), "TDefense - 206 MFR - 1001 ExtraTIC - 1024");
+
+		AeonsteelMatID = config.getInt("Aeonsteel Material ID", "Material Configs", 201, 30, Int.MaxValue(), null);
+		QueensGoldMatID = config.getInt("QueensGold Material ID", "Material Configs", 202, 30, Int.MaxValue(), null);
+		DogbeariumMatID = config.getInt("Dogbearium Material ID", "Material Configs", 203, 30, Int.MaxValue(), null);
+		RedMintMatID = config.getInt("RedMint Material ID", "Material Configs", 204, 30, Int.MaxValue(), null);
+		GreenMintMatID = config.getInt("GreenMint Material ID", "Material Configs", 205, 30, Int.MaxValue(), null);
+
+		DazeID = config.getInt("Daze ID", "Modifier Configs", count++, 18, Int.MaxValue(), null);
+		SoulBoundID = config.getInt("Soulbound ID", "Modifier Configs", count++, 18, Int.MaxValue(), null);
+		RainbowID = config.getInt("Rainbow ID", "Modifier Configs", count++, 18, Int.MaxValue(), null);
+		XPBoostID = config.getInt("XPBoost ID", "Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ShearFortuneID = config.getInt("Fortune for Shears ID", "Modifier Configs", count++, 18, Int.MaxValue(), null);
+
+		CrestFeathersID = ConfigCrest(config, "Feathers");
+		CrestMirrorsID = ConfigCrest(config, "Mirrors");
+		CrestLegendsID = ConfigCrest(config, "Legends");
+		CrestBladesID = ConfigCrest(config, "Blades");
+		CrestGluttonyID = ConfigCrest(config, "Gluttony");
+		CrestPitchID = ConfigCrest(config, "Pitch");
+		CrestThornsID = ConfigCrest(config, "Thorns");
+		CrestSanguisugaID = ConfigCrest(config, "Sanguisuga");
+		CrestWindsID = ConfigCrest(config, "Winds");
+		CrestRetributionID = ConfigCrest(config, "Retribution");
+		CrestLightID = ConfigCrest(config, "Light");
+
+		SoulSteveID = config.getInt("Soulstone Steve ID", "Modifier Configs", count++, 18, Int.MaxValue(), null);
+
+		ArmorProtectionID = config.getInt("Protection ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorFireProtectionID = config.getInt("Fire Protection ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorBlastProtectionID = config.getInt("Blast Protection ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorProjectileProtectionID = config.getInt("Projectile Protection ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorFeatherfallID = config.getInt("Featherfall ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorGlowstepID = config.getInt("Glowstep ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorFrostwalkerID = config.getInt("Frostwalker ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorFirewalkerID = config.getInt("Firewalker ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorDepthstriderID = config.getInt("Depthstrider ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorRebreatherID = config.getInt("Rebreather ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorNightvisionID = config.getInt("Nightvision ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorAntiBlindnessID = config.getInt("Anti Blindness ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorPumpkinID = config.getInt("Pumpkin ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorDodgeID = config.getInt("Dodge ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorThornsID = config.getInt("Thorns ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorAbsorptionID = config.getInt("Absorbtion ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorJumpboostID = config.getInt("Jump Boost ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorSpeedID = config.getInt("Speed ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorHighstepID = config.getInt("High Step ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+		ArmorKnockbackResistID = config.getInt("Knockback Resistance ID", "Armor Modifier Configs", count++, 18, Int.MaxValue(), null);
+
+		MineAndBladeAddon = config.getBoolean("Enable Mine and Blade Addon", "Integration", true, "");
+
+		BotaniaAddon = config.getBoolean("Enable Botania Addon", "Integration", true, "");
+		CorpseIvyModID = config.getInt("Corpse Drinker Ivy Modifier ID", "Botania Addon", count++, 18, Int.MaxValue(), null);
+		ManaRepairModID = config.getInt("Mana Repair Modifier ID", "Botania Addon", count++, 18, Int.MaxValue(), null);
+		TerraCoreModID = config.getInt("Terra Core Modifier ID", "Botania Addon", count++, 18, Int.MaxValue(), null);
+		ArmorPixieCoreModID = config.getInt("Elementium Core Modifier ID", "Botania Addon", count++, 18, Int.MaxValue(), null);
+		ArmorManaDiscountModID = config.getInt("Mana Embroidery Modifier ID", "Botania Addon", count++, 18, Int.MaxValue(), null);
+
+		ThaumcraftAddon = config.getBoolean("Enable Thaumcraft Addon", "Integration", true, "Requires Thaumcraft to use");
+		RevealingModID = config.getInt("Revealing Modifier ID", "Thaumcraft Addon", count++, 18, Int.MaxValue(), null);
+		VisDiscountModID = config.getInt("Vis Discount Modifier ID", "Thaumcraft Addon", count++, 18, Int.MaxValue(), null);
+		CapsModID = config.getInt("Cap Repair Modifier ID", "Thaumcraft Addon", count++, 18, Int.MaxValue(), null);
+		//SpellbindModID = config.getIntInt("Spellbinding Modifier ID", "Thaumcraft Addon", 73, 0, Integer.MAX_VALUE, "");
+
+		BloodMagicAddon = config.getBoolean("Enable BloodMagic Addon", "Integration", true, "Requires BloodMagic to use");
+		DivinationModID = config.getInt("Divination Modifier ID", "BloodMagic Addon", count++, 18, Int.MaxValue(), null);
+		SuppingModID = config.getInt("Supping Modifier ID", "BloodMagic Addon", count++, 18, Int.MaxValue(), null);
+		BloodOathModID = config.getInt("Blood Oath Modifier ID", "BloodMagic Addon", count++, 18, Int.MaxValue(), null);
+		ScabbingModID = config.getInt("Scabbing Modifier ID", "BloodMagic Addon", count++, 18, Int.MaxValue(), null);
+
+		//JokeInsultID = config.getInt("Insult ID", "Joke Modifier Configs", count++, 18, Int.MaxValue(), null);
+		JokePyrotechID = config.getInt("Pyrotech ID", "Joke Modifier Configs", count++, 18, Int.MaxValue(), null);
 
 		config.save();
 	}
+
+	private int[] ConfigCrest(Configuration config, String name)
+	{
+		final int[] crest = new int[TinkersDefense.colors.length];
+
+		for(int i = 0; i < TinkersDefense.colors.length; i++)
+		{
+			crest[i] = config.getInt("Crest of " + name + " (" + TinkersDefense.colors[i] + ") ID", "Shield Modifier Configs", count++, 18, Int.MaxValue(), null);
+		}
+
+		return crest;
+	}
 }