Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into Exp

89 files changed, 3039 insertions, 2603 deletions

diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index c24414d1d5..1a22ab7409 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -13,6 +13,7 @@ import gregtech.api.enums.*;
 import gregtech.api.interfaces.internal.IGT_Mod;

 import gregtech.api.objects.ItemData;

 import gregtech.api.objects.MaterialStack;

+import gregtech.api.objects.XSTR;

 import gregtech.api.util.*;

 import gregtech.common.GT_DummyWorld;

 import gregtech.common.GT_Network;

@@ -56,14 +57,8 @@ import java.io.PrintStream;
 import java.util.*;

 import java.util.Map.Entry;

 

-//import forestry.factory.recipes.ISqueezerRecipe;

-//import forestry.factory.tiles.TileCentrifuge;

-//import forestry.factory.tiles.TileSqueezer;

-

-

 @Mod(modid = "gregtech", name = "GregTech", version = "MC1710", useMetadata = false, dependencies = "required-after:IC2; after:Forestry; after:PFAAGeologica; after:Thaumcraft; after:Railcraft; after:appliedenergistics2; after:ThermalExpansion; after:TwilightForest; after:harvestcraft; after:magicalcrops; after:BuildCraft|Transport; after:BuildCraft|Silicon; after:BuildCraft|Factory; after:BuildCraft|Energy; after:BuildCraft|Core; after:BuildCraft|Builders; after:GalacticraftCore; after:GalacticraftMars; after:GalacticraftPlanets; after:ThermalExpansion|Transport; after:ThermalExpansion|Energy; after:ThermalExpansion|Factory; after:RedPowerCore; after:RedPowerBase; after:RedPowerMachine; after:RedPowerCompat; after:RedPowerWiring; after:RedPowerLogic; after:RedPowerLighting; after:RedPowerWorld; after:RedPowerControl; after:UndergroundBiomes;")

-public class GT_Mod

