Merged
Conversation
[ci skip]
Per the associated gson change[1], javadoc headings can no longer start with `<h3>`, so it is changed to `<h2>` instead. Separately, on JDKs above 11, PMD complains that the given `try` block should be a try-with-resources, despite that change not compiling. This is addressed with a `// NOPMD` comment. [1]: google/gson@0864a02
# Conflicts: # gradle.properties
Contributor
WalkthroughThis pull request updates RuneLite and Microbot to version 1.12.20 and 2.1.24 respectively, and introduces new game constants and data structures related to minigame features. Changes include new minigame-related item IDs, interface elements, database table definitions, sprite constants, and varbit/varplayer identifiers. The PR also increments four spellbook interface IDs in the interface configuration file, adds new mining site location data, expands sprite icon definitions, and updates region mappings. Possibly related PRs
🚥 Pre-merge checks | ✅ 1 | ❌ 2❌ Failed checks (1 warning, 1 inconclusive)
✅ Passed checks (1 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches
Warning There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure. 🔧 ast-grep (0.41.0)runelite-api/src/main/java/net/runelite/api/NullItemID.javarunelite-api/src/main/java/net/runelite/api/gameval/DBTableID.javarunelite-api/src/main/java/net/runelite/api/gameval/InterfaceID.java
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Nitpick comments (1)
runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java (1)
112-114: GLOW_HUNTER and GLOW_CONSTRUCTION are ordered inconsistently.All prior GLOW_* entries follow ascending StatSilhouette index order (_0 through _19), but here
_22(HUNTER) is listed before_21(CONSTRUCTION). For consistency with the established pattern:Suggested reorder
GLOW_SLAYER(SpriteID.StatSilhouette._19, AROUND_2010), - GLOW_HUNTER(SpriteID.StatSilhouette._22, AROUND_2010), GLOW_CONSTRUCTION(SpriteID.StatSilhouette._21, AROUND_2010), + GLOW_HUNTER(SpriteID.StatSilhouette._22, AROUND_2010),🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java` around lines 112 - 114, The GLOW_* enum entries are out of order: swap the positions of GLOW_HUNTER and GLOW_CONSTRUCTION so the SpriteID.StatSilhouette indices are ascending (place GLOW_CONSTRUCTION with SpriteID.StatSilhouette._21 before GLOW_HUNTER with SpriteID.StatSilhouette._22) to match the established ordering pattern in the SpriteOverride enum.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@runelite-client/src/main/resources/net/runelite/client/plugins/gpu/regions/regions.txt`:
- Around line 412-414: The area header comment "dream mentor battle" is followed
by a commented-out `n` command so the `r 28 80` region gets attached to the
previous "ancient cavern ds2" area; either uncomment the `n` command to start a
new area for "dream mentor battle" or, if this region is intentionally part of
"ancient cavern ds2", update the comment to indicate it's grouped—look for the
`//n` line above `r 28 80` and either remove the leading `//` to enable the `n`
area separator or change the area comment text to reflect grouping.
---
Nitpick comments:
In
`@runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java`:
- Around line 112-114: The GLOW_* enum entries are out of order: swap the
positions of GLOW_HUNTER and GLOW_CONSTRUCTION so the SpriteID.StatSilhouette
indices are ascending (place GLOW_CONSTRUCTION with SpriteID.StatSilhouette._21
before GLOW_HUNTER with SpriteID.StatSilhouette._22) to match the established
ordering pattern in the SpriteOverride enum.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: 492ef320-747d-4f71-8c32-55adda4bb7ac
⛔ Files ignored due to path filters (21)
runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7431.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7432.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7433.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7434.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7436.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7437.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7438.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7439.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7440.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7441.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7442.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7443.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7444.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7445.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7446.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7447.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7448.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7449.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7450.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7452.pngis excluded by!**/*.pngrunelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/7453.pngis excluded by!**/*.png
📒 Files selected for processing (15)
gradle.propertiesrunelite-api/src/main/interfaces/interfaces.tomlrunelite-api/src/main/java/net/runelite/api/NullItemID.javarunelite-api/src/main/java/net/runelite/api/gameval/DBTableID.javarunelite-api/src/main/java/net/runelite/api/gameval/InterfaceID.javarunelite-api/src/main/java/net/runelite/api/gameval/InventoryID.javarunelite-api/src/main/java/net/runelite/api/gameval/ItemID.javarunelite-api/src/main/java/net/runelite/api/gameval/SpriteID.javarunelite-api/src/main/java/net/runelite/api/gameval/VarPlayerID.javarunelite-api/src/main/java/net/runelite/api/gameval/VarbitID.javarunelite-client/src/main/java/net/runelite/client/account/SessionManager.javarunelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.javarunelite-client/src/main/java/net/runelite/client/plugins/worldmap/MiningSiteLocation.javarunelite-client/src/main/java/net/runelite/client/util/RuntimeTypeAdapterFactory.javarunelite-client/src/main/resources/net/runelite/client/plugins/gpu/regions/regions.txt
Comment on lines
+412
to
+414
| // dream mentor battle | ||
| //n | ||
| r 28 80 |
Contributor
There was a problem hiding this comment.
Inconsistent: n command is commented out but area comment suggests a distinct region.
The n command on line 413 is commented out (//n), so r 28 80 will be assigned to the previous area's ID (ancient cavern ds2) rather than starting a new "dream mentor battle" area. This breaks the pattern used throughout the file where each named area starts with an n command.
If "dream mentor battle" should be its own distinct area, uncomment the n. If it's intentionally grouped with the previous area, the comment should reflect that.
Proposed fix if this should be a distinct area
// dream mentor battle
-//n
+n
r 28 80📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| // dream mentor battle | |
| //n | |
| r 28 80 | |
| // dream mentor battle | |
| n | |
| r 28 80 |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@runelite-client/src/main/resources/net/runelite/client/plugins/gpu/regions/regions.txt`
around lines 412 - 414, The area header comment "dream mentor battle" is
followed by a commented-out `n` command so the `r 28 80` region gets attached to
the previous "ancient cavern ds2" area; either uncomment the `n` command to
start a new area for "dream mentor battle" or, if this region is intentionally
part of "ancient cavern ds2", update the comment to indicate it's grouped—look
for the `//n` line above `r 28 80` and either remove the leading `//` to enable
the `n` area separator or change the area comment text to reflect grouping.
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
5 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.
No description provided.