diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/base')
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java b/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java index c11effde74..3e13fa0b41 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java @@ -15,7 +15,7 @@ public class BaseItemBurnable extends CoreItem { super(unlocalizedName, creativeTab, stackSize, maxDmg, description); this.itemName = displayName; this.meta = meta; - if (!oredictName.equals("") || oredictName != null){ + if (oredictName != null && !oredictName.equals("")){ registerOrdictionary(oredictName); } registerFuel(burnTime); @@ -26,7 +26,7 @@ public class BaseItemBurnable extends CoreItem { CORE.burnables.add(new Pair<Integer, ItemStack>(burn, ItemUtils.getSimpleStack(this, 1))); } - public void registerOrdictionary(String name){ + public final void registerOrdictionary(String name){ ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(this), name); } diff --git a/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java b/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java index 04bb1d59d8..eb9fb733ea 100644 --- a/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java +++ b/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java @@ -241,7 +241,7 @@ public class BasicSpawnEgg extends ItemMonsterPlacer return this.colorSpots; } - public void setEntityToSpawnName(final String parEntityToSpawnName){ + public final void setEntityToSpawnName(final String parEntityToSpawnName){ this.entityToSpawnName = parEntityToSpawnName; this.entityToSpawnNameFull = this.entityMODID+"."+this.entityToSpawnName; } diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java index 2062094159..2428224fec 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java @@ -17,7 +17,7 @@ public abstract class BaseItemDustAbstract extends Item{ public BaseItemDustAbstract(final String unlocalizedName, final String materialName, final int colour, final String pileSize) { this.setUnlocalizedName(unlocalizedName); this.setMaxStackSize(64); - if (pileSize.toLowerCase().equals("dust")){ + if (pileSize.equalsIgnoreCase("dust")){ this.setTextureName(CORE.MODID + ":" + "dust"); } else{ @@ -37,6 +37,6 @@ public abstract class BaseItemDustAbstract extends Item{ public abstract String getMaterialName(); @Override - public abstract int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF); + public abstract int getColorFromItemStack(ItemStack stack, int hex); } |