-        implements IGT_Mod {

+public class GT_Mod implements IGT_Mod {

     public static final int VERSION = 509;

     public static final int REQUIRED_IC2 = 624;

     @Mod.Instance("gregtech")

@@ -72,6 +67,8 @@ public class GT_Mod
     public static GT_Proxy gregtechproxy;

     public static int MAX_IC2 = 2147483647;

     public static GT_Achievements achievements;

+    private final String aTextGeneral = "general";

+    private final String aTextIC2 = "ic2_";

 

     static {

         if ((509 != GregTech_API.VERSION) || (509 != GT_ModHandler.VERSION) || (509 != GT_OreDictUnificator.VERSION) || (509 != GT_Recipe.VERSION) || (509 != GT_Utility.VERSION) || (509 != GT_RecipeRegistrator.VERSION) || (509 != Element.VERSION) || (509 != Materials.VERSION) || (509 != OrePrefixes.VERSION)) {

@@ -106,13 +103,11 @@ public class GT_Mod
         if (GregTech_API.sPreloadStarted) {

             return;

         }

-        for (Runnable tRunnable : GregTech_API.sBeforeGTPreload) {

-            try {

+        try {

+            for (Runnable tRunnable : GregTech_API.sBeforeGTPreload) {

                 tRunnable.run();

-            } catch (Throwable e) {

-                e.printStackTrace(GT_Log.err);

             }

-        }

+        } catch (Throwable e) {e.printStackTrace(GT_Log.err);}

         File tFile = new File(new File(aEvent.getModConfigurationDirectory(), "GregTech"), "GregTech.cfg");

         Configuration tMainConfig = new Configuration(tFile);

         tMainConfig.load();

@@ -148,7 +143,7 @@ public class GT_Mod
             } catch (Throwable e) {

             }

         }

-        if (tMainConfig.get("general", "LoggingPlayerActivity", true).getBoolean(true)) {

+        if (tMainConfig.get(aTextGeneral, "LoggingPlayerActivity", true).getBoolean(true)) {

             GT_Log.mPlayerActivityLogFile = new File(aEvent.getModConfigurationDirectory().getParentFile(), "logs/PlayerActivity.log");

             if (!GT_Log.mPlayerActivityLogFile.exists()) {

                 try {

@@ -178,15 +173,15 @@ public class GT_Mod
         gregtechproxy.onPreLoad();

 

         GT_Log.out.println("GT_Mod: Setting Configs");

-        GT_Values.D1 = tMainConfig.get("general", "Debug", false).getBoolean(false);

-        GT_Values.D2 = tMainConfig.get("general", "Debug2", false).getBoolean(false);

+        GT_Values.D1 = tMainConfig.get(aTextGeneral, "Debug", false).getBoolean(false);

+        GT_Values.D2 = tMainConfig.get(aTextGeneral, "Debug2", false).getBoolean(false);

 

-        GregTech_API.TICKS_FOR_LAG_AVERAGING = tMainConfig.get("general", "TicksForLagAveragingWithScanner", 25).getInt(25);

-        GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = tMainConfig.get("general", "MillisecondsPassedInGTTileEntityUntilLagWarning", 100).getInt(100);

-        if (tMainConfig.get("general", "disable_STDOUT", false).getBoolean(false)) {

+        GregTech_API.TICKS_FOR_LAG_AVERAGING = tMainConfig.get(aTextGeneral, "TicksForLagAveragingWithScanner", 25).getInt(25);

+        GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = tMainConfig.get(aTextGeneral, "MillisecondsPassedInGTTileEntityUntilLagWarning", 100).getInt(100);

+        if (tMainConfig.get(aTextGeneral, "disable_STDOUT", false).getBoolean(false)) {

             System.out.close();

         }

-        if (tMainConfig.get("general", "disable_STDERR", false).getBoolean(false)) {

+        if (tMainConfig.get(aTextGeneral, "disable_STDERR", false).getBoolean(false)) {

             System.err.close();

         }

         GregTech_API.sMachineExplosions = tMainConfig.get("machines", "machines_explosion_damage", true).getBoolean(false);

@@ -199,41 +194,46 @@ public class GT_Mod
         GregTech_API.sConstantEnergy = tMainConfig.get("machines", "constant_need_of_energy", true).getBoolean(false);

         GregTech_API.sColoredGUI = tMainConfig.get("machines", "colored_guis_when_painted", true).getBoolean(false);

 

-        GregTech_API.sTimber = tMainConfig.get("general", "timber_axe", false).getBoolean(false);

-        GregTech_API.sDrinksAlwaysDrinkable = tMainConfig.get("general", "drinks_always_drinkable", false).getBoolean(false);

-        GregTech_API.sDoShowAllItemsInCreative = tMainConfig.get("general", "show_all_metaitems_in_creative_and_NEI", false).getBoolean(false);

-        GregTech_API.sMultiThreadedSounds = tMainConfig.get("general", "sound_multi_threading", false).getBoolean(false);

+        GregTech_API.sTimber = tMainConfig.get(aTextGeneral, "timber_axe", false).getBoolean(false);

+        GregTech_API.sDrinksAlwaysDrinkable = tMainConfig.get(aTextGeneral, "drinks_always_drinkable", false).getBoolean(false);

+        GregTech_API.sDoShowAllItemsInCreative = tMainConfig.get(aTextGeneral, "show_all_metaitems_in_creative_and_NEI", false).getBoolean(false);

+        GregTech_API.sMultiThreadedSounds = tMainConfig.get(aTextGeneral, "sound_multi_threading", false).getBoolean(false);

+        String SBdye0 = "ColorModulation.";

         for (Dyes tDye : Dyes.values()) {

             if ((tDye != Dyes._NULL) && (tDye.mIndex < 0)) {

-                tDye.mRGBa[0] = ((short) Math.min(255, Math.max(0, GregTech_API.sClientDataFile.get("ColorModulation." + tDye, "R", tDye.mRGBa[0]))));

-                tDye.mRGBa[1] = ((short) Math.min(255, Math.max(0, GregTech_API.sClientDataFile.get("ColorModulation." + tDye, "G", tDye.mRGBa[1]))));

-                tDye.mRGBa[2] = ((short) Math.min(255, Math.max(0, GregTech_API.sClientDataFile.get("ColorModulation." + tDye, "B", tDye.mRGBa[2]))));

-            }

-        }

-        gregtechproxy.mMaxEqualEntitiesAtOneSpot = tMainConfig.get("general", "MaxEqualEntitiesAtOneSpot", 3).getInt(3);

-        gregtechproxy.mSkeletonsShootGTArrows = tMainConfig.get("general", "SkeletonsShootGTArrows", 16).getInt(16);

-        gregtechproxy.mFlintChance = tMainConfig.get("general", "FlintAndSteelChance", 30).getInt(30);

-        gregtechproxy.mItemDespawnTime = tMainConfig.get("general", "ItemDespawnTime", 6000).getInt(6000);

-        gregtechproxy.mDisableVanillaOres = tMainConfig.get("general", "DisableVanillaOres", true).getBoolean(true);

-        gregtechproxy.mNerfDustCrafting = tMainConfig.get("general", "NerfDustCrafting", true).getBoolean(true);

-        gregtechproxy.mIncreaseDungeonLoot = tMainConfig.get("general", "IncreaseDungeonLoot", true).getBoolean(true);

-        gregtechproxy.mAxeWhenAdventure = tMainConfig.get("general", "AdventureModeStartingAxe", true).getBoolean(true);

-        gregtechproxy.mHardcoreCables = tMainConfig.get("general", "HardCoreCableLoss", false).getBoolean(false);

-        gregtechproxy.mSurvivalIntoAdventure = tMainConfig.get("general", "forceAdventureMode", false).getBoolean(false);

-        gregtechproxy.mHungerEffect = tMainConfig.get("general", "AFK_Hunger", false).getBoolean(false);

-        gregtechproxy.mHardRock = tMainConfig.get("general", "harderstone", false).getBoolean(false);

-        gregtechproxy.mInventoryUnification = tMainConfig.get("general", "InventoryUnification", true).getBoolean(true);

-        gregtechproxy.mGTBees = tMainConfig.get("general", "GTBees", true).getBoolean(true);

-        gregtechproxy.mCraftingUnification = tMainConfig.get("general", "CraftingUnification", true).getBoolean(true);

-        gregtechproxy.mNerfedWoodPlank = tMainConfig.get("general", "WoodNeedsSawForCrafting", true).getBoolean(true);

-        gregtechproxy.mNerfedVanillaTools = tMainConfig.get("general", "smallerVanillaToolDurability", true).getBoolean(true);

-        gregtechproxy.mSortToTheEnd = tMainConfig.get("general", "EnsureToBeLoadedLast", true).getBoolean(true);

-        gregtechproxy.mDisableIC2Cables = tMainConfig.get("general", "DisableIC2Cables", true).getBoolean(true);

-        gregtechproxy.mAchievements = tMainConfig.get("general", "EnableAchievements", true).getBoolean(true);

+                String SBdye1 = new StringBuilder(18).append(SBdye0).append(tDye).toString();

+                tDye.mRGBa[0] = ((short) Math.min(255, Math.max(0, GregTech_API.sClientDataFile.get(SBdye1, "R", tDye.mRGBa[0]))));

+                tDye.mRGBa[1] = ((short) Math.min(255, Math.max(0, GregTech_API.sClientDataFile.get(SBdye1, "G", tDye.mRGBa[1]))));