diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java | 23 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/Material.java | 3 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java | 2 |
3 files changed, 3 insertions, 25 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java index 2345c1ee8d..9bbef4db15 100644 --- a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java +++ b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java @@ -42,29 +42,6 @@ public class BaseItemCell extends BaseItemComponent{ if (renderPass == 0){ return Utils.rgbtoHexValue(230, 230, 230); } - - - /*if (tickValue == 20){ - if (upwards){ - fluidBright++; - } - else { - fluidBright--; - } - if (fluidBright <= 0 || fluidBright >= 20){ - if (fluidBright <= 0) upwards = true; - if (fluidBright >= 20) upwards = false; - } - } - - if (tickValue > 20){ - tickValue=0; - } - else { - tickValue++; - } - - return Utils.rgbtoHexValue(fluidColour[0]+fluidBright, fluidColour[1]+fluidBright, fluidColour[2]+fluidBright);*/ return this.componentColour; } diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index 5a38e5cf08..38b49e0d9d 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -644,7 +644,8 @@ public class Material { public final Fluid generatePlasma(){ final Materials isValid = Materials.get(this.getLocalizedName()); - if ((isValid != Materials._NULL) && (isValid != null) && (isValid != Materials.Clay)){ + if ((isValid != Materials._NULL) && (isValid != null) && (isValid != Materials.Clay) && (isValid != Materials.Clay) + && (isValid != Materials.Phosphorus) && (isValid != Materials.Steel) && (isValid != Materials.Bronze)){ if (isValid.mPlasma != null){ Utils.LOG_MACHINE_INFO("Using a pre-defined Plasma from GT."); return isValid.mPlasma; diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java index aa44c24440..1539488501 100644 --- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java +++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java @@ -229,7 +229,7 @@ public class FluidUtils { } public static Fluid addGTPlasma(final Material aMaterial) { - if (aMaterial.getLocalizedName().toLowerCase().contains("clay")){ + if (aMaterial.getLocalizedName().toLowerCase().contains("clay") || aMaterial.getComposites().size()>1 || aMaterial.getLocalizedName().toLowerCase().contains("wrought")){ return null; } Utils.LOG_INFO("Generating a "+aMaterial.getLocalizedName()+" Plasma Cell"); |