find volume control and add mute button to loginscreen

Promises · Promises · commit c0b36b03b8a4 · 2021-04-27T13:43:47.000+02:00
diff --git a/src/main/java/com/jagex/runescape/Class22.java b/src/main/java/com/jagex/runescape/Class22.java
@@ -156,8 +156,8 @@ public static void method309(int varPlayerIndex) {
                         i_22_ = 64;
                     if(varPlayerValue == 4)
                         i_22_ = 0;
-                    if(i_22_ != RSCanvas.anInt60) {
-                        if(RSCanvas.anInt60 != 0 || MouseHandler.anInt1457 == -1) {
+                    if(i_22_ != RSCanvas.musicVolume) {
+                        if(RSCanvas.musicVolume != 0 || MouseHandler.anInt1457 == -1) {
                             if(i_22_ == 0) {
                                 Class33.method402(false);
                                 Class35.songTimeout = 0;
@@ -167,7 +167,7 @@ public static void method309(int varPlayerIndex) {
                             Class33.method414(false, 0, MouseHandler.anInt1457, i_22_, 0, CacheArchive.musicCacheArchive);
                             Class35.songTimeout = 0;
                         }
-                        RSCanvas.anInt60 = i_22_;
+                        RSCanvas.musicVolume = i_22_;
                     }
                 }
                 if(varPlayerType == 9)
diff --git a/src/main/java/com/jagex/runescape/Class51.java b/src/main/java/com/jagex/runescape/Class51.java
@@ -71,8 +71,8 @@ public static void clearModelCache() {
     public static void method942(int arg1) {
         if(arg1 == -1 && Class35.songTimeout == 0)
             Class33.method402(false);
-        else if(arg1 != -1 && arg1 != MouseHandler.anInt1457 && RSCanvas.anInt60 != 0 && Class35.songTimeout == 0)
-            Class33.method403(RSCanvas.anInt60, true, 10, arg1, CacheArchive.musicCacheArchive, 0, 0, false);
+        else if(arg1 != -1 && arg1 != MouseHandler.anInt1457 && RSCanvas.musicVolume != 0 && Class35.songTimeout == 0)
+            Class33.method403(RSCanvas.musicVolume, true, 10, arg1, CacheArchive.musicCacheArchive, 0, 0, false);
         MouseHandler.anInt1457 = arg1;
     }
 }
diff --git a/src/main/java/com/jagex/runescape/Class57.java b/src/main/java/com/jagex/runescape/Class57.java
@@ -13,8 +13,8 @@ public class Class57 {
     public static int[] anIntArray1347;
 
     public static void method975(int songTimeout, int songId) {
-        if(RSCanvas.anInt60 != 0 && songId != -1) {
-            Class33.method414(false, 1, songId, RSCanvas.anInt60, 0, CacheArchive.jingleCacheArchive);
+        if(RSCanvas.musicVolume != 0 && songId != -1) {
+            Class33.method414(false, 1, songId, RSCanvas.musicVolume, 0, CacheArchive.jingleCacheArchive);
             Class35.songTimeout = songTimeout;
         }
     }
diff --git a/src/main/java/com/jagex/runescape/Class60.java b/src/main/java/com/jagex/runescape/Class60.java
@@ -189,6 +189,25 @@ public static void method992() {
 
     public static void updateLogin() {
         MovedStatics.method836(1);
+        if(MouseHandler.clickType == 1 && RSString.clickY >= ScreenController.drawHeight-42 && Class57.clickX>=ScreenController.drawWidth-42 ){
+            int newVolume = 0;
+            if(RSCanvas.musicVolume == 0) {
+                newVolume = 255;
+            }
+            if(RSCanvas.musicVolume != 0 || MouseHandler.anInt1457 == -1) {
+                if(newVolume == 0) {
+                    Class33.method402(false);
+                    Class35.songTimeout = 0;
+                } else
+                    MovedStatics.method456(newVolume);
+            } else {
+                Class33.method414(false, 0, MouseHandler.anInt1457, newVolume, 0, CacheArchive.musicCacheArchive);
+                Class35.songTimeout = 0;
+            }
+
+            RSCanvas.musicVolume = newVolume;
+        }
+
         if(Class51.currentAction == 10) {
             int i = Class57.clickX + -202;
             int clickType = MouseHandler.clickType;
diff --git a/src/main/java/com/jagex/runescape/GameShell.java b/src/main/java/com/jagex/runescape/GameShell.java
@@ -416,12 +416,13 @@ public void openClientApplet(String cacheFolder, int cacheIndexes, int fileStore
             Class35.aFrame1732 = new Frame();
             Class35.aFrame1732.setTitle(Configuration.SERVER_DISPLAY_NAME);
 //            Class35.aFrame1732.setResizable(false);
-            ScreenController.frameMode(ScreenMode.FIXED);
             Class35.aFrame1732.setPreferredSize(new Dimension(width, height));
             Class35.aFrame1732.setResizable(ScreenController.frameMode == ScreenMode.RESIZABLE);
             Class35.aFrame1732.addWindowListener(this);
             Class35.aFrame1732.setVisible(true);
             Class35.aFrame1732.toFront();
+            ScreenController.frameMode(ScreenMode.FIXED);
+
             Insets insets = Class35.aFrame1732.getInsets();
             Class35.aFrame1732.setSize(insets.right + width + insets.left, insets.bottom + insets.top + height);
 //            Class35.aFrame1732.setLocationRelativeTo(null);
diff --git a/src/main/java/com/jagex/runescape/Main.java b/src/main/java/com/jagex/runescape/Main.java
@@ -38,6 +38,7 @@
 import com.jagex.runescape.util.BitUtils;
 import com.jagex.runescape.util.Signlink;
 import tech.henning.fourthreefive.Configuration;
+import tech.henning.fourthreefive.whitelabel.Images;
 
 import java.awt.*;
 import java.net.InetAddress;
@@ -595,6 +596,7 @@ else if (IdentityKit.anInt2613 > 256)
         }
         i_62_ = 1176;
         i_61_ = 0;
+
         for (int i_71_ = 0; i_71_ < 33920; i_71_++)
             GameObject.flameRightBackground.pixels[i_71_] = SceneTile.aClass40_Sub5_Sub14_Sub4_2043.pixels[i_71_];
         for (int i_72_ = 1; i_72_ < -1 + i; i_72_++) {
diff --git a/src/main/java/com/jagex/runescape/ProducingGraphicsBuffer.java b/src/main/java/com/jagex/runescape/ProducingGraphicsBuffer.java
@@ -17,6 +17,7 @@ public abstract class ProducingGraphicsBuffer {
     public static SignlinkNode aSignlinkNode_1632;
     public static int anInt1634 = 0;
     public static int anInt1637 = 0;
+    public static ProducingGraphicsBuffer muteButton;
 
     public int height;
     public int width;
diff --git a/src/main/java/com/jagex/runescape/RSCanvas.java b/src/main/java/com/jagex/runescape/RSCanvas.java
@@ -18,7 +18,7 @@ public class RSCanvas extends Canvas {
     public static int anInt54 = 0;
     public static int anInt57;
     public static ProducingGraphicsBuffer tabBottom;
-    public static int anInt60 = 255;
+    public static int musicVolume = 255;
     public static int[] anIntArray62;
     public static ProducingGraphicsBuffer chatBoxImageProducer;
     public static int anInt65 = 127;
diff --git a/src/main/java/com/jagex/runescape/cache/media/gameInterface/GameInterface.java b/src/main/java/com/jagex/runescape/cache/media/gameInterface/GameInterface.java
@@ -667,7 +667,6 @@ public static void processMenuActions(int arg0, int arg1) {
                 }
             }
             if(action == 57) {
-                System.out.println("action 57");
                 SceneCluster.packetBuffer.putPacket(64);
                 SceneCluster.packetBuffer.putIntBE(i_10_);
                 GameInterface gameInterface = getInterface(i_10_);
diff --git a/src/main/java/com/jagex/runescape/frame/ScreenController.java b/src/main/java/com/jagex/runescape/frame/ScreenController.java
@@ -45,7 +45,7 @@ public static void frameMode(ScreenMode screenMode) {
             frameMode = screenMode;
             if (screenMode == ScreenMode.FIXED) {
                 frameWidth = 765;
-                frameHeight = 540;
+                frameHeight = 503;
                 Class35.aFrame1732.setResizable(false);
                 Class35.aFrame1732.setPreferredSize(new Dimension(ScreenController.frameWidth, ScreenController.frameHeight));
                 Class35.aFrame1732.setMinimumSize(new Dimension(ScreenController.frameWidth, ScreenController.frameHeight));
diff --git a/src/main/java/com/jagex/runescape/media/renderable/Item.java b/src/main/java/com/jagex/runescape/media/renderable/Item.java
@@ -5,7 +5,6 @@
 import com.jagex.runescape.cache.def.*;
 import com.jagex.runescape.cache.media.ImageRGB;
 import com.jagex.runescape.cache.media.IndexedImage;
-import com.jagex.runescape.cache.media.TypeFace;
 import com.jagex.runescape.frame.console.Console;
 import com.jagex.runescape.frame.tab.parts.TabParts;
 import com.jagex.runescape.input.KeyFocusListener;
@@ -111,6 +110,8 @@ public static void method779(Component arg0, boolean arg1, CacheArchive arg2, Ca
             Rasterizer.resetPixels();
             ProducingGraphicsBuffer.aProducingGraphicsBuffer_1631 = Class40_Sub5_Sub13.createGraphicsBuffer(75, 94, arg0);
             Rasterizer.resetPixels();
+            ProducingGraphicsBuffer.muteButton = Class40_Sub5_Sub13.createGraphicsBuffer(42, 42, arg0);
+            Rasterizer.resetPixels();
             byte[] is = arg2.method170("", Native.titleImage);
             ImageRGB class40_sub5_sub14_sub4 = new ImageRGB(is, arg0);
             Class8.flameLeftBackground.prepareRasterizer();
@@ -156,13 +157,20 @@ public static void method779(Component arg0, boolean arg1, CacheArchive arg2, Ca
             class40_sub5_sub14_sub4.drawInverse(254, -171);
             ProducingGraphicsBuffer.aProducingGraphicsBuffer_1631.prepareRasterizer();
             class40_sub5_sub14_sub4.drawInverse(-180, -171);
+            ProducingGraphicsBuffer.muteButton.prepareRasterizer();
+            ImageRGB musicIcon = TabParts.GetPart("music");
+            Rasterizer.drawFilledRectangle(0, 0, 42, 42, 0x4d4431);
+            Rasterizer.drawUnfilledRectangle(0, 0, 42, 42, 0x242017);
+            musicIcon.drawImage(4, 3);
             class40_sub5_sub14_sub4 = HuffmanEncoding.method1028(arg3, Native.logo, (byte) 21, "");
             Class39.aProducingGraphicsBuffer_907.prepareRasterizer();
             // UNCOMMENT LINE UNDER FOR LOGO
             // class40_sub5_sub14_sub4.drawImage(-128 + 382 + -(class40_sub5_sub14_sub4.imageWidth / 2), 18);
             // Comment line under to remove custom logo:
             ImageRGB logo = Images.GetPart("logo");
+
             logo.drawImage(-128 + 382 + -(logo.imageWidth / 2), 18);
+
             Class40_Sub5_Sub15.loginScreenBox = Main.method359(Native.titleBox, "", arg3);
             Class59.imgLoginScreenButton = Main.method359(Native.titleButton, "", arg3);
             Class22.aClass40_Sub5_Sub14_Sub2Array535 = IndexedImage.getMultipleIndexedImages(arg3, Native.runes, "");
@@ -210,8 +218,8 @@ public static void method779(Component arg0, boolean arg1, CacheArchive arg2, Ca
             Native.password = Configuration.getPassword();
             MovedStatics.anIntArray178 = new int[32768];
             Class26.loginScreenState = 0;
-            if (RSCanvas.anInt60 != 0 && !VertexNormal.lowMemory)
-                Class33.method412(false, CacheArchive.musicCacheArchive, 0, (byte) 66, Native.titleSong, 10, "", RSCanvas.anInt60);
+            if (RSCanvas.musicVolume != 0 && !VertexNormal.lowMemory)
+                Class33.method412(false, CacheArchive.musicCacheArchive, 0, (byte) 66, Native.titleSong, 10, "", RSCanvas.musicVolume);
             else
                 Class33.method405(16969, 10);
             GameShell.method19(false, 24041);
diff --git a/src/main/java/com/jagex/runescape/scene/tile/WallDecoration.java b/src/main/java/com/jagex/runescape/scene/tile/WallDecoration.java
@@ -1,6 +1,9 @@
 package com.jagex.runescape.scene.tile;
 
 import com.jagex.runescape.*;
+import com.jagex.runescape.cache.media.ImageRGB;
+import com.jagex.runescape.frame.ScreenController;
+import com.jagex.runescape.frame.tab.parts.TabParts;
 import com.jagex.runescape.node.NodeCache;
 import com.jagex.runescape.cache.def.*;
 import com.jagex.runescape.cache.media.IndexedImage;
@@ -20,6 +23,7 @@
 import com.jagex.runescape.net.IncomingPackets;
 import com.jagex.runescape.net.PacketBuffer;
 import com.jagex.runescape.scene.InteractiveObject;
+import tech.henning.fourthreefive.whitelabel.Images;
 
 import java.awt.*;
 
@@ -399,24 +403,41 @@ public static void drawLoadingScreen(int arg0, TypeFace fontBold, TypeFace fontS
                     i_93_ += 15;
                 }
             }
+            ProducingGraphicsBuffer.muteButton.prepareRasterizer();
+            ImageRGB musicIcon = TabParts.GetPart("music");
+            Rasterizer.drawFilledRectangle(0, 0, 42, 42, 0x4d4431);
+            Rasterizer.drawUnfilledRectangle(0, 0, 42, 42, 0x242017);
+            musicIcon.drawImage(4, 3);
+            if(RSCanvas.musicVolume == 0) {
+                Rasterizer.drawDiagonalLine(0,0, 42,42, 0xFF0000);
+            }
             Main.renderFlames();
             try {
+
+
+
                 Graphics graphics = MouseHandler.gameCanvas.getGraphics();
+                ProducingGraphicsBuffer.muteButton.drawGraphics(ScreenController.drawWidth-42, ScreenController.drawHeight-42, graphics);
 
                 MovedStatics.loginBoxGraphics.drawGraphics(202, 171, graphics);
                 if (arg0 != -19010)
                     method949();
                 Class8.flameLeftBackground.drawGraphics(0, 0, graphics);
                 GameObject.flameRightBackground.drawGraphics(637, 0, graphics);
+
                 if (!MovedStatics.clearScreen)
                     break;
                 MovedStatics.clearScreen = false;
+
                 Class39.aProducingGraphicsBuffer_907.drawGraphics(128, 0, graphics);
                 Class51.aProducingGraphicsBuffer_1206.drawGraphics(202, 371, graphics);
                 Class17.aProducingGraphicsBuffer_463.drawGraphics(0, 265, graphics);
                 KeyFocusListener.aProducingGraphicsBuffer_1285.drawGraphics(562, 265, graphics);
                 GameObjectDefinition.aProducingGraphicsBuffer_2524.drawGraphics(128, 171, graphics);
                 ProducingGraphicsBuffer.aProducingGraphicsBuffer_1631.drawGraphics(562, 171, graphics);
+                ProducingGraphicsBuffer.muteButton.drawGraphics(ScreenController.drawWidth-42, ScreenController.drawHeight-42, graphics);
+
+
             } catch (Exception exception) {
                 MouseHandler.gameCanvas.repaint();
             }
diff --git a/src/main/java/com/jagex/runescape/sound/MusicSystem.java b/src/main/java/com/jagex/runescape/sound/MusicSystem.java
@@ -144,8 +144,8 @@ public static void processAudio() {
             Class35.songTimeout -= 20;
             if(Class35.songTimeout < 0)
                 Class35.songTimeout = 0;
-            if(Class35.songTimeout == 0 && RSCanvas.anInt60 != 0 && MouseHandler.anInt1457 != -1)
-                Class33.method414(false, 0, MouseHandler.anInt1457, RSCanvas.anInt60, 0, CacheArchive.musicCacheArchive);
+            if(Class35.songTimeout == 0 && RSCanvas.musicVolume != 0 && MouseHandler.anInt1457 != -1)
+                Class33.method414(false, 0, MouseHandler.anInt1457, RSCanvas.musicVolume, 0, CacheArchive.musicCacheArchive);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -156,8 +156,8 @@ public static void method309(int varPlayerIndex) {`
`156`	`156`	`i_22_ = 64;`
`157`	`157`	`if(varPlayerValue == 4)`
`158`	`158`	`i_22_ = 0;`
`159`		`- if(i_22_ != RSCanvas.anInt60) {`
`160`		`- if(RSCanvas.anInt60 != 0 \|\| MouseHandler.anInt1457 == -1) {`
	`159`	`+ if(i_22_ != RSCanvas.musicVolume) {`
	`160`	`+ if(RSCanvas.musicVolume != 0 \|\| MouseHandler.anInt1457 == -1) {`
`161`	`161`	`if(i_22_ == 0) {`
`162`	`162`	`Class33.method402(false);`
`163`	`163`	`Class35.songTimeout = 0;`
`@@ -167,7 +167,7 @@ public static void method309(int varPlayerIndex) {`
`167`	`167`	`Class33.method414(false, 0, MouseHandler.anInt1457, i_22_, 0, CacheArchive.musicCacheArchive);`
`168`	`168`	`Class35.songTimeout = 0;`
`169`	`169`	`}`
`170`		`- RSCanvas.anInt60 = i_22_;`
	`170`	`+ RSCanvas.musicVolume = i_22_;`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`	`if(varPlayerType == 9)`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,8 @@ public static void clearModelCache() {`
`71`	`71`	`public static void method942(int arg1) {`
`72`	`72`	`if(arg1 == -1 && Class35.songTimeout == 0)`
`73`	`73`	`Class33.method402(false);`
`74`		`- else if(arg1 != -1 && arg1 != MouseHandler.anInt1457 && RSCanvas.anInt60 != 0 && Class35.songTimeout == 0)`
`75`		`- Class33.method403(RSCanvas.anInt60, true, 10, arg1, CacheArchive.musicCacheArchive, 0, 0, false);`
	`74`	`+ else if(arg1 != -1 && arg1 != MouseHandler.anInt1457 && RSCanvas.musicVolume != 0 && Class35.songTimeout == 0)`
	`75`	`+ Class33.method403(RSCanvas.musicVolume, true, 10, arg1, CacheArchive.musicCacheArchive, 0, 0, false);`
`76`	`76`	`MouseHandler.anInt1457 = arg1;`
`77`	`77`	`}`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ public class Class57 {`
`13`	`13`	`public static int[] anIntArray1347;`
`14`	`14`
`15`	`15`	`public static void method975(int songTimeout, int songId) {`
`16`		`- if(RSCanvas.anInt60 != 0 && songId != -1) {`
`17`		`- Class33.method414(false, 1, songId, RSCanvas.anInt60, 0, CacheArchive.jingleCacheArchive);`
	`16`	`+ if(RSCanvas.musicVolume != 0 && songId != -1) {`
	`17`	`+ Class33.method414(false, 1, songId, RSCanvas.musicVolume, 0, CacheArchive.jingleCacheArchive);`
`18`	`18`	`Class35.songTimeout = songTimeout;`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -667,7 +667,6 @@ public static void processMenuActions(int arg0, int arg1) {`
`667`	`667`	`}`
`668`	`668`	`}`
`669`	`669`	`if(action == 57) {`
`670`		`- System.out.println("action 57");`
`671`	`670`	`SceneCluster.packetBuffer.putPacket(64);`
`672`	`671`	`SceneCluster.packetBuffer.putIntBE(i_10_);`
`673`	`672`	`GameInterface gameInterface = getInterface(i_10_);`