Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change some recipes to use LazyToolStack for results #5288

Open
wants to merge 9 commits into
base: 1.20.1
Choose a base branch
from

Conversation

IACTU
Copy link
Contributor

@IACTU IACTU commented Jan 1, 2025

Same as #5282, for #5281

@IACTU
Copy link
Contributor Author

IACTU commented Jan 1, 2025

I’ll fix those conflicts

@KnightMiner
Copy link
Member

Whoops, did not meant to delete the branch this PR was targeted at. Was deleting a couple other branches when it was encountered.

I was too far into the port to look into this originally pre-1.20, and it turns out Mojang's recipe access changes made 1.20 a pretty big burden, so it will probably be necessary to fix some conflicts for this to work on 1.20. Otherwise, I can revisit your 1.19 version and just handle the conflicts myself via cherry pick.

@IACTU
Copy link
Contributor Author

IACTU commented Jan 1, 2025

No problem. And not sure what timeline you were looking for, but I can probably take a crack at it myself in the next few days

@KnightMiner
Copy link
Member

No rush. The alpha I released today said more API breaks are likely happening, this is one I planned for.

IACTU added 2 commits January 1, 2025 16:12
…ruct into nobuild-api-break

# Conflicts:
#	src/main/java/slimeknights/tconstruct/library/recipe/modifiers/adding/AbstractModifierRecipe.java
#	src/main/java/slimeknights/tconstruct/library/recipe/modifiers/adding/IncrementalModifierRecipe.java
#	src/main/java/slimeknights/tconstruct/library/recipe/modifiers/adding/ModifierRecipe.java
#	src/main/java/slimeknights/tconstruct/library/recipe/modifiers/adding/MultilevelModifierRecipe.java
#	src/main/java/slimeknights/tconstruct/library/recipe/modifiers/adding/OverslimeModifierRecipe.java
#	src/main/java/slimeknights/tconstruct/library/recipe/modifiers/adding/SwappableModifierRecipe.java
#	src/main/java/slimeknights/tconstruct/library/recipe/tinkerstation/ITinkerStationRecipe.java
#	src/main/java/slimeknights/tconstruct/library/recipe/tinkerstation/repairing/ModifierRepairTinkerStationRecipe.java
#	src/main/java/slimeknights/tconstruct/tables/block/entity/table/TinkerStationBlockEntity.java
#	src/main/java/slimeknights/tconstruct/tables/client/inventory/ModifierWorktableScreen.java
#	src/main/java/slimeknights/tconstruct/tables/client/inventory/TinkerStationScreen.java
#	src/main/java/slimeknights/tconstruct/tables/recipe/TinkerStationDamagingRecipe.java
#	src/main/java/slimeknights/tconstruct/tables/recipe/TinkerStationPartSwapping.java
#	src/main/java/slimeknights/tconstruct/tables/recipe/TinkerStationRepairRecipe.java
@IACTU IACTU marked this pull request as draft January 1, 2025 23:01
@IACTU IACTU marked this pull request as ready for review January 2, 2025 02:56
@KnightMiner KnightMiner added Technical Pull requests making changes to workspace or targeted versions 1.20 Issue affects 1.20 labels Jan 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.20 Issue affects 1.20 Technical Pull requests making changes to workspace or targeted versions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants