From 2e956f89f5e6923a513ec7509e50af4f1f696fb4 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Sat, 24 Jun 2023 00:40:59 +0900
Subject: [PATCH] fix for edge case where 64-bit x86 CPU not reporting itself
 as AMD64

---
 src/net/torvald/terrarum/Principii.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net/torvald/terrarum/Principii.java b/src/net/torvald/terrarum/Principii.java
index 1bd500d27..ddd23436f 100644
--- a/src/net/torvald/terrarum/Principii.java
+++ b/src/net/torvald/terrarum/Principii.java
@@ -66,13 +66,13 @@ public class Principii {
         String CPUARCH = System.getProperty("os.arch").toUpperCase();
         String runtimeRoot;
         String runtimeArch;
-        if (!CPUARCH.equals("AMD64") && !CPUARCH.equals("AARCH64")) {
+        if (!CPUARCH.equals("AMD64") && !CPUARCH.equals("X86_64") && !CPUARCH.equals("AARCH64")) { // macOS Rosetta2 reports X86_64
             System.err.println("Unsupported CPU architecture: " + CPUARCH);
             System.exit(1);
             return;
         }
         else {
-            runtimeArch = CPUARCH.equals("AMD64") ? "x86" : "arm";
+            runtimeArch = (CPUARCH.equals("AMD64") || CPUARCH.equals("X86_64")) ? "x86" : "arm";
         }
 
         if (OS.contains("WIN")) {