From 4771ec5bdbf53ac3d106794469d75e7b3147cd8b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Mar 2016 14:41:10 -0500 Subject: [PATCH] Some item overrides, fix bow firing --- .../client/core/handler/ModelHandler.java | 50 +++---------------- .../botania/common/item/ItemTwigWand.java | 8 +++ .../armor/manaweave/ItemManaweaveArmor.java | 10 ++++ .../equipment/tool/bow/ItemLivingwoodBow.java | 1 + .../botania/models/item/manaweaveBoots.json | 11 ++-- .../models/item/manaweaveBootsHoliday.json | 3 +- .../botania/models/item/manaweaveChest.json | 11 ++-- .../models/item/manaweaveChestHoliday.json | 3 +- .../botania/models/item/manaweaveHelm.json | 11 ++-- .../models/item/manaweaveHelmHoliday.json | 3 +- .../botania/models/item/manaweaveLegs.json | 11 ++-- .../models/item/manaweaveLegsHoliday.json | 3 +- .../assets/botania/models/item/twigWand.json | 8 ++- 13 files changed, 68 insertions(+), 65 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index f2071bc05..02b752f27 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -233,14 +233,6 @@ public final class ModelHandler { ? new ModelResourceLocation("botania:tornadoRod_flying", "inventory") : new ModelResourceLocation("botania:tornadoRod", "inventory"))); - ModelLoader.registerItemVariants(twigWand, - new ModelResourceLocation("botania:twigWand", "inventory"), - new ModelResourceLocation("botania:twigWand_bind", "inventory")); - ModelLoader.setCustomMeshDefinition(twigWand, MesherWrapper.of(stack -> { - String path = "botania:twigWand"; - return new ModelResourceLocation(path + (ItemTwigWand.getBindMode(stack) ? "_bind" : ""), "inventory"); - })); - ModelLoader.registerItemVariants(manaCookie, new ModelResourceLocation("botania:manaCookie", "inventory"), new ModelResourceLocation("botania:totalBiscuit", "inventory")); @@ -249,42 +241,6 @@ public final class ModelHandler { ? new ModelResourceLocation("botania:totalBiscuit", "inventory") : new ModelResourceLocation("botania:manaCookie", "inventory"))); - ModelLoader.registerItemVariants(manaweaveBoots, - new ModelResourceLocation("botania:manaweaveBoots", "inventory"), - new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory")); - - ModelLoader.setCustomMeshDefinition(manaweaveBoots, MesherWrapper.of(stack -> - ClientProxy.jingleTheBells - ? new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveBoots", "inventory"))); - - ModelLoader.registerItemVariants(manaweaveChest, - new ModelResourceLocation("botania:manaweaveChest", "inventory"), - new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory")); - - ModelLoader.setCustomMeshDefinition(manaweaveChest, MesherWrapper.of(stack -> - ClientProxy.jingleTheBells - ? new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveChest", "inventory"))); - - ModelLoader.registerItemVariants(manaweaveHelm, - new ModelResourceLocation("botania:manaweaveHelm", "inventory"), - new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory")); - - ModelLoader.setCustomMeshDefinition(manaweaveHelm, MesherWrapper.of(stack -> - ClientProxy.jingleTheBells - ? new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveHelm", "inventory"))); - - ModelLoader.registerItemVariants(manaweaveLegs, - new ModelResourceLocation("botania:manaweaveLegs", "inventory"), - new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory")); - - ModelLoader.setCustomMeshDefinition(manaweaveLegs, MesherWrapper.of(stack -> - ClientProxy.jingleTheBells - ? new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveLegs", "inventory"))); - ModelLoader.registerItemVariants(manasteelSword, new ModelResourceLocation("botania:manasteelSword", "inventory"), new ModelResourceLocation("botania:elucidator", "inventory")); @@ -469,6 +425,7 @@ public final class ModelHandler { } private static void registerStandardItems() { + registerItemModel(twigWand); registerItemModel(pestleAndMortar); registerItemModel(blackLotus); registerItemModel(blackLotus, 1); @@ -486,6 +443,11 @@ public final class ModelHandler { registerItemModel(manasteelAxe); registerItemModel(manasteelShears); + registerItemModel(manaweaveHelm); + registerItemModel(manaweaveChest); + registerItemModel(manaweaveLegs); + registerItemModel(manaweaveBoots); + registerItemModel(elementiumHelm); registerItemModel(elementiumHelmRevealing); registerItemModel(elementiumChest); diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index d1d68fcbf..3dceeab72 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -17,10 +17,12 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.EnumRarity; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -59,6 +61,12 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { public ItemTwigWand() { super(LibItemNames.TWIG_WAND); setMaxStackSize(1); + addPropertyOverride(new ResourceLocation("botania", "bindmode"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + return getBindMode(stack) ? 1 : 0; + } + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index ca567a7e3..d54a88faf 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -13,12 +13,16 @@ package vazkii.botania.common.item.equipment.armor.manaweave; import java.util.List; import net.minecraft.client.model.ModelBiped; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; +import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; @@ -35,6 +39,12 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi public ItemManaweaveArmor(EntityEquipmentSlot type, String name) { super(type, name, BotaniaAPI.manaweaveArmorMaterial); + addPropertyOverride(new ResourceLocation("botania", "holiday"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + return ClientProxy.jingleTheBells ? 1 : 0; + } + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index 8597e6094..a88860db8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -131,6 +131,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { if(ammo == null) ammo = new ItemStack(Items.arrow); EntityArrow entityarrow = ((ItemArrow) ammo.getItem()).createArrow(world, ammo, shooter); + entityarrow.func_184547_a(shooter, shooter.rotationPitch, shooter.rotationYaw, 0.0F, f * 3.0F, 1.0F); if(f == 1.0F) entityarrow.setIsCritical(true); diff --git a/src/main/resources/assets/botania/models/item/manaweaveBoots.json b/src/main/resources/assets/botania/models/item/manaweaveBoots.json index 855af3490..21f61818a 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveBoots.json +++ b/src/main/resources/assets/botania/models/item/manaweaveBoots.json @@ -1,7 +1,12 @@ { "parent": "minecraft:item/generated", - "textures": - { + "textures": { "layer0": "botania:items/manaweaveBoots" - } + }, + "overrides": [{ + "predicate": { + "botania:holiday": 1 + }, + "model": "botania:item/manaweaveBootsHoliday" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json index 666436bb9..dbbcfb782 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json @@ -1,7 +1,6 @@ { "parent": "minecraft:item/generated", - "textures": - { + "textures": { "layer0": "botania:items/manaweaveBootsHoliday" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveChest.json b/src/main/resources/assets/botania/models/item/manaweaveChest.json index 7628e9d37..42f9e20cf 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveChest.json +++ b/src/main/resources/assets/botania/models/item/manaweaveChest.json @@ -1,7 +1,12 @@ { "parent": "minecraft:item/generated", - "textures": - { + "textures": { "layer0": "botania:items/manaweaveChest" - } + }, + "overrides": [{ + "predicate": { + "botania:holiday": 1 + }, + "model": "botania:item/manaweaveChestHoliday" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json index 8accb14c4..96a9d8450 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json @@ -1,7 +1,6 @@ { "parent": "minecraft:item/generated", - "textures": - { + "textures": { "layer0": "botania:items/manaweaveChestHoliday" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveHelm.json b/src/main/resources/assets/botania/models/item/manaweaveHelm.json index 7853b7e07..3f8ecc2ed 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveHelm.json +++ b/src/main/resources/assets/botania/models/item/manaweaveHelm.json @@ -1,7 +1,12 @@ { "parent": "minecraft:item/generated", - "textures": - { + "textures": { "layer0": "botania:items/manaweaveHelm" - } + }, + "overrides": [{ + "predicate": { + "botania:holiday": 1 + }, + "model": "botania:item/manaweaveHelmHoliday" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json index cadc02bea..3fad87e44 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json @@ -1,7 +1,6 @@ { "parent": "minecraft:item/generated", - "textures": - { + "textures": { "layer0": "botania:items/manaweaveHelmHoliday" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveLegs.json b/src/main/resources/assets/botania/models/item/manaweaveLegs.json index 014fc8fbb..506d1733f 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveLegs.json +++ b/src/main/resources/assets/botania/models/item/manaweaveLegs.json @@ -1,7 +1,12 @@ { "parent": "minecraft:item/generated", - "textures": - { + "textures": { "layer0": "botania:items/manaweaveLegs" - } + }, + "overrides": [{ + "predicate": { + "botania:holiday": 1 + }, + "model": "botania:item/manaweaveLegsHoliday" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json index 167ca6e37..e16a174b8 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json @@ -1,7 +1,6 @@ { "parent": "minecraft:item/generated", - "textures": - { + "textures": { "layer0": "botania:items/manaweaveLegsHoliday" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/twigWand.json b/src/main/resources/assets/botania/models/item/twigWand.json index f0b2b89d7..a513a38f4 100644 --- a/src/main/resources/assets/botania/models/item/twigWand.json +++ b/src/main/resources/assets/botania/models/item/twigWand.json @@ -4,5 +4,11 @@ "layer0": "botania:items/twigWand0", "layer1": "botania:items/twigWand1", "layer2": "botania:items/twigWand2" - } + }, + "overrides": [{ + "predicate": { + "botania:bindmode": 1 + }, + "model": "botania:item/twigWand_bind" + }] } \ No newline at end of file