diff --git a/lang b/lang index 22f0ca7df..9f956b050 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 22f0ca7dfdbf6feaa632d295199d391d93d89fe3 +Subproject commit 9f956b050a9adc2f538f166e4deddd2907f94dc5 diff --git a/src/main/java/forestry/apiculture/items/EnumHoneyDrop.java b/src/main/java/forestry/apiculture/items/EnumHoneyDrop.java index 0a2ae32ec..a95fa545d 100644 --- a/src/main/java/forestry/apiculture/items/EnumHoneyDrop.java +++ b/src/main/java/forestry/apiculture/items/EnumHoneyDrop.java @@ -39,7 +39,7 @@ public enum EnumHoneyDrop implements ItemOverlay.IOverlayInfo { } @Override - public String getName() { + public String getUid() { return name; } diff --git a/src/main/java/forestry/apiculture/items/EnumPollenCluster.java b/src/main/java/forestry/apiculture/items/EnumPollenCluster.java index 4db65e489..bcfa712f9 100644 --- a/src/main/java/forestry/apiculture/items/EnumPollenCluster.java +++ b/src/main/java/forestry/apiculture/items/EnumPollenCluster.java @@ -32,7 +32,7 @@ public enum EnumPollenCluster implements ItemOverlay.IOverlayInfo { } @Override - public String getName() { + public String getUid() { return name; } diff --git a/src/main/java/forestry/apiculture/items/EnumPropolis.java b/src/main/java/forestry/apiculture/items/EnumPropolis.java index b12cdf140..a69486bee 100644 --- a/src/main/java/forestry/apiculture/items/EnumPropolis.java +++ b/src/main/java/forestry/apiculture/items/EnumPropolis.java @@ -38,7 +38,7 @@ public enum EnumPropolis implements ItemOverlay.IOverlayInfo { } @Override - public String getName() { + public String getUid() { return name; } diff --git a/src/main/java/forestry/core/items/EnumElectronTube.java b/src/main/java/forestry/core/items/EnumElectronTube.java index a0254aeb5..e77bc1a97 100644 --- a/src/main/java/forestry/core/items/EnumElectronTube.java +++ b/src/main/java/forestry/core/items/EnumElectronTube.java @@ -11,6 +11,7 @@ package forestry.core.items; import java.awt.Color; +import java.util.Locale; public enum EnumElectronTube implements ItemOverlay.IOverlayInfo { COPPER(new Color(0xe3b78e)), @@ -29,7 +30,7 @@ public enum EnumElectronTube implements ItemOverlay.IOverlayInfo { public static final EnumElectronTube[] VALUES = values(); - private final String name; + private final String uid; private final int primaryColor; private final int secondaryColor; @@ -38,14 +39,14 @@ public enum EnumElectronTube implements ItemOverlay.IOverlayInfo { } EnumElectronTube(Color secondaryColor, Color primaryColor) { - this.name = "ex-" + ordinal(); + this.uid = toString().toLowerCase(Locale.ENGLISH); this.primaryColor = primaryColor.getRGB(); this.secondaryColor = secondaryColor.getRGB(); } @Override - public String getName() { - return name; + public String getUid() { + return uid; } @Override diff --git a/src/main/java/forestry/core/items/ItemOverlay.java b/src/main/java/forestry/core/items/ItemOverlay.java index 715f9a87d..ba6bdc1a5 100755 --- a/src/main/java/forestry/core/items/ItemOverlay.java +++ b/src/main/java/forestry/core/items/ItemOverlay.java @@ -24,7 +24,7 @@ import forestry.core.config.Config; public class ItemOverlay extends ItemForestry { public interface IOverlayInfo { - String getName(); + String getUid(); int getPrimaryColor(); @@ -35,7 +35,7 @@ public class ItemOverlay extends ItemForestry { protected final IOverlayInfo[] overlays; - public ItemOverlay(CreativeTabs tab, IOverlayInfo... overlays) { + public ItemOverlay(CreativeTabs tab, IOverlayInfo[] overlays) { setMaxDamage(0); setHasSubtypes(true); setCreativeTab(tab); @@ -77,7 +77,7 @@ public class ItemOverlay extends ItemForestry { return null; } - return super.getUnlocalizedName(stack) + "." + overlays[stack.getItemDamage()].getName(); + return super.getUnlocalizedName(stack) + "." + overlays[stack.getItemDamage()].getUid(); } @Override diff --git a/src/main/java/forestry/food/items/EnumBeverage.java b/src/main/java/forestry/food/items/EnumBeverage.java index 5ba17cd9c..9dc114602 100644 --- a/src/main/java/forestry/food/items/EnumBeverage.java +++ b/src/main/java/forestry/food/items/EnumBeverage.java @@ -66,7 +66,7 @@ public enum EnumBeverage implements ItemBeverage.IBeverageInfo { } @Override - public String getName() { + public String getUid() { return name; } diff --git a/src/main/java/forestry/food/items/ItemBeverage.java b/src/main/java/forestry/food/items/ItemBeverage.java index fb7819984..6faa1b7fb 100755 --- a/src/main/java/forestry/food/items/ItemBeverage.java +++ b/src/main/java/forestry/food/items/ItemBeverage.java @@ -133,7 +133,7 @@ public class ItemBeverage extends ItemForestryFood { @Override public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + "." + beverages[stack.getItemDamage()].getName(); + return super.getUnlocalizedName(stack) + "." + beverages[stack.getItemDamage()].getUid(); } /* MODELS */ diff --git a/src/main/java/forestry/mail/PluginMail.java b/src/main/java/forestry/mail/PluginMail.java index 3e90952de..bd31a977d 100644 --- a/src/main/java/forestry/mail/PluginMail.java +++ b/src/main/java/forestry/mail/PluginMail.java @@ -106,7 +106,7 @@ public class PluginMail extends BlankForestryPlugin { if (Config.craftingStampsEnabled) { for (EnumStampDefinition stampDefinition : EnumStampDefinition.VALUES) { - if (Config.collectorStamps.contains(stampDefinition.getName())) { + if (Config.collectorStamps.contains(stampDefinition.getUid())) { continue; } diff --git a/src/main/java/forestry/mail/items/EnumStampDefinition.java b/src/main/java/forestry/mail/items/EnumStampDefinition.java index ac9693d8b..84f9869f8 100644 --- a/src/main/java/forestry/mail/items/EnumStampDefinition.java +++ b/src/main/java/forestry/mail/items/EnumStampDefinition.java @@ -62,7 +62,7 @@ public enum EnumStampDefinition implements ItemOverlay.IOverlayInfo { } @Override - public String getName() { + public String getUid() { return name; }