diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core')
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/Material.java | 17 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java | 5 |
2 files changed, 15 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index 6f111b6551..e1aa0d730b 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -30,7 +30,7 @@ public class Material { private ArrayList<MaterialStack> vMaterialInput = new ArrayList<MaterialStack>(); public final long[] vSmallestRatio; public final short vComponentCount; - + private final short[] RGBA; private final boolean usesBlastFurnace; @@ -101,7 +101,7 @@ public class Material { if (m.getStackMaterial().vDurability != 0){ durabilityTemp = (durabilityTemp+m.getStackMaterial().vDurability); counterTemp++; - + } } } @@ -425,12 +425,12 @@ public class Material { } return new int[]{}; } - + private final short getComponentCount(MaterialStack[] inputs){ int counterTemp = 0; for (MaterialStack m : inputs){ if (m.getStackMaterial() != null){ - counterTemp++; + counterTemp++; } } if (counterTemp != 0){ @@ -538,6 +538,13 @@ public class Material { } public final Fluid generateFluid(){ + + try { + if (Materials.get(localizedName) == Materials.Clay){ + return null; + } + } catch (Throwable e){} + if (Materials.get(localizedName).mFluid == null){ Utils.LOG_WARNING("Generating our own fluid."); @@ -562,7 +569,7 @@ public class Material { public final Fluid generatePlasma(){ Materials isValid = Materials.get(getLocalizedName()); - if (isValid != Materials._NULL && isValid != null){ + if (isValid != Materials._NULL && isValid != null && isValid != Materials.Clay){ if (isValid.mPlasma != null){ Utils.LOG_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 2a3527e9d1..8163648c41 100644 --- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java +++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java @@ -2,10 +2,8 @@ package gtPlusPlus.core.util.fluid; import gregtech.api.enums.*; import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.fluids.GenericFluid; import gtPlusPlus.core.item.base.BaseItemComponent; -import gtPlusPlus.core.item.base.cell.BaseItemCell; import gtPlusPlus.core.item.base.cell.BaseItemPlasmaCell; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialStack; @@ -231,6 +229,9 @@ public class FluidUtils { } public static Fluid addGTPlasma(Material aMaterial) { + if (aMaterial.getLocalizedName().toLowerCase().contains("clay")){ + return null; + } Utils.LOG_INFO("Generating a "+aMaterial.getLocalizedName()+" Plasma Cell"); if (aMaterial.vComponentCount != 1){ Utils.LOG_INFO("Compound made from: "); |