From cf3ab8d3372e84c96523131317ebefc5b6f271cb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 11 Dec 2017 11:56:56 -0600 Subject: [PATCH] Fix manaresource unlocal names --- .../botania/common/fixers/FlattenItems.java | 4 ++-- .../common/item/material/ItemManaResource.java | 18 +----------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 7cb2ab834..f7b1e8c10 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -16,9 +16,9 @@ public class FlattenItems implements IFixableData { private static final Map> LOOKUP = new HashMap<>(); static { - LOOKUP.put(LibMisc.MOD_ID + ":manaresource", i -> { + LOOKUP.put("botania:manaresource", i -> { if (i == 10) { - // support ancient prismarine from 1. + // support ancient prismarine from 1.7 return "minecraft:prismarine_shard"; } else { return LibMisc.MOD_ID + ":" + LibItemNames.MANA_RESOURCE_NAMES[i].toLowerCase(Locale.ROOT); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 61279ca86..e3a46e986 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.material; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; @@ -20,29 +18,20 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.api.recipe.IFlowerComponent; -import vazkii.botania.client.core.handler.ModelHandler; -import vazkii.botania.common.Botania; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.entity.EntityEnderAirBottle; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @@ -50,6 +39,7 @@ import javax.annotation.Nonnull; public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem { public ItemManaResource(String registryName) { super(registryName); + setUnlocalizedName(registryName); } @SubscribeEvent @@ -115,12 +105,6 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve return ActionResult.newResult(EnumActionResult.PASS, stack); } - @Nonnull - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return "item." + getRegistryName().getResourcePath(); // todo set these properly - } - @Override public boolean canFit(ItemStack stack, IPetalApothecary apothecary) { return this == ModItems.lifeEssence || this == ModItems.redstoneRoot