Distinct Fluid Behaviour and Recipe Runner Refactor #2544
+2,140
−3,189
Conversation
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
… tables tables tables tables tables tables
…x duplicate ingredient counting in buses and default distinct mode set on world
… into yo/distinctness
… into yo/distinctness # Conflicts: # src/main/java/com/gregtechceu/gtceu/api/item/tool/ToolHelper.java # src/main/java/com/gregtechceu/gtceu/api/machine/feature/IRecipeLogicMachine.java # src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java # src/main/java/com/gregtechceu/gtceu/api/machine/trait/RecipeLogic.java # src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipe.java # src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeHelper.java # src/main/java/com/gregtechceu/gtceu/api/recipe/content/Content.java # src/main/java/com/gregtechceu/gtceu/api/recipe/modifier/RecipeModifierList.java # src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeModifiers.java # src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/DistillationTowerMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/generator/LargeCombustionEngineMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/steam/SteamParallelMultiblockMachine.java # src/main/java/com/gregtechceu/gtceu/common/machine/trait/BedrockOreMinerLogic.java # src/main/java/com/gregtechceu/gtceu/common/machine/trait/FluidDrillLogic.java # src/main/java/com/gregtechceu/gtceu/common/machine/trait/NotifiableStressTrait.java # src/main/java/com/gregtechceu/gtceu/test/GTGameTests.java
krossgg
requested changes
Mar 4, 2025
src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableMultiblockMachine.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/api/recipe/ActionResult.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeHelper.java
Outdated
Show resolved
Hide resolved
| return recipe; | ||
| } | ||
|
|
||
| GTRecipe current = recipe.copy(); |
There was a problem hiding this comment.
I think this copy is unnecessary? Check if the GTRecipeBuilder call does a shallow copy.
src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeHelper.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferPartMachine.java
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferPartMachine.java
Outdated
Show resolved
Hide resolved
...main/java/com/gregtechceu/gtceu/integration/ae2/machine/trait/InternalSlotRecipeHandler.java
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/trait/ProxySlotRecipeHandler.java
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/api/machine/trait/RecipeHandlerList.java
Outdated
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
Refactored how the recipe runner class handled searching and consuming contents of a recipe based on the current handler trying to process that recipe, in short distinct fluid hatches are now possible.
Implementation Details
Refactors out the recipe handling related functions out of
GTRecipeand into their own classRecipeHandler, switched the capability proxy table into a double nested map for better clarity. UnifiedRecipeRunnerto handle the entire map of recipe contents at once instead of on a per capability basis. Got rid of references to the unused slot naming system in recipe searching and handling. Adds Recipe ActionResults to various method for logging how a recipe search or handle method failedOutcome
TBD