From 3b5c500bc99652c61c2bef4da41007b974b699e1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 24 Jul 2016 10:12:12 -0500 Subject: [PATCH] Clean up meshers --- .../client/core/handler/ModelHandler.java | 72 +++---------------- .../botania/common/item/ItemGrassHorn.java | 11 +++ .../botania/common/item/ItemManaCookie.java | 10 +++ .../tool/elementium/ItemElementiumShears.java | 7 ++ .../common/item/relic/ItemInfiniteFruit.java | 10 ++- .../botania/models/item/elementiumShears.json | 11 ++- .../botania/models/item/grassHorn0.json | 8 ++- .../botania/models/item/grassHorn1.json | 8 ++- .../botania/models/item/grassHorn2.json | 8 ++- .../botania/models/item/infiniteFruit.json | 8 ++- .../botania/models/item/manaCookie.json | 8 ++- .../assets/botania/models/item/vuvuzela.json | 2 +- 12 files changed, 88 insertions(+), 75 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 d2f98a9cc..888616e40 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -16,12 +16,10 @@ import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockSkull; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; -import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.ForgeHooksClient; @@ -124,13 +122,10 @@ public final class ModelHandler { ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); OBJLoader.INSTANCE.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); - /** Subtile block models **/ registerSubtiles(); - /** Custom statemappers **/ registerStateMappers(); - /** ItemBlocks **/ registerStandardBlocks(); registerPavement(); registerStairs(); @@ -138,50 +133,12 @@ public final class ModelHandler { registerWalls(); registerQuartzBlocks(); - /** Normal Items **/ registerStandardItems(); registerTESRItems(); registerManaResources(); registerRunes(); registerLens(); registerBrews(); - - /** Special Item Meshers **/ - // Cannot use lambdas directly yet because FG/SS can't reobfuscate them, need a dummy wrapper - // See https://github.com/MinecraftForge/ForgeGradle/issues/314. - ModelLoader.registerItemVariants(elementiumShears, - new ModelResourceLocation("botania:elementiumShears", "inventory"), - new ModelResourceLocation("botania:dammitReddit", "inventory")); - ModelLoader.setCustomMeshDefinition(elementiumShears, MesherWrapper.of(stack -> - stack.getDisplayName().equalsIgnoreCase("dammit reddit") - ? new ModelResourceLocation("botania:dammitReddit", "inventory") - : new ModelResourceLocation("botania:elementiumShears", "inventory"))); - - ModelLoader.registerItemVariants(grassHorn, - new ModelResourceLocation("botania:grassHorn0", "inventory"), - new ModelResourceLocation("botania:grassHorn1", "inventory"), - new ModelResourceLocation("botania:grassHorn2", "inventory"), - new ModelResourceLocation("botania:vuvuzela", "inventory")); - ModelLoader.setCustomMeshDefinition(grassHorn, MesherWrapper.of(stack -> - stack.getDisplayName().toLowerCase().contains("vuvuzela") - ? new ModelResourceLocation("botania:vuvuzela", "inventory") - : new ModelResourceLocation("botania:grassHorn" + stack.getMetadata(), "inventory"))); - - ModelLoader.registerItemVariants(infiniteFruit, - new ModelResourceLocation("botania:infiniteFruit", "inventory"), - new ModelResourceLocation("botania:infiniteFruitBoot", "inventory")); - ModelLoader.setCustomMeshDefinition(infiniteFruit, MesherWrapper.of(stack -> - ItemInfiniteFruit.isBoot(stack) - ? new ModelResourceLocation("botania:infiniteFruitBoot", "inventory") - : new ModelResourceLocation("botania:infiniteFruit", "inventory"))); - - ModelLoader.registerItemVariants(manaCookie, - new ModelResourceLocation("botania:manaCookie", "inventory"), - new ModelResourceLocation("botania:totalBiscuit", "inventory")); - ModelLoader.setCustomMeshDefinition(manaCookie, MesherWrapper.of(stack -> - stack.getDisplayName().toLowerCase().equals("totalbiscuit") - ? new ModelResourceLocation("botania:totalBiscuit", "inventory") - : new ModelResourceLocation("botania:manaCookie", "inventory"))); } private static void registerSubtiles() { @@ -388,6 +345,7 @@ public final class ModelHandler { registerItemModel(elementiumShovel); registerItemModel(elementiumAxe); registerItemModel(elementiumSword); + registerItemModel(elementiumShears); registerItemModel(terrasteelHelm); registerItemModel(terrasteelHelmRevealing); @@ -457,6 +415,8 @@ public final class ModelHandler { registerItemModel(auraRing); registerItemModel(auraRingGreater); registerItemModel(spark); + registerItemModel(manaCookie); + registerItemModel(infiniteFruit); registerItemModel(waterRing); registerItemModel(miningRing); @@ -500,6 +460,7 @@ public final class ModelHandler { registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32); registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9); registerItemModelMetas(virus, LibItemNames.VIRUS, 2); + registerItemModelMetas(grassHorn, LibItemNames.GRASS_HORN, 3); } // Only for models that absolutely can't be converted to JSON. Use VERY sparingly @@ -560,19 +521,19 @@ public final class ModelHandler { ModelLoader.registerItemVariants(brewFlask, new ModelResourceLocation("botania:flask1_" + i, "inventory")); } - ModelLoader.setCustomMeshDefinition(brewFlask, MesherWrapper.of(stack -> { + ModelLoader.setCustomMeshDefinition(brewFlask, stack -> { int swigsTaken = 6 - ((ItemBrewBase) brewFlask).getSwigsLeft(stack); return new ModelResourceLocation("botania:flask1_" + swigsTaken, "inventory"); - })); + }); for (int i = 0; i < 4; i++) { ModelLoader.registerItemVariants(brewVial, new ModelResourceLocation("botania:vial1_" + i, "inventory")); } - ModelLoader.setCustomMeshDefinition(brewVial, MesherWrapper.of(stack -> { + ModelLoader.setCustomMeshDefinition(brewVial, stack -> { int swigsTaken = 4 - ((ItemBrewBase) brewVial).getSwigsLeft(stack); return new ModelResourceLocation("botania:vial1_" + swigsTaken, "inventory"); - })); + }); } private static void registerStateMappers() { @@ -873,21 +834,4 @@ public final class ModelHandler { } private ModelHandler() {} - - private interface MesherWrapper extends ItemMeshDefinition { - - static MesherWrapper of(MesherWrapper w) { - return w; - } - - ModelResourceLocation getLocation(ItemStack stack); - - @Nonnull - @Override - default ModelResourceLocation getModelLocation(@Nonnull ItemStack stack) { - return getLocation(stack); - } - - } - } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index d225b9729..48a5a54d2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -20,11 +20,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumAction; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; 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.util.math.BlockPos; import net.minecraft.world.World; @@ -33,11 +35,14 @@ import vazkii.botania.api.item.IHornHarvestable.EnumHornType; import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Locale; import java.util.Random; public class ItemGrassHorn extends ItemMod { @@ -48,6 +53,12 @@ public class ItemGrassHorn extends ItemMod { super(LibItemNames.GRASS_HORN); setMaxStackSize(1); setHasSubtypes(true); + addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "vuvuzela"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { + return stack.getDisplayName().toLowerCase(Locale.ROOT).contains("vuvuzela") ? 1 : 0; + } + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index 7134cb647..a90063f99 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -10,8 +10,10 @@ */ package vazkii.botania.common.item; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; @@ -25,6 +27,8 @@ import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.Locale; public class ItemManaCookie extends ItemFood { @@ -34,6 +38,12 @@ public class ItemManaCookie extends ItemFood { setCreativeTab(BotaniaCreativeTab.INSTANCE); GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibItemNames.MANA_COOKIE)); setUnlocalizedName(LibItemNames.MANA_COOKIE); + addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "totalbiscuit"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { + return stack.getDisplayName().toLowerCase(Locale.ROOT).contains("totalbiscuit") ? 1F : 0F; + } + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java index 4f6be4ed2..f1e51222f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java @@ -8,10 +8,12 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Enchantments; import net.minecraft.item.EnumAction; +import net.minecraft.item.IItemPropertyGetter; 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.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -19,15 +21,20 @@ import net.minecraftforge.common.IShearable; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShears; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.List; +import java.util.Locale; import java.util.Random; public class ItemElementiumShears extends ItemManasteelShears { public ItemElementiumShears() { super(LibItemNames.ELEMENTIUM_SHEARS); + addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "reddit"), + (stack, worldIn, entityIn) -> stack.getDisplayName().equalsIgnoreCase("dammit reddit") ? 1F: 0F); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index 9cae941e0..2479fefe8 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -13,23 +13,29 @@ package vazkii.botania.common.item.relic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; +import net.minecraft.item.IItemPropertyGetter; 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.world.World; import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibObfuscation; import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.Locale; public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { public ItemInfiniteFruit() { super(LibItemNames.INFINITE_FRUIT); + addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "boot"), (stack, worldIn, entityIn) -> ItemInfiniteFruit.isBoot(stack) ? 1F : 0F); } @Override @@ -69,8 +75,8 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { } } - public static boolean isBoot(ItemStack par1ItemStack) { - String name = par1ItemStack.getDisplayName().toLowerCase().trim(); + private static boolean isBoot(ItemStack par1ItemStack) { + String name = par1ItemStack.getDisplayName().toLowerCase(Locale.ROOT).trim(); return name.equals("das boot"); } diff --git a/src/main/resources/assets/botania/models/item/elementiumShears.json b/src/main/resources/assets/botania/models/item/elementiumShears.json index d7b2f9a53..70b29c93f 100644 --- a/src/main/resources/assets/botania/models/item/elementiumShears.json +++ b/src/main/resources/assets/botania/models/item/elementiumShears.json @@ -1,7 +1,12 @@ { "parent": "minecraft:item/handheld", - "textures": - { + "textures": { "layer0": "botania:items/elementiumShears" - } + }, + "overrides": [{ + "predicate": { + "botania:reddit": 1 + }, + "model": "botania:item/dammitReddit" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassHorn0.json b/src/main/resources/assets/botania/models/item/grassHorn0.json index 0109ba579..41fe77a90 100644 --- a/src/main/resources/assets/botania/models/item/grassHorn0.json +++ b/src/main/resources/assets/botania/models/item/grassHorn0.json @@ -2,5 +2,11 @@ "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/grassHorn0" - } + }, + "overrides": [{ + "predicate": { + "botania:vuvuzela": 1 + }, + "model": "botania:item/vuvuzela" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassHorn1.json b/src/main/resources/assets/botania/models/item/grassHorn1.json index 179d15288..519d2b035 100644 --- a/src/main/resources/assets/botania/models/item/grassHorn1.json +++ b/src/main/resources/assets/botania/models/item/grassHorn1.json @@ -2,5 +2,11 @@ "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/grassHorn1" - } + }, + "overrides": [{ + "predicate": { + "botania:vuvuzela": 1 + }, + "model": "botania:item/vuvuzela" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassHorn2.json b/src/main/resources/assets/botania/models/item/grassHorn2.json index e77f4e412..96e0cadc3 100644 --- a/src/main/resources/assets/botania/models/item/grassHorn2.json +++ b/src/main/resources/assets/botania/models/item/grassHorn2.json @@ -2,5 +2,11 @@ "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/grassHorn2" - } + }, + "overrides": [{ + "predicate": { + "botania:vuvuzela": 1 + }, + "model": "botania:item/vuvuzela" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/infiniteFruit.json b/src/main/resources/assets/botania/models/item/infiniteFruit.json index d0bd03eee..bac332e08 100644 --- a/src/main/resources/assets/botania/models/item/infiniteFruit.json +++ b/src/main/resources/assets/botania/models/item/infiniteFruit.json @@ -2,5 +2,11 @@ "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/infiniteFruit" - } + }, + "overrides": [{ + "predicate": { + "botania:boot": 1 + }, + "model": "botania:item/infiniteFruitBoot" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaCookie.json b/src/main/resources/assets/botania/models/item/manaCookie.json index f1fd19778..3f825a6c8 100644 --- a/src/main/resources/assets/botania/models/item/manaCookie.json +++ b/src/main/resources/assets/botania/models/item/manaCookie.json @@ -2,5 +2,11 @@ "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaCookie" - } + }, + "overrides": [{ + "predicate": { + "botania:totalbiscuit": 1 + }, + "model": "botania:item/totalBiscuit" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vuvuzela.json b/src/main/resources/assets/botania/models/item/vuvuzela.json index 365e71f56..20f0310d8 100644 --- a/src/main/resources/assets/botania/models/item/vuvuzela.json +++ b/src/main/resources/assets/botania/models/item/vuvuzela.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/vuvuzela" }