Skip to content

Commit

Permalink
Add sushi, cookies, drops of sherds from breaking ceramics, add seale…
Browse files Browse the repository at this point in the history 
…d brick variants, dont require fluid to make strawbery ice cream, fix damage source crash, some fixes to ovens, fix stovetop grills not damaging (Closes #153)
  • Loading branch information
@eerussianguy
eerussianguy committed Dec 3, 2023
1 parent b344ee8 commit b03b315
Show file tree
Hide file tree
Showing 81 changed files with 1,039 additions and 38 deletions.
6 changes: 5 additions & 1 deletion resources/constants.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ class Wood(NamedTuple):
SIMPLE_FOODS = ('frothy_coconut', 'white_chocolate_blend', 'dark_chocolate_blend', 'milk_chocolate_blend', 'tofu', 'soy_mixture', 'yak_curd', 'goat_curd', 'milk_curd', 'cheddar', 'chevre', 'rajya_metok', 'gouda', 'feta', 'shosha', 'butter',
'pie_dough', 'filled_pie', 'cooked_pie', 'pizza_dough', 'raw_pizza', 'cooked_pizza', 'shredded_cheese', 'pickled_egg', 'pumpkin_pie_dough', 'raw_pumpkin_pie', 'cooked_pumpkin_pie', 'cocoa_beans', 'roasted_cocoa_beans',
'cocoa_butter', 'cocoa_powder', 'toast', 'dark_chocolate', 'milk_chocolate', 'white_chocolate', 'garlic_bread', 'cured_maize', 'nixtamal', 'masa', 'masa_flour', 'corn_tortilla', 'taco_shell', 'burrito', 'taco', 'salsa',
'tomato_sauce', 'nightshade_berry', 'stinky_soup', 'toast_with_jam', 'toast_with_butter', 'bacon', 'cooked_bacon', 'tomato_sauce_mix', 'vanilla_ice_cream', 'strawberry_ice_cream', 'chocolate_ice_cream', 'banana_split',)
'tomato_sauce', 'nightshade_berry', 'stinky_soup', 'toast_with_jam', 'toast_with_butter', 'bacon', 'cooked_bacon', 'tomato_sauce_mix', 'vanilla_ice_cream', 'strawberry_ice_cream', 'chocolate_ice_cream', 'banana_split',
'cookie_dough', 'sugar_cookie', 'chocolate_chip_cookie_dough', 'chocolate_chip_cookie', 'cookie_dough_ice_cream', 'maki_roll', 'futo_maki_roll')
SIMPLE_SPICES = ('ground_cinnamon', 'cinnamon', 'basil_leaves', 'vanilla')
SIMPLE_BLOCKS: Dict[str, str] = {
'sealed_bricks': 'minecraft:mineable/pickaxe',
'chiseled_sealed_bricks': 'minecraft:mineable/pickaxe',
'polished_sealed_bricks': 'minecraft:mineable/pickaxe',
'treated_wood': 'minecraft:mineable/axe',
'tiles': 'minecraft:mineable/pickaxe',
'rustic_bricks': 'minecraft:mineable/pickaxe',
Expand Down Expand Up @@ -49,6 +52,7 @@ class Wood(NamedTuple):
'meads_milkweed', 'nasturtium', 'oxeye_daisy', 'poppy', 'primrose', 'pulsatilla', 'sacred_datura', 'silver_spurflower', 'snapdragon_pink',
'snapdragon_red', 'snapdragon_white', 'snapdragon_yellow', 'strelitzia', 'sword_fern', 'trillium', 'tropical_milkweed', 'tulip_orange', 'tulip_pink',
'tulip_red', 'tulip_white')
TFC_FISH_ITEMS = ('cod', 'bluegill', 'crappie', 'lake_trout', 'largemouth_bass', 'smallmouth_bass', 'rainbow_trout', 'salmon',)
TFC_FLOATING_FLOWERS = ('duckweed', 'lotus', 'pistia', 'water_canna', 'water_lily')
TFC_ROCKS: Dict[str, Rock] = {
'granite': Rock('igneous_intrusive', 'white'),
Expand Down
7 changes: 7 additions & 0 deletions resources/data.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ def generate(rm: ResourceManager):
food_item(rm, 'pickled_egg', 'firmalife:food/pickled_egg', Category.other, 4, 2, 10, 0.3, protein=1.5, dairy=0.25)
decayable(rm, 'chocolate_blends', '#firmalife:chocolate_blends', Category.dairy)
food_item(rm, 'chocolate', '#firmalife:foods/chocolate', Category.other, 4, 1, 0, 0.3, dairy=0.5, grain=0.5)
food_item(rm, 'chocolate_chip_cookie', 'firmalife:food/chocolate_chip_cookie', Category.other, 4, 0.5, 0, 4.5, dairy=0.2, grain=1.0)
food_item(rm, 'cookie', 'firmalife:food/chocolate_chip_cookie', Category.other, 4, 0.5, 0, 4.5, dairy=0.1, grain=0.8)
decayable(rm, 'cookie_dough', 'firmalife:food/cookie_dough', Category.other)
decayable(rm, 'chocolate_chip_cookie_dough', 'firmalife:food/chocolate_chip_cookie_dough', Category.other)
decayable(rm, 'doughs', '#firmalife:foods/extra_dough', Category.other, decay=2)
decayable(rm, 'butter', 'firmalife:food/butter', Category.other)
decayable(rm, 'pie_dough', 'firmalife:food/pie_dough', Category.other)
Expand All @@ -143,6 +147,7 @@ def generate(rm: ResourceManager):
food_item(rm, 'pineapple', 'firmalife:food/pineapple', Category.fruit, 4, 1, 1, 0.85, fruit=0.75)
food_item(rm, 'nightshade_berry', 'firmalife:food/nightshade_berry', Category.other, 4, 1, 1, 0.85, fruit=3.0)
food_item(rm, 'vanilla_ice_cream', 'firmalife:food/vanilla_ice_cream', Category.other, 4, 1, 1, 5, dairy=0.75)
food_item(rm, 'cookie_dough_ice_cream', 'firmalife:food/cookie_dough_ice_cream', Category.other, 4, 1, 1, 5, dairy=1.0, grain=0.5)
food_item(rm, 'chocolate_ice_cream', 'firmalife:food/chocolate_ice_cream', Category.other, 4, 1.5, 1, 5, dairy=0.5, grain=0.25)
food_item(rm, 'strawberry_ice_cream', 'firmalife:food/strawberry_ice_cream', Category.other, 4, 1.5, 1, 5, dairy=0.5, fruit=0.5)
food_item(rm, 'banana_split', 'firmalife:food/banana_split', Category.other, 4, 2, 1, 5, fruit=3.5, dairy=1.75, grain=0.25)
Expand All @@ -153,6 +158,8 @@ def generate(rm: ResourceManager):
dynamic_food_item(rm, 'cooked_pizza', 'firmalife:food/cooked_pizza', 'dynamic')
dynamic_food_item(rm, 'burrito', 'firmalife:food/burrito', 'dynamic')
dynamic_food_item(rm, 'taco', 'firmalife:food/taco', 'dynamic')
dynamic_food_item(rm, 'maki_roll', 'firmalife:food/maki_roll', 'dynamic')
dynamic_food_item(rm, 'futo_maki_roll', 'firmalife:food/futo_maki_roll', 'dynamic')

rm.domain = 'tfc'
dynamic_food_item(rm, 'pumpkin_pie', 'minecraft:pumpkin_pie', 'dynamic_bowl')
Expand Down
19 changes: 15 additions & 4 deletions resources/recipes.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,13 @@ def craft_decorations(recipe_name: str, base_block: str):
craft_decorations('crafting/rustic_bricks', 'firmalife:rustic_bricks')
craft_decorations('crafting/tiles', 'firmalife:tiles')
rm.crafting_shapeless('crafting/banana_split', (not_rotten('firmalife:food/vanilla_ice_cream'), not_rotten('firmalife:food/strawberry_ice_cream'), not_rotten('firmalife:food/chocolate_ice_cream'), not_rotten('firmalife:food/pineapple'), not_rotten('tfc:food/cherry'), not_rotten('tfc:food/banana'), not_rotten('tfc:food/banana')), 'firmalife:food/banana_split').with_advancement('firmalife:food/vanilla_ice_cream')
rm.crafting_shapeless('crafting/cookie_dough_ice_cream', (not_rotten('firmalife:food/vanilla_ice_cream'), not_rotten('firmalife:food/chocolate_chip_cookie_dough')), 'firmalife:food/cookie_dough_ice_cream').with_advancement('firmalife:food/vanilla_ice_cream')
rm.crafting_shapeless('crafting/plate', ('firmalife:treated_lumber', 'firmalife:treated_lumber', 'minecraft:white_dye', 'tfc:glue'), 'firmalife:plate').with_advancement('firmalife:treated_lumber')
rm.crafting_shapeless('crafting/oxidized_copper_pipe', ('firmalife:copper_pipe', 'firmalife:copper_pipe', 'firmalife:copper_pipe', 'firmalife:copper_pipe', 'tfc:powder/wood_ash'), '4 firmalife:oxidized_copper_pipe').with_advancement('firmalife:copper_pipe')
rm.crafting_shapeless('crafting/irrigation_tank', ('#tfc:barrels', '#forge:sheets/bronze', 'firmalife:copper_pipe'), 'firmalife:irrigation_tank').with_advancement('firmalife:copper_pipe')
rm.crafting_shaped('crafting/pumping_station', ['SRS', 'BBB', 'ZZZ'], {'S': '#forge:sheets/bronze', 'R': '#forge:dusts/redstone', 'B': 'tfc:brass_mechanisms', 'Z': '#tfc:axles'}, 'firmalife:pumping_station').with_advancement('tfc:brass_mechanisms')
damage_shapeless(rm, 'crafting/chiseled_sealed_bricks', ('firmalife:sealed_bricks', '#tfc:chisels', 'tfc:mortar'), 'firmalife:chiseled_sealed_bricks').with_advancement('firmalife:sealed_bricks')
damage_shapeless(rm, 'crafting/polished_sealed_bricks', ('firmalife:sealed_bricks', '#tfc:chisels'), 'firmalife:polished_sealed_bricks').with_advancement('firmalife:sealed_bricks')

for section in ARMOR_SECTIONS:
rm.crafting_shapeless('crafting/beekeeper_%s' % section, ('minecraft:leather_%s' % section, 'tfc:burlap_cloth', 'tfc:burlap_cloth', 'tfc:powder/wood_ash'), 'firmalife:beekeeper_%s' % section).with_advancement('tfc:burlap_cloth')
Expand Down Expand Up @@ -149,7 +152,7 @@ def chisel_stair_slab(name: str, ingredient: str):
vat_recipe(rm, 'tallow', 'tfc:blubber', '200 minecraft:water', output_fluid='200 tfc:tallow')
vat_recipe(rm, 'lye', 'tfc:powder/wood_ash', '200 minecraft:water', output_fluid='200 tfc:lye')
vat_recipe(rm, 'cooked_rice', not_rotten('tfc:food/rice_grain'), '200 minecraft:water', output_item='tfc:food/cooked_rice')
vat_recipe(rm, 'boiled_egg', not_rotten('minecraft:egg'), '200 minecraft:water', output_item='tfc:food/boiled_egg')
vat_recipe(rm, 'boiled_egg', not_rotten('#firmalife:foods/raw_eggs'), '200 minecraft:water', output_item='tfc:food/boiled_egg')
for color in COLORS:
vat_recipe(rm, '%s_dye' % color, 'minecraft:%s_dye' % color, '1000 minecraft:water', output_fluid='1000 tfc:%s_dye' % color)
vat_recipe(rm, 'beet_sugar', {'count': 5, 'ingredient': not_rotten('tfc:food/beet')}, '1000 tfc:salt_water', output_item='3 minecraft:sugar')
Expand Down Expand Up @@ -225,6 +228,8 @@ def chisel_stair_slab(name: str, ingredient: str):
oven_recipe(rm, 'pumpkin_pie', not_rotten('firmalife:food/raw_pumpkin_pie'), 400, result_item=item_stack_provider('minecraft:pumpkin_pie', other_modifier='firmalife:add_pie_pan'))
oven_recipe(rm, 'roasted_cocoa_beans', not_rotten('firmalife:food/cocoa_beans'), 400, result_item=item_stack_provider('firmalife:food/roasted_cocoa_beans'))
oven_recipe(rm, 'taco_shell', not_rotten('firmalife:food/corn_tortilla'), 400, result_item=item_stack_provider('firmalife:food/taco_shell'))
oven_recipe(rm, 'sugar_cookie', not_rotten('firmalife:food/cookie_dough'), 400, result_item=item_stack_provider('firmalife:food/sugar_cookie'))
oven_recipe(rm, 'chocolate_chip_cookie', not_rotten('firmalife:food/chocolate_chip_cookie_dough'), 400, result_item=item_stack_provider('firmalife:food/chocolate_chip_cookie'))

# Firmalife Recipes
knapping_type(rm, 'pumpkin', '1 #firmalife:pumpkin_knapping', None, 'tfc:item.knapping.leather', False, False, False, 'tfc:pumpkin')
Expand All @@ -249,14 +254,16 @@ def chisel_stair_slab(name: str, ingredient: str):

mixing_recipe(rm, 'butter', ingredients=[utils.ingredient('tfc:powder/salt')], fluid='1000 firmalife:cream', output_item='firmalife:food/butter')
mixing_recipe(rm, 'pie_dough', ingredients=[not_rotten('firmalife:food/butter'), not_rotten('#tfc:foods/flour'), utils.ingredient('#tfc:sweetener')], fluid='1000 minecraft:water', output_item='firmalife:food/pie_dough')
mixing_recipe(rm, 'pumpkin_pie_dough', ingredients=[utils.ingredient('minecraft:egg'), not_rotten('tfc:food/pumpkin_chunks'), not_rotten('tfc:food/pumpkin_chunks'), not_rotten('#tfc:foods/flour'), utils.ingredient('#tfc:sweetener')], fluid='1000 minecraft:water', output_item='firmalife:food/pumpkin_pie_dough')
mixing_recipe(rm, 'pumpkin_pie_dough', ingredients=[utils.ingredient('#firmalife:foods/raw_eggs'), not_rotten('tfc:food/pumpkin_chunks'), not_rotten('tfc:food/pumpkin_chunks'), not_rotten('#tfc:foods/flour'), utils.ingredient('#tfc:sweetener')], fluid='1000 minecraft:water', output_item='firmalife:food/pumpkin_pie_dough')
mixing_recipe(rm, 'pizza_dough', ingredients=[not_rotten('#tfc:foods/dough'), utils.ingredient('tfc:powder/salt'), utils.ingredient('firmalife:spice/basil_leaves')], fluid='1000 tfc:olive_oil', output_item='4 firmalife:food/pizza_dough')
mixing_recipe(rm, 'dark_chocolate_blend', ingredients=[utils.ingredient('#tfc:sweetener'), not_rotten('firmalife:food/cocoa_powder'), not_rotten('firmalife:food/cocoa_powder')], fluid='1000 #tfc:milks', output_item='2 firmalife:food/dark_chocolate_blend')
mixing_recipe(rm, 'white_chocolate_blend', ingredients=[utils.ingredient('#tfc:sweetener'), not_rotten('firmalife:food/cocoa_butter'), not_rotten('firmalife:food/cocoa_butter')], fluid='1000 #tfc:milks', output_item='2 firmalife:food/white_chocolate_blend')
mixing_recipe(rm, 'milk_chocolate_blend', ingredients=[utils.ingredient('#tfc:sweetener'), not_rotten('firmalife:food/cocoa_butter'), not_rotten('firmalife:food/cocoa_powder')], fluid='1000 #tfc:milks', output_item='2 firmalife:food/milk_chocolate_blend')
mixing_recipe(rm, 'vanilla_ice_cream', ingredients=[utils.ingredient('#tfc:sweetener'), utils.ingredient('firmalife:spice/vanilla'), utils.ingredient('firmalife:ice_shavings')], fluid='1000 firmalife:cream', output_item='2 firmalife:food/vanilla_ice_cream')
mixing_recipe(rm, 'chocolate_ice_cream', ingredients=[not_rotten('firmalife:food/vanilla_ice_cream')], fluid='1000 firmalife:chocolate', output_item='firmalife:food/chocolate_ice_cream')
mixing_recipe(rm, 'strawberry_ice_cream', ingredients=[not_rotten('firmalife:food/vanilla_ice_cream'), not_rotten('tfc:food/strawberry')], fluid='1000 firmalife:chocolate', output_item='firmalife:food/strawberry_ice_cream')
mixing_recipe(rm, 'strawberry_ice_cream', ingredients=[not_rotten('firmalife:food/vanilla_ice_cream'), not_rotten('tfc:food/strawberry'), not_rotten('tfc:food/strawberry')], output_item='firmalife:food/strawberry_ice_cream')
mixing_recipe(rm, 'cookie_dough', ingredients=[not_rotten('#firmalife:foods/raw_eggs'), utils.ingredient('firmalife:spice/vanilla'), not_rotten('firmalife:food/butter'), utils.ingredient('#tfc:sweetener'), not_rotten('#tfc:foods/flour')], output_item='4 firmalife:food/cookie_dough')
mixing_recipe(rm, 'chocolate_chip_cookie_dough', ingredients=[not_rotten('#firmalife:foods/chocolate'), not_rotten('firmalife:food/cookie_dough'), not_rotten('firmalife:food/cookie_dough'), not_rotten('firmalife:food/cookie_dough'), not_rotten('firmalife:food/cookie_dough')], output_item='4 firmalife:food/chocolate_chip_cookie_dough')

pie_mod = {
'food': {
Expand Down Expand Up @@ -301,9 +308,13 @@ def chisel_stair_slab(name: str, ingredient: str):
}]
}
meal_shapeless(rm, 'crafting/filled_pie', (not_rotten('firmalife:food/pie_dough'), '#tfc:foods/preserves', '#firmalife:pie_pans'), 'firmalife:food/filled_pie', pie_mod).with_advancement('firmalife:food/pie_dough')
meal_shapeless(rm, 'crafting/raw_pizza', (not_rotten('firmalife:food/pizza_dough'), not_rotten('#firmalife:foods/pizza_ingredients'), not_rotten('#firmalife:foods/pizza_ingredients'), not_rotten('firmalife:food/shredded_cheese'), not_rotten('firmalife:food/tomato_sauce')), 'firmalife:food/raw_pizza', pizza_mod).with_advancement('firmalife:food/pizza_dough')
meal_shapeless(rm, 'crafting/raw_pizza3', (not_rotten('firmalife:food/pizza_dough'), not_rotten('#firmalife:foods/pizza_ingredients'), not_rotten('#firmalife:foods/pizza_ingredients'), not_rotten('firmalife:food/shredded_cheese'), not_rotten('firmalife:food/tomato_sauce')), 'firmalife:food/raw_pizza', pizza_mod).with_advancement('firmalife:food/pizza_dough')
meal_shapeless(rm, 'crafting/raw_pizza2', (not_rotten('firmalife:food/pizza_dough'), not_rotten('#firmalife:foods/pizza_ingredients'), not_rotten('firmalife:food/shredded_cheese'), not_rotten('firmalife:food/tomato_sauce')), 'firmalife:food/raw_pizza', pizza_mod).with_advancement('firmalife:food/pizza_dough')
meal_shapeless(rm, 'crafting/raw_pizza', (not_rotten('firmalife:food/pizza_dough'), not_rotten('firmalife:food/shredded_cheese'), not_rotten('firmalife:food/tomato_sauce')), 'firmalife:food/raw_pizza', pizza_mod).with_advancement('firmalife:food/pizza_dough')
meal_shapeless(rm, 'crafting/burrito', (not_rotten('#firmalife:foods/cooked_meats_and_substitutes'), not_rotten('firmalife:food/shredded_cheese'), not_rotten('firmalife:food/corn_tortilla'), not_rotten('#tfc:foods/vegetables'), not_rotten('firmalife:food/salsa')), 'firmalife:food/burrito', burrito_mod).with_advancement('firmalife:food/corn_tortilla')
meal_shapeless(rm, 'crafting/taco', (not_rotten('#firmalife:foods/cooked_meats_and_substitutes'), not_rotten('firmalife:food/shredded_cheese'), not_rotten('firmalife:food/taco_shell'), not_rotten('#tfc:foods/vegetables'), not_rotten('firmalife:food/salsa')), 'firmalife:food/taco', burrito_mod).with_advancement('firmalife:food/taco_shell')
meal_shapeless(rm, 'crafting/maki_roll', (not_rotten('tfc:food/cooked_rice'), not_rotten('tfc:food/dried_seaweed'), not_rotten('#firmalife:foods/raw_fish')), 'firmalife:food/maki_roll', burrito_mod).with_advancement('tfc:food/cooked_rice')
meal_shapeless(rm, 'crafting/futo_maki_roll', (not_rotten('tfc:food/cooked_rice'), not_rotten('tfc:food/dried_seaweed'), not_rotten('tfc:food/shellfish')), 'firmalife:food/futo_maki_roll', burrito_mod).with_advancement('tfc:food/cooked_rice')

