diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-02-21 16:15:53 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-02-21 16:15:53 +1000 |
| commit | 694ca264a3540f2b396a00aa1031e3ba805c8e31 (patch) | |
| tree | 86c7295153be4688eae87a8b82f6d61dda6b0c2e /src/Java/gtPlusPlus/core/item | |
| parent | 5d15dce9293f7c37089be3adfe0768de425838e2 (diff) | |
| download | GT5-Unofficial-694ca264a3540f2b396a00aa1031e3ba805c8e31.tar.gz GT5-Unofficial-694ca264a3540f2b396a00aa1031e3ba805c8e31.tar.bz2 GT5-Unofficial-694ca264a3540f2b396a00aa1031e3ba805c8e31.zip | |
+ Added localization for en_US for basically every item and block.
$ Tried to better support locales across all items. This should enhance #218.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
4 files changed, 8 insertions, 8 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java index 7622838f68..8b68d955e3 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -86,7 +86,7 @@ public class BaseItemComponent extends Item{ //return "gregtech" + ":" + "materialicons/"+metType+"/" + this.componentType.COMPONENT_NAME.toLowerCase(); } - @Override + /*@Override public String getItemStackDisplayName(final ItemStack p_77653_1_) { if (this.componentType == ComponentTypes.SMALLGEAR){ @@ -97,7 +97,7 @@ public class BaseItemComponent extends Item{ return (this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME); } return this.materialName+" Cell"; - } + }*/ public final String getMaterialName() { return this.materialName; diff --git a/src/Java/gtPlusPlus/core/item/base/CoreItem.java b/src/Java/gtPlusPlus/core/item/base/CoreItem.java index 3b0fa7b621..d80553de96 100644 --- a/src/Java/gtPlusPlus/core/item/base/CoreItem.java +++ b/src/Java/gtPlusPlus/core/item/base/CoreItem.java @@ -194,11 +194,11 @@ public class CoreItem extends Item } } - @Override +/* @Override public String getItemStackDisplayName(final ItemStack tItem) { if ((this.itemName == null) || this.itemName.equals("")) { return super.getItemStackDisplayName(tItem); } return this.itemName; - } + }*/ }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java index e2de72fa57..d11deecc17 100644 --- a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java +++ b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java @@ -57,10 +57,10 @@ public class BaseOreComponent extends Item{ return "gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME; } - @Override + /*@Override public String getItemStackDisplayName(final ItemStack p_77653_1_) { return (this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME); - } + }*/ public final String getMaterialName() { return this.materialName; diff --git a/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java b/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java index 0463628e46..1ad12b69d4 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java +++ b/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java @@ -32,7 +32,7 @@ public class ItemHalfCompleteCasings extends BaseItemColourable{ } } - @Override + /*@Override public String getItemStackDisplayName(final ItemStack tItem) { String prefix = "Half Complete Casing "; String casingType = ""; @@ -50,7 +50,7 @@ public class ItemHalfCompleteCasings extends BaseItemColourable{ } return (prefix+casingType); - } + }*/ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { |