mirror of
https://github.com/Sollace/Unicopia.git
synced 2024-11-27 15:17:59 +01:00
Fixed apples being able to have an invalid metadata (may fix rendering issues with Pam's Harvest)
This commit is contained in:
parent
23499cc011
commit
5063c6e766
1 changed files with 19 additions and 3 deletions
|
@ -76,7 +76,7 @@ public class ItemApple extends ItemFood {
|
||||||
}
|
}
|
||||||
|
|
||||||
public ItemApple setSubTypes(String... types) {
|
public ItemApple setSubTypes(String... types) {
|
||||||
setHasSubtypes(true);
|
setHasSubtypes(types.length > 0);
|
||||||
setMaxDamage(0);
|
setMaxDamage(0);
|
||||||
|
|
||||||
subTypes = types;
|
subTypes = types;
|
||||||
|
@ -110,12 +110,28 @@ public class ItemApple extends ItemFood {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getDamage(ItemStack stack) {
|
||||||
|
return super.getDamage(stack);// % subTypes.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMetadata(ItemStack stack) {
|
||||||
|
if (getHasSubtypes()) {
|
||||||
|
return super.getMetadata(stack) % subTypes.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
return super.getMetadata(stack);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getTranslationKey(ItemStack stack) {
|
public String getTranslationKey(ItemStack stack) {
|
||||||
if (subTypes.length > 0) {
|
if (getHasSubtypes()) {
|
||||||
int meta = Math.max(0, stack.getMetadata() % subTypes.length);
|
int meta = Math.max(0, stack.getMetadata() % subTypes.length);
|
||||||
|
|
||||||
return super.getTranslationKey(stack) + (meta > 0 ? "." + subTypes[meta] : "");
|
if (meta > 0) {
|
||||||
|
return super.getTranslationKey(stack) + "." + subTypes[meta];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return super.getTranslationKey(stack);
|
return super.getTranslationKey(stack);
|
||||||
|
|
Loading…
Reference in a new issue