aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/material/Material.java
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2017-12-29 05:34:55 +1000
committerJordan Byrne <draknyte1@hotmail.com>2017-12-29 05:34:55 +1000
commitd9bb6aa63908828d5844c29c1b76956ea2079cf2 (patch)
tree9896aad8062d05d9f7a6342871c0cd5f39100224 /src/Java/gtPlusPlus/core/material/Material.java
parent2625df7eb11b16c3aa55ff1099e821cb79d55a8b (diff)
downloadGT5-Unofficial-d9bb6aa63908828d5844c29c1b76956ea2079cf2.tar.gz
GT5-Unofficial-d9bb6aa63908828d5844c29c1b76956ea2079cf2.tar.bz2
GT5-Unofficial-d9bb6aa63908828d5844c29c1b76956ea2079cf2.zip
+ Added several new ore materials.
$ Fixed bug where ores generated fluids. $ Fixed issue where old Fluorite ores still exist. $ Fixed issue where ore processing recipes were generated incorrectly. $ Partially implemented smooth lighting on GT++ Ores.
Diffstat (limited to 'src/Java/gtPlusPlus/core/material/Material.java')
-rw-r--r--src/Java/gtPlusPlus/core/material/Material.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 751a371bdb..62fd0ebb80 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -661,7 +661,10 @@ public class Material {
}
public final Fluid generateFluid(){
-
+ if (this.materialState == MaterialState.ORE){
+ return null;
+ }
+
final Materials isValid = Materials.get(this.getLocalizedName());
Logger.INFO("Is "+this.getLocalizedName()+" a Gregtech material? "+(isValid != null && isValid != Materials._NULL)+" | Found "+isValid.mDefaultLocalName);
if (isValid != Materials._NULL){
@@ -781,6 +784,9 @@ public class Material {
}
public final Fluid generatePlasma(){
+ if (this.materialState == MaterialState.ORE){
+ return null;
+ }
final Materials isValid = Materials.get(this.getLocalizedName());
if (!this.vGenerateCells){