-
Notifications
You must be signed in to change notification settings - Fork 184
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
Item Material Information Refactor #2591
Open
YoungOnionMC
wants to merge
26
commits into
1.20.1
Choose a base branch
from
yo/material-decomp-refactor
base: 1.20.1
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
# Conflicts: # src/main/java/com/gregtechceu/gtceu/api/data/chemical/ChemicalHelper.java # src/main/java/com/gregtechceu/gtceu/api/recipe/ToolHeadReplaceRecipe.java # src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java # src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java # src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java # src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCYMRecipes.java # src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java # src/main/java/com/gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java # src/main/java/com/gregtechceu/gtceu/integration/kjs/GregTechKubeJSPlugin.java
…o yo/material-decomp-refactor # Conflicts: # src/main/java/com/gregtechceu/gtceu/data/recipe/builder/GTRecipeBuilder.java # src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComputerRecipes.java # src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityMachineRecipeLoader.java
… into yo/material-decomp-refactor
… into yo/material-decomp-refactor # Conflicts: # src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java
… into yo/material-decomp-refactor # Conflicts: # src/main/java/com/gregtechceu/gtceu/data/recipe/misc/RecyclingRecipes.java
screret
reviewed
Dec 30, 2024
src/main/java/com/gregtechceu/gtceu/client/renderer/BlockHighlightRenderer.java
Outdated
Show resolved
Hide resolved
@@ -281,6 +284,20 @@ public static void registerCommand(RegisterCommandsEvent event) { | |||
|
|||
@SubscribeEvent | |||
public static void registerReloadListeners(AddReloadListenerEvent event) { | |||
// moved here so that we can get tag info for decomp recipes |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
my comment is just false lmo
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
move this back to where it was originally.
YoungOnionMC
added
Do Not Merge
DO NOT MERGE THIS PR YET!
type: refactor
Suggestion to refactor a section of code
labels
Jan 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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
Overhauls and breaks apart the various methods of
ChemicalHelper
into material related functions and the newItemMaterialInfo
methods, also renamesUnificationEntry
to the more suitableMaterialEntry
.Removes most of
MaterialInfoLoader
in favor of the more procedural method of generating item material stacks as mentioned inGTRecipeBuilder
Additional Information
GTRecipeBuilder
s now temporarily store allMaterialStack
information for use in item decomposition information for recycling recipes if desiredItem decomposition material information also no longer depends on recipe order for material computation (ex needing to register iron plate decomp before iron furnace decomp)
GTRecipeBuilder
allows for fluid inputs using aMaterial
andamount
instead of just theFluidStack
if desiredPotential Incompatibilities
KubeJS recipes should be fine out of the box, just need to use the
addMaterialInfo
helper method if they want added decomp