1 files changed, 228 insertions, 223 deletions
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 8fa77c80d8..eecc916f1f 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -1,226 +1,231 @@
-package gtPlusPlus.core.lib;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.mojang.authlib.GameProfile;
-
-import gregtech.api.GregTech_API;
-import gtPlusPlus.api.analytics.SegmentAnalytics;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.array.Pair;
-import gtPlusPlus.core.util.geo.GeoUtils;
-import gtPlusPlus.core.util.gregtech.recipehandlers.GregtechRecipe;
-import gtPlusPlus.core.util.networking.NetworkUtils;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
-import gtPlusPlus.xmod.gregtech.api.objects.XSTR;
-import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
-import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator;
-import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal;
-import net.minecraft.item.ItemStack;
-import net.minecraft.server.management.PlayerProfileCache;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraftforge.common.config.Configuration;
-
-public class CORE {
-
-	//import cpw.mods.fml.common.Optional;
-
-
-
-	//Analytics handler
+package gtPlusPlus.core.lib;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.mojang.authlib.GameProfile;
+
+import gregtech.api.GregTech_API;
+import gtPlusPlus.api.analytics.SegmentAnalytics;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.array.Pair;
+import gtPlusPlus.core.util.geo.GeoUtils;
+import gtPlusPlus.core.util.gregtech.recipehandlers.GregtechRecipe;
+import gtPlusPlus.core.util.networking.NetworkUtils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
+import gtPlusPlus.xmod.gregtech.api.objects.XSTR;
+import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
+import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator;
+import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal;
+import net.minecraft.item.ItemStack;
+import net.minecraft.server.management.PlayerProfileCache;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.common.config.Configuration;
+
+public class CORE {
+
+	//import cpw.mods.fml.common.Optional;
+
+
+
+	//Analytics handler
 	public static SegmentAnalytics mAnalytics;
-
-	public static Map PlayerCache;	
-
-	//Math Related
-	public static final float PI = (float) Math.PI;
-	public static volatile Random RANDOM = new XSTR();
-	//Env. Variables
+
+	public static Map PlayerCache;	
+
+	//Math Related
+	public static final float PI = (float) Math.PI;
+	public static volatile Random RANDOM = new XSTR();
+
+	//Env. Variables
 	public static Configuration Config;
-
-	public static boolean DEVENV = false;
-	public static boolean DEBUG = false;
-	public static boolean mFancyGraphics;
-	//Only can be set in Dev, no config or setting elsewhere.
-	public static final boolean LOAD_ALL_CONTENT = false;;
+
+	public static boolean DEVENV = false;
+	public static boolean DEBUG = false;
+	public static boolean mFancyGraphics;
+	//Only can be set in Dev, no config or setting elsewhere.
+	public static final boolean LOAD_ALL_CONTENT = false;;
+
 	//Mod Variables
-
-	public static final String name = "GT++";
-	public static final String MODID = "miscutils";
-	public static final String VERSION = "1.6.99-release";
-	public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
-	public static String USER_COUNTRY = GeoUtils.determineUsersCountry();
-	public static boolean isModUpToDate = Utils.isModUpToDate();
-
-	//Tweakables
-	public static int DARKBIOME_ID = 238;	
-
-	//GT Vars;
-	public static final int GREG_FIRST_ID = 760;
-	public static final boolean MAIN_GREGTECH_5U_EXPERIMENTAL_FORK = Meta_GT_Proxy.areWeUsingGregtech5uExperimental();
-	public static final int GREGTECH_API_VERSION = GregTech_API.VERSION;
-	public static IGregtech_RecipeAdder RA;
-
-	//Local Client Player, null if Server Side
-	public static GameProfile mLocalProfile;
-	//GT++ Fake Player Profile
-	public static GameProfile gameProfile = new GameProfile(UUID.nameUUIDFromBytes("gtplusplus.core".getBytes()), "[GT++]");
-	;
-	//Tooltips;
-	public static final String GT_Tooltip = "Added by: " + EnumChatFormatting.DARK_GREEN+"Alkalus "+EnumChatFormatting.GRAY+"- "+EnumChatFormatting.RED+"[GT++]";
-	public static final String GT_Tooltip_Radioactive = EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection.";
-	public static final String noItem = "";
-
-	//Because I want to be lazy Gregtech New Horizons Var.
-	public static boolean GTNH = false;
-	//Because I want to be lazy. Beyond Reality Classic Var.
-	public static boolean BRC = false;
-
-
-	
-	/**
-	 * Lists/Maps
-	 */
-	 //Burnables List
-	 public static List<Pair<Integer, ItemStack>> burnables = new ArrayList<Pair<Integer, ItemStack>>();
-
-
-	 //TesseractMapss
-	 public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> sTesseractGeneratorOwnershipMap = new HashMap<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>>();
-	 public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> sTesseractTerminalOwnershipMap = new HashMap<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>>();
-
-	 //BookMapt
-	 public static final Map<String, ItemStack> sBookList = new ConcurrentHashMap<String, ItemStack>();
-
-
-	 
-	 
-	/**
-	 * Some Gregtech Material and Recipe Variables
-	 */
-	 
-	 @Deprecated
-	 public static IGregtech_RecipeAdder sRecipeAdder;
-	 public static GregtechRecipe GT_Recipe = new GregtechRecipe();
-	 public static final GT_Materials[] sMU_GeneratedMaterials = new GT_Materials[1000];
-
-	 /**
-	  * File Paths and Resource Paths
-	  */
-
-	 public static final String
-	 TEX_DIR = "textures/",
-	 TEX_DIR_GUI = TEX_DIR + "gui/",
-	 TEX_DIR_ITEM = TEX_DIR + "items/",
-	 TEX_DIR_BLOCK = TEX_DIR + "blocks/",
-	 TEX_DIR_ENTITY = TEX_DIR + "entity/",
-	 TEX_DIR_ASPECTS = TEX_DIR + "aspects/",
-	 TEX_DIR_FLUIDS = TEX_DIR_BLOCK + "fluids/",
-	 RES_PATH = MODID + ":" + TEX_DIR,
-	 RES_PATH_GUI = MODID + ":" + TEX_DIR_GUI,
-	 RES_PATH_ITEM = MODID + ":" + TEX_DIR_ITEM,
-	 RES_PATH_BLOCK = MODID + ":" + TEX_DIR_BLOCK,
-	 RES_PATH_ENTITY = MODID + ":" + TEX_DIR_ENTITY,
-	 RES_PATH_ASPECTS = MODID + ":" + TEX_DIR_ASPECTS,
-	 RES_PATH_FLUIDS = MODID + ":" + TEX_DIR_FLUIDS;
-
-
-
-
-
-
-
-
-
-
-
-	 /*
-	  * Config Switch Class
-	  */
-
-	 public static class ConfigSwitches {
-
-		 //Updates
-		 public static boolean enableUpdateChecker = true;
-
-		 //Debug
-		 public static boolean disableEnderIOIntegration = false;
-		 public static boolean MACHINE_INFO = true;
-		 public static boolean showHiddenNEIItems = false;
-
-		 //Tools
-		 public static boolean enableSkookumChoochers = true;
-		 public static boolean enableMultiSizeTools = true;
-
-		 //Block Drops
-		 public static int chanceToDropDrainedShard = 196;
-		 public static int chanceToDropFluoriteOre = 32;
-
-		 //Machine Related
-		 public static boolean enableAlternativeBatteryAlloy = false;
-		 public static boolean enableThaumcraftShardUnification = false;
-		 public static boolean disableIC2Recipes = false;
-		 public static boolean enableAlternativeDivisionSigilRecipe = false;
-		 public static int boilerSteamPerSecond = 750;
-
-		 //Feature Related
-		 public static boolean enableCustomCapes = false;
-		 public static boolean enableCustomCircuits = true;
-		 public static boolean enableOldGTcircuits = false;
-		 public static boolean disableZombieReinforcement = false;
-
-		 //GT Fixes
-		 public static boolean enableNitroFix = false;
-
-		 //Single Block Machines
-		 public static boolean enableMachine_SolarGenerators = false;
-		 public static boolean enableMachine_Safes = true;
-		 public static boolean enableMachine_Dehydrators = true;
-		 public static boolean enableMachine_SteamConverter = true;
-		 public static boolean enableMachine_FluidTanks = true;
-		 public static boolean enableMachine_RocketEngines = true;
-		 public static boolean enableMachine_GeothermalEngines = true;
-		 public static boolean enableMachine_WorldAccelerators = true;
-		 public static boolean enableMachine_Tesseracts = true;
-		 public static boolean enableMachine_SimpleWasher = true;
-		 public static boolean enableMachine_Pollution = true;
-		 public static boolean enableCustom_Pipes = true;
-		 public static boolean enableCustom_Cables = true;
-
-		 //Multiblocks
-		 public static boolean enableMultiblock_AlloyBlastSmelter = true;
-		 public static boolean enableMultiblock_IndustrialCentrifuge = true;
-		 public static boolean enableMultiblock_IndustrialCokeOven = true;
-		 public static boolean enableMultiblock_IndustrialElectrolyzer = true;
-		 public static boolean enableMultiblock_IndustrialMacerationStack = true;
-		 public static boolean enableMultiblock_IndustrialPlatePress = true;
-		 public static boolean enableMultiblock_IndustrialWireMill = true;
-		 public static boolean enableMultiblock_IronBlastFurnace = true;
-		 public static boolean enableMultiblock_MatterFabricator = true;
-		 public static boolean enableMultiblock_MultiTank = true;
-		 public static boolean enableMultiblock_PowerSubstation = true;
-		 public static boolean enableMultiblock_LiquidFluorideThoriumReactor = true;
-		 public static boolean enableMultiblock_NuclearFuelRefinery = true;
-		 public static boolean enableMultiblock_TreeFarmer = true;
-		 public static boolean enableMultiblock_IndustrialSifter = true;
-		 public static boolean enableMultiblock_IndustrialThermalCentrifuge = true;
-		 public static boolean enableMultiblock_IndustrialWashPlant = true;
-		 public static boolean enableMultiblock_LargeAutoCrafter = true;
-		 public static boolean enableMultiblock_ThermalBoiler = true;
-		 public static boolean enableMultiblock_IndustrialCuttingMachine = true;
-
-		 //Visuals
-		 public static boolean enableTreeFarmerParticles = true;
-		 public static boolean useGregtechTextures = true;
-
-
-
-
-	 }
-
-}
+
+	public static final String name = "GT++";
+	public static final String MODID = "miscutils";
+	public static final String VERSION = "1.6.99-release";
+	public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
+	public static String USER_COUNTRY = GeoUtils.determineUsersCountry();
+	public static boolean isModUpToDate = Utils.isModUpToDate();
+
+	//Tweakables
+	public static int DARKBIOME_ID = 238;	
+
+	//GT Vars;
+	public static final int GREG_FIRST_ID = 760;
+	public static final boolean MAIN_GREGTECH_5U_EXPERIMENTAL_FORK = Meta_GT_Proxy.areWeUsingGregtech5uExperimental();
+	public static final int GREGTECH_API_VERSION = GregTech_API.VERSION;
+	public static IGregtech_RecipeAdder RA;
+
+	//Local Client Player, null if Server Side
+	public static GameProfile mLocalProfile;
+	//GT++ Fake Player Profile
+	public static GameProfile gameProfile = new GameProfile(UUID.nameUUIDFromBytes("gtplusplus.core".getBytes()), "[GT++]");
+	;
+	//Tooltips;
+	public static final String GT_Tooltip = "Added by: " + EnumChatFormatting.DARK_GREEN+"Alkalus "+EnumChatFormatting.GRAY+"- "+EnumChatFormatting.RED+"[GT++]";
+	public static final String GT_Tooltip_Radioactive = EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection.";
+	public static final String noItem = "";
+
+	//Because I want to be lazy Gregtech New Horizons Var.
+	public static boolean GTNH = false;
+	//Because I want to be lazy. Beyond Reality Classic Var.
+	public static boolean BRC = false;
+
+
+	
+	/**
+	 * Lists/Maps
+	 */
+
+	 //Burnables List
+	 public static List<Pair<Integer, ItemStack>> burnables = new ArrayList<Pair<Integer, ItemStack>>();
+
+
+	 //TesseractMapss
+	 public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> sTesseractGeneratorOwnershipMap = new HashMap<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>>();
+	 public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> sTesseractTerminalOwnershipMap = new HashMap<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>>();
+
+	 //BookMapt
+	 public static final Map<String, ItemStack> sBookList = new ConcurrentHashMap<String, ItemStack>();
+
+
+	 
+	 
+	/**
+	 * Some Gregtech Material and Recipe Variables
+	 */
+	 
+	 @Deprecated
+	 public static IGregtech_RecipeAdder sRecipeAdder;
+	 public static GregtechRecipe GT_Recipe = new GregtechRecipe();
+	 public static final GT_Materials[] sMU_GeneratedMaterials = new GT_Materials[1000];
+
+	 /**
+	  * File Paths and Resource Paths
+	  */
+
+	 public static final String
+	 TEX_DIR = "textures/",
+	 TEX_DIR_GUI = TEX_DIR + "gui/",
+	 TEX_DIR_ITEM = TEX_DIR + "items/",
+	 TEX_DIR_BLOCK = TEX_DIR + "blocks/",
+	 TEX_DIR_ENTITY = TEX_DIR + "entity/",
+	 TEX_DIR_ASPECTS = TEX_DIR + "aspects/",
+	 TEX_DIR_FLUIDS = TEX_DIR_BLOCK + "fluids/",
+	 RES_PATH = MODID + ":" + TEX_DIR,
+	 RES_PATH_GUI = MODID + ":" + TEX_DIR_GUI,
+	 RES_PATH_ITEM = MODID + ":" + TEX_DIR_ITEM,
+	 RES_PATH_BLOCK = MODID + ":" + TEX_DIR_BLOCK,
+	 RES_PATH_ENTITY = MODID + ":" + TEX_DIR_ENTITY,
+	 RES_PATH_ASPECTS = MODID + ":" + TEX_DIR_ASPECTS,
+	 RES_PATH_FLUIDS = MODID + ":" + TEX_DIR_FLUIDS;
+
+
+
+
+
+
+
+
+
+
+
+	 /*
+	  * Config Switch Class
+	  */
+
+	 public static class ConfigSwitches {
+
+		 //Updates
+		 public static boolean enableUpdateChecker = true;
+
+		 //Debug
+		 public static boolean disableEnderIOIntegration = false;
+		 public static boolean MACHINE_INFO = true;
+		 public static boolean showHiddenNEIItems = false;
+
+		 //Tools
+		 public static boolean enableSkookumChoochers = true;
+		 public static boolean enableMultiSizeTools = true;
+
+		 //Block Drops
+		 public static int chanceToDropDrainedShard = 196;
+		 public static int chanceToDropFluoriteOre = 32;
+
+		 //Machine Related
+		 public static boolean enableAlternativeBatteryAlloy = false;
+		 public static boolean enableThaumcraftShardUnification = false;
+		 public static boolean disableIC2Recipes = false;
+		 public static boolean enableAlternativeDivisionSigilRecipe = false;
+		 public static int boilerSteamPerSecond = 750;
+
+		 //Feature Related
+		 public static boolean enableCustomCapes = false;
+		 public static boolean enableCustomCircuits = true;
+		 public static boolean enableOldGTcircuits = false;
+		 public static boolean disableZombieReinforcement = false;
+
+		 //GT Fixes
+		 public static boolean enableNitroFix = false;
+
+		 //Single Block Machines
+		 public static boolean enableMachine_SolarGenerators = false;
+		 public static boolean enableMachine_Safes = true;
+		 public static boolean enableMachine_Dehydrators = true;
+		 public static boolean enableMachine_SteamConverter = true;
+		 public static boolean enableMachine_FluidTanks = true;
+		 public static boolean enableMachine_RocketEngines = true;
+		 public static boolean enableMachine_GeothermalEngines = true;
+		 public static boolean enableMachine_WorldAccelerators = true;
+		 public static boolean enableMachine_Tesseracts = true;
+		 public static boolean enableMachine_SimpleWasher = true;
+		 public static boolean enableMachine_Pollution = true;
+		 public static boolean enableCustom_Pipes = true;
+		 public static boolean enableCustom_Cables = true;
+
+		 //Multiblocks
+		 public static boolean enableMultiblock_AlloyBlastSmelter = true;
+		 public static boolean enableMultiblock_IndustrialCentrifuge = true;
+		 public static boolean enableMultiblock_IndustrialCokeOven = true;
+		 public static boolean enableMultiblock_IndustrialElectrolyzer = true;
+		 public static boolean enableMultiblock_IndustrialMacerationStack = true;
+		 public static boolean enableMultiblock_IndustrialPlatePress = true;
+		 public static boolean enableMultiblock_IndustrialWireMill = true;
+		 public static boolean enableMultiblock_IronBlastFurnace = true;
+		 public static boolean enableMultiblock_MatterFabricator = true;
+		 public static boolean enableMultiblock_MultiTank = true;
+		 public static boolean enableMultiblock_PowerSubstation = true;
+		 public static boolean enableMultiblock_LiquidFluorideThoriumReactor = true;
+		 public static boolean enableMultiblock_NuclearFuelRefinery = true;
+		 public static boolean enableMultiblock_TreeFarmer = true;
+		 public static boolean enableMultiblock_IndustrialSifter = true;
+		 public static boolean enableMultiblock_IndustrialThermalCentrifuge = true;
+		 public static boolean enableMultiblock_IndustrialWashPlant = true;
+		 public static boolean enableMultiblock_LargeAutoCrafter = true;
+		 public static boolean enableMultiblock_ThermalBoiler = true;
+		 public static boolean enableMultiblock_IndustrialCuttingMachine = true;
+
+		 //Visuals
+		 public static boolean enableTreeFarmerParticles = true;
+		 public static boolean useGregtechTextures = true;
+
+
+
+
+	 }
+
+}
+\ No newline at end of file