diff options
| -rw-r--r-- | src/Java/gtPlusPlus/GTplusplus.java | 7 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java | 4 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java | 15 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/general/BufferCore.java | 3 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/lib/CORE.java | 414 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/lib/LoadedMods.java | 11 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/player/PlayerUtils.java | 12 |
7 files changed, 262 insertions, 204 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index 21185910a4..e43a362ee1 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -33,6 +33,7 @@ import gtPlusPlus.core.util.networking.NetworkUtils; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools; +import net.minecraft.client.Minecraft; import net.minecraft.item.Item; import net.minecraft.launchwrapper.Launch; import net.minecraftforge.oredict.OreDictionary; @@ -68,8 +69,14 @@ public class GTplusplus implements ActionListener { public void preInit(final FMLPreInitializationEvent event) { Utils.LOG_INFO("Loading " + CORE.name + " V" + CORE.VERSION); + //Get Graphics Mode. + CORE.mFancyGraphics = Minecraft.isFancyGraphicsEnabled(); + if(!Utils.isServer()){ enableCustomCapes = true; + if (Minecraft.getMinecraft().thePlayer != null){ + CORE.mLocalProfile = Minecraft.getMinecraft().thePlayer.getGameProfile(); + } } //Give this a go mate. diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index a59fc7923b..ad26dbaf39 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -5,12 +5,12 @@ import static gtPlusPlus.core.lib.LoadedMods.Gregtech; import java.util.LinkedList; import java.util.Queue; +import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.common.compat.*; import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler; import gtPlusPlus.core.handler.Recipes.RegistrationHandler; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.recipe.*; import gtPlusPlus.core.util.Utils; @@ -35,7 +35,7 @@ public class COMPAT_HANDLER { GT_OreDictUnificator.registerOre("craftingToolSandHammer", new ItemStack(ModItems.itemSandstoneHammer)); for(int i=1; i<=10; i++){ - GT_OreDictUnificator.registerOre("bufferCore_"+CORE.VOLTAGES[i-1], new ItemStack(ItemUtils.getItem("miscutils:item.itemBufferCore"+i))); + GT_OreDictUnificator.registerOre("bufferCore_"+GT_Values.VN[i-1], new ItemStack(ItemUtils.getItem("miscutils:item.itemBufferCore"+i))); } } diff --git a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java index 1096816690..830f986d0b 100644 --- a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java +++ b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.handler.events; +import static gtPlusPlus.core.lib.CORE.mLocalProfile; + import java.util.*; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -28,7 +30,10 @@ public class LoginEventHandler { //Set this for easier use elsewhere. if (event.player.getEntityWorld().isRemote){ ClientProxy.playerName = this.localPlayersName; - } + if (mLocalProfile == null){ + mLocalProfile = this.localPlayerRef.getGameProfile(); + } + } try { @@ -39,6 +44,14 @@ public class LoginEventHandler { if (!this.localPlayerRef.worldObj.isRemote){ PlayerCache.appendParamChanges(this.localPlayersName, this.localPlayersUUID.toString()); + //Submit Analytics + try { + CORE.mAnalytics.SubmitNewUserSession(); + } + catch (Throwable t){ + Utils.LOG_INFO("Failed to submit analytics data."); + } + if (CORE.ConfigSwitches.enableUpdateChecker){ if (!Utils.isModUpToDate()){ Utils.LOG_INFO("[GT++] You're not using the latest recommended version of GT++, consider updating."); diff --git a/src/Java/gtPlusPlus/core/item/general/BufferCore.java b/src/Java/gtPlusPlus/core/item/general/BufferCore.java index 40136d7409..a9f0f775ee 100644 --- a/src/Java/gtPlusPlus/core/item/general/BufferCore.java +++ b/src/Java/gtPlusPlus/core/item/general/BufferCore.java @@ -4,6 +4,7 @@ import java.util.List; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.GT_Values; import gtPlusPlus.core.item.base.BaseItemWithDamageValue; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; @@ -25,7 +26,7 @@ public class BufferCore extends BaseItemWithDamageValue{ @Override public String getItemStackDisplayName(final ItemStack stack) { - return super.getItemStackDisplayName(stack)+" ["+CORE.VOLTAGES[this.coreTier-1]+"]."; + return super.getItemStackDisplayName(stack)+" ["+GT_Values.VN[this.coreTier-1]+"]."; } @Override diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index f9959f6d57..0fbcd95774 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -1,193 +1,225 @@ -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.util.EnumChatFormatting; -import net.minecraftforge.common.config.Configuration; - -public class CORE { - - //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; - - - - protected CORE(){ - //import cpw.mods.fml.common.Optional; - } - - //Math Related - public static final float PI = (float) Math.PI; - public static volatile Random RANDOM = new XSTR(); - - public static boolean DEVENV = false; - - 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(); - public static boolean DEBUG = false; - public static final boolean LOAD_ALL_CONTENT = false; - public static final int GREG_FIRST_ID = 760; - public static Map PlayerCache; - public static final String[] VOLTAGES = {"ULV","LV","MV","HV","EV","IV","LuV","ZPM","UV","MAX"}; - public static List<Pair<Integer, ItemStack>> burnables = new ArrayList<Pair<Integer, ItemStack>>(); - 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; - - - public static GameProfile gameProfile = new GameProfile(UUID.nameUUIDFromBytes("gtplusplus.core".getBytes()), "[GT++]"); - - @Deprecated - public static IGregtech_RecipeAdder sRecipeAdder; - public static GregtechRecipe GT_Recipe = new GregtechRecipe(); - +
+ 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 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. - public static boolean GTNH = false; - public static int DARKBIOME_ID = 238; - - /** - * A List containing all the Materials, which are somehow in use by GT and therefor receive a specific Set of Items. - */ - public static final GT_Materials[] sMU_GeneratedMaterials = new GT_Materials[1000]; - - //Tesseract maps - 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>>(); - - //Book List - public static final Map<String, ItemStack> sBookList = new ConcurrentHashMap<String, ItemStack>(); - - /** - * 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; - - - - //public static final Materials2[] MiscGeneratedMaterials = new Materials2[1000]; - - 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; - - //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 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;
+
+ //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;
+
+
+
+
+ }
+
+}
diff --git a/src/Java/gtPlusPlus/core/lib/LoadedMods.java b/src/Java/gtPlusPlus/core/lib/LoadedMods.java index 632c9d235f..d93e5acdfc 100644 --- a/src/Java/gtPlusPlus/core/lib/LoadedMods.java +++ b/src/Java/gtPlusPlus/core/lib/LoadedMods.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.lib; +import static gtPlusPlus.core.lib.CORE.BRC; import static gtPlusPlus.core.lib.CORE.GTNH; import cpw.mods.fml.common.Loader; @@ -41,6 +42,7 @@ public class LoadedMods { public static boolean OpenComputers = false; //OpenComputers public static boolean Computronics = false; //computronics public static boolean DreamCraft = false; //GT: New Horizons + public static boolean BeyondRealityCore = false; //Beyond Reality - Probably Classic public static boolean BiomesOPlenty = false; public static boolean PamsHarvestcraft = false; public static boolean GalacticraftCore = false; @@ -70,8 +72,6 @@ public class LoadedMods { totalMods++; } - // - if (Loader.isModLoaded("dreamcraft") == true){ DreamCraft = true; GTNH = true; @@ -79,7 +79,12 @@ public class LoadedMods { Utils.LOG_INFO("Components enabled for: GT: New Horizons"); totalMods++; } - + if (Loader.isModLoaded("beyondrealitycore") == true){ + BeyondRealityCore = true; + BRC = true; + Utils.LOG_INFO("Components enabled for: Beyond Reality"); + totalMods++; + } if (Loader.isModLoaded("PlayerAPI") == true){ PlayerAPI = true; Utils.LOG_INFO("Components enabled for: PlayerAPI"); diff --git a/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java b/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java index f1462ba51e..e566a41849 100644 --- a/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java +++ b/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java @@ -22,19 +22,19 @@ public class PlayerUtils { } public static EntityPlayer getPlayer(final String name){ - final List<EntityPlayer> i = new ArrayList<>(); - final Iterator<EntityPlayer> crunchifyIterator = MinecraftServer.getServer().getConfigurationManager().playerEntityList.iterator(); - while (crunchifyIterator.hasNext()) { - i.add((crunchifyIterator.next())); - } try{ + final List<EntityPlayer> i = new ArrayList<>(); + final Iterator<EntityPlayerMP> iterator = MinecraftServer.getServer().getConfigurationManager().playerEntityList.iterator(); + while (iterator.hasNext()) { + i.add((EntityPlayer) (iterator.next())); + } for (final EntityPlayer temp : i) { if (temp.getDisplayName().toLowerCase().equals(name.toLowerCase())){ return temp; } } } - catch(final NullPointerException e){} + catch(final Throwable e){} return null; } |