From 81018bf51767e0150f14b7c4ab7a0385004a63a6 Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Thu, 18 Nov 2021 09:48:13 +0100
Subject: [PATCH] Cleanup BaseMainActivity

---
 .../net/kdt/pojavlaunch/BaseMainActivity.java | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
index 9386f0692..ed54412e9 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
@@ -1,6 +1,7 @@
 package net.kdt.pojavlaunch;
 
 import static net.kdt.pojavlaunch.Architecture.ARCH_X86;
+import static net.kdt.pojavlaunch.Tools.currentDisplayMetrics;
 
 import static org.lwjgl.glfw.CallbackBridge.windowHeight;
 import static org.lwjgl.glfw.CallbackBridge.windowWidth;
@@ -37,21 +38,14 @@ public class BaseMainActivity extends LoggableActivity {
 
     private Gamepad gamepad;
 
-    private DisplayMetrics displayMetrics;
     public float scaleFactor = 1;
     public double sensitivityFactor;
 
     private boolean mIsResuming = false;
 
-
-
     private MinecraftGLView minecraftGLView;
-    private int guiScale;
 
-    
-    private static boolean isVirtualMouseEnabled;
     private static Touchpad touchpad;
-    private ImageView mousePointer;
     private MinecraftAccount mProfile;
     
     private DrawerLayout drawerLayout;
@@ -72,7 +66,6 @@ public class BaseMainActivity extends LoggableActivity {
     private PrintStream logStream;
     private PerVersionConfig.VersionConfig config;
     private final boolean lastEnabled = false;
-    private boolean lastGrab = false;
     private final boolean isExited = false;
     private boolean isLogAllow = false;
 
@@ -118,10 +111,10 @@ public class BaseMainActivity extends LoggableActivity {
             // Minecraft 1.13+
             isInputStackCall = mVersionInfo.arguments != null;
             
-            displayMetrics = Tools.getDisplayMetrics(this);
-            sensitivityFactor = 1.4 * (1080f/ displayMetrics.heightPixels);
-            windowWidth = Tools.getDisplayFriendlyRes(displayMetrics.widthPixels, scaleFactor);
-            windowHeight = Tools.getDisplayFriendlyRes(displayMetrics.heightPixels, scaleFactor);
+            Tools.getDisplayMetrics(this);
+            sensitivityFactor = 1.4 * (1080f/ currentDisplayMetrics.heightPixels);
+            windowWidth = Tools.getDisplayFriendlyRes(currentDisplayMetrics.widthPixels, scaleFactor);
+            windowHeight = Tools.getDisplayFriendlyRes(currentDisplayMetrics.heightPixels, scaleFactor);
             System.out.println("WidthHeight: " + windowWidth + ":" + windowHeight);
 
 
@@ -521,13 +514,6 @@ public class BaseMainActivity extends LoggableActivity {
         drawerLayout.openDrawer(Gravity.RIGHT);
     }
 
-    public void placeMouseAdd(float x, float y) {
-        this.mousePointer.setX(mousePointer.getX() + x);
-        this.mousePointer.setY(mousePointer.getY() + y);
-    }
-
-
-
     public static void toggleMouse(Context ctx) {
         if (CallbackBridge.isGrabbing()) return;