# Greenhouse
for block in GREENHOUSE_BLOCKS:
Expand Down
7 changes: 5 additions & 2 deletions resources/tags.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def generate(rm: ResourceManager):
rm.item_tag('tfc:usable_on_tool_rack', 'firmalife:spoon', 'firmalife:peel')
rm.item_tag('pumpkin_knapping', 'tfc:pumpkin')
rm.item_tag('tfc:any_knapping', '#firmalife:pumpkin_knapping')
rm.item_tag('foods/heatable', 'firmalife:food/raw_pizza', 'firmalife:food/filled_pie', 'firmalife:food/raw_pumpkin_pie', 'firmalife:food/corn_tortilla', 'firmalife:food/masa', '#firmalife:foods/slices', 'firmalife:food/cocoa_beans', 'firmalife:food/bacon')
rm.item_tag('foods/heatable', 'firmalife:food/raw_pizza', 'firmalife:food/filled_pie', 'firmalife:food/raw_pumpkin_pie', 'firmalife:food/corn_tortilla', 'firmalife:food/masa', '#firmalife:foods/slices', 'firmalife:food/cocoa_beans', 'firmalife:food/bacon', 'firmalife:food/cookie_dough', 'firmalife:food/chocolate_chip_cookie_dough')
rm.item_tag('foods/dynamic', 'firmalife:food/raw_pizza', 'firmalife:food/filled_pie', 'firmalife:food/cooked_pizza', 'firmalife:food/cooked_pie', 'firmalife:food/burrito', 'firmalife:food/taco', 'firmalife:food/stinky_soup')
rm.item_tag('foods/washable', 'firmalife:food/filled_pie', 'firmalife:food/cooked_pie', 'firmalife:food/raw_pumpkin_pie', 'minecraft:pumpkin_pie', 'firmalife:food/stinky_soup')
rm.item_tag('pie_pans', 'firmalife:pie_pan')
Expand All @@ -33,10 +33,13 @@ def generate(rm: ResourceManager):
rm.item_tag('forge:leather', 'firmalife:pineapple_leather')
rm.item_tag('usable_in_stovetop_soup', '#tfc:foods/usable_in_soup')
rm.item_tag('beekeeper_armor', *['firmalife:beekeeper_%s' % p for p in ARMOR_SECTIONS])
rm.item_tag('foods/raw_eggs', 'minecraft:egg')
rm.item_tag('foods/raw_fish', *['tfc:food/%s' % fish for fish in TFC_FISH_ITEMS])
rm.item_tag('foods/cooked_fish', *['tfc:food/cooked_%s' % fish for fish in TFC_FISH_ITEMS])

