mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-17 19:05:31 +00:00
Use names for Electron Tube UIDs instead of meta values
This commit is contained in:
1 parent
47a4bb70e0
commit
64cf622ccf
10 files changed
+16
-15
No files matched your search
@@ -39,7 +39,7 @@ public enum EnumHoneyDrop implements ItemOverlay.IOverlayInfo {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
public String getUid() {
|
||||
return name;
|
||||
}
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ public enum EnumPollenCluster implements ItemOverlay.IOverlayInfo {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
public String getUid() {
|
||||
return name;
|
||||
}
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ public enum EnumPropolis implements ItemOverlay.IOverlayInfo {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
public String getUid() {
|
||||
return name;
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -66,7 +66,7 @@ public enum EnumBeverage implements ItemBeverage.IBeverageInfo {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
public String getUid() {
|
||||
return name;
|
||||
}
|
||||
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ public enum EnumStampDefinition implements ItemOverlay.IOverlayInfo {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
public String getUid() {
|
||||
return name;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user