From 30309431e8f94bd7b0659685e0a2b913a7cb8701 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 22 Jan 2018 11:27:26 -0600 Subject: [PATCH] Flatten slime bottle --- .../botania/common/item/ItemSlimeBottle.java | 22 +++++++++---------- .../botania/models/item/slimebottle.json | 14 ++++++++++++ .../botania/models/item/slimebottle0.json | 6 ----- ...ottle1.json => slimebottle_activated.json} | 0 4 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/slimebottle.json delete mode 100644 src/main/resources/assets/botania/models/item/slimebottle0.json rename src/main/resources/assets/botania/models/item/{slimebottle1.json => slimebottle_activated.json} (100%) diff --git a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java index 60bed0489..e3265dd27 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java @@ -11,21 +11,29 @@ package vazkii.botania.common.item; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; 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.block.subtile.generating.SubTileNarslimmus; +import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; + +import javax.annotation.Nullable; public class ItemSlimeBottle extends ItemMod { + private static final String TAG_ACTIVE = "active"; public ItemSlimeBottle() { super(LibItemNames.SLIME_BOTTLE); setMaxStackSize(1); - setHasSubtypes(true); + addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "active"), (stack, worldIn, entityIn) -> stack.hasTagCompound() && stack.getTagCompound().getBoolean(TAG_ACTIVE) ? 1.0F : 0.0F); } @Override @@ -34,17 +42,7 @@ public class ItemSlimeBottle extends ItemMod { int x = MathHelper.floor(entity.posX); int z = MathHelper.floor(entity.posZ); boolean slime = SubTileNarslimmus.isSlimeChunk(world, x, z); - int meta = stack.getItemDamage(); - int newMeta = slime ? 1 : 0; - if(meta != newMeta) - stack.setItemDamage(newMeta); + ItemNBTHelper.setBoolean(stack, TAG_ACTIVE, slime); } } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerItemAppendMeta(this, 2, LibItemNames.SLIME_BOTTLE); - } - } diff --git a/src/main/resources/assets/botania/models/item/slimebottle.json b/src/main/resources/assets/botania/models/item/slimebottle.json new file mode 100644 index 000000000..0802d69f3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/slimebottle.json @@ -0,0 +1,14 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/bottle_slime" + }, + "overrides": [ + { + "predicate": { + "botania:active": 1 + }, + "model": "botania:item/slimebottle_activated" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/slimebottle0.json b/src/main/resources/assets/botania/models/item/slimebottle0.json deleted file mode 100644 index 4459b0cc5..000000000 --- a/src/main/resources/assets/botania/models/item/slimebottle0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/bottle_slime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/slimebottle1.json b/src/main/resources/assets/botania/models/item/slimebottle_activated.json similarity index 100% rename from src/main/resources/assets/botania/models/item/slimebottle1.json rename to src/main/resources/assets/botania/models/item/slimebottle_activated.json