block_and_item_tag(rm, 'tfc:wild_fruits', 'firmalife:plant/pineapple_bush', 'firmalife:plant/nightshade_bush', 'firmalife:plant/fig_sapling', 'firmalife:plant/cocoa_sapling')

rm.block_tag('oven_insulation', 'minecraft:bricks', '#tfc:forge_insulation', '#firmalife:oven_blocks', 'minecraft:brick_stairs', 'minecraft:brick_slab', 'firmalife:sealed_bricks')
rm.block_tag('oven_insulation', 'minecraft:bricks', '#tfc:forge_insulation', '#firmalife:oven_blocks', 'minecraft:brick_stairs', 'minecraft:brick_slab', 'firmalife:sealed_bricks', 'firmalife:chiseled_sealed_bricks', 'firmalife:polished_sealed_bricks')
rm.block_tag('minecraft:mineable/pickaxe', '#firmalife:oven_blocks')
rm.block_tag('planters', *['firmalife:%s_planter' % p for p in PLANTERS])
rm.block_tag('bee_restoration_plants', *['tfc:plant/%s' % p for p in TFC_FLOWERS])
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/eerussianguy/firmalife/common/blockentities/ApplianceBlockEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@ public void tickTemperature()
}
}

public void onTemperatureAdjusted() {}
public void onTemperatureAdjusted()
{
markForSync();
}

