diff options
| author | Dream-Master <dream-master@gmx.net> | 2017-05-20 14:49:30 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-05-20 14:49:30 +0200 |
| commit | e18e2890afde0067a58af02eb9ea824bd386ae29 (patch) | |
| tree | 36ef0157aaeb81883dbf848c11525a43d9d8dc1a /src/main/java/gregtech/common/GT_Proxy.java | |
| parent | 08cd5fe48560f7b8db2252733afe59d160eaf426 (diff) | |
| parent | f83ceb606f55e908a7bf12da7e6800d395261807 (diff) | |
| download | GT5-Unofficial-e18e2890afde0067a58af02eb9ea824bd386ae29.tar.gz GT5-Unofficial-e18e2890afde0067a58af02eb9ea824bd386ae29.tar.bz2 GT5-Unofficial-e18e2890afde0067a58af02eb9ea824bd386ae29.zip | |
Merge branch 'Test-Chemie' into mergeGTNH
Diffstat (limited to 'src/main/java/gregtech/common/GT_Proxy.java')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 46f5f00a70..6481cb16dd 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -184,6 +184,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { public boolean mLowGravProcessing = false; public boolean mAprilFool = false; public boolean mCropNeedBlock = true; + public boolean mReenableSimplifiedChemicalRecipes = false; public GT_Proxy() { GameRegistry.registerFuelHandler(this); @@ -1440,6 +1441,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { rFuelValue = Math.max(rFuelValue, 100); } else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinySodium")) { rFuelValue = Math.max(rFuelValue, 44); + } else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSulfur")) { + rFuelValue = Math.max(rFuelValue, 1600); } else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemLithium")) { rFuelValue = Math.max(rFuelValue, 6000); } else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedLithium")) { @@ -1488,6 +1491,12 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { rFuelValue = Math.max(rFuelValue, 400); } else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyCoal")) { rFuelValue = Math.max(rFuelValue, 177); + } else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustCarbon")) { + rFuelValue = Math.max(rFuelValue, 1600); + } else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallCarbon")) { + rFuelValue = Math.max(rFuelValue, 400); + } else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyCarbon")) { + rFuelValue = Math.max(rFuelValue, 177); } else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemCharcoal")) { rFuelValue = Math.max(rFuelValue, 1600); } else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedCharcoal")) { @@ -1530,6 +1539,16 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { return rFuelValue; } + public Fluid addAutoGeneratedCorrespondingFluid(Materials aMaterial){ + return addFluid(aMaterial.mName.toLowerCase(Locale.ENGLISH), "molten.autogenerated", aMaterial.mDefaultLocalName, aMaterial, + aMaterial.mRGBa, 1, aMaterial.getLiquidTemperature(), GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); + } + + public Fluid addAutoGeneratedCorrespondingGas(Materials aMaterial) { + return addFluid(aMaterial.mName.toLowerCase(Locale.ENGLISH), "molten.autogenerated", aMaterial.mDefaultLocalName, aMaterial, + aMaterial.mRGBa, 2, aMaterial.getGasTemperature(), GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); + } + public Fluid addAutogeneratedMoltenFluid(Materials aMaterial) { return addFluid("molten." + aMaterial.mName.toLowerCase(Locale.ENGLISH), "molten.autogenerated", "Molten " + aMaterial.mDefaultLocalName, aMaterial, aMaterial.mMoltenRGBa, 4, aMaterial.mMeltingPoint <= 0 ? 1000 : aMaterial.mMeltingPoint, null, null, 0); |