From 2214833189caf3eb262f049746be4987b97aa6a7 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Fri, 15 Dec 2017 18:15:08 +1000 Subject: More fixes pre-gtnh update (#168) $ Tree Farmer Fix (a) $ Multitank Fix. ^ Version Bump. * + Added Chainsaw support to treefarm. + Added check for creative tools to tree farm for creative testing. --- src/Java/gtPlusPlus/core/lib/CORE.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/core/lib') diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 78b7cf4326..11ed154d5a 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -55,7 +55,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.6.101-prerelease"; + public static final String VERSION = "1.6.102-prerelease"; 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(); -- cgit From f0b0ced99b15884fd485129c1fb231c04eaa9e42 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Mon, 18 Dec 2017 14:23:05 +1000 Subject: + Added some safety handling to Bee generation since they will not generate in older versions of Forestry. % Made all of Growthcraft support reflective. --- src/Java/gtPlusPlus/core/lib/CORE.java | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/Java/gtPlusPlus/core/lib') diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 11ed154d5a..2fb3dd42b4 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -10,8 +10,6 @@ import java.util.concurrent.ConcurrentHashMap; import com.mojang.authlib.GameProfile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.array.Pair; @@ -46,8 +44,6 @@ public class CORE { public static boolean DEVENV = false; public static boolean DEBUG = false; - @SideOnly(Side.CLIENT) - public static boolean mFancyGraphics = false; //Only can be set in Dev, no config or setting elsewhere. public static final boolean LOAD_ALL_CONTENT = false;; -- cgit From 5715a32d2901922503fd850f3a68503fb77467c3 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Wed, 20 Dec 2017 23:39:49 +1000 Subject: - Disabled some logging. % Minor Project Clean-up, added missing Override annotations to 100+ methods & removed pointless casts. % Moved Logging to it's own class. $ Fixed Multi-block handling of Pollution. $ Fixed the GT 5.09 material enabler system. (From My Side, it's still borked on GTs). + Added a Dynamic Proxy invocation for IMaterialHandler. + Added an AutoMap data type, which is a Auto-incremental ID'd Hashmap wrapper. --- src/Java/gtPlusPlus/core/lib/LoadedMods.java | 92 ++++++++++++++-------------- 1 file changed, 46 insertions(+), 46 deletions(-) (limited to 'src/Java/gtPlusPlus/core/lib') diff --git a/src/Java/gtPlusPlus/core/lib/LoadedMods.java b/src/Java/gtPlusPlus/core/lib/LoadedMods.java index c807d8f03c..04ddd7b021 100644 --- a/src/Java/gtPlusPlus/core/lib/LoadedMods.java +++ b/src/Java/gtPlusPlus/core/lib/LoadedMods.java @@ -4,8 +4,8 @@ import static gtPlusPlus.core.lib.CORE.BRC; import static gtPlusPlus.core.lib.CORE.GTNH; import cpw.mods.fml.common.Loader; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE.ConfigSwitches; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechTextures; import gtPlusPlus.xmod.gregtech.recipes.GregtechRecipeAdder; @@ -55,19 +55,19 @@ public class LoadedMods { private static int totalMods; @SuppressWarnings("deprecation") public static void checkLoaded(){ - Utils.LOG_INFO("Looking for optional mod prereqs."); + Logger.INFO("Looking for optional mod prereqs."); if (Loader.isModLoaded("gregtech") == true ){ Gregtech = true; - Utils.LOG_INFO("Components enabled for: Gregtech"); + Logger.INFO("Components enabled for: Gregtech"); if (Gregtech){ try { CORE.sRecipeAdder = CORE.RA = new GregtechRecipeAdder(); - Utils.LOG_INFO("Created Gregtech recipe handler."); + Logger.INFO("Created Gregtech recipe handler."); GregtechTextures.BlockIcons.VOID.name(); GregtechTextures.ItemIcons.VOID.name(); - Utils.LOG_INFO("Created Gregtech texture handler."); + Logger.INFO("Created Gregtech texture handler."); } catch (final NullPointerException e){ - Utils.LOG_INFO("Could NOT create a Gregtech recipe handler."); + Logger.INFO("Could NOT create a Gregtech recipe handler."); } } @@ -76,194 +76,194 @@ public class LoadedMods { if (Loader.isModLoaded("dreamcraft") == true){ DreamCraft = true; GTNH = true; - Utils.LOG_INFO("Components enabled for: DreamCraft"); - Utils.LOG_INFO("Components enabled for: GT: New Horizons"); + Logger.INFO("Components enabled for: DreamCraft"); + Logger.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"); + Logger.INFO("Components enabled for: Beyond Reality"); totalMods++; } if (Loader.isModLoaded("PlayerAPI") == true){ PlayerAPI = true; - Utils.LOG_INFO("Components enabled for: PlayerAPI"); + Logger.INFO("Components enabled for: PlayerAPI"); totalMods++; } if (Loader.isModLoaded("BuildCraft") == true){ BuildCraft = true; - Utils.LOG_INFO("Components enabled for: BuildCraft"); + Logger.INFO("Components enabled for: BuildCraft"); totalMods++; } if ((Loader.isModLoaded("EnderIO") == true) && !ConfigSwitches.disableEnderIOIntegration){ EnderIO = true; - Utils.LOG_INFO("Components enabled for: EnderIO"); + Logger.INFO("Components enabled for: EnderIO"); totalMods++; } if (Loader.isModLoaded("BigReactors") == true){ Big_Reactors = true; - Utils.LOG_INFO("Components enabled for: Big Reactors"); + Logger.INFO("Components enabled for: Big Reactors"); totalMods++; } if (Loader.isModLoaded("IC2") == true){ IndustrialCraft2 = true; - Utils.LOG_INFO("Components enabled for: IndustrialCraft2"); + Logger.INFO("Components enabled for: IndustrialCraft2"); totalMods++; } if (Loader.isModLoaded("simplyjetpacks") == true){ Simply_Jetpacks = true; - Utils.LOG_INFO("Components enabled for: Simply Jetpacks"); + Logger.INFO("Components enabled for: Simply Jetpacks"); totalMods++; } if (Loader.isModLoaded("rftools") == true){ RFTools = true; - Utils.LOG_INFO("Components enabled for: RFTools"); + Logger.INFO("Components enabled for: RFTools"); totalMods++; } if (Loader.isModLoaded("Thaumcraft") == true){ Thaumcraft = true; - Utils.LOG_INFO("Components enabled for: Thaumcraft"); + Logger.INFO("Components enabled for: Thaumcraft"); totalMods++; } if (Loader.isModLoaded("BiomesOPlenty") == true){ BiomesOPlenty = true; - Utils.LOG_INFO("Components enabled for: BiomesOPlenty"); + Logger.INFO("Components enabled for: BiomesOPlenty"); totalMods++; } if (Loader.isModLoaded("ExtraUtilities") == true){ Extra_Utils = true; - Utils.LOG_INFO("Components enabled for: Extra_Utils"); + Logger.INFO("Components enabled for: Extra_Utils"); totalMods++; } if (Loader.isModLoaded("harvestcraft") == true){ PamsHarvestcraft = true; - Utils.LOG_INFO("Components enabled for: PamsHarvestcraft"); + Logger.INFO("Components enabled for: PamsHarvestcraft"); totalMods++; } if (Loader.isModLoaded("PneumaticCraft") == true){ PneumaticCraft = true; - Utils.LOG_INFO("Components enabled for: PneumaticCraft"); + Logger.INFO("Components enabled for: PneumaticCraft"); totalMods++; } if (Loader.isModLoaded("MorePlanet") == true){ MorePlanets = true; - Utils.LOG_INFO("Components enabled for: MorePlanets"); + Logger.INFO("Components enabled for: MorePlanets"); totalMods++; } if (Loader.isModLoaded("ForbiddenMagic") == true){ ForbiddenMagic = true; - Utils.LOG_INFO("Components enabled for: ForbiddenMagic"); + Logger.INFO("Components enabled for: ForbiddenMagic"); totalMods++; } if (Loader.isModLoaded("CompactWindmills") == true){ CompactWindmills = true; - Utils.LOG_INFO("Components enabled for: CompactWindmills"); + Logger.INFO("Components enabled for: CompactWindmills"); totalMods++; } if (Loader.isModLoaded("Railcraft") == true){ Railcraft = true; - Utils.LOG_INFO("Components enabled for: Railcraft"); + Logger.INFO("Components enabled for: Railcraft"); totalMods++; } if (Loader.isModLoaded("Mekanism") == true){ Mekanism = true; - Utils.LOG_INFO("Components enabled for: Mekanism - This feature is not configurable and balances Mekanism to suit GT."); + Logger.INFO("Components enabled for: Mekanism - This feature is not configurable and balances Mekanism to suit GT."); totalMods++; } if (Loader.isModLoaded("Growthcraft") == true){ - Utils.LOG_INFO("Growthcraft Version: "+getModVersion("Growthcraft")); + Logger.INFO("Growthcraft Version: "+getModVersion("Growthcraft")); if (getModVersion("Growthcraft").equals("1.7.10-2.3.1")){ //Load Growthcraft Compat Growthcraft = true; - Utils.LOG_INFO("Components enabled for: Growthcraft"); + Logger.INFO("Components enabled for: Growthcraft"); totalMods++; } else { Growthcraft = false; - Utils.LOG_INFO("Growthcraft found, but the version was too new. I will update GC support eventually."); + Logger.INFO("Growthcraft found, but the version was too new. I will update GC support eventually."); } } if (Loader.isModLoaded("CoFHCore") == true){ CoFHCore = true; - Utils.LOG_INFO("Components enabled for: CoFHCore"); + Logger.INFO("Components enabled for: CoFHCore"); totalMods++; } if (Loader.isModLoaded("Forestry") == true){ Forestry = true; - Utils.LOG_INFO("Components enabled for: Forestry"); + Logger.INFO("Components enabled for: Forestry"); totalMods++; } if (Loader.isModLoaded("MagicBees") == true){ MagicBees = true; - Utils.LOG_INFO("Components enabled for: MagicBees"); + Logger.INFO("Components enabled for: MagicBees"); totalMods++; } if (Loader.isModLoaded("psychedelicraft") == true){ Psychedelicraft = true; - Utils.LOG_INFO("Components enabled for: Psychedelicraft"); + Logger.INFO("Components enabled for: Psychedelicraft"); totalMods++; } if (Loader.isModLoaded("ImmersiveEngineering") == true){ ImmersiveEngineering = true; - Utils.LOG_INFO("Components enabled for: ImmersiveEngineering"); + Logger.INFO("Components enabled for: ImmersiveEngineering"); totalMods++; } if (Loader.isModLoaded("ExtraBees") == true){ ExtraBees = true; - Utils.LOG_INFO("Components enabled for: ExtraBees"); + Logger.INFO("Components enabled for: ExtraBees"); totalMods++; } if (Loader.isModLoaded("ThermalFoundation") == false){ ThermalFoundation = false; - Utils.LOG_INFO("Components enabled for: ThermalFoundation - This feature will disable itself if you add TF."); + Logger.INFO("Components enabled for: ThermalFoundation - This feature will disable itself if you add TF."); totalMods++; } else if (Loader.isModLoaded("ThermalFoundation") == true){ ThermalFoundation = true; - Utils.LOG_INFO("Components disabled for: ThermalFoundation - This feature will enable itself if you remove TF."); + Logger.INFO("Components disabled for: ThermalFoundation - This feature will enable itself if you remove TF."); //totalMods++; } if (Loader.isModLoaded("ihl") == true){ IHL = true; - Utils.LOG_INFO("Components enabled for: IHL"); + Logger.INFO("Components enabled for: IHL"); totalMods++; } if (Loader.isModLoaded("Baubles") == true){ Baubles = true; - Utils.LOG_INFO("Components enabled for: Baubles"); + Logger.INFO("Components enabled for: Baubles"); totalMods++; } if (Loader.isModLoaded("GalacticraftCore") == true){ GalacticraftCore = true; - Utils.LOG_INFO("Components enabled for: Galacticraft Core"); + Logger.INFO("Components enabled for: Galacticraft Core"); totalMods++; } if (Loader.isModLoaded("OpenComputers") == true){ OpenComputers = true; - Utils.LOG_INFO("Components enabled for: OpenComputers"); + Logger.INFO("Components enabled for: OpenComputers"); totalMods++; } if (Loader.isModLoaded("computronics") == true){ Computronics = true; - Utils.LOG_INFO("Components disabled for: Computronics - This feature will enable itself if you remove Computronics."); + Logger.INFO("Components disabled for: Computronics - This feature will enable itself if you remove Computronics."); totalMods++; } else { - Utils.LOG_INFO("Components enabled for: Computronics - This feature will disable itself if you add Computronics."); + Logger.INFO("Components enabled for: Computronics - This feature will disable itself if you add Computronics."); } if (Loader.isModLoaded("GTRedtech") == true){ RedTech = true; - Utils.LOG_INFO("Components enabled for: GTRedtech"); + Logger.INFO("Components enabled for: GTRedtech"); totalMods++; } if (Loader.isModLoaded("tectech") == true){ TecTech = true; - Utils.LOG_INFO("Components enabled for: TecTech"); + Logger.INFO("Components enabled for: TecTech"); totalMods++; } - Utils.LOG_INFO("Content found for "+totalMods+" mods"); + Logger.INFO("Content found for "+totalMods+" mods"); } -- cgit From 6a05213a156b3c5fe95f422234a8cb9a19ec00f1 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Thu, 21 Dec 2017 00:25:53 +1000 Subject: ^ Version Bump. --- src/Java/gtPlusPlus/core/lib/CORE.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/Java/gtPlusPlus/core/lib') diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 2fb3dd42b4..cc6fade7ce 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -1,11 +1,6 @@ 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.*; import java.util.concurrent.ConcurrentHashMap; import com.mojang.authlib.GameProfile; @@ -51,7 +46,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.6.102-prerelease"; + public static final String VERSION = "1.6.110-prerelease"; 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(); -- cgit From ecc60485f31011bf9cc6a02edb985fb683793bb7 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Thu, 21 Dec 2017 15:48:47 +1000 Subject: + Added a dimension ID config option which it now will try use if available. % More work on the Dimension again. $ Fixed NPE caused by disabled material handler. $ Fixed bad fluid used in world generation. # Fixed spawn rate of mobs in custom dimension. --- src/Java/gtPlusPlus/core/lib/CORE.java | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Java/gtPlusPlus/core/lib') diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index cc6fade7ce..5de70b467a 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -53,6 +53,7 @@ public class CORE { //Tweakables public static int DARKBIOME_ID = 238; + public static int DARKWORLD_ID = 227; //GT Vars; public static final int GREG_FIRST_ID = 760; -- cgit