Improve TagPrefix-based Recipe Generation #2616
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
TechLord22
added
Do Not Merge
screret
requested changes
Jan 4, 2025
| * | ||
| * @param materials the materials to add as byproducts | ||
| */ | ||
| public void addOreByProducts(@NotNull Material @NotNull... materials) { |
There was a problem hiding this comment.
I love @NotNull Material @NotNull...
Comment on lines
+237
to
250
| /** | ||
| * Copies the ItemStack with new stack size. | ||
| * | ||
| * @param stack item stack for copying | ||
| * @return a copy of ItemStack, or {@link ItemStack#EMPTY} if the stack is empty | ||
| */ | ||
| public static @NotNull ItemStack copy(int newCount, @NotNull ItemStack stack) { | ||
| if (stack.isEmpty()) { | ||
| return ItemStack.EMPTY; | ||
| } | ||
| ItemStack copy = stack.copy(); | ||
| copy.setCount(newCount); | ||
| return copy; | ||
| } |
There was a problem hiding this comment.
this can be removed in favor of ItemStack#copyWithCount
Comment on lines
+284
to
+286
| ItemStack copy = stack.copy(); | ||
| copy.setCount(newCount); | ||
| return copy; |
There was a problem hiding this comment.
change this to use ItemStack#copyWithCount
Comment on lines
+50
to
+57
| private static final Reference2IntMap<TagPrefix> INSULATION_AMOUNT = new Reference2IntOpenHashMap<>(); | ||
| static { | ||
| INSULATION_AMOUNT.put(cableGtSingle, 1); | ||
| INSULATION_AMOUNT.put(cableGtDouble, 1); | ||
| INSULATION_AMOUNT.put(cableGtQuadruple, 2); | ||
| INSULATION_AMOUNT.put(cableGtOctal, 3); | ||
| INSULATION_AMOUNT.put(cableGtHex, 5); | ||
| } |
There was a problem hiding this comment.
could use the Util.make(T,Consumer<T>) method from vanilla here
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
Improves TagPrefix-based Recipe Generation. Notably, this PR no longer iterates all materials for every registration handler. Instead, materials are only iterated once.
Also, fixes a bug where ores of gem materials would not forge hammer to the gem if the material had an ignored gem.
Implementation Details
GTUtil.copyAmountandGTUtil.selectItemInListto begin with.TagPrefix.MaterialRecipeHandlerandTagPrefix#executeHandler. This will require addons to update, and this PR serves as an example of how to do so.Outcome
Improves performance and cleans up recipe generation code.