Skip to content

Commit

Permalink
- Fix ingot and sheet textures missing
Browse files Browse the repository at this point in the history
- Add vat recipes for tfc fruits
- Fix hollow shells deleting blocks they shouldn't when placing
- Hopefully fix IWeatherable crash
- Fix toast with jam recipe
  • Loading branch information
eerussianguy committed Dec 5, 2023
1 parent 2649a1d commit f43e743
Show file tree
Hide file tree
Showing 33 changed files with 548 additions and 13 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@

### Fixes

- Temporarily rolled back the sherd changes as they are crashing the mod on load. You can still obtain sherds via crafting.
- Fix ingot and sheet textures missing for Firmalife metals.
- Add vat recipes for TFC fruits.
- Fix hollow shells deleting blocks they shouldn't when placing.
- Attempt to fix a crash related to greenhouse blocks.
- Fix toast with jam recipe not being usable.
- Update some textures, thanks to Lexal for these
5 changes: 4 additions & 1 deletion resources/recipes.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def craft_decorations(recipe_name: str, base_block: str):
damage_shapeless(rm, 'crafting/salsa', ('tfc:food/tomato', 'tfc:powder/salt', 'firmalife:plant/cilantro', '#tfc:knives'), '5 firmalife:food/salsa').with_advancement('tfc:food/tomato')
damage_shapeless(rm, 'crafting/pineapple_fiber', (not_rotten(has_trait('firmalife:food/pineapple', trait='firmalife:dried')), '#tfc:knives'), 'firmalife:pineapple_fiber').with_advancement('firmalife:food/pineapple')
damage_shapeless(rm, 'crafting/pineapple_yarn', ('tfc:spindle', 'firmalife:pineapple_fiber'), '8 firmalife:pineapple_yarn').with_advancement('firmalife:pineapple_fiber')
rm.crafting_shapeless('crafting/toast_with_jam', ('firmalife:food/toast', '#firmalife:foods/preserves'), 'firmalife:food/toast_with_jam').with_advancement('firmalife:food/toast')
rm.crafting_shapeless('crafting/toast_with_jam', ('firmalife:food/toast', '#tfc:foods/preserves'), 'firmalife:food/toast_with_jam').with_advancement('firmalife:food/toast')
rm.crafting_shapeless('crafting/toast_with_butter', ('firmalife:food/toast', 'firmalife:food/butter'), 'firmalife:food/toast_with_butter').with_advancement('firmalife:food/toast')
damage_shapeless(rm, 'crafting/bacon', (not_rotten(has_trait('tfc:food/pork', trait='firmalife:smoked')), '#tfc:knives', 'tfc:powder/salt'), '4 firmalife:food/bacon').with_advancement('tfc:food/cooked_pork')
rm.crafting_shapeless('crafting/tomato_sauce_mix', (not_rotten('tfc:food/tomato'), utils.ingredient('tfc:powder/salt'), not_rotten('tfc:food/garlic')), '5 firmalife:food/tomato_sauce_mix').with_advancement('tfc:food/tomato')
Expand Down Expand Up @@ -177,6 +177,9 @@ def chisel_stair_slab(name: str, ingredient: str):
'texture': 'firmalife:block/jar/%s' % fruit
})
rm.crafting_shapeless('crafting/unseal_%s_jar' % fruit, (not_rotten('firmalife:jar/%s' % fruit), ), 'firmalife:jar/%s_unsealed' % fruit).with_advancement('firmalife:jar/%s' % fruit)
for fruit in TFC_FRUITS:
ing = not_rotten(has_trait('tfc:food/%s' % fruit, 'firmalife:dried', True))
vat_recipe(rm, '%s_jar' % fruit, ing, '500 firmalife:sugar_water', output_fluid='500 firmalife:fruity_fluid', jar='tfc:jar/%s' % fruit)

beet = not_rotten('tfc:food/beet')
simple_pot_recipe(rm, 'beet_sugar', [beet, beet, beet, beet, beet], '1000 tfc:salt_water', output_items=['minecraft:sugar', 'minecraft:sugar', 'minecraft:sugar'])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

