1.20.6 #744
Open
1.20.6 #744
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
Minecraftschurli
requested changes
May 2, 2024
Xplat/src/main/java/vazkii/patchouli/common/recipe/ShapedBookRecipe.java
Outdated
Show resolved
Hide resolved
Xplat/src/main/java/vazkii/patchouli/common/recipe/ShapelessBookRecipe.java
Outdated
Show resolved
Hide resolved
| if (nbtStart > 0) { | ||
| nbt = res.substring(nbtStart).replaceAll("([^\\\\])'", "$1\"").replaceAll("\\\\'", "'"); | ||
| res = res.substring(0, nbtStart); | ||
| public static Triple<ResourceLocation, Integer, DataComponentMap> parseItemStackString(String res) { |
There was a problem hiding this comment.
Maybe it's time for a purpose built record here
There was a problem hiding this comment.
Probably, I didn't want to change anything without talking it over first
Xplat/src/main/java/vazkii/patchouli/mixin/AccessorComponentSerializer.java
Outdated
Show resolved
Hide resolved
You can specify components in vanilla results now
|
As discussed in Discord. The custom book recipe types have been removed since you can specify components in vanilla recipe outputs now. |
Minecraftschurli
requested changes
May 6, 2024
Comment on lines
70
to
77
| ItemParser.ItemResult result = parser.parse(new StringReader(res.toString() + components)); //TODO: Check if the parsed result is correct | ||
| componentMap.addAll(result.components()); | ||
| } catch (CommandSyntaxException e) { | ||
| throw new RuntimeException("Failed to parse ItemStack JSON", e); | ||
| } | ||
| } | ||
|
|
||
| return ImmutableTriple.of(key, countn, tag); | ||
| return ImmutableTriple.of(key, countn, componentMap.build()); |
There was a problem hiding this comment.
- use the patch directly not the map
- this method checks for
{for the components but the components use[now
There was a problem hiding this comment.
I don't know regex 😓
There was a problem hiding this comment.
It's probably the res.indexOf("{") isn't it 😓
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.
Initial update to 1.20.6.
I was able to abstract/implement the network message classes into the Xplat source-set.
There's still some TODOs like figuring out what to do with the
nbtkeys from the item related json.