diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-03-02 14:37:13 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-03-02 14:37:13 +1000 |
| commit | 718b0e6773693f30b3c61a0a069a446a6c8f6c4d (patch) | |
| tree | a07d8be68c634a697dce11220db730f371e31b84 /src/Java/gtPlusPlus/core/item | |
| parent | 3fa1a63540b9bd279d6ac1c91e37c4eb29b024a1 (diff) | |
| download | GT5-Unofficial-718b0e6773693f30b3c61a0a069a446a6c8f6c4d.tar.gz GT5-Unofficial-718b0e6773693f30b3c61a0a069a446a6c8f6c4d.tar.bz2 GT5-Unofficial-718b0e6773693f30b3c61a0a069a446a6c8f6c4d.zip | |
$ Findbugs cleanup.
% Revised Tesseract run-time costs.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
3 files changed, 3 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java index 4ac42eaeb3..688483b831 100644 --- a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java +++ b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java @@ -19,7 +19,7 @@ public class BaseItemCell extends BaseItemComponent{ public BaseItemCell(final Material material) { super(material, BaseItemComponent.ComponentTypes.CELL); - this.fluidColour = (short[]) ((material == null) ? this.extraData : material.getRGBA()); + this.fluidColour = (short[]) material.getRGBA(); //FluidContainerRegistry.registerFluidContainer(material.getFluid(1000), ItemUtils.getSimpleStack(this), Ic2Items.cell.copy()); } diff --git a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java index e216a21796..23d1d022fa 100644 --- a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java +++ b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java @@ -26,7 +26,7 @@ public class BaseItemPlasmaCell extends BaseItemComponent{ public BaseItemPlasmaCell(final Material material) { super(material, ComponentTypes.PLASMACELL); - this.fluidColour = (short[]) ((material == null) ? this.extraData : material.getRGBA()); + this.fluidColour = (short[]) material.getRGBA(); } @Override diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java index 3d31f6c0a5..6923cb545e 100644 --- a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java +++ b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java @@ -71,9 +71,7 @@ public class BaseOreComponent extends Item{ @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - - if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("") && (this.componentMaterial != null)){ - + if (this.materialName != null && !this.materialName.equals("")){ if (this.componentMaterial != null){ if (!this.componentMaterial.vChemicalFormula.equals("??") && !this.componentMaterial.vChemicalFormula.equals("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) { list.add(Utils.sanitizeStringKeepBrackets(this.componentMaterial.vChemicalFormula)); |