From ca9ec13dd4641c5084e4467344e25059541cfecf Mon Sep 17 00:00:00 2001 From: itsmeow Date: Sat, 23 Nov 2019 20:13:08 -0500 Subject: [PATCH] Add turkey legs and turkey meat drop --- .../client/init/ClientRegistrar.java | 2 + .../init/BetterAnimalsPlusRegistrar.java | 2 + .../betteranimalsplus/init/ModItems.java | 3 + .../init/ModOreDictSmelting.java | 1 + .../assets/betteranimalsplus/lang/en_us.lang | 2 + .../betteranimalsplus/loot_tables/turkey.json | 55 +++++++++++++++++++ .../models/item/turkey_leg_cooked.json | 6 ++ .../models/item/turkey_leg_raw.json | 6 ++ 8 files changed, 77 insertions(+) create mode 100644 src/main/resources/assets/betteranimalsplus/models/item/turkey_leg_cooked.json create mode 100644 src/main/resources/assets/betteranimalsplus/models/item/turkey_leg_raw.json diff --git a/src/main/java/its_meow/betteranimalsplus/client/init/ClientRegistrar.java b/src/main/java/its_meow/betteranimalsplus/client/init/ClientRegistrar.java index c1e3891a..5624af07 100644 --- a/src/main/java/its_meow/betteranimalsplus/client/init/ClientRegistrar.java +++ b/src/main/java/its_meow/betteranimalsplus/client/init/ClientRegistrar.java @@ -127,6 +127,8 @@ public static void registerRenders(final ModelRegistryEvent event) { initModel(ModItems.BEAR_CAPE_KERMODE); initModel(ModItems.PHEASANT_EGG); initModel(ModItems.TURKEY_EGG); + initModel(ModItems.TURKEY_LEG_RAW); + initModel(ModItems.TURKEY_LEG_COOKED); for(ItemAdvancementIcon icon : ModItems.ADVANCEMENT_ICONS.values()) { initModel(icon); diff --git a/src/main/java/its_meow/betteranimalsplus/init/BetterAnimalsPlusRegistrar.java b/src/main/java/its_meow/betteranimalsplus/init/BetterAnimalsPlusRegistrar.java index 91644c06..70590e07 100644 --- a/src/main/java/its_meow/betteranimalsplus/init/BetterAnimalsPlusRegistrar.java +++ b/src/main/java/its_meow/betteranimalsplus/init/BetterAnimalsPlusRegistrar.java @@ -106,6 +106,8 @@ public static void registerItems(final RegistryEvent.Register event) { ModItems.RECORD_CRAB_RAVE, ModItems.PHEASANT_EGG, ModItems.TURKEY_EGG, + ModItems.TURKEY_LEG_RAW, + ModItems.TURKEY_LEG_COOKED, new ItemAdvancementIcon("advancement_icon_jellyfish"), new ItemAdvancementIcon("advancement_icon_jellyfish_cross"), new ItemAdvancementIcon("advancement_icon_goat"), diff --git a/src/main/java/its_meow/betteranimalsplus/init/ModItems.java b/src/main/java/its_meow/betteranimalsplus/init/ModItems.java index dfdb5aa6..3fed9ba4 100644 --- a/src/main/java/its_meow/betteranimalsplus/init/ModItems.java +++ b/src/main/java/its_meow/betteranimalsplus/init/ModItems.java @@ -62,6 +62,9 @@ public class ModItems { public static final ItemThrowableCustomEgg PHEASANT_EGG = new ItemThrowableCustomEgg("pheasant_egg", player -> new EntityPheasantEgg(player.world, player)); public static final ItemThrowableCustomEgg TURKEY_EGG = new ItemThrowableCustomEgg("turkey_egg", player -> new EntityTurkeyEgg(player.world, player)); + public static final ItemBetterFood TURKEY_LEG_RAW = new ItemBetterFood("turkey_leg_raw", 3, 2, 16, true); + public static final ItemBetterFood TURKEY_LEG_COOKED = new ItemBetterFood("turkey_leg_cooked", 4, 1.2F, 16, true); + public static Map ADVANCEMENT_ICONS = new HashMap(); @ObjectHolder("turkey_raw") diff --git a/src/main/java/its_meow/betteranimalsplus/init/ModOreDictSmelting.java b/src/main/java/its_meow/betteranimalsplus/init/ModOreDictSmelting.java index 48d5dbd3..d55206a8 100644 --- a/src/main/java/its_meow/betteranimalsplus/init/ModOreDictSmelting.java +++ b/src/main/java/its_meow/betteranimalsplus/init/ModOreDictSmelting.java @@ -12,6 +12,7 @@ public static final void register() { GameRegistry.addSmelting(new ItemStack(ModItems.PHEASANT_RAW), new ItemStack(ModItems.PHEASANT_COOKED), 0.0F); GameRegistry.addSmelting(new ItemStack(ModItems.CRAB_MEAT_RAW), new ItemStack(ModItems.CRAB_MEAT_COOKED), 0.0F); GameRegistry.addSmelting(new ItemStack(ModItems.TURKEY_RAW), new ItemStack(ModItems.TURKEY_COOKED), 0.0F); + GameRegistry.addSmelting(new ItemStack(ModItems.TURKEY_LEG_RAW), new ItemStack(ModItems.TURKEY_LEG_COOKED), 0.0F); // Register oredict OreDictionary.registerOre("listAllmeatraw", ModItems.VENISON_RAW); diff --git a/src/main/resources/assets/betteranimalsplus/lang/en_us.lang b/src/main/resources/assets/betteranimalsplus/lang/en_us.lang index fb943f4e..35f44610 100644 --- a/src/main/resources/assets/betteranimalsplus/lang/en_us.lang +++ b/src/main/resources/assets/betteranimalsplus/lang/en_us.lang @@ -27,6 +27,8 @@ item.betteranimalsplus.bear_skin_black.name=Black Bear Skin item.betteranimalsplus.bear_skin_kermode.name=Kermode Bear Skin item.betteranimalsplus.pheasant_egg.name=Pheasant Egg item.betteranimalsplus.turkey_egg.name=Turkey Egg +item.betteranimalsplus.turkey_leg_raw.name=Raw Turkey Leg +item.betteranimalsplus.turkey_leg_cooked.name=Cooked Turkey Leg #Blocks tile.betteranimalsplus.trillium.name=Trillium tile.betteranimalsplus.hirschgeistskull.name=Hirschgeist Skull diff --git a/src/main/resources/assets/betteranimalsplus/loot_tables/turkey.json b/src/main/resources/assets/betteranimalsplus/loot_tables/turkey.json index 5978a031..39a6429c 100644 --- a/src/main/resources/assets/betteranimalsplus/loot_tables/turkey.json +++ b/src/main/resources/assets/betteranimalsplus/loot_tables/turkey.json @@ -26,6 +26,61 @@ ] } ] + }, + { + "name": "turkey-meat", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "betteranimalsplus:turkey_leg_raw", + "weight": 7, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 2 + } + }, + { + "function": "furnace_smelt", + "conditions": [ + { + "condition": "entity_properties", + "entity": "this", + "properties": { + "on_fire": true + } + } + ] + } + ] + }, + { + "type": "item", + "name": "betteranimalsplus:turkey_raw", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": 1 + }, + { + "function": "furnace_smelt", + "conditions": [ + { + "condition": "entity_properties", + "entity": "this", + "properties": { + "on_fire": true + } + } + ] + } + ] + } + ] } ] } diff --git a/src/main/resources/assets/betteranimalsplus/models/item/turkey_leg_cooked.json b/src/main/resources/assets/betteranimalsplus/models/item/turkey_leg_cooked.json new file mode 100644 index 00000000..2da254b7 --- /dev/null +++ b/src/main/resources/assets/betteranimalsplus/models/item/turkey_leg_cooked.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld_rod", + "textures": { + "layer0": "betteranimalsplus:items/turkey_leg_cooked" + } +} diff --git a/src/main/resources/assets/betteranimalsplus/models/item/turkey_leg_raw.json b/src/main/resources/assets/betteranimalsplus/models/item/turkey_leg_raw.json new file mode 100644 index 00000000..96d0dd13 --- /dev/null +++ b/src/main/resources/assets/betteranimalsplus/models/item/turkey_leg_raw.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld_rod", + "textures": { + "layer0": "betteranimalsplus:items/turkey_leg_raw" + } +}