diff --git a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java index de1cfd8d0..76b1093f8 100755 --- a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java +++ b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java @@ -85,7 +85,6 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable { return StringUtil.localize(customTreeKey); } return StringUtil.localize("trees.grammar." + type.getName()).replaceAll("%SPECIES", individual.getDisplayName()).replaceAll("%TYPE", StringUtil.localize("trees.grammar." + type.getName() + ".type")); - //return individual.getDisplayName() + " " + type.getName(); } @SuppressWarnings("rawtypes") diff --git a/src/main/java/forestry/core/items/ItemArmorNaturalist.java b/src/main/java/forestry/core/items/ItemArmorNaturalist.java index 0c0d1cf51..b61620889 100755 --- a/src/main/java/forestry/core/items/ItemArmorNaturalist.java +++ b/src/main/java/forestry/core/items/ItemArmorNaturalist.java @@ -34,7 +34,8 @@ public class ItemArmorNaturalist extends ItemArmor implements IArmorNaturalist { setCreativeTab(CreativeTabForestry.tabForestry); } - public String getArmorTexture(ItemStack stack, Entity entity, int slot, int layer) { + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return Defaults.ID + ":" + Defaults.TEXTURE_NATURALIST_ARMOR_PRIMARY; }