From ff31ffef01088d7b4612dbaa8688fe1e9446550d Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Tue, 17 Jul 2018 19:56:59 -0700 Subject: [PATCH] plugins: Use shared clue arrow and reset images These images are used throughout multiple plugins, thus are moved to a new utility directory. --- .../plugins/cluescrolls/ClueScrollPlugin.java | 2 +- .../deathindicator/DeathWorldMapPoint.java | 2 +- .../kourendlibrary/KourendLibraryPanel.java | 2 +- .../plugins/mta/alchemy/AlchemyRoomTimer.java | 2 +- .../plugins/deathindicator/clue_arrow.png | Bin 368 -> 0 bytes .../client/plugins/mta/alchemy/reset.png | Bin 16069 -> 0 bytes .../plugins/cluescrolls => util}/clue_arrow.png | Bin .../plugins/kourendlibrary => util}/reset.png | Bin 8 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/deathindicator/clue_arrow.png delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/mta/alchemy/reset.png rename runelite-client/src/main/resources/{net/runelite/client/plugins/cluescrolls => util}/clue_arrow.png (100%) rename runelite-client/src/main/resources/{net/runelite/client/plugins/kourendlibrary => util}/reset.png (100%) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java index 4ac8fab050..4d092127f9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java @@ -158,7 +158,7 @@ public class ClueScrollPlugin extends Plugin synchronized (ImageIO.class) { CLUE_SCROLL_IMAGE = ImageIO.read(ClueScrollPlugin.class.getResourceAsStream("clue_scroll.png")); - MAP_ARROW = ImageIO.read(ClueScrollPlugin.class.getResourceAsStream("clue_arrow.png")); + MAP_ARROW = ImageIO.read(ClueScrollPlugin.class.getResourceAsStream("/util/clue_arrow.png")); EMOTE_IMAGE = ImageIO.read(ClueScrollPlugin.class.getResourceAsStream("emote.png")); SPADE_IMAGE = ImageIO.read(ClueScrollPlugin.class.getResourceAsStream("spade.png")); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathWorldMapPoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathWorldMapPoint.java index 629d05b27e..2ef3557965 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathWorldMapPoint.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathWorldMapPoint.java @@ -45,7 +45,7 @@ class DeathWorldMapPoint extends WorldMapPoint { synchronized (ImageIO.class) { - MAP_ARROW = ImageIO.read(DeathWorldMapPoint.class.getResourceAsStream("clue_arrow.png")); + MAP_ARROW = ImageIO.read(DeathWorldMapPoint.class.getResourceAsStream("/util/clue_arrow.png")); } } catch (IOException e) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java index 3dcf7e6542..229c307769 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java @@ -71,7 +71,7 @@ class KourendLibraryPanel extends PluginPanel { synchronized (ImageIO.class) { - BufferedImage resetIcon = ImageIO.read(KourendLibraryPanel.class.getResourceAsStream("reset.png")); + BufferedImage resetIcon = ImageIO.read(KourendLibraryPanel.class.getResourceAsStream("/util/reset.png")); RESET_ICON = new ImageIcon(resetIcon); RESET_CLICK_ICON = new ImageIcon(ImageUtil.alphaOffset(resetIcon, -100)); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java index 1cde50d6f3..7f4d295aaf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java @@ -55,7 +55,7 @@ public class AlchemyRoomTimer extends Timer { synchronized (ImageIO.class) { - image = ImageIO.read(AlchemyRoomTimer.class.getResourceAsStream("reset.png")); + image = ImageIO.read(AlchemyRoomTimer.class.getResourceAsStream("/util/reset.png")); } } catch (IOException ex) diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/deathindicator/clue_arrow.png b/runelite-client/src/main/resources/net/runelite/client/plugins/deathindicator/clue_arrow.png deleted file mode 100644 index 1d0e78056416f5f69be00a3c32cf7b69ee24cf03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^3P7yR!3HGr>b-n`6kC$Fy9>jA5L~c#`DCC7XMsm# zF#`j)FbFd;%$g$s6l5>)^mS!_#3CmkZy2=4dLmHhucwP+NW|f{GdB7i3XpI+zqfe? z!?f~^I!A=qtscHewmPLWL&B%vLi*6 zi8tKgt%@=6hL=g})7cSp1DzCtaonHHvYe37nNQ1o+8dYZ`u2}&wIE&cHWrq z-u8Zl&6FjcJ|$OI?a|a0>*1gBn~mXwLg&jr!V{ksA6qXU_k5P}zQuC|=l`73x%|(K zhWj0}v#kPmPurt6Np0hjzv~3vJrA>7wC)f4TZ^ETd>R*ufC0ha>FVdQ&MBb@07qw< ALjV8( diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/mta/alchemy/reset.png b/runelite-client/src/main/resources/net/runelite/client/plugins/mta/alchemy/reset.png deleted file mode 100644 index e94f6102a5cd22911c1e858557a9eb5c96decb4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16069 zcmeI3dsGuw8o0B2tiC#u%f(Fu=p4z6BtM`F$oYJivqP3 z>w{VqU*MyQU7uL1R%@-)f>l?g3P-!zR#3o4!P;8IE*#lA36F4rIiAz**?(rvfy{Tm z*WBN|-*@MqDTtUkZHW8d+z|vB5*DhB0>3ZQe}e~t|83t){T}?hXbz3DB8bN@`fmWT zdFx07;fy3Tnuv%b%0^j}C^I)qqv4t@l%6yY2x7mEFIrSmd-qoT`Pa(JBO+p=>V4`* zdV6}8mgkh@uFBn%OJ8G!$B&f@x#jQC_h>M>egG%?#F_H5<>lq(xNDay&#ljuly8oY zh&c@gmgeSuHF5lr0N`5Z!Qp5!Gr~e%Hv``Gjfz7a4VaZc~ z4JY546GBAlGp82h?I_oTU9)>I*JIO*udcRXiKjij{g54 z@7d@-V#J22b0%Ds$$XBIP3N1oDB=|+%Lwyg3%?=lR!&9r>AhcNtu9-+u%!L)q-EPb zuN|_(9}BEQd3&csSJYRU3aSbR7Y#4^VytwUGGuCaPsn$hW>m$Me(H5e5!_Oh z-Ru_W5$M$%-_hVsR#ja;lX~Oosek|Tu&?D&1^@Mk z-_c(eK04LhKK7yb-n9+Eh9%>k?SIxj1{rvodvWkT)?G#rB}&G`+G4|JC~?Z@kLjoc z!ryK*gNi~BRj}QR;VFcTn?NLzrXb$WCrV6rOhK|DuXCAg=DQ6AS}VoM3)h0qDPvEdP14P_y?QhymA z7s%vXxx!y4mCGgaH@PB#P>Kq~s93-kiIoz8QX=AZTs*ZqxKmkldS#S$YDYRC1@V$> zHnS2%)6>)a)5ZRjB@q=W6be)zLPa7zu;5!WOg7BUH(AFygLKBx5?0(onr$Ry;?i-k z1S-`Q#N*M4x~`6S8O>dZOx6x|fFf$g%&5>`fcE92!@GRUsTPCd(R4UU7ziU_vRQ$j zuung8XBX>o?~$@g-EU&BCgI_IJ9j>>(b#8dt8GdeK+u7-N7_zLYfOfjK%)pNm1@C> zDQRFT|{S~w8rV?*b2@SQh~WDH5LN1QI;5rGN_%qtotAU z=K#H{xD)4+CLNV-^;My;OZR$rMk>zYEA^Dch}qPn5lbXcvnf%9b`QE( zcI_&qhB8nV@K}Ues6zW1?$Zk#xDn3tR;{IM+-VqT;tB=hT_d=dxP)+QR%MvUYQs!8 z5vEmx0e_OzDFq37ksbr|2}~m8>j;UEkLhq7AIBBA6bn!Uh{RIII)sP2y7vmLrSMd` z;6P|+Z_-gX2;V(3nS{_w1s+dIhG}V+ukb>zYd+VS1$sC9Pn? zXSfssCCRx;#7F$llBOd0!s6E}_ z@G6u(P7LJ#U?Hqn+8+4NIPMO)smnOTj_ox4CwHI6@5C! z_2=lK=x}r{mCKu*qXwO$;Jp#NvZ7t@ti8&!tBd`aH{CP(GowPW*d!1TW|76k%m>o4 zxF8_RB8!We52R&rK|q*A78f%gNXz1afG~?JE@nQEmc<1DVHR0j%zPj%iwgq6EV8(m z`9NA07X*Y^WN|U`fwU|x2ne&t;$r3lX<1wl5N46Z#mooNvbZ21%p!}6nGd98aX~|du`BRuMHD@ zcb?2UnmlUlu~o9NO4E1q^MjXFUwoLIy<}K@OZC(Iu`%cq?{7m&j=eaDG}(ng1GJ$_=vaC6o1+wO6uZ*~O}L-ib}*o2{>H0~ z18WNk_`hlkJhmB^gqZB5`X4hBckMbl_ufw)>V!#N8TGvQB9Ec%PqwKCA!!pn)qHbz S`9At1+OR1zwFf3I%KI-(1ve%D diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/cluescrolls/clue_arrow.png b/runelite-client/src/main/resources/util/clue_arrow.png similarity index 100% rename from runelite-client/src/main/resources/net/runelite/client/plugins/cluescrolls/clue_arrow.png rename to runelite-client/src/main/resources/util/clue_arrow.png diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/kourendlibrary/reset.png b/runelite-client/src/main/resources/util/reset.png similarity index 100% rename from runelite-client/src/main/resources/net/runelite/client/plugins/kourendlibrary/reset.png rename to runelite-client/src/main/resources/util/reset.png