public interface IWeatherable
{
default void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random)
default void onRandomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random)
{
Supplier<? extends Block> next = getNext();
if (next != null && random.nextInt(weatherChance()) == 0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public boolean isRandomlyTicking(BlockState state)

@Override
@SuppressWarnings("deprecation")
public void randomTick(BlockState lower, ServerLevel level, BlockPos pos, RandomSource rand)
public void onRandomTick(BlockState lower, ServerLevel level, BlockPos pos, RandomSource rand)
{
Supplier<? extends Block> next = getNext();
if (next != null && rand.nextInt(weatherChance()) == 0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ public boolean isRandomlyTicking(BlockState pState)

@Override
@SuppressWarnings("deprecation")
public void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource rand)
public void onRandomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource rand)
{
IWeatherable.super.randomTick(state, level, pos, rand);
IWeatherable.super.onRandomTick(state, level, pos, rand);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ public boolean isRandomlyTicking(BlockState pState)
}

@Override
public void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource rand)
public void onRandomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource rand)
{
IWeatherable.super.randomTick(state, level, pos, rand);
IWeatherable.super.onRandomTick(state, level, pos, rand);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,9 @@ public boolean isRandomlyTicking(BlockState state)
}

@Override
@SuppressWarnings("deprecation")
public void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource rand)
public void onRandomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource rand)
{
IWeatherable.super.randomTick(state, level, pos, rand);
IWeatherable.super.onRandomTick(state, level, pos, rand);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protected InteractionResultHolder<ItemStack> afterFillFailed(IFluidHandler handl
{
final BlockPos pos = hit.getBlockPos().above();
BlockState state = FLBlocks.HOLLOW_SHELL.get().defaultBlockState();
if (state.canSurvive(level, pos))
if (state.canSurvive(level, pos) && level.getBlockState(pos).canBeReplaced())
{
Fluid fluid = level.getFluidState(pos).getType();
state = FluidHelpers.fillWithFluid(state, fluid);
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"item": "firmalife:food/toast"
},
{
"tag": "firmalife:foods/preserves"
"tag": "tfc:foods/preserves"
}
],
"result": {
Expand Down
24 changes: 24 additions & 0 deletions src/main/resources/data/firmalife/recipes/vat/banana_jar.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"__comment__": "This file was automatically created by mcresources",
"type": "firmalife:vat",
"input_item": {
"ingredient": {
"type": "tfc:lacks_trait",
"trait": "firmalife:dried",
"ingredient": {
"item": "tfc:food/banana"
}
}
},
"input_fluid": {
"ingredient": "firmalife:sugar_water",
"amount": 500
},
"output_fluid": {
"fluid": "firmalife:fruity_fluid",
"amount": 500
},
"jar": {
"item": "tfc:jar/banana"
}
}
24 changes: 24 additions & 0 deletions src/main/resources/data/firmalife/recipes/vat/blackberry_jar.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"__comment__": "This file was automatically created by mcresources",
"type": "firmalife:vat",
"input_item": {
"ingredient": {
"type": "tfc:lacks_trait",
"trait": "firmalife:dried",
"ingredient": {
"item": "tfc:food/blackberry"
}
}
},
"input_fluid": {
"ingredient": "firmalife:sugar_water",
"amount": 500
},
"output_fluid": {
"fluid": "firmalife:fruity_fluid",
"amount": 500
},
"jar": {
"item": "tfc:jar/blackberry"
}
}
24 changes: 24 additions & 0 deletions src/main/resources/data/firmalife/recipes/vat/blueberry_jar.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"__comment__": "This file was automatically created by mcresources",
"type": "firmalife:vat",
"input_item": {
"ingredient": {
"type": "tfc:lacks_trait",
"trait": "firmalife:dried",
"ingredient": {
"item": "tfc:food/blueberry"
}
}
},
"input_fluid": {
"ingredient": "firmalife:sugar_water",
"amount": 500
},
"output_fluid": {
"fluid": "firmalife:fruity_fluid",
"amount": 500
},
"jar": {
"item": "tfc:jar/blueberry"
}
}
24 changes: 24 additions & 0 deletions src/main/resources/data/firmalife/recipes/vat/bunchberry_jar.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"__comment__": "This file was automatically created by mcresources",
"type": "firmalife:vat",
"input_item": {
"ingredient": {
"type": "tfc:lacks_trait",
"trait": "firmalife:dried",
"ingredient": {
"item": "tfc:food/bunchberry"
}
}
},
"input_fluid": {
"ingredient": "firmalife:sugar_water",
"amount": 500
},
"output_fluid": {
"fluid": "firmalife:fruity_fluid",
"amount": 500
},
"jar": {
"item": "tfc:jar/bunchberry"
}
}
24 changes: 24 additions & 0 deletions src/main/resources/data/firmalife/recipes/vat/cherry_jar.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"__comment__": "This file was automatically created by mcresources",
"type": "firmalife:vat",
"input_item": {
"ingredient": {
"type": "tfc:lacks_trait",
"trait": "firmalife:dried",
"ingredient": {
"item": "tfc:food/cherry"
}
}
},
"input_fluid": {
"ingredient": "firmalife:sugar_water",
"amount": 500
},
"output_fluid": {
"fluid": "firmalife:fruity_fluid",
"amount": 500
},
"jar": {
"item": "tfc:jar/cherry"
}
}
24 changes: 24 additions & 0 deletions src/main/resources/data/firmalife/recipes/vat/cloudberry_jar.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"__comment__": "This file was automatically created by mcresources",
"type": "firmalife:vat",
"input_item": {
"ingredient": {
"type": "tfc:lacks_trait",
"trait": "firmalife:dried",
"ingredient": {
"item": "tfc:food/cloudberry"
}
}
},
"input_fluid": {
"ingredient": "firmalife:sugar_water",
"amount": 500
},
"output_fluid": {
"fluid": "firmalife:fruity_fluid",
"amount": 500
},
"jar": {
"item": "tfc:jar/cloudberry"
}
}
24 changes: 24 additions & 0 deletions src/main/resources/data/firmalife/recipes/vat/cranberry_jar.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"__comment__": "This file was automatically created by mcresources",
"type": "firmalife:vat",
"input_item": {
"ingredient": {
"type": "tfc:lacks_trait",
"trait": "firmalife:dried",
"ingredient": {
"item": "tfc:food/cranberry"
}
}
},
"input_fluid": {
"ingredient": "firmalife:sugar_water",
"amount": 500
},
"output_fluid": {
"fluid": "firmalife:fruity_fluid",
"amount": 500
},
"jar": {
"item": "tfc:jar/cranberry"
}
}
24 changes: 24 additions & 0 deletions src/main/resources/data/firmalife/recipes/vat/elderberry_jar.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"__comment__": "This file was automatically created by mcresources",
"type": "firmalife:vat",
"input_item": {
"ingredient": {
"type": "tfc:lacks_trait",
"trait": "firmalife:dried",
"ingredient": {
"item": "tfc:food/elderberry"
}
}
},
"input_fluid": {
"ingredient": "firmalife:sugar_water",
"amount": 500
},
"output_fluid": {
"fluid": "firmalife:fruity_fluid",
"amount": 500
},
"jar": {
"item": "tfc:jar/elderberry"
}
}
24 changes: 24 additions & 0 deletions src/main/resources/data/firmalife/recipes/vat/gooseberry_jar.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"__comment__": "This file was automatically created by mcresources",
"type": "firmalife:vat",
"input_item": {
"ingredient": {
"type": "tfc:lacks_trait",
"trait": "firmalife:dried",
"ingredient": {
"item": "tfc:food/gooseberry"
}
}
},
"input_fluid": {
"ingredient": "firmalife:sugar_water",
"amount": 500
},
"output_fluid": {
"fluid": "firmalife:fruity_fluid",
"amount": 500
},
"jar": {
"item": "tfc:jar/gooseberry"
}
}
24 changes: 24 additions & 0 deletions src/main/resources/data/firmalife/recipes/vat/green_apple_jar.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"__comment__": "This file was automatically created by mcresources",
"type": "firmalife:vat",
"input_item": {
"ingredient": {
"type": "tfc:lacks_trait",
"trait": "firmalife:dried",
"ingredient": {
"item": "tfc:food/green_apple"
}
}
},
"input_fluid": {
"ingredient": "firmalife:sugar_water",
"amount": 500
},
"output_fluid": {
"fluid": "firmalife:fruity_fluid",
"amount": 500
},
"jar": {
"item": "tfc:jar/green_apple"
}
}
24 changes: 24 additions & 0 deletions src/main/resources/data/firmalife/recipes/vat/lemon_jar.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"__comment__": "This file was automatically created by mcresources",
"type": "firmalife:vat",
"input_item": {
"ingredient": {
"type": "tfc:lacks_trait",
"trait": "firmalife:dried",
"ingredient": {
"item": "tfc:food/lemon"
}
}
},
"input_fluid": {
"ingredient": "firmalife:sugar_water",
"amount": 500
},
"output_fluid": {
"fluid": "firmalife:fruity_fluid",
"amount": 500
},
"jar": {
"item": "tfc:jar/lemon"
}
}
Loading

0 comments on commit f43e743

Please sign in to comment.