diff options
| author | Muramasa <haydenkilloh@gmail.com> | 2016-10-11 22:51:52 +0100 |
|---|---|---|
| committer | Muramasa <haydenkilloh@gmail.com> | 2016-10-11 22:51:52 +0100 |
| commit | 796b822ab62d44513465ba95f5510eb65dacd2c2 (patch) | |
| tree | 32d6c34db0a0dd87821ef9c3afe26c594d6ae895 /src/main/java/gregtech/api | |
| parent | 1c8fcb89eccf09a76154134edbd9652fede027ec (diff) | |
| download | GT5-Unofficial-796b822ab62d44513465ba95f5510eb65dacd2c2.tar.gz GT5-Unofficial-796b822ab62d44513465ba95f5510eb65dacd2c2.tar.bz2 GT5-Unofficial-796b822ab62d44513465ba95f5510eb65dacd2c2.zip | |
Add HasParentMod to config & Generate fluids for all Materials
Diffstat (limited to 'src/main/java/gregtech/api')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 75f9367d0a..e46d844891 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -739,7 +739,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public Element mElement = null; public Materials mDirectSmelting = this, mOreReplacement = this, mMacerateInto = this, mSmeltInto = this, mArcSmeltInto = this, mHandleMaterial = this; public byte mToolQuality = 0; - public boolean mHasParentMod = true, mEnableFluid = true, mHasPlasma = false, mHasGas = false, mCustomOre = false; + public boolean mHasParentMod = true, mHasPlasma = false, mHasGas = false, mCustomOre = false; public Fluid mSolid = null, mFluid = null, mGas = null, mPlasma = null; /** @@ -1346,8 +1346,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { aMaterial.mMacerateInto = MATERIALS_MAP.get(GregTech_API.sMaterialProperties.get(aConfigPath, "MaterialMacerateInto", aMaterial.mMacerateInto.mName)); aMaterial.mArcSmeltInto = MATERIALS_MAP.get(GregTech_API.sMaterialProperties.get(aConfigPath, "MaterialArcSmeltInto", aMaterial.mArcSmeltInto.mName)); aMaterial.mDirectSmelting = MATERIALS_MAP.get(GregTech_API.sMaterialProperties.get(aConfigPath, "MaterialDirectSmeltInto", aMaterial.mDirectSmelting.mName)); - if (aMaterial.mMetaItemSubID == -1) aMaterial.mEnableFluid = false; - aMaterial.mEnableFluid = GregTech_API.sMaterialProperties.get(aConfigPath, "EnableFluid", aMaterial.mEnableFluid); + aMaterial.mHasParentMod = GregTech_API.sMaterialProperties.get(aConfigPath, "HasParentMod", aMaterial.mHasParentMod); if (aMaterial.mHasPlasma = GregTech_API.sMaterialProperties.get(aConfigPath, "AddPlasma", aMaterial.mHasPlasma)) GT_Mod.gregtechproxy.addAutogeneratedPlasmaFluid(aMaterial); if (aMaterial.mHasGas = GregTech_API.sMaterialProperties.get(aConfigPath, "AddGas", aMaterial.mHasGas)) GT_Mod.gregtechproxy.addFluid(aMaterial.mName.toLowerCase(), aMaterial.mDefaultLocalName, aMaterial, 2, aMaterial.mGasTemp); aMaterial.mEnchantmentToolsLevel = (byte) GregTech_API.sMaterialProperties.get(aConfigPath, "EnchantmentLevel", aMaterial.mEnchantmentToolsLevel); |