Merge pull request #190 from runejs/frame-renderers

refactor: create FrameRenderer interface, convert FrameRenderer to ResizableFrameRenderer

Author: Promises

src/main/java/org/runejs/client/frame/FrameRenderer.java

@@ -1,34 +1,4 @@
 package org.runejs.client.frame;
 
-import org.runejs.client.Game;
-import org.runejs.client.frame.tab.TabProducer;
-
-public class FrameRenderer implements Runnable {
-    private final Minimap minimap;
-    private final TabProducer tabProducer;
-
-    public FrameRenderer(Minimap minimap, TabProducer tabProducer) {
-        this.minimap = minimap;
-        this.tabProducer = tabProducer;
-    }
-
-    @Override
-    public void run() {
-        while(true){
-//            System.out.println("Rendering");
-
-            if(Game.gameStatusCode <= 35 && Game.gameStatusCode >= 30){
-                minimap.RenderResizableMiniMapArea(ScreenController.drawWidth - 210, 0);
-            }
-            if(Game.gameStatusCode <= 35 && Game.gameStatusCode >= 30){
-                tabProducer.RenderResizableSideBarArea();
-            }
-            try {
-                Thread.sleep(1);
-            } catch(InterruptedException e) {
-                e.printStackTrace();
-            }
-
-        }
-    }
+public interface FrameRenderer extends Runnable {
 }

src/main/java/org/runejs/client/frame/ResizableFrameRenderer.java

@@ -0,0 +1,32 @@
+package org.runejs.client.frame;
+
+import org.runejs.client.Game;
+import org.runejs.client.frame.tab.TabProducer;
+
+public class ResizableFrameRenderer implements FrameRenderer {
+    private final Minimap minimap;
+    private final TabProducer tabProducer;
+
+    public ResizableFrameRenderer(Minimap minimap, TabProducer tabProducer) {
+        this.minimap = minimap;
+        this.tabProducer = tabProducer;
+    }
+
+    @Override
+    public void run() {
+        while(true){
+            if(Game.gameStatusCode <= 35 && Game.gameStatusCode >= 30){
+                minimap.RenderResizableMiniMapArea(ScreenController.drawWidth - 210, 0);
+            }
+            if(Game.gameStatusCode <= 35 && Game.gameStatusCode >= 30){
+                tabProducer.RenderResizableSideBarArea();
+            }
+            try {
+                Thread.sleep(1);
+            } catch(InterruptedException e) {
+                e.printStackTrace();
+            }
+
+        }
+    }
+}

src/main/java/org/runejs/client/frame/ScreenController.java

@@ -12,7 +12,6 @@
 import org.runejs.client.media.renderable.actor.Player;
 import org.runejs.client.message.outbound.chat.SetChatOptionsOutboundMessage;
 import org.runejs.client.net.OutgoingPackets;
-import org.runejs.client.scene.*;
 import org.runejs.client.*;
 
 import java.awt.*;
@@ -125,14 +124,17 @@ public static void setBounds() {
         }
     }
 
+    /**
+     * TODO (jkm) move all this to ResizableFrameRenderer
+     */
     public static void RenderResizableUI() {
         if (drawingThread == null) {
-            renderer = new FrameRenderer(minimap, tabProducer);
+            renderer = new ResizableFrameRenderer(minimap, tabProducer);
             drawingThread = new Thread(renderer);
             drawingThread.start();
         }
         minimap.drawResizableMiniMapArea(drawWidth - 210, 0);
-//        RenderTabArea(drawWidth - 234, drawHeight - (337));
+        RenderTabArea(drawWidth - 234, drawHeight - (337));
         RenderChatArea(0, drawHeight - (162));
 
         tabProducer.drawResizableSideBarArea(drawWidth - 241, drawHeight - (334));
@@ -198,6 +200,9 @@ public static Dimension getInnerSize(Frame frame) {
         return size;
     }
 
+    /**
+     * TODO (jkm) move all this to ResizableFrameRenderer
+     */
     public static void RenderTabArea(int x, int y) {
         // height 337
         // width 234
@@ -208,10 +213,11 @@ public static void RenderTabArea(int x, int y) {
         drawFramePieceCutout(MovedStatics.tabBottom, x, y + 300, MovedStatics.tabBottom.width - 35, MovedStatics.tabBottom.height, 35, 0);
         drawFramePieceCutout(MovedStatics.tabTop, x, y, MovedStatics.tabTop.width - 15, MovedStatics.tabTop.height - 6, 15, 6);
         drawFramePiece(MovedStatics.tabImageProducer, x + 22, y + 39);
-
-
     }
 
+    /**
+     * TODO (jkm) move all this to ResizableFrameRenderer
+     */
     public static void RenderChatArea(int x, int y) {
         //width 516
         //height 184
@@ -223,8 +229,6 @@ public static void RenderChatArea(int x, int y) {
         //        System.out.println(Class40_Sub5_Sub1.chatboxRight.height + (Class17.chatboxTop.height-3) + HuffmanEncoding.aProducingGraphicsBuffer_1541.height);
 
         drawFramePieceCutout(MovedStatics.tabPieveLowerRight, x + 496, y + 16, 20, MovedStatics.tabPieveLowerRight.height, 0, 0);
-
-
     }
 
     public static void drawFramePiece(ProducingGraphicsBuffer framePiece, int x, int y) {
@@ -235,7 +239,6 @@ public static void drawFramePieceCutout(ProducingGraphicsBuffer framePiece, int
         Rasterizer.copyPixelsCutOff(framePiece.pixels, framePiece.width, framePiece.height, x, y, width, height, offsetX, offsetY);
     }
 
-
     public static boolean isCoordinatesIn3dScreen(int x, int y) {
         if (frameMode == ScreenMode.FIXED) {
             return x > 4 && y > 4 && x < 516 && y < 338;