Format/import cleanup

1 files changed, 113 insertions, 193 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java b/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java
index ac524e6..16cee81 100755
--- a/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java
@@ -7,251 +7,172 @@ import darkknight.jewelrycraft.util.Variables;
 import net.minecraftforge.common.config.Configuration;

 

 public class ConfigHandler {

-	public static Configuration		config;

-	public static final ConfigHandler	INSTANCE	= new ConfigHandler();

-	public static final String[]		categories	= {

-			"Timers", "Village Generation", "Misc",

-			"World Generation", "Curses"

-	};

-

-	public static int	INGOT_COOLING_TIME;

-	public static int	INGOT_MELTING_TIME;

-	public static int	GEM_PLACEMENT_TIME;

-	public static int	RITUAL_TIME;

-	public static int	HEART_DESPAWN_TIME;

-

-	public static boolean	GENERATE_VILLAGE_NETHERSTAR;

-	public static boolean	CAN_FURNACE_GENERATE_INGOTS;

-	public static int	MAX_VILLAGE_JEWELERS;

-	public static int	JEWELER_WEIGHT;

-	public static int	INGOT_CHEST_MIN;

-	public static int	INGOT_CHEST_MAX;

-	public static int	INGOT_CHEST_MAX_STACK;

-	public static int	GEM_CHEST_MIN;

-	public static int	GEM_CHEST_MAX;

-	public static int	FURNACE_MIN_INGOT_STACK;

-	public static int	FURNACE_MAX_INGOT_STACK;

-

-	public static int	MAX_BLACK_HEARTS_PICKUP;

-	public static int	MAX_BLUE_HEARTS_PICKUP;

-	public static boolean	CAN_BLUE_HEARTS_SPAWN;

-	public static boolean	CAN_BLACK_HEARTS_SPAWN;

-	public static boolean	CAN_HOLY_HEARTS_SPAWN;

-	public static boolean	CAN_RED_HEARTS_SPAWN;

-

-	public static boolean	CRYSTAL_GLOW;

-	public static boolean	CRYSTAL_PARTICLES;

-	public static boolean	HEARTS_DESPAWN;

-	public static boolean	JEWELRY_INFO;

-

-	public static boolean	CURSES_ENABLED			= true;

-	public static boolean	CURSE_ROTTEN_HEART		= true;

-	public static boolean	CURSE_FLAMING_SOUL		= true;

-	public static boolean	CURSE_GREED			= true;

-	public static boolean	CURSE_BLIND			= true;

-	public static boolean	CURSE_INFAMY			= true;

-	public static boolean	CURSE_MIDAS_TOUCH		= true;

-	public static boolean	CURSE_RABBIT_PAW		= true;

-	public static boolean	CURSE_PENTAGRAM			= true;

-	public static boolean	CURSE_VAMPIRE_HUNGER		= true;

-	public static boolean	CURSE_HUMBLE_BUNDLE		= true;

-	public static boolean	CURSE_DEATHS_TOUCH		= true;

-	public static boolean	CURSE_DOUBLE_DOWN		= true;

-	public static boolean	CURSE_INCREDIBLE_DEVOTION	= true;

-	public static float	DEVOTION_FACTOR			= 10.0f;

-	public static boolean	CURSE_MONEY_EQUALS_POWER	= true;

-	public static boolean	CURSE_SCION_OF_HELL		= true;

-

-	public static boolean	ENABLE_WORLD_GEN		= true;

-	public static boolean	ORE_GEN				= true;

-	public static boolean	CRYSTAL_GEN			= true;

-	public static boolean	STRUCTURES[]			= {

-			true, true, true, true, true, true

-	};

-	public static int	STRUCTURES_SPAWN_CHANCE[]	= {

-			6, 5, 7, 10, 6, 10

-	};

+	public static Configuration config;

+	public static final ConfigHandler INSTANCE = new ConfigHandler();

+	public static final String[] categories = { "Timers", "Village Generation", "Misc", "World Generation", "Curses" };

+

+	public static int INGOT_COOLING_TIME;

+	public static int INGOT_MELTING_TIME;

+	public static int GEM_PLACEMENT_TIME;

+	public static int RITUAL_TIME;

+	public static int HEART_DESPAWN_TIME;

+

+	public static boolean GENERATE_VILLAGE_NETHERSTAR;

+	public static boolean CAN_FURNACE_GENERATE_INGOTS;

+	public static int MAX_VILLAGE_JEWELERS;

+	public static int JEWELER_WEIGHT;

+	public static int INGOT_CHEST_MIN;

+	public static int INGOT_CHEST_MAX;

+	public static int INGOT_CHEST_MAX_STACK;

+	public static int GEM_CHEST_MIN;

+	public static int GEM_CHEST_MAX;

+	public static int FURNACE_MIN_INGOT_STACK;

+	public static int FURNACE_MAX_INGOT_STACK;

+

+	public static int MAX_BLACK_HEARTS_PICKUP;

+	public static int MAX_BLUE_HEARTS_PICKUP;

+	public static boolean CAN_BLUE_HEARTS_SPAWN;

+	public static boolean CAN_BLACK_HEARTS_SPAWN;

+	public static boolean CAN_HOLY_HEARTS_SPAWN;

+	public static boolean CAN_RED_HEARTS_SPAWN;

+

+	public static boolean CRYSTAL_GLOW;

+	public static boolean CRYSTAL_PARTICLES;

+	public static boolean HEARTS_DESPAWN;

+	public static boolean JEWELRY_INFO;

+

+	public static boolean CURSES_ENABLED = true;

+	public static boolean CURSE_ROTTEN_HEART = true;

+	public static boolean CURSE_FLAMING_SOUL = true;

+	public static boolean CURSE_GREED = true;

+	public static boolean CURSE_BLIND = true;

+	public static boolean CURSE_INFAMY = true;

+	public static boolean CURSE_MIDAS_TOUCH = true;

+	public static boolean CURSE_RABBIT_PAW = true;

+	public static boolean CURSE_PENTAGRAM = true;

+	public static boolean CURSE_VAMPIRE_HUNGER = true;

+	public static boolean CURSE_HUMBLE_BUNDLE = true;

+	public static boolean CURSE_DEATHS_TOUCH = true;

+	public static boolean CURSE_DOUBLE_DOWN = true;

+	public static boolean CURSE_INCREDIBLE_DEVOTION = true;

+	public static float DEVOTION_FACTOR = 10.0f;

+	public static boolean CURSE_MONEY_EQUALS_POWER = true;

+	public static boolean CURSE_SCION_OF_HELL = true;

+

+	public static boolean ENABLE_WORLD_GEN = true;

+	public static boolean ORE_GEN = true;

+	public static boolean CRYSTAL_GEN = true;

+	public static boolean STRUCTURES[] = { true, true, true, true, true, true };

+	public static int STRUCTURES_SPAWN_CHANCE[] = { 6, 5, 7, 10, 6, 10 };

 

 	public void loadConfig(FMLPreInitializationEvent event) {

-		config = new Configuration(

-				event.getSuggestedConfigurationFile(),

-				true);

+		config = new Configuration(event.getSuggestedConfigurationFile(), true);

 		config.load();

 		syncConfigs();

 	}

 

 	private void syncConfigs() {

-		INGOT_COOLING_TIME = config.getInt(

-				"Molder Ingot Cooling Time", categories[0],

-				100, 5, Integer.MAX_VALUE,

+		INGOT_COOLING_TIME = config.getInt("Molder Ingot Cooling Time", categories[0], 100, 5, Integer.MAX_VALUE,

 				"This sets the number of ticks you need to wait before the mold is cooled.");

-		INGOT_MELTING_TIME = config.getInt("Ingot Melting Time",

-				categories[0], 1500, 5, Integer.MAX_VALUE,

+		INGOT_MELTING_TIME = config.getInt("Ingot Melting Time", categories[0], 1500, 5, Integer.MAX_VALUE,

 				"This sets the number of ticks you need to wait before an ingot is completely smelted.");

-		GEM_PLACEMENT_TIME = config.getInt("Jewelry Crafting Time",

-				categories[0], 200, 5, Integer.MAX_VALUE,

+		GEM_PLACEMENT_TIME = config.getInt("Jewelry Crafting Time", categories[0], 200, 5, Integer.MAX_VALUE,

 				"This sets the number of ticks it takes for a jewel to be modified.");

-		RITUAL_TIME = config.getInt("Ritual Time", categories[0],

-				500, 5, Integer.MAX_VALUE,

+		RITUAL_TIME = config.getInt("Ritual Time", categories[0], 500, 5, Integer.MAX_VALUE,

 				"This sets the number of ticks it takes for the ritual to end.");

-		HEART_DESPAWN_TIME = config.getInt("Hearts Despawn Time",

-				categories[0], 900, 20, Integer.MAX_VALUE,

+		HEART_DESPAWN_TIME = config.getInt("Hearts Despawn Time", categories[0], 900, 20, Integer.MAX_VALUE,

 				"This sets the number of ticks it takes for hearts to despawn, 20=1 second");

 

-		GENERATE_VILLAGE_NETHERSTAR = config.getBoolean(

-				"Netherstar Generation", categories[1],

-				false,

+		GENERATE_VILLAGE_NETHERSTAR = config.getBoolean("Netherstar Generation", categories[1], false,

 				"If set to true Nether Stars will be able to generate in Jewelers chests.");

-		CAN_FURNACE_GENERATE_INGOTS = config.getBoolean(

-				"Furnace Ingots Generation", categories[1],

-				true,

+		CAN_FURNACE_GENERATE_INGOTS = config.getBoolean("Furnace Ingots Generation", categories[1], true,

 				"If set to true jewelers will generate ingots in furnaces.");

 

-		MAX_VILLAGE_JEWELERS = config.getInt("Maximum Jewelers",

-				categories[1], 1, 0, Integer.MAX_VALUE,

+		MAX_VILLAGE_JEWELERS = config.getInt("Maximum Jewelers", categories[1], 1, 0, Integer.MAX_VALUE,

 				"Sets how many jewelers can be in a village.");

-		JEWELER_WEIGHT = config.getInt("Jewelers Weight",

-				categories[1], 30, 0, Integer.MAX_VALUE,

+		JEWELER_WEIGHT = config.getInt("Jewelers Weight", categories[1], 30, 0, Integer.MAX_VALUE,

 				"Chance of getting a jeweler in a village. The higher the value, the higher the chance.");

-		INGOT_CHEST_MIN = config.getInt("Ingot Chest Min",

-				categories[1], 1, 0, Integer.MAX_VALUE,

+		INGOT_CHEST_MIN = config.getInt("Ingot Chest Min", categories[1], 1, 0, Integer.MAX_VALUE,

 				"Minimum number of ingots that can be found in a chest from the Jeweler. (It's the chest from the back part)");

-		INGOT_CHEST_MAX = config.getInt("Ingot Chest Max",

-				categories[1], 4, 0, Integer.MAX_VALUE,

+		INGOT_CHEST_MAX = config.getInt("Ingot Chest Max", categories[1], 4, 0, Integer.MAX_VALUE,

 				"Maximum number of ingots that can be found in a chest from the Jeweler. (It's the chest from the back part)");

-		INGOT_CHEST_MAX_STACK = config.getInt(

-				"Ingot Chest Max Stack", categories[1], 2,

-				0, Integer.MAX_VALUE,

+		INGOT_CHEST_MAX_STACK = config.getInt("Ingot Chest Max Stack", categories[1], 2, 0, Integer.MAX_VALUE,

 				"Maximum number of the stack the ingots can be. For example: if set to 2 and ingots have a chance of generating, you have a chance of getting a stack of max 2 ingots in a chest.");

-		GEM_CHEST_MIN = config.getInt("Jewelers Chest Min",

-				categories[1], 2, 0, Integer.MAX_VALUE,

+		GEM_CHEST_MIN = config.getInt("Jewelers Chest Min", categories[1], 2, 0, Integer.MAX_VALUE,

 				"Determines the minimum nuber of jewels/modifiers that can be generated in the front chests of a Jeweler.");

-		GEM_CHEST_MAX = config.getInt("Jewelers Chest Max",

-				categories[1], 5, 0, Integer.MAX_VALUE,

+		GEM_CHEST_MAX = config.getInt("Jewelers Chest Max", categories[1], 5, 0, Integer.MAX_VALUE,

 				"Determines the maximum nuber of jewels/modifiers that can be generated in the front chests of a Jeweler.");

-		FURNACE_MIN_INGOT_STACK = config.getInt(

-				"Ingot Furnace Min", categories[1], 2, 0,

-				Integer.MAX_VALUE,

+		FURNACE_MIN_INGOT_STACK = config.getInt("Ingot Furnace Min", categories[1], 2, 0, Integer.MAX_VALUE,

 				"Determines the minimum number of ingots that can generate in a furnace.");

-		FURNACE_MAX_INGOT_STACK = config.getInt(

-				"Ingot Furnace Max", categories[1], 5, 0,

-				Integer.MAX_VALUE,

+		FURNACE_MAX_INGOT_STACK = config.getInt("Ingot Furnace Max", categories[1], 5, 0, Integer.MAX_VALUE,

 				"Determines the maximum number of ingots that can generate in a furnace.");

 

-		CRYSTAL_GLOW = config.getBoolean("Crystal Glow",

-				categories[2], false,

+		CRYSTAL_GLOW = config.getBoolean("Crystal Glow", categories[2], false,

 				"If true, then crystal will slowly glow (can cause lag)");

-		CRYSTAL_PARTICLES = config.getBoolean("Crystal Particles",

-				categories[2], true,

+		CRYSTAL_PARTICLES = config.getBoolean("Crystal Particles", categories[2], true,

 				"If false, then crystal will no longer spawn particles");

-		HEARTS_DESPAWN = config.getBoolean("Hearts Despawn",

-				categories[2], true,

+		HEARTS_DESPAWN = config.getBoolean("Hearts Despawn", categories[2], true,

 				"If false, then Hearts and Half-hearts will no longer despawn");

-		JEWELRY_INFO = config.getBoolean("Jewelry Info",

-				categories[2], true,

+		JEWELRY_INFO = config.getBoolean("Jewelry Info", categories[2], true,

 				"If false, then extra info won't be show when hovering over a jewelery.");

-		MAX_BLACK_HEARTS_PICKUP = config.getInt(

-				"Max Black Hearts Pickup", categories[2],

-				Integer.MAX_VALUE, 0, Integer.MAX_VALUE,

-				"Determines how many black hearts can a player pick up.");

-		MAX_BLUE_HEARTS_PICKUP = config.getInt(

-				"Max Blue Hearts Pickup", categories[2],

-				Integer.MAX_VALUE, 0, Integer.MAX_VALUE,

-				"Determines how many blue hearts can a player pick up.");

-		CAN_BLUE_HEARTS_SPAWN = config.getBoolean(

-				"Can Blue Hearts Spawn", categories[2],

-				true,

+		MAX_BLACK_HEARTS_PICKUP = config.getInt("Max Black Hearts Pickup", categories[2], Integer.MAX_VALUE, 0,

+				Integer.MAX_VALUE, "Determines how many black hearts can a player pick up.");

+		MAX_BLUE_HEARTS_PICKUP = config.getInt("Max Blue Hearts Pickup", categories[2], Integer.MAX_VALUE, 0,

+				Integer.MAX_VALUE, "Determines how many blue hearts can a player pick up.");

+		CAN_BLUE_HEARTS_SPAWN = config.getBoolean("Can Blue Hearts Spawn", categories[2], true,

 				"Determines if blue hearts can spawn.");

-		CAN_BLACK_HEARTS_SPAWN = config.getBoolean(

-				"Can Black Hearts Spawn", categories[2],

-				true,

+		CAN_BLACK_HEARTS_SPAWN = config.getBoolean("Can Black Hearts Spawn", categories[2], true,

 				"Determines if black hearts can spawn.");

-		CAN_HOLY_HEARTS_SPAWN = config.getBoolean(

-				"Can Holy Hearts Spawn", categories[2],

-				true,

+		CAN_HOLY_HEARTS_SPAWN = config.getBoolean("Can Holy Hearts Spawn", categories[2], true,

 				"Determines if holy hearts can spawn.");

-		CAN_RED_HEARTS_SPAWN = config.getBoolean(

-				"Can Red Hearts Spawn", categories[2],

-				true,

+		CAN_RED_HEARTS_SPAWN = config.getBoolean("Can Red Hearts Spawn", categories[2], true,

 				"Determines if red hearts can spawn.");

 

-		ENABLE_WORLD_GEN = config.getBoolean("World Generation",

-				categories[3], true,

+		ENABLE_WORLD_GEN = config.getBoolean("World Generation", categories[3], true,

 				"If false, nothing will generate (this includes ore)");

-		ORE_GEN = config.getBoolean("Ore Generation",

-				categories[3], true,

-				"If false, ores won't generate");

-		CRYSTAL_GEN = config.getBoolean("Crystal Generation",

-				categories[3], true,

-				"If false, crystals won't generate");

+		ORE_GEN = config.getBoolean("Ore Generation", categories[3], true, "If false, ores won't generate");

+		CRYSTAL_GEN = config.getBoolean("Crystal Generation", categories[3], true, "If false, crystals won't generate");

 		for (int i = 0; i < STRUCTURES.length; i++)

-			STRUCTURES[i] = config.getBoolean(

-					"Structure " + (i + 1)

-							+ " Generation",

-					categories[3], true,

-					"If false, structure no." + (i + 1)

-							+ " won't generate");

+			STRUCTURES[i] = config.getBoolean("Structure " + (i + 1) + " Generation", categories[3], true,

+					"If false, structure no." + (i + 1) + " won't generate");

 		for (int i = 0; i < STRUCTURES.length; i++)

-			STRUCTURES_SPAWN_CHANCE[i] = config.getInt(

-					"Structure " + (i + 1)

-							+ " Spawn Chance",

-					categories[3],

-					STRUCTURES_SPAWN_CHANCE[i], 1,

-					Integer.MAX_VALUE,

-					"Determines the chance for structure no."

-							+ (i + 1)

-							+ " to generate. Lower = higher chance and vice versa.");

+			STRUCTURES_SPAWN_CHANCE[i] = config.getInt("Structure " + (i + 1) + " Spawn Chance", categories[3],

+					STRUCTURES_SPAWN_CHANCE[i], 1, Integer.MAX_VALUE, "Determines the chance for structure no."

+							+ (i + 1) + " to generate. Lower = higher chance and vice versa.");

 

-		CURSES_ENABLED = config.getBoolean("Curses", categories[4],

-				true,

+		CURSES_ENABLED = config.getBoolean("Curses", categories[4], true,

 				"If set to false curses will be deactivated.");

-		CURSE_ROTTEN_HEART = config.getBoolean("Rotten Heart",

-				categories[4], true,

+		CURSE_ROTTEN_HEART = config.getBoolean("Rotten Heart", categories[4], true,

 				"If set to false this curse will be deactivated.");

-		CURSE_FLAMING_SOUL = config.getBoolean("Flaming Soul",

-				categories[4], true,

+		CURSE_FLAMING_SOUL = config.getBoolean("Flaming Soul", categories[4], true,

 				"If set to false this curse will be deactivated.");

-		CURSE_GREED = config.getBoolean("Greed", categories[4],

-				true,

+		CURSE_GREED = config.getBoolean("Greed", categories[4], true,

 				"If set to false this curse will be deactivated.");

-		CURSE_BLIND = config.getBoolean("Blind", categories[4],

-				true,

+		CURSE_BLIND = config.getBoolean("Blind", categories[4], true,

 				"If set to false this curse will be deactivated.");

-		CURSE_INFAMY = config.getBoolean("Infamy", categories[4],

-				true,

+		CURSE_INFAMY = config.getBoolean("Infamy", categories[4], true,

 				"If set to false this curse will be deactivated.");

-		CURSE_MIDAS_TOUCH = config.getBoolean("Midas Touch",

-				categories[4], true,

+		CURSE_MIDAS_TOUCH = config.getBoolean("Midas Touch", categories[4], true,

 				"If set to false this curse will be deactivated.");

-		CURSE_RABBIT_PAW = config.getBoolean("Rabbit's Paw",

-				categories[4], true,

+		CURSE_RABBIT_PAW = config.getBoolean("Rabbit's Paw", categories[4], true,

 				"If set to false this curse will be deactivated.");

-		CURSE_PENTAGRAM = config.getBoolean("Pentagram",

-				categories[4], true,

+		CURSE_PENTAGRAM = config.getBoolean("Pentagram", categories[4], true,

 				"If set to false this curse will be deactivated.");

-		CURSE_VAMPIRE_HUNGER = config.getBoolean("Vampire Hunger",

-				categories[4], true,

+		CURSE_VAMPIRE_HUNGER = config.getBoolean("Vampire Hunger", categories[4], true,

 				"If set to false this curse will be deactivated.");

-		CURSE_HUMBLE_BUNDLE = config.getBoolean("Humble Bundle",

-				categories[4], true,

+		CURSE_HUMBLE_BUNDLE = config.getBoolean("Humble Bundle", categories[4], true,

 				"If set to false this curse will be deactivated.");

-		CURSE_DEATHS_TOUCH = config.getBoolean("Death's Touch",

-				categories[4], true,

+		CURSE_DEATHS_TOUCH = config.getBoolean("Death's Touch", categories[4], true,

 				"If set to false this curse will be deactivated.");

-		CURSE_DOUBLE_DOWN = config.getBoolean("Double Down",

-				categories[4], true,

+		CURSE_DOUBLE_DOWN = config.getBoolean("Double Down", categories[4], true,

 				"If set to false this curse will be deactivated.");

-		CURSE_INCREDIBLE_DEVOTION = config.getBoolean(

-				"Incredible Devotion", categories[4], true,

+		CURSE_INCREDIBLE_DEVOTION = config.getBoolean("Incredible Devotion", categories[4], true,

 				"If set to false this curse will be deactivated.");

-		DEVOTION_FACTOR = config.getFloat("Devotion Factor",

-				categories[4], 10.0f, 0.0f,

-				Float.MAX_VALUE, "How devoted are mobs?");

-		CURSE_MONEY_EQUALS_POWER = config.getBoolean(

-				"Money = Power", categories[4], true,

+		DEVOTION_FACTOR = config.getFloat("Devotion Factor", categories[4], 10.0f, 0.0f, Float.MAX_VALUE,

+				"How devoted are mobs?");

+		CURSE_MONEY_EQUALS_POWER = config.getBoolean("Money = Power", categories[4], true,

 				"If set to false this curse will be deactivated.");

-		CURSE_SCION_OF_HELL = config.getBoolean("Scion of Hell",

-				categories[4], true,

+		CURSE_SCION_OF_HELL = config.getBoolean("Scion of Hell", categories[4], true,

 				"If set to false this curse will be deactivated.");

 

 		if (config.hasChanged())

@@ -259,8 +180,7 @@ public class ConfigHandler {
 	}

 

 	@SubscribeEvent

-	public void onConfigChanged(

-			ConfigChangedEvent.OnConfigChangedEvent event) {

+	public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) {

 		if (event.modID.equals(Variables.MODID))

 			syncConfigs();

 	}