Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Quick Fixes BloodASP

Browse source
This commit is contained in:
Blood-Asp 2016-10-22 23:51:28 +02:00 committed by Technus
parent 1986494508
commit c5390a5074
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/gregtech/GT_Mod.java
View file

@ -69,7 +69,7 @@ public class GT_Mod implements IGT_Mod {
public static GT_Achievements achievements; public static GT_Achievements achievements;
private final String aTextGeneral = "general"; private final String aTextGeneral = "general";
private final String aTextIC2 = "ic2_"; private final String aTextIC2 = "ic2_";
static { 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)) { 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)) {
throw new GT_ItsNotMyFaultException("One of your Mods included GregTech-API Files inside it's download, mention this to the Mod Author, who does this bad thing, and tell him/her to use reflection. I have added a Version check, to prevent Authors from breaking my Mod that way."); throw new GT_ItsNotMyFaultException("One of your Mods included GregTech-API Files inside it's download, mention this to the Mod Author, who does this bad thing, and tell him/her to use reflection. I have added a Version check, to prevent Authors from breaking my Mod that way.");
@ -195,7 +195,7 @@ public class GT_Mod implements IGT_Mod {
GregTech_API.sConstantEnergy = tMainConfig.get("machines", "constant_need_of_energy", true).getBoolean(false); 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.sColoredGUI = tMainConfig.get("machines", "colored_guis_when_painted", true).getBoolean(false);
GregTech_API.sTimber = tMainConfig.get(aTextGeneral, "timber_axe", false).getBoolean(false); GregTech_API.sTimber = tMainConfig.get(aTextGeneral, "timber_axe", true).getBoolean(true);
GregTech_API.sDrinksAlwaysDrinkable = tMainConfig.get(aTextGeneral, "drinks_always_drinkable", 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.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); GregTech_API.sMultiThreadedSounds = tMainConfig.get(aTextGeneral, "sound_multi_threading", false).getBoolean(false);
@ -692,7 +692,6 @@ public class GT_Mod implements IGT_Mod {
GregTech_API.mInputRF = false; GregTech_API.mInputRF = false;
} }
} }
achievements = new GT_Achievements(); achievements = new GT_Achievements();
GT_Log.out.println("GT_Mod: Loading finished, deallocating temporary Init Variables."); GT_Log.out.println("GT_Mod: Loading finished, deallocating temporary Init Variables.");
GregTech_API.sBeforeGTPreload = null; GregTech_API.sBeforeGTPreload = null;

2
src/main/java/gregtech/api/GregTech_API.java
View file

@ -183,7 +183,7 @@ public class GregTech_API {
/** /**
* Getting assigned by the Config * Getting assigned by the Config
*/ */
public static boolean sTimber = false, sDrinksAlwaysDrinkable = false, sMultiThreadedSounds = false, sDoShowAllItemsInCreative = false, sColoredGUI = true, sConstantEnergy = true, sMachineExplosions = true, sMachineFlammable = true, sMachineNonWrenchExplosions = true, sMachineRainExplosions = true, sMachineThunderExplosions = true, sMachineFireExplosions = true, sMachineWireFire = true; public static boolean sTimber = true, sDrinksAlwaysDrinkable = false, sMultiThreadedSounds = false, sDoShowAllItemsInCreative = false, sColoredGUI = true, sConstantEnergy = true, sMachineExplosions = true, sMachineFlammable = true, sMachineNonWrenchExplosions = true, sMachineRainExplosions = true, sMachineThunderExplosions = true, sMachineFireExplosions = true, sMachineWireFire = true;
public static boolean mOutputRF = false; public static boolean mOutputRF = false;
public static boolean mInputRF = false; public static boolean mInputRF = false;
public static boolean meIOLoaded = false; public static boolean meIOLoaded = false;

2
src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java
View file

@ -44,7 +44,7 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior {
ItemStack tTurbine = multi.getRealInventory()[1]; ItemStack tTurbine = multi.getRealInventory()[1];
long tMax = GT_MetaGenerated_Tool.getToolMaxDamage(tTurbine); long tMax = GT_MetaGenerated_Tool.getToolMaxDamage(tTurbine);
long tCur = GT_MetaGenerated_Tool.getToolDamage(tTurbine); long tCur = GT_MetaGenerated_Tool.getToolDamage(tTurbine);
if(tCur < tMax*20/100); if(tCur > tMax*8/10);
} }
} }