-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix pumpkin pies (removes cooked pumpkin pie item, makes vanilla pump…
…kin pie a dynamic bowl food), fix drying mats working in snow, remove decay date rounding on food shelves (should fix time duplication), fix divide by zero error in vats, add sealed bricks as oven insulation
- Loading branch information
1 parent
7e98aeb
commit 4d72cda
Showing
24 changed files
with
72 additions
and
114 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 0 additions & 31 deletions
31
src/main/java/com/eerussianguy/firmalife/common/items/DecayingContainerItem.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
src/main/java/com/eerussianguy/firmalife/common/recipes/data/AddPiePanModifier.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
package com.eerussianguy.firmalife.common.recipes.data; | ||
|
||
import com.eerussianguy.firmalife.common.items.FLItems; | ||
import net.minecraft.world.item.ItemStack; | ||
|
||
import net.dries007.tfc.common.capabilities.food.FoodCapability; | ||
import net.dries007.tfc.common.items.DynamicBowlFood; | ||
import net.dries007.tfc.common.recipes.outputs.ItemStackModifier; | ||
|
||
public enum AddPiePanModifier implements ItemStackModifier.SingleInstance<AddPiePanModifier> | ||
{ | ||
INSTANCE; | ||
|
||
@Override | ||
public AddPiePanModifier instance() | ||
{ | ||
return INSTANCE; | ||
} | ||
|
||
@Override | ||
public ItemStack apply(ItemStack stack, ItemStack input) | ||
{ | ||
stack.getCapability(FoodCapability.CAPABILITY).ifPresent(cap -> { | ||
if (cap instanceof DynamicBowlFood.DynamicBowlHandler handler) | ||
{ | ||
handler.setBowl(new ItemStack(FLItems.PIE_PAN.get())); | ||
} | ||
}); | ||
return stack; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 0 additions & 10 deletions
10
src/main/resources/data/firmalife/tfc/food_items/cooked_pumpkin_pie.json
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 0 additions & 35 deletions
35
src/main/resources/data/tfc/advancements/crafting/pumpkin_pie.json
This file was deleted.
Oops, something went wrong.
11 changes: 3 additions & 8 deletions
11
src/main/resources/data/tfc/recipes/crafting/pumpkin_pie.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,8 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"type": "minecraft:crafting_shapeless", | ||
"ingredients": [ | ||
"conditions": [ | ||
{ | ||
"type": "forge:nbt", | ||
"item": "firmalife:food/cooked_pumpkin_pie" | ||
"type": "forge:false" | ||
} | ||
], | ||
"result": { | ||
"item": "minecraft:pumpkin_pie" | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"__comment__": "This file was automatically created by mcresources", | ||
"ingredient": { | ||
"item": "minecraft:pumpkin_pie" | ||
}, | ||
"type": "dynamic_bowl" | ||
} |