diff --git a/resources/data.py b/resources/data.py index 54109648..a503dd8d 100644 --- a/resources/data.py +++ b/resources/data.py @@ -52,7 +52,7 @@ def generate(rm: ResourceManager): rm.item_tag('oven_fuel', '#minecraft:logs', 'tfc:stick_bundle') rm.item_tag('chocolate_blends', 'firmalife:food/milk_chocolate_blend', 'firmalife:food/dark_chocolate_blend', 'firmalife:food/white_chocolate_blend') rm.item_tag('tfc:foods/can_be_salted', 'firmalife:food/butter') - rm.item_tag('tfc:usable_on_tool_rack', 'firmalife:spoon') + rm.item_tag('tfc:usable_on_tool_rack', 'firmalife:spoon', 'firmalife:peel') rm.item_tag('pumpkin_knapping', 'tfc:pumpkin') rm.item_tag('foods/heatable', 'firmalife:food/raw_pizza', 'firmalife:food/filled_pie', 'firmalife:food/raw_pumpkin_pie') rm.item_tag('foods/dynamic', 'firmalife:food/raw_pizza', 'firmalife:food/filled_pie', 'firmalife:food/cooked_pizza', 'firmalife:food/cooked_pie') diff --git a/resources/recipes.py b/resources/recipes.py index e9ae453d..f9468141 100644 --- a/resources/recipes.py +++ b/resources/recipes.py @@ -72,7 +72,7 @@ def generate(rm: ResourceManager): rm.crafting_shapeless('crafting/raw_pumpkin_pie', ('firmalife:food/pumpkin_pie_dough', 'firmalife:pie_pan'), 'firmalife:food/raw_pumpkin_pie').with_advancement('firmalife:food/pumpkin_pie_dough') rm.crafting_shaped('crafting/squirting_moisture_transducer', ['XYX', 'XZX', 'XYX'], {'X': '#forge:sheets/stainless_steel', 'Y': 'tfc:brass_mechanisms', 'Z': '#forge:rods/nickel'}, 'firmalife:squirting_moisture_transducer').with_advancement('#forge:rods/stainless_steel') rm.crafting_shaped('crafting/embedded_pipe', ['XY', 'XY', 'ZZ'], {'X': '#forge:rods/stainless_steel', 'Y': '#forge:rods/copper', 'Z': 'firmalife:beeswax'}, '6 firmalife:embedded_pipe').with_advancement('#forge:rods/stainless_steel') - rm.crafting_shaped('crafting/pumpkin_chunks_bulk', ['XXX', 'XYX', 'XXX'], {'X': 'tfc:pumpkin', 'Y': '#tfc:hammers'}, '8 firmalife:food/pumpkin_chunks').with_advancement('tfc:pumpkin') + damage_shapeless(rm, 'crafting/pumpkin_chunks_bulk', ('#tfc:hammers', *('tfc:pumpkin' for _ in range(0, 8))), '8 firmalife:food/pumpkin_chunks').with_advancement('tfc:pumpkin') rm.crafting_shapeless('crafting/garlic_bread', ('firmalife:food/toast', 'firmalife:food/butter', 'tfc:food/garlic'), 'firmalife:food/garlic_bread').with_advancement('tfc:food/garlic') rm.domain = 'tfc' rm.crafting_shapeless('crafting/pumpkin_pie', ('firmalife:food/cooked_pumpkin_pie',), 'minecraft:pumpkin_pie').with_advancement('firmalife:food/cooked_pumpkin_pie') diff --git a/src/main/java/com/eerussianguy/firmalife/common/blockentities/MixingBowlBlockEntity.java b/src/main/java/com/eerussianguy/firmalife/common/blockentities/MixingBowlBlockEntity.java index 287731fa..6eadc4ad 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/blockentities/MixingBowlBlockEntity.java +++ b/src/main/java/com/eerussianguy/firmalife/common/blockentities/MixingBowlBlockEntity.java @@ -171,6 +171,9 @@ private void finishMixing() for (int i = 0; i < SLOTS; i++) { inventory.setStackInSlot(i, ItemStack.EMPTY); + } + for (int i = 0; i < SLOTS; i++) + { if (count > 0) { inventory.setStackInSlot(i, Helpers.copyWithSize(outputStack, 1)); diff --git a/src/main/java/com/eerussianguy/firmalife/common/blocks/FLBlocks.java b/src/main/java/com/eerussianguy/firmalife/common/blocks/FLBlocks.java index d4b4d80b..1e158faa 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/blocks/FLBlocks.java +++ b/src/main/java/com/eerussianguy/firmalife/common/blocks/FLBlocks.java @@ -202,4 +202,5 @@ private static RegistryObject register(String name, Supplie { return RegistrationHelpers.registerBlock(BLOCKS, FLItems.ITEMS, name, blockSupplier, blockItemFactory); } + } diff --git a/src/main/resources/data/firmalife/recipes/crafting/pumpkin_chunks_bulk.json b/src/main/resources/data/firmalife/recipes/crafting/pumpkin_chunks_bulk.json index 130994d0..3a6a0117 100644 --- a/src/main/resources/data/firmalife/recipes/crafting/pumpkin_chunks_bulk.json +++ b/src/main/resources/data/firmalife/recipes/crafting/pumpkin_chunks_bulk.json @@ -1,21 +1,40 @@ { "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XYX", - "XXX" - ], - "key": { - "X": { - "item": "tfc:pumpkin" - }, - "Y": { - "tag": "tfc:hammers" + "type": "tfc:damage_inputs_shapeless_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "tfc:hammers" + }, + { + "item": "tfc:pumpkin" + }, + { + "item": "tfc:pumpkin" + }, + { + "item": "tfc:pumpkin" + }, + { + "item": "tfc:pumpkin" + }, + { + "item": "tfc:pumpkin" + }, + { + "item": "tfc:pumpkin" + }, + { + "item": "tfc:pumpkin" + }, + { + "item": "tfc:pumpkin" + } + ], + "result": { + "item": "firmalife:food/pumpkin_chunks", + "count": 8 } - }, - "result": { - "item": "firmalife:food/pumpkin_chunks", - "count": 8 } } \ No newline at end of file diff --git a/src/main/resources/data/tfc/tags/items/usable_on_tool_rack.json b/src/main/resources/data/tfc/tags/items/usable_on_tool_rack.json index b16605e7..ce12015b 100644 --- a/src/main/resources/data/tfc/tags/items/usable_on_tool_rack.json +++ b/src/main/resources/data/tfc/tags/items/usable_on_tool_rack.json @@ -2,6 +2,7 @@ "__comment__": "This file was automatically created by mcresources", "replace": false, "values": [ - "firmalife:spoon" + "firmalife:spoon", + "firmalife:peel" ] } \ No newline at end of file