aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/core/util')
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index b286eeb45b..f8e777dd35 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -43,10 +43,15 @@ public class MaterialUtils {
return null;
}
+
public static Material generateMaterialFromGtENUM(final Materials material){
+ return generateMaterialFromGtENUM(material, null);
+ }
+
+ public static Material generateMaterialFromGtENUM(final Materials material, short[] customRGB){
@SuppressWarnings("deprecation")
String name = material.name();
- final short[] rgba = material.mRGBa;
+ final short[] rgba = (customRGB == null ? material.mRGBa : customRGB);
final int melting = material.mMeltingPoint;
final int boiling = material.mBlastFurnaceTemp;
final long protons = material.getProtons();