diff options
author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-08-24 21:21:48 +0100 |
---|---|---|
committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-08-24 21:21:48 +0100 |
commit | b851ee133b5f0a0d1ca5837d9dac3cdfec922561 (patch) | |
tree | ec288dacabbe87a784932508cb81fab6dce88aa3 /src/Java/gtPlusPlus/core/material/Material.java | |
parent | 7403427bbb0026962665c2f46d4108ae5777814d (diff) | |
download | GT5-Unofficial-b851ee133b5f0a0d1ca5837d9dac3cdfec922561.tar.gz GT5-Unofficial-b851ee133b5f0a0d1ca5837d9dac3cdfec922561.tar.bz2 GT5-Unofficial-b851ee133b5f0a0d1ca5837d9dac3cdfec922561.zip |
+ Added new recipes for Hydrogen Chloride, Sodium Hydroxide, Brine.
+ Added new UV/IR laser lens.
$ Fixed Chemical formula not showing up correctly on some mixed materials.
$ Fixed Tooltips of Rare Earth materials being too long.
$ Fixed Voltage of Rare Earth materials being a tier too high.
Diffstat (limited to 'src/Java/gtPlusPlus/core/material/Material.java')
-rw-r--r-- | src/Java/gtPlusPlus/core/material/Material.java | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index 5fca2fb2fe..904d1fb4df 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -85,8 +85,17 @@ public class Material { public static AutoMap<Materials> invalidMaterials = new AutoMap<Materials>(); + + + public Material(final String materialName, final MaterialState defaultState, final MaterialStack... inputs){ + this(materialName, defaultState, null, inputs); + } + + public Material(final String materialName, final MaterialState defaultState, final short[] rgba, final MaterialStack... inputs){ + this(materialName, defaultState, null, 0, rgba, -1, -1, -1, -1, false, "", 0, false, false, inputs); + } - public Material(String materialName, MaterialState defaultState, short[] rgba, int radiationLevel, MaterialStack[] materialStacks) { + public Material(final String materialName, final MaterialState defaultState, final short[] rgba, int radiationLevel, MaterialStack... materialStacks) { this(materialName, defaultState, null, 0, rgba, -1, -1, -1, -1, false, "", radiationLevel, false, materialStacks); } @@ -1335,7 +1344,17 @@ public class Material { } + public boolean registerComponentForMaterial(FluidStack aStack) { + return registerComponentForMaterial(this, aStack); + } + private static boolean registerComponentForMaterial(Material componentMaterial, FluidStack aStack) { + if (componentMaterial != null && aStack != null && componentMaterial.vMoltenFluid == null) { + componentMaterial.vMoltenFluid = aStack.getFluid(); + return true; + } + return false; + } public boolean registerComponentForMaterial(ComponentTypes aPrefix, ItemStack aStack) { return registerComponentForMaterial(this, aPrefix.getGtOrePrefix(), aStack); |