Bring texture-based pattern rendering to 1.20 - #555
Merged
Conversation
…o the 1.20 branch and fixed it up to work in this version (FallingColors@f5a76ed)
…ntical by altering the old renderer to match the new (only bothered for slate since its the only one that will toggle back to the old renderer in normal gameplay, and the scroll renderer is a bit more complicated).
Comment on lines
+18
to
+38
| // cmd.then(Commands.literal("textureSetColor") | ||
| // .requires(dp -> dp.hasPermission(Commands.LEVEL_ADMINS)) | ||
| // .then(Commands.argument("r", IntegerArgumentType.integer()) | ||
| // .then(Commands.argument("g", IntegerArgumentType.integer()) | ||
| // .then(Commands.argument("b", IntegerArgumentType.integer()).executes(ctx -> { | ||
| // var r = IntegerArgumentType.getInteger(ctx, "r"); | ||
| // var g = IntegerArgumentType.getInteger(ctx, "g"); | ||
| // var b = IntegerArgumentType.getInteger(ctx, "b"); | ||
| // PatternTextureManager.color = new Color(r,g,b,255); | ||
| // PatternTextureManager.repaint(); | ||
| // return 1; | ||
| // }))))); | ||
| // | ||
| // cmd.then(Commands.literal("textureSetResolution") | ||
| // .requires(dp -> dp.hasPermission(Commands.LEVEL_ADMINS)) | ||
| // .then(Commands.argument("integer", IntegerArgumentType.integer()).executes(ctx -> { | ||
| // var integer = IntegerArgumentType.getInteger(ctx, "integer"); | ||
| // PatternTextureManager.resolutionByBlockSize = integer; | ||
| // PatternTextureManager.repaint(); | ||
| // return 1; | ||
| // }))); |
Member
There was a problem hiding this comment.
Suggested change
| // cmd.then(Commands.literal("textureSetColor") | |
| // .requires(dp -> dp.hasPermission(Commands.LEVEL_ADMINS)) | |
| // .then(Commands.argument("r", IntegerArgumentType.integer()) | |
| // .then(Commands.argument("g", IntegerArgumentType.integer()) | |
| // .then(Commands.argument("b", IntegerArgumentType.integer()).executes(ctx -> { | |
| // var r = IntegerArgumentType.getInteger(ctx, "r"); | |
| // var g = IntegerArgumentType.getInteger(ctx, "g"); | |
| // var b = IntegerArgumentType.getInteger(ctx, "b"); | |
| // PatternTextureManager.color = new Color(r,g,b,255); | |
| // PatternTextureManager.repaint(); | |
| // return 1; | |
| // }))))); | |
| // | |
| // cmd.then(Commands.literal("textureSetResolution") | |
| // .requires(dp -> dp.hasPermission(Commands.LEVEL_ADMINS)) | |
| // .then(Commands.argument("integer", IntegerArgumentType.integer()).executes(ctx -> { | |
| // var integer = IntegerArgumentType.getInteger(ctx, "integer"); | |
| // PatternTextureManager.resolutionByBlockSize = integer; | |
| // PatternTextureManager.repaint(); | |
| // return 1; | |
| // }))); |
Probably better to just remove this - we can always grab it from commit history if we need it back
… second every time someone places a scroll
Render pattern textures in a background thread
# Conflicts: # Common/src/main/java/at/petrak/hexcasting/client/render/PatternTextureManager.java
… crash when too many patterns added to render queue at once, try and fix flickering issue.
| public static ResourceLocation getTexture(List<Vec2> points, String pointsKey, int blockSize, boolean showsStrokeOrder, float lineWidth, boolean useFullSize, Color innerColor, Color outerColor) { | ||
| if (patternTexturesToAdd.containsKey(pointsKey)) | ||
| return patternTexturesToAdd.get(pointsKey); | ||
| if (patternTexturesToAdd.containsKey(pointsKey)) { |
Member
There was a problem hiding this comment.
nice, i think i tried to do something like this but i'm bad at java and minecraft so it didn't work
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Copied the code from Nitero's texture-based pattern rendering pull request into the 1.20 branch and fixed all resulting errors, then matched the colours with the currently-used colours and got the old-style rendering for slates being centered and scaled the same as the new style so that switching back to the old style when they become energised isn't jarring.