From 816bb9e412baac5a6b7f411790b6e434d86736b3 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 22 Feb 2022 12:34:21 -0500 Subject: [PATCH 1/9] client: update archive-patcher to 1.2 --- runelite-client/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 2847fd6f70..a8c0353dd6 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -118,9 +118,9 @@ 1.4 - net.runelite - archive-patcher - 1.0 + net.runelite.archive-patcher + archive-patcher-applier + 1.2 net.java.dev.jna From 44c8c3e1e4d52d31270063bbf835160de7d130a6 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 22 Feb 2022 09:42:25 -0700 Subject: [PATCH 2/9] Update Item IDs to 2022-2-23 --- .../main/java/net/runelite/api/ItemID.java | 32 +++++++++++++++++++ .../java/net/runelite/api/NullItemID.java | 28 ++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java index 87a8035fc7..ff78a30dc2 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -12370,5 +12370,37 @@ public final class ItemID public static final int STRONGBONES_BONE = 26593; public static final int GRUBFOOT = 26594; public static final int ZANIK_26595 = 26595; + public static final int NOTES_26596 = 26596; + public static final int DESERT_BAIT = 26598; + public static final int TINY_FISH = 26600; + public static final int OSMANS_REPORT = 26602; + public static final int TREASURE_CLUE_ONE = 26605; + public static final int TREASURE_CLUE_TWO = 26607; + public static final int TREASURE_CLUE_THREE = 26609; + public static final int ZEKES_CHALLENGE_SCROLL = 26611; + public static final int CAPT_ARNAVS_CHEST = 26613; + public static final int BUCKET_COOKOUT = 26615; + public static final int BUCKET_OF_WATER_COOKOUT = 26617; + public static final int POT_COOKOUT = 26619; + public static final int POT_OF_FLOUR_COOKOUT = 26621; + public static final int TOMATO_COOKOUT = 26623; + public static final int CHEESE_COOKOUT = 26625; + public static final int BANANA_COOKOUT = 26627; + public static final int PIZZA_BASE_COOKOUT = 26629; + public static final int INCOMPLETE_PIZZA_COOKOUT = 26631; + public static final int UNCOOKED_PIZZA_COOKOUT = 26633; + public static final int PLAIN_PIZZA_COOKOUT = 26635; + public static final int BURNT_PIZZA_COOKOUT = 26637; + public static final int BREAD_DOUGH_COOKOUT = 26639; + public static final int BREAD_COOKOUT = 26641; + public static final int BURNT_BREAD_COOKOUT = 26643; + public static final int BANANA_PIZZA_COOKOUT = 26645; + public static final int BURNT_BANANA_PIZZA_COOKOUT = 26647; + public static final int SKIS = 26649; + public static final int LOOT_KEY = 26651; + public static final int LOOT_KEY_26652 = 26652; + public static final int LOOT_KEY_26653 = 26653; + public static final int LOOT_KEY_26654 = 26654; + public static final int LOOT_KEY_26655 = 26655; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java index 472a12a29b..4679c49e16 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -14015,5 +14015,33 @@ public final class NullItemID public static final int NULL_26584 = 26584; public static final int NULL_26586 = 26586; public static final int NULL_26588 = 26588; + public static final int NULL_26597 = 26597; + public static final int NULL_26599 = 26599; + public static final int NULL_26601 = 26601; + public static final int NULL_26603 = 26603; + public static final int NULL_26604 = 26604; + public static final int NULL_26606 = 26606; + public static final int NULL_26608 = 26608; + public static final int NULL_26610 = 26610; + public static final int NULL_26612 = 26612; + public static final int NULL_26614 = 26614; + public static final int NULL_26616 = 26616; + public static final int NULL_26618 = 26618; + public static final int NULL_26620 = 26620; + public static final int NULL_26622 = 26622; + public static final int NULL_26624 = 26624; + public static final int NULL_26626 = 26626; + public static final int NULL_26628 = 26628; + public static final int NULL_26630 = 26630; + public static final int NULL_26632 = 26632; + public static final int NULL_26634 = 26634; + public static final int NULL_26636 = 26636; + public static final int NULL_26638 = 26638; + public static final int NULL_26640 = 26640; + public static final int NULL_26642 = 26642; + public static final int NULL_26644 = 26644; + public static final int NULL_26646 = 26646; + public static final int NULL_26648 = 26648; + public static final int NULL_26650 = 26650; /* This file is automatically generated. Do not edit. */ } From f99232fc4f31972e2d5b67c09b4051a637986a37 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 22 Feb 2022 09:42:25 -0700 Subject: [PATCH 3/9] Update Item variations to 2022-2-23 --- .../src/main/resources/item_variations.json | 66 +++++++++++++++++-- 1 file changed, 61 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index 20478a5d05..4d99b9390d 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -261,7 +261,8 @@ 21056, 21057, 21058, - 26276 + 26276, + 26596 ], "glarials urn": [ 296, @@ -2454,16 +2455,23 @@ "bucket": [ 1925, 8986, - 9660 + 9660, + 26615 ], "bucket of water": [ 1929, 6712, - 9659 + 9659, + 26617 + ], + "pot": [ + 1931, + 26619 ], "pot of flour": [ 1933, - 2516 + 2516, + 26621 ], "swamp paste": [ 1941, @@ -2490,6 +2498,10 @@ 11029, 11030 ], + "banana": [ + 1963, + 26627 + ], "cabbage": [ 1965, 1967, @@ -2508,6 +2520,14 @@ 1980, 7728 ], + "tomato": [ + 1982, + 26623 + ], + "cheese": [ + 1985, + 26625 + ], "jug of bad wine": [ 1991, 1992 @@ -2686,9 +2706,22 @@ 2281, 9533 ], + "pizza base": [ + 2283, + 26629 + ], + "incomplete pizza": [ + 2285, + 26631 + ], + "uncooked pizza": [ + 2287, + 26633 + ], "plain pizza": [ 2289, - 2291 + 2291, + 26635 ], "meat pizza": [ 2293, @@ -2702,6 +2735,22 @@ 2301, 2303 ], + "burnt pizza": [ + 2305, + 26637 + ], + "bread dough": [ + 2307, + 26639 + ], + "bread": [ + 2309, + 26641 + ], + "burnt bread": [ + 2311, + 26643 + ], "redberry pie": [ 2325, 2333 @@ -10341,5 +10390,12 @@ 26583, 26585, 26587 + ], + "loot key": [ + 26651, + 26652, + 26653, + 26654, + 26655 ] } \ No newline at end of file From 5f752957e44d10145c1d5ab3c09b591b007db18a Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 22 Feb 2022 09:42:25 -0700 Subject: [PATCH 4/9] Update Object IDs to 2022-2-23 --- .../java/net/runelite/api/NullObjectID.java | 1 + .../main/java/net/runelite/api/ObjectID.java | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java index 8f6c9c556b..dcb5736025 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -21428,5 +21428,6 @@ public final class NullObjectID public static final int NULL_43465 = 43465; public static final int NULL_43466 = 43466; public static final int NULL_43467 = 43467; + public static final int NULL_43486 = 43486; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java index 257d06bdf3..872014c641 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -22025,5 +22025,23 @@ public final class ObjectID public static final int LARGE_DOOR_43459 = 43459; public static final int LARGE_DOOR_43460 = 43460; public static final int CAVE_ENTRANCE_43462 = 43462; + public static final int BANNER_43468 = 43468; + public static final int BANNER_43469 = 43469; + public static final int BANNER_43470 = 43470; + public static final int BANNER_43471 = 43471; + public static final int PARTY_BALLOONS = 43472; + public static final int PARTY_BALLOONS_43473 = 43473; + public static final int PARTY_BALLOONS_43474 = 43474; + public static final int PARTY_BALLOONS_43475 = 43475; + public static final int PARTY_BALLOONS_43476 = 43476; + public static final int SINK_43477 = 43477; + public static final int BARREL_OF_FLOUR_43478 = 43478; + public static final int CLAY_OVEN_43479 = 43479; + public static final int COOKING_SHELF_UTENSILS = 43480; + public static final int JUDGES_TABLE = 43481; + public static final int TABLE_43482 = 43482; + public static final int CUPBOARD_43483 = 43483; + public static final int LOOT_CHEST = 43484; + public static final int LOOT_CHEST_43485 = 43485; /* This file is automatically generated. Do not edit. */ } From dcf1c579c0502443b0f7409d8a5f858b538651ea Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 22 Feb 2022 09:42:25 -0700 Subject: [PATCH 5/9] Update NPC IDs to 2022-2-23 --- .../src/main/java/net/runelite/api/NpcID.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index 87ab0865c5..043207441e 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -8747,8 +8747,8 @@ public final class NpcID public static final int ZAMORAKIAN_ACOLYTE = 10379; public static final int ZAMORAKIAN_ACOLYTE_10380 = 10380; public static final int ZAMORAKIAN_ACOLYTE_10381 = 10381; - public static final int REFUGEE = 10382; - public static final int REFUGEE_10383 = 10383; + public static final int SKULLY = 10382; + public static final int REFUGEE = 10383; public static final int REFUGEE_10384 = 10384; public static final int REFUGEE_10385 = 10385; public static final int PHABELLE_BILE = 10386; @@ -9620,5 +9620,15 @@ public final class NpcID public static final int DIPFLIP = 11383; public static final int OLDAK_11384 = 11384; public static final int OLDAK_11385 = 11385; + public static final int LARRY_LEPRECHAUN = 11399; + public static final int FISHING_SPOT_11400 = 11400; + public static final int BIG_DAVE_11401 = 11401; + public static final int CAPT_ARNAV_11402 = 11402; + public static final int MY_ARM_11403 = 11403; + public static final int COOK_11404 = 11404; + public static final int WISE_OLD_MAN_11405 = 11405; + public static final int HANS_11406 = 11406; + public static final int HASSAN_11407 = 11407; + public static final int LEPRECHAUN = 11408; /* This file is automatically generated. Do not edit. */ } From 37229a5fa43b50d1e98c651a4c19907574f8b6bf Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 22 Feb 2022 09:42:25 -0700 Subject: [PATCH 6/9] Update Scripts to 2022-2-23 --- .../src/main/scripts/CommandScript.hash | 2 +- .../src/main/scripts/CommandScript.rs2asm | 181 ++++++++++-------- 2 files changed, 101 insertions(+), 82 deletions(-) diff --git a/runelite-client/src/main/scripts/CommandScript.hash b/runelite-client/src/main/scripts/CommandScript.hash index 837a1a06f9..b6795bca51 100644 --- a/runelite-client/src/main/scripts/CommandScript.hash +++ b/runelite-client/src/main/scripts/CommandScript.hash @@ -1 +1 @@ -BC3DDC3675375E1FD9AD64DEBF4FDA5B4102FE542088C310881120DC47270566 \ No newline at end of file +7A4628DC7933B4340CEC5F1B3C75ED1857FEDB5E683829499A07E5C364F633FA \ No newline at end of file diff --git a/runelite-client/src/main/scripts/CommandScript.rs2asm b/runelite-client/src/main/scripts/CommandScript.rs2asm index 8f7fb0cece..1e345c3c41 100644 --- a/runelite-client/src/main/scripts/CommandScript.rs2asm +++ b/runelite-client/src/main/scripts/CommandScript.rs2asm @@ -90,13 +90,13 @@ LABEL60: iload 0 iconst 84 if_icmpeq LABEL76 - jump LABEL815 + jump LABEL829 LABEL76: invoke 1984 iload 2 iconst 0 if_icmpgt LABEL81 - jump LABEL814 + jump LABEL828 LABEL81: iload 3 iconst 1 @@ -699,7 +699,7 @@ LABEL587: sconst "You are not chatting as a guest in a clan channel at the moment." mes LABEL589: - jump LABEL810 + jump LABEL824 LABEL590: iload 5 iconst 41 @@ -792,7 +792,7 @@ LABEL662: sconst "You are not chatting in the channel of your own Iron Group at the moment." mes LABEL664: - jump LABEL810 + jump LABEL824 LABEL665: iload 5 iconst 9 @@ -852,7 +852,7 @@ LABEL706: iconst -1 invoke 5517 LABEL712: - jump LABEL810 + jump LABEL824 LABEL713: iload 5 iconst 2 @@ -868,17 +868,17 @@ LABEL717: iconst 0 iload 9 invoke 5517 - jump LABEL810 + jump LABEL824 LABEL727: iload 4 iconst 1 if_icmpeq LABEL731 - jump LABEL804 + jump LABEL818 LABEL731: iload 2 iconst 2 if_icmpgt LABEL735 - jump LABEL797 + jump LABEL811 LABEL735: get_varc_string 335 sconst "::toggleroof" @@ -886,61 +886,80 @@ LABEL735: string_indexof_string iconst 0 if_icmpeq LABEL742 - jump LABEL756 + jump LABEL770 LABEL742: getremoveroofs iconst 1 if_icmpeq LABEL746 - jump LABEL751 + jump LABEL758 LABEL746: iconst 0 setremoveroofs + get_varbit 12378 + iconst 0 + if_icmpeq LABEL752 + jump LABEL755 +LABEL752: sconst "Roofs will only be removed selectively." mes - jump LABEL755 -LABEL751: + jump LABEL757 +LABEL755: + sconst "Roofs will only be removed selectively. This setting will not be saved." + mes +LABEL757: + jump LABEL769 +LABEL758: iconst 1 setremoveroofs + get_varbit 12378 + iconst 1 + if_icmpeq LABEL764 + jump LABEL767 +LABEL764: sconst "Roofs are now all hidden." mes -LABEL755: - jump LABEL796 -LABEL756: + jump LABEL769 +LABEL767: + sconst "Roofs are now all hidden. This setting will not be saved." + mes +LABEL769: + jump LABEL810 +LABEL770: get_varc_string 335 sconst "::wiki " iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL768 + if_icmpeq LABEL782 get_varc_string 335 sconst "::wiki" compare iconst 0 - if_icmpeq LABEL768 + if_icmpeq LABEL782 sconst "runeliteCommand" ; load callback name runelite_callback ; invoke callback - jump LABEL771 -LABEL768: + jump LABEL785 +LABEL782: get_varc_string 335 invoke 3299 - jump LABEL796 -LABEL771: + jump LABEL810 +LABEL785: get_varc_string 335 sconst "::bank" iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL778 - jump LABEL785 -LABEL778: + if_icmpeq LABEL792 + jump LABEL799 +LABEL792: sconst "Hey, everyone, I just tried to do something very silly!" iconst 0 iconst -1 iconst 0 iconst -1 invoke 5517 - jump LABEL796 -LABEL785: + jump LABEL810 +LABEL799: get_varc_string 335 invoke 224 set_varc_string 335 @@ -952,97 +971,97 @@ LABEL785: iload 2 substring docheat -LABEL796: - jump LABEL803 -LABEL797: +LABEL810: + jump LABEL817 +LABEL811: get_varc_string 335 iconst 0 iconst -1 iconst 0 iconst -1 invoke 5517 -LABEL803: - jump LABEL810 -LABEL804: +LABEL817: + jump LABEL824 +LABEL818: get_varc_string 335 iconst 0 iconst -1 iconst 1 iload 9 invoke 5517 -LABEL810: +LABEL824: get_varc_string 335 invoke 77 sconst "" set_varc_string 335 -LABEL814: - jump LABEL890 -LABEL815: +LABEL828: + jump LABEL904 +LABEL829: iload 0 iconst 104 - if_icmpeq LABEL819 - jump LABEL825 -LABEL819: + if_icmpeq LABEL833 + jump LABEL839 +LABEL833: iload 3 iconst 1 - if_icmpeq LABEL823 - jump LABEL824 -LABEL823: + if_icmpeq LABEL837 + jump LABEL838 +LABEL837: invoke 75 -LABEL824: - jump LABEL890 -LABEL825: +LABEL838: + jump LABEL904 +LABEL839: iload 0 iconst 105 - if_icmpeq LABEL829 - jump LABEL835 -LABEL829: + if_icmpeq LABEL843 + jump LABEL849 +LABEL843: iload 3 iconst 1 - if_icmpeq LABEL833 - jump LABEL834 -LABEL833: + if_icmpeq LABEL847 + jump LABEL848 +LABEL847: invoke 76 -LABEL834: - jump LABEL890 -LABEL835: +LABEL848: + jump LABEL904 +LABEL849: iload 0 iconst 80 - if_icmpeq LABEL839 - jump LABEL884 -LABEL839: + if_icmpeq LABEL853 + jump LABEL898 +LABEL853: iconst 40697936 iconst 1 cc_find iconst 1 - if_icmpeq LABEL845 - jump LABEL846 -LABEL845: + if_icmpeq LABEL859 + jump LABEL860 +LABEL859: return -LABEL846: +LABEL860: get_varc_string 356 string_length iconst 0 - if_icmpgt LABEL851 - jump LABEL871 -LABEL851: + if_icmpgt LABEL865 + jump LABEL885 +LABEL865: get_varc_string 356 friend_test iconst 1 - if_icmpeq LABEL856 - jump LABEL859 -LABEL856: + if_icmpeq LABEL870 + jump LABEL873 +LABEL870: get_varc_string 356 invoke 107 return -LABEL859: +LABEL873: get_varc_int 60 clientclock - if_icmpgt LABEL863 - jump LABEL864 -LABEL863: + if_icmpgt LABEL877 + jump LABEL878 +LABEL877: return -LABEL864: +LABEL878: clientclock iconst 50 add @@ -1050,14 +1069,14 @@ LABEL864: sconst "That player was not found on your Friends list." mes return -LABEL871: +LABEL885: get_varc_int 60 clientclock - if_icmpgt LABEL875 - jump LABEL876 -LABEL875: + if_icmpgt LABEL889 + jump LABEL890 +LABEL889: return -LABEL876: +LABEL890: clientclock iconst 50 add @@ -1065,8 +1084,8 @@ LABEL876: sconst "You haven't received any messages to which you can reply." mes return - jump LABEL890 -LABEL884: + jump LABEL904 +LABEL898: get_varc_string 335 iconst 0 iload 0 @@ -1078,9 +1097,9 @@ LABEL884: runelite_callback ; if_icmpeq SKIPSETVARC ; skip setting varc with input set_varc_string 335 - jump LABEL890 ; jump over SKIPSETVARC + jump LABEL904 ; jump over SKIPSETVARC SKIPSETVARC: pop_string ; pop message -LABEL890: +LABEL904: invoke 223 return From 36ddf04b5f43af4d0aced9dc85865fbf212b41ad Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Wed, 23 Feb 2022 11:55:18 +0000 Subject: [PATCH 7/9] Release 1.8.12 --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- pom.xml | 4 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-jshell/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 34b7b38d62..47c2934c8a 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.12-SNAPSHOT + 1.8.12 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 4aa3eaf1be..2784cae6ca 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.12-SNAPSHOT + 1.8.12 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 70e4080d39..684047fb64 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.12-SNAPSHOT + 1.8.12 cache diff --git a/pom.xml b/pom.xml index 5e33dd9167..19558e81a9 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.12-SNAPSHOT + 1.8.12 pom RuneLite @@ -63,7 +63,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - HEAD + runelite-parent-1.8.12 diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 565e23d095..74e6eaef97 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.12-SNAPSHOT + 1.8.12 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index a8c0353dd6..129147785c 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.12-SNAPSHOT + 1.8.12 client diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml index 8ba2729be0..b97a78179e 100644 --- a/runelite-jshell/pom.xml +++ b/runelite-jshell/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.8.12-SNAPSHOT + 1.8.12 jshell diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index c4a2aa59aa..00b42e38db 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.12-SNAPSHOT + 1.8.12 script-assembler-plugin From edf647f1abd52f2211ba1803b770c3da2e7d470b Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Wed, 23 Feb 2022 11:55:21 +0000 Subject: [PATCH 8/9] Bump for 1.8.13-SNAPSHOT --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- pom.xml | 4 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-jshell/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 47c2934c8a..7246369f27 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.12 + 1.8.13-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 2784cae6ca..57c3667f93 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.12 + 1.8.13-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 684047fb64..84a81a4512 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.12 + 1.8.13-SNAPSHOT cache diff --git a/pom.xml b/pom.xml index 19558e81a9..fa8dfc977d 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.12 + 1.8.13-SNAPSHOT pom RuneLite @@ -63,7 +63,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - runelite-parent-1.8.12 + HEAD diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 74e6eaef97..15c2888624 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.12 + 1.8.13-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 129147785c..b24ff0f30c 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.12 + 1.8.13-SNAPSHOT client diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml index b97a78179e..78198cd8d5 100644 --- a/runelite-jshell/pom.xml +++ b/runelite-jshell/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.8.12 + 1.8.13-SNAPSHOT jshell diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 00b42e38db..2c26602602 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.12 + 1.8.13-SNAPSHOT script-assembler-plugin From 35949bce22b5de0a8bebb4fbd89615a09b0983f7 Mon Sep 17 00:00:00 2001 From: Hooder Date: Wed, 23 Feb 2022 02:41:00 +0100 Subject: [PATCH 9/9] gpu: Fix loading gluegen natives on some Windows configurations This commit works around a bug with loading natives when the user's home folder contains special characters such as `&`, `^` or `!`. When Gluegen loads native libraries on Windows, it uses a temporary directory located in `%appdata%` under the user's home directory, and Gluegen checks whether files can be executed from this temporary directory. To perform this check, it writes an executable to the directory, executes it, and ensures that the return code is zero. The executable file it writes is by default a `.bat` file, but it can be told to write an `.exe` file instead by supplying this VM argument: `-Djogamp.gluegen.UseNativeExeFile=true`. The default behaviour of writing and executing a `.bat` file is broken when the path to the temp folder contains a special character, due to a convoluted trail of calls that leads to undefined behaviour: - Gluegen attempts to execute the `.bat` file by calling `Runtime.exec()`: `Runtime.exec(new String[] { "...absolute path...bat" }, null, null)` - OpenJDK 11.0.8 passes the command to `ProcessBuilder`, which calls `ProcessImpl.start(...)`, which creates a new `ProcessImpl` instance. - In the `ProcessImpl` constructor, there are two different character escape modes: - **Legacy mode**, which allows ambiguous commands. - **Non-legacy mode**, which does more rigorous escaping. - Legacy is the default mode as long as `System.getSecurityManager()` returns `null`, which is the case for RuneLite currently. This mode can be changed by supplying the following VM argument: `-Djdk.lang.Process.allowAmbiguousCommands=false`. - Incidentally this also fixes the issue of loading natives with special characters in the path, however it applies to *all* `Runtime.exec()` calls. - In legacy mode, the command is wrapped in quotes if it contains either a space or tab character. The command is then passed along to the native function `Java_java_lang_ProcessImpl_create`, which eventually passes it along untouched to Microsoft's `CreateProcessW` function as the `lpCommandLine` argument. - In the documentation for this function, it is mentioned that an interpreter (i.e. `cmd.exe`) is required in order to run a `.bat` file. It is not specified what will happen if you instead pass the path to a `.bat` file directly to the function, which is what Gluegen ends up doing. However, `CreateProcessW` *does* support supplying the path to an `.exe`, which Gluegen will do when `jogamp.gluegen.UseNativeExeFile` is set to `true`. It is unclear why supplying a `.bat` file normally works, yet breaks when special characters are in the path. It seems like it should not work in the first place. This might help with #6509 and #14180. Some other special characters, like Cyrillic letters, are more fundamentally broken in RuneLite. This patch only slightly helps with that. --- .../main/java/net/runelite/client/plugins/gpu/GpuPlugin.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java index 232dd9d351..96c992f2da 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java @@ -353,6 +353,8 @@ public class GpuPlugin extends Plugin implements DrawCallbacks System.setProperty("jogl.debug", "true"); } + System.setProperty("jogamp.gluegen.UseNativeExeFile", "true"); + GLProfile.initSingleton(); invokeOnMainThread(() ->