@Override
public void onCalendarUpdate(long ticks)
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/eerussianguy/firmalife/common/blockentities/MixingBowlBlockEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ private static void sendParticle(ServerLevel level, BlockPos pos, ItemStack item
}

public static final int SLOTS = 5;
private static final int DEFAULT_COLOR = TFCFluids.ALPHA_MASK | 0xFFEF91;

private final SidedHandler.Builder<IFluidHandler> sidedFluidInventory;
private int rotationTimer = -1;
Expand Down Expand Up @@ -171,6 +170,10 @@ private void finishMixing()
int count = outputStack.getCount();
for (int i = 0; i < SLOTS; i++)
{
if (inventory.getStackInSlot(i).hasCraftingRemainingItem())
{
Helpers.spawnItem(level, worldPosition, inventory.getStackInSlot(i).getCraftingRemainingItem().copy());
}
inventory.setStackInSlot(i, ItemStack.EMPTY);
}
for (int i = 0; i < SLOTS; i++)
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/com/eerussianguy/firmalife/common/blockentities/OvenTopBlockEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,16 @@ public void saveAdditional(CompoundTag nbt)
super.saveAdditional(nbt);
}

@Override
public void tickTemperature()
{
if (temperature != targetTemperature && targetTemperature <= 0f)
{
ranOutDueToCalendar();
}
super.tickTemperature();
}

@Override
public int getCureTicks()
{
Expand Down
Loading

0 comments on commit b03b315

Please sign in to comment.