aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/item
diff options
context:
space:
mode:
authordraknyte1 <draknyte1@hotmail.com>2017-02-22 21:21:29 +1000
committerdraknyte1 <draknyte1@hotmail.com>2017-02-22 21:21:29 +1000
commit31bf8ea23313e4eab2db072a35467c6e68d04932 (patch)
tree2b83c33d86f41c05557371879214821d26d62204 /src/Java/gtPlusPlus/core/item
parenta1540dee487183de00bcc02ac7517790da00f9d9 (diff)
downloadGT5-Unofficial-31bf8ea23313e4eab2db072a35467c6e68d04932.tar.gz
GT5-Unofficial-31bf8ea23313e4eab2db072a35467c6e68d04932.tar.bz2
GT5-Unofficial-31bf8ea23313e4eab2db072a35467c6e68d04932.zip
% Tweaked recipe creation for materials due to states.
% Tweaked items generated for materials due to states. % Tweaked tooltips of cells, now they are cleaner. % Changed max progress time of LFTR to be 500x what it was.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 5b585aed16..8c38ad82d0 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -4,6 +4,7 @@ import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.entity.EntityUtils;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
@@ -134,7 +135,12 @@ public class BaseItemComponent extends Item{
}
if (componentMaterial != null){
if (!componentMaterial.vChemicalFormula.equals("??")) {
+ if (componentType != ComponentTypes.CELL || componentType != ComponentTypes.PLASMACELL){
list.add(componentMaterial.vChemicalFormula);
+ }
+ else {
+ list.add(Utils.sanitizeString(componentMaterial.vChemicalFormula));
+ }
}
if (componentMaterial.isRadioactive){