move hook to gatherEnvironmentDetails

Ecdcaeb · Dec 14, 2024 · 47bf523 · 47bf523
1 parent ac4f302
commit 47bf523
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 25 deletions.
diff --git a/src/main/java/com/cleanroommc/fugue/helper/HookHelper.java b/src/main/java/com/cleanroommc/fugue/helper/HookHelper.java
@@ -9,6 +9,8 @@
 import net.minecraft.launchwrapper.Launch;
 import net.minecraft.launchwrapper.LaunchClassLoader;
 import org.objectweb.asm.Opcodes;
+import org.lwjgl.opengl.GL11;
+import oshi.SystemInfo;
 import top.outlands.foundation.TransformerDelegate;
 import top.outlands.foundation.boot.ActualClassLoader;
 
@@ -209,6 +211,26 @@ public static void addToClasspath(File file) {
         } catch (MalformedURLException ignored) {}
     }
 
+    public static HashMap<String, Object> essential$gatherEnvironmentDetails() {
+        HashMap<String, String> hardwareMap = new HashMap<>();
+        try {
+            hardwareMap.put("cpu", new SystemInfo().getHardware().getProcessor().getProcessorIdentifier().getName());
+        }
+        catch (Throwable e) {
+            hardwareMap.putIfAbsent("cpu", "UNKNOWN");
+        }
+        hardwareMap.put("gpu", GL11.glGetString(GL11.GL_RENDERER));
+        hardwareMap.put("allocatedMemory", (Runtime.getRuntime().maxMemory() / 1024L / 1024L));
+        try {
+            hardwareMap.put("os", System.getProperty("os.name", "UNKNOWN"));
+            hardwareMap.put("osVersion", System.getProperty("os.version", "UNKNOWN"));
+        }
+        catch (Throwable e) {
+            hardwareMap.putIfAbsent("os", "UNKNOWN");
+            hardwareMap.putIfAbsent("osVersion", "UNKNOWN");
+        }
+    }
+
     public static String[] listToArray(List<String> list) {
         return list.toArray(new String[0]);
     }

diff --git a/...ava/com/cleanroommc/fugue/transformer/essential/EssentialTelemetryManagerTransformer.java b/...ava/com/cleanroommc/fugue/transformer/essential/EssentialTelemetryManagerTransformer.java
@@ -6,10 +6,6 @@
 import org.objectweb.asm.Label;
 import org.objectweb.asm.tree.*;
 
-import org.lwjgl.opengl.GL11;
-
-import java.util.HashMap;
-import oshi.SystemInfo;
 import top.outlands.foundation.IExplicitTransformer;
 
 import java.util.ListIterator;
@@ -33,34 +29,14 @@ public byte[] transform(byte[] bytes) {
                 method.visitTypeInsn(NEW, "gg/essential/connectionmanager/common/packet/telemetry/ClientTelemetryPacket");
                 method.visitInsn(DUP);
                 method.visitLdcInsn("HARDWARE_V2");
-                method.visitMethodInsn(INVOKESTATIC, "com/cleanroommc/fugue/transformer/essential/EssentialTelemetryManagerTransformer", "sendHardwareAndOSTelemetryImpl", "()Ljava/util/HashMap;", false);
+                method.visitMethodInsn(INVOKESTATIC, "com/cleanroommc/fugue/helper/HookHelper", "essential$gatherEnvironmentDetails", "()Ljava/util/HashMap;", false);
                 method.visitMethodInsn(INVOKESPECIAL, "gg/essential/connectionmanager/common/packet/telemetry/ClientTelemetryPacket", "<init>", "(Ljava/lang/String;Ljava/util/Map;)V", false);
                 method.visitMethodInsn(INVOKEVIRTUAL, "gg/essential/network/connectionmanager/telemetry/TelemetryManager", "enqueue", "(Lgg/essential/connectionmanager/common/packet/telemetry/ClientTelemetryPacket;)V", false);
                 method.visitInsn(RETURN);
             }
         }
     }
 
-    public static HashMap<String, Object> sendHardwareAndOSTelemetryImpl() {
-        HashMap<String, String> hardwareMap = new HashMap<>();
-        try {
-            hardwareMap.put("cpu", new SystemInfo().getHardware().getProcessor().getProcessorIdentifier().getName());
-        }
-        catch (Throwable e) {
-            hardwareMap.putIfAbsent("cpu", "UNKNOWN");
-        }
-        hardwareMap.put("gpu", GL11.glGetString(GL11.GL_RENDERER));
-        hardwareMap.put("allocatedMemory", (Runtime.getRuntime().maxMemory() / 1024L / 1024L));
-        try {
-            hardwareMap.put("os", System.getProperty("os.name", "UNKNOWN"));
-            hardwareMap.put("osVersion", System.getProperty("os.version", "UNKNOWN"));
-        }
-        catch (Throwable e) {
-            hardwareMap.putIfAbsent("os", "UNKNOWN");
-            hardwareMap.putIfAbsent("osVersion", "UNKNOWN");
-        }
-    }
-
     @Override
     public int getPriority() {
         return 0;