From 53543d607a2eac3b36b9c3a6316bbd11f75ff0eb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 19 Dec 2017 11:44:25 -0600 Subject: [PATCH] 'flatten' temeprance stone --- .../botania/common/fixers/FlattenItems.java | 2 ++ .../common/item/ItemTemperanceStone.java | 22 +++++++++---------- .../botania/models/item/temperancestone.json | 14 ++++++++++++ .../botania/models/item/temperancestone0.json | 6 ----- ...tone1.json => temperancestone_active.json} | 0 5 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/temperancestone.json delete mode 100644 src/main/resources/assets/botania/models/item/temperancestone0.json rename src/main/resources/assets/botania/models/item/{temperancestone1.json => temperancestone_active.json} (100%) diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 8a29abf09..3d073ca8f 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -79,6 +79,8 @@ public class FlattenItems implements IFixableData { case 8: return ModItems.mutatedSeeds.getRegistryName().toString(); } }); + // Just remove the meta (moved to NBT, defaults back to inactive) + LOOKUP.put("botania:temperancestone", i -> ModItems.temperanceStone.getRegistryName().toString()); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index a4a8b30f3..274f3fa11 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -19,48 +19,46 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.ModelHandler; +import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; public class ItemTemperanceStone extends ItemMod { + private static final String TAG_ACTIVE = "active"; public ItemTemperanceStone() { super(LibItemNames.TEMPERANCE_STONE); setMaxStackSize(1); - setHasSubtypes(true); + addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "active"), + (stack, worldIn, entityIn) -> ItemNBTHelper.getBoolean(stack, TAG_ACTIVE, false) ? 1 : 0); } @Nonnull @Override public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { ItemStack stack = player.getHeldItem(hand); - int dmg = stack.getItemDamage(); - stack.setItemDamage(~dmg & 1); + ItemNBTHelper.setBoolean(stack, TAG_ACTIVE, !ItemNBTHelper.getBoolean(stack, TAG_ACTIVE, false)); world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, SoundCategory.NEUTRAL, 0.3F, 0.1F); return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, World world, List stacks, ITooltipFlag flags) { - if(par1ItemStack.getItemDamage() == 1) + public void addInformation(ItemStack stack, World world, List stacks, ITooltipFlag flags) { + if(ItemNBTHelper.getBoolean(stack, TAG_ACTIVE, false)) addStringToTooltip(I18n.format("botaniamisc.active"), stacks); else addStringToTooltip(I18n.format("botaniamisc.inactive"), stacks); } - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerItemAppendMeta(this, 2, LibItemNames.TEMPERANCE_STONE); - } - private void addStringToTooltip(String s, List tooltip) { tooltip.add(s.replaceAll("&", "\u00a7")); } @@ -69,7 +67,7 @@ public class ItemTemperanceStone extends ItemMod { IInventory inv = player.inventory; for(int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); - if(!stack.isEmpty() && stack.getItem() == ModItems.temperanceStone && stack.getItemDamage() == 1) + if(!stack.isEmpty() && stack.getItem() == ModItems.temperanceStone && ItemNBTHelper.getBoolean(stack, TAG_ACTIVE, false)) return true; } diff --git a/src/main/resources/assets/botania/models/item/temperancestone.json b/src/main/resources/assets/botania/models/item/temperancestone.json new file mode 100644 index 000000000..2b46059dc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/temperancestone.json @@ -0,0 +1,14 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/stone_temperance" + }, + "overrides": [ + { + "predicate": { + "botania:active": 1 + }, + "model": "botania:item/temperancestone_active" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/temperancestone0.json b/src/main/resources/assets/botania/models/item/temperancestone0.json deleted file mode 100644 index cbb7f505b..000000000 --- a/src/main/resources/assets/botania/models/item/temperancestone0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/stone_temperance" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/temperancestone1.json b/src/main/resources/assets/botania/models/item/temperancestone_active.json similarity index 100% rename from src/main/resources/assets/botania/models/item/temperancestone1.json rename to src/main/resources/assets/botania/models/item/temperancestone_active.json