Repository navigation
fix: backport #564 RuneLite 1.13 price changes into development - #609
Merged
Merged
Conversation
Development fixed the 2.6.25 long item-price API independently in #566 by narrowing prices back to int, while main got #564, which keeps prices and totals in long. Since then every development -> main release has had to keep main's copy of these files by hand. Bring #564's content into development: long price/total arithmetic in Discord, Humidifier, LunarPlankMake, TanLeather, MoonlightMoth, revKiller, Thieving, PVirewatchKiller and WildernessAgility, the minClientVersion = "2.6.25" bumps for revKiller and Zulrah, and docs/RUNELITE_1_13_MIGRATION.md. Development's newer revKiller version 2.0.11 (#606) and its non-deprecated VarClientID.TOPLEVEL_PANEL read in PrayerMarkerOverlay (same varc 171 as VarClientInt.INVENTORY_TAB) stay. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LjtEMzQHGuq4M1Mpqk9pPV
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
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.
Problem
#564 (the RuneLite 1.13 / client 2.6.25 item-price fix) was merged only into
main. Development got its own fix in #566, which narrowed the newlongprices back toint. So the same files now differ between the two branches, and each development -> main release since then (#595, #605) has had to keep main's copy of them by hand.Change
For the files #564 touched, this PR applies main's content on top of development:
longin Discord, Humidifier, LunarPlankMake, TanLeather, MoonlightMoth (overlay and script), revKiller, Thieving (comparingLong), PVirewatchKiller (formatNumber(long)) and WildernessAgility (mapToLong, value getters now returnlong). Lunar, TanLeather and Humidifier show profit withQuantityFormatter.quantityToStackSize(long).minClientVersion = "2.6.25".docs/RUNELITE_1_13_MIGRATION.md.Two of development's changes stay as they are on purpose:
version = "2.0.11"from fix(revkiller): bump version to 2.0.11 so stable users get the #598 changes #606. It is newer than main's 2.0.10.PrayerMarkerOverlaykeeps fix: compile Hub plugins against Microbot client 2.6.26 #566'sclient.getVarcIntValue(VarClientID.TOPLEVEL_PANEL). fix: compile Hub plugins against Microbot client 2.6.26 #566 was merged after [codex] Migrate Hub plugins for Microbot 2.6.25 / RuneLite 1.13 #564, andnet.runelite.api.VarClientIntis@Deprecatedin client 2.6.32. Both constants are171(checked withjavap -constantson microbot-2.6.32.jar), so it reads the same varc.There are no other plugin version bumps. Stable users already have this code under the versions main shipped, and development's versions are equal to or higher than main's for every plugin touched.
The other six files #564 touched (AutoFiremakingPlus overlay and plugin, the Humidifier, LunarPlankMake, MoonlightMoth and Thieving plugin classes) were already identical on both branches.
git diff origin/main 352dc76 -- <#564 files>Nothing else differs from main in those 22 files.
git merge-tree --write-tree origin/main 352dc76Exit code 0, so it merges cleanly with no conflicts. One thing to know: the merge base (362786b) already has the
TOPLEVEL_PANELline, so a plain merge keeps main'sINVENTORY_TABline there. A squash release from development would move main toTOPLEVEL_PANEL. Both read varc 171, so the behaviour is the same either way.Testing
./gradlew compileJava compileTestJava testagainst client 2.6.32 (the latest release, resolved by the build): BUILD SUCCESSFUL. 790 tests ran, 0 failures, 0 errors, 2 skipped.PVirewatchKillerPluginFormatNumberTest:formatNumber(3_000_000_000L)returns"3000m", and the existing k/m formatting for small totals is unchanged. With development'sPVirewatchKillerPlugin.javaput back, the test fails to compile (possible lossy conversion from long to int). With this change it passes.Not verified: no live in-game run. These are type-widening changes that match what stable users already run from main. The other plugins' profit and total displays have no tests, so they are covered only by compiling.
🤖 Generated with Claude Code
https://claude.ai/code/session_01LjtEMzQHGuq4M1Mpqk9pPV