diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-10-27 02:10:31 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-10-27 02:10:31 +1000 |
| commit | 9fa6dce3449e8d339ee8b81544ccf073bc350745 (patch) | |
| tree | 506f1999f88c1133f2ad5265735283d1ecf3eaba /src/Java/gtPlusPlus/core/material/Material.java | |
| parent | b074293f70fec5df93a6d0610d99a5183dd2cbfd (diff) | |
| download | GT5-Unofficial-9fa6dce3449e8d339ee8b81544ccf073bc350745.tar.gz GT5-Unofficial-9fa6dce3449e8d339ee8b81544ccf073bc350745.tar.bz2 GT5-Unofficial-9fa6dce3449e8d339ee8b81544ccf073bc350745.zip | |
+ Made ELEMENT a singleton.
% PMD updated Material, MaterialStack and ELEMENT.
Diffstat (limited to 'src/Java/gtPlusPlus/core/material/Material.java')
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/Material.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index 16c87c427a..d73ac96bec 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -387,23 +387,23 @@ public class Material { if (dummyFormulaArray.length >= 1){ for (int e=0;e<tempInput.size();e++){ if (tempInput.get(e) != null){ - if (tempInput.get(e).stackMaterial != null){ - if (!tempInput.get(e).stackMaterial.vChemicalSymbol.equals("??")){ + if (tempInput.get(e).getStackMaterial() != null){ + if (!tempInput.get(e).getStackMaterial().vChemicalSymbol.equals("??")){ if (dummyFormulaArray[e] > 1){ - if (tempInput.get(e).stackMaterial.vChemicalFormula.length() > 3){ - dummyFormula = dummyFormula + "(" + tempInput.get(e).stackMaterial.vChemicalFormula + ")" + dummyFormulaArray[e]; + if (tempInput.get(e).getStackMaterial().vChemicalFormula.length() > 3){ + dummyFormula = dummyFormula + "(" + tempInput.get(e).getStackMaterial().vChemicalFormula + ")" + dummyFormulaArray[e]; } else { - dummyFormula = dummyFormula + tempInput.get(e).stackMaterial.vChemicalFormula + dummyFormulaArray[e]; + dummyFormula = dummyFormula + tempInput.get(e).getStackMaterial().vChemicalFormula + dummyFormulaArray[e]; } } else if (dummyFormulaArray[e] == 1){ - if (tempInput.get(e).stackMaterial.vChemicalFormula.length() > 3){ - dummyFormula = dummyFormula + "(" +tempInput.get(e).stackMaterial.vChemicalFormula + ")"; + if (tempInput.get(e).getStackMaterial().vChemicalFormula.length() > 3){ + dummyFormula = dummyFormula + "(" +tempInput.get(e).getStackMaterial().vChemicalFormula + ")"; } else { - dummyFormula = dummyFormula +tempInput.get(e).stackMaterial.vChemicalFormula; + dummyFormula = dummyFormula +tempInput.get(e).getStackMaterial().vChemicalFormula; } } } |