Worked on armor. Straps eat items placed in them...

1 files changed, 121 insertions, 149 deletions

diff --git a/src/main/java/lance5057/tDefense/TD_Config.java b/src/main/java/lance5057/tDefense/TD_Config.java
index 4c6745a..43a511a 100644
--- a/src/main/java/lance5057/tDefense/TD_Config.java
+++ b/src/main/java/lance5057/tDefense/TD_Config.java
@@ -16,208 +16,180 @@ public class TD_Config
 {
 	@Config.Comment("Enable Debug Features")
 	public static boolean debug = false;
-//	public boolean	ArmorAddon;
-//	public boolean	transparency;
-//	public boolean	mossEnabled;
-//	public boolean	mossHard;
-	
+	// public boolean ArmorAddon;
+	// public boolean transparency;
+	// public boolean mossEnabled;
+	// public boolean mossHard;
+
 	@Config.Name("Shields")
-	public static final Shields shields = new Shields();
+	public static Shields	shields		= new Shields();
 	@Config.Name("Tools")
-	public static final Tools tools = new Tools();
+	public static Tools		tools		= new Tools();
 	@Config.Name("Materials")
-	public static final Materials materials = new Materials();
+	public static Materials	materials	= new Materials();
 	@Config.Name("Addons")
-	public static final Addons addons = new Addons();
-	
+	public static Addons	addons		= new Addons();
+
 	public static class Shields
 	{
 		@Config.RequiresMcRestart()
 		@Config.Comment("Enable Shields")
-		public static boolean enableShields= true;
-		
+		public static boolean enableShields = true;
+
 		@Config.RequiresMcRestart()
-		public static boolean enableHeaterShield= true;
-		
+		public static boolean enableHeaterShield = true;
+
 		@Config.RequiresMcRestart()
-		public static boolean enableBuckler= true;
-		
+		public static boolean enableBuckler = true;
+
 		@Config.Comment("How much damage should a shield block percentage wise if the material has no shield data built in?")
 		public static int defaultShieldBlockPercentage = 33;
 	}
-	
+
 	public static class Tools
 	{
 		@Config.RequiresMcRestart()
-		public static boolean enableZweihander= true;
-		
-		@Config.RequiresMcRestart()
-		public static boolean enableShears= true;
-		
-		@Config.RequiresMcRestart()
-		public static boolean enableFishingRod= true;
-	}
-	
-	public static class Materials
-	{
-		@Config.RequiresMcRestart()
-		public static boolean enableCustomMaterials= true;
-		
-		@Config.RequiresMcRestart()
-		public static boolean enableBaseMaterials= true;
-		
-		@Config.RequiresMcRestart()
-		public static boolean enableJokeMaterials= true;
-		
-		@Config.RequiresMcRestart()
-		public static boolean enableHolidayMaterials= true;
-		
-		@Config.RequiresMcRestart()
-		public static boolean enableGemMaterials= true;
-		
-		@Config.RequiresMcRestart()
-		public static boolean enableBloodMagicMaterials= true;
-		
-		@Config.RequiresMcRestart()
-		public static boolean enableTwilightForestMaterials= true;
-		
-		@Config.RequiresMcRestart()
-		public static boolean enableHarvestCraftMaterials= true;
+		public boolean enableZweihander = true;
 
 		@Config.RequiresMcRestart()
-		public static boolean enableCornucopiaMaterials= true;
-		
-		@Config.RequiresMcRestart()
-		public static boolean enableAeonsteel= true;
+		public boolean enableShears = true;
 
 		@Config.RequiresMcRestart()
-		public static boolean enableQueensGold= true;
-
-		@Config.RequiresMcRestart()
-		public static boolean enableDogbearium= true;
-
-		@Config.RequiresMcRestart()
-		public static boolean enableRedCandy= true;
-
-		@Config.RequiresMcRestart()
-		public static boolean enableGreenCandy= true;
+		public boolean enableFishingRod = true;
+	}
 
+	public static class Materials
+	{
 		@Config.RequiresMcRestart()
-		public static boolean enableSinisterium= true;
+		public boolean enableCustomMaterials = true;
 
 		@Config.RequiresMcRestart()
-		public static boolean enableNihilite= true;
+		public boolean enableBaseMaterials = true;
 
 		@Config.RequiresMcRestart()
-		public static boolean enableVibrant= true;
+		public boolean enableJokeMaterials = true;
 
 		@Config.RequiresMcRestart()
-		public static boolean enableOrichalcum= true;
+		public boolean enableHolidayMaterials = true;
 
 		@Config.RequiresMcRestart()
-		public static boolean enablePandorium= true;
+		public boolean enableGemMaterials = true;
 
 		@Config.RequiresMcRestart()
-		public static boolean enableRoseGold= true;
+		public boolean enableBloodMagicMaterials = true;
 
 		@Config.RequiresMcRestart()
-		public static boolean enablePlatinum= true;
+		public boolean enableTwilightForestMaterials = true;
 
 		@Config.RequiresMcRestart()
-		public static boolean enableBrass= true;
+		public boolean enableHarvestCraftMaterials = true;
 
 		@Config.RequiresMcRestart()
-		public static boolean enableSilver= true;
+		public boolean enableCornucopiaMaterials = true;
 
 		@Config.RequiresMcRestart()
-		public static boolean enableCheese= true;
+		public String[] materialBlacklist = {
 
-		@Config.RequiresMcRestart()
-		public static boolean enableGold= true;
+		};
+		
+		public boolean isBlacklisted(String s)
+		{
+			for(String str: materialBlacklist)
+			{
+				if(str.equals(s))
+					return true;
+			}
+			return false;
+		}
 	}
-	
+
 	public static class Addons
 	{
-		
+
 	}
-	
-	public int		SoulBoundID;
-	public int		DazeID;
-	public int		RainbowID;
-	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;
-	public int		ArmorBlastProtectionID;
-	public int		ArmorProjectileProtectionID;
-	public int		ArmorFeatherfallID;
-	public int		ArmorGlowstepID;
-	public int		ArmorFrostwalkerID;
-	public int		ArmorFirewalkerID;
-	public int		ArmorDepthstriderID;
-	public int		ArmorRebreatherID;
-	public int		ArmorNightvisionID;
-	public int		ArmorAntiBlindnessID;
-	public int		ArmorPumpkinID;
-	public int		ArmorDodgeID;
-	public int		ArmorThornsID;
-	public int		ArmorAbsorptionID;
-	public int		ArmorJumpboostID;
-	public int		ArmorSpeedID;
-	public int		ArmorHighstepID;
-	public int		ArmorKnockbackResistID;
-
-	public boolean	BotaniaAddon;
-	public int		CorpseIvyModID;
-	public int		ManaRepairModID;
-	public int		TerraCoreModID;
-	public int		ArmorPixieCoreModID;
-	public int		ArmorManaDiscountModID;
-
-//	public boolean	ThaumcraftAddon;
-//	public int		RevealingModID;
-//	public int		VisDiscountModID;
-//	public int		CapsModID;
-	//public int		SpellbindModID;
-
-	public boolean	BloodMagicAddon;
-	public int		SuppingModID;
-	public int		BloodOathModID;
-	public int		ScabbingModID;
-	public int		DivinationModID;
+
+	// public int SoulBoundID;
+	// public int DazeID;
+	// public int RainbowID;
+	// 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;
+	// public int ArmorBlastProtectionID;
+	// public int ArmorProjectileProtectionID;
+	// public int ArmorFeatherfallID;
+	// public int ArmorGlowstepID;
+	// public int ArmorFrostwalkerID;
+	// public int ArmorFirewalkerID;
+	// public int ArmorDepthstriderID;
+	// public int ArmorRebreatherID;
+	// public int ArmorNightvisionID;
+	// public int ArmorAntiBlindnessID;
+	// public int ArmorPumpkinID;
+	// public int ArmorDodgeID;
+	// public int ArmorThornsID;
+	// public int ArmorAbsorptionID;
+	// public int ArmorJumpboostID;
+	// public int ArmorSpeedID;
+	// public int ArmorHighstepID;
+	// public int ArmorKnockbackResistID;
+	//
+	// public boolean BotaniaAddon;
+	// public int CorpseIvyModID;
+	// public int ManaRepairModID;
+	// public int TerraCoreModID;
+	// public int ArmorPixieCoreModID;
+	// public int ArmorManaDiscountModID;
+
+	// public boolean ThaumcraftAddon;
+	// public int RevealingModID;
+	// public int VisDiscountModID;
+	// public int CapsModID;
+	// public int SpellbindModID;
+
+	// public boolean BloodMagicAddon;
+	// public int SuppingModID;
+	// public int BloodOathModID;
+	// public int ScabbingModID;
+	// public int DivinationModID;
 
 	@Mod.EventBusSubscriber(modid = Reference.MOD_ID)
-	private static class EventHandler {
+	private static class EventHandler
+	{
 
 		/**
-		 * Inject the new values and save to the config file when the config has been changed from the GUI.
+		 * Inject the new values and save to the config file when the config has
+		 * been changed from the GUI.
 		 *
-		 * @param event The event
+		 * @param event
+		 *            The event
 		 */
 		@SubscribeEvent
-		public static void onConfigChanged(final ConfigChangedEvent.OnConfigChangedEvent event) {
-			if (event.getModID().equals(Reference.MOD_ID)) {
+		public static void onConfigChanged(final ConfigChangedEvent.OnConfigChangedEvent event)
+		{
+			if (event.getModID().equals(Reference.MOD_ID))
+			{
 				ConfigManager.sync(Reference.MOD_ID, Config.Type.INSTANCE);
 			}
 		}
-}
+	}
 }