From f877ce10737f657fadab950d7fc7f5aee9e53d6c Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Tue, 3 Oct 2023 06:15:40 +1100
Subject: Add game directory to crash reports (#847)

* added /neudevtest crash

* Add game directory to crash reports
---
 .../notenoughupdates/mixins/MixinCrashReport.java  | 49 ++++++++++++++++++++++
 .../commands/dev/DevTestCommand.kt                 | 10 +++++
 src/main/resources/mixins.notenoughupdates.json    |  3 +-
 3 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinCrashReport.java

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinCrashReport.java b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinCrashReport.java
new file mode 100644
index 00000000..8d11f552
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinCrashReport.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2023 NotEnoughUpdates contributors
+ *
+ * This file is part of NotEnoughUpdates.
+ *
+ * NotEnoughUpdates is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * NotEnoughUpdates is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package io.github.moulberry.notenoughupdates.mixins;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.concurrent.Callable;
+
+@Mixin(CrashReport.class)
+public class MixinCrashReport {
+
+	@Final
+	@Shadow private CrashReportCategory theReportCategory;
+	@Inject(method = "populateEnvironment", at = @At(value = "HEAD"))
+	private void populateEnvironment(CallbackInfo ci) {
+		this.theReportCategory.addCrashSectionCallable("Game Directory", new Callable<String>(){
+
+			@Override
+			public String call() throws Exception {
+				return Minecraft.getMinecraft().mcDataDir.getCanonicalPath();
+			}
+		});
+	}
+}
diff --git a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.kt
index e138b512..cf55416b 100644
--- a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.kt
+++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.kt
@@ -265,6 +265,16 @@ class DevTestCommand {
                     NotEnoughUpdates.INSTANCE.config.hidden.customUserAgent = null
                 }
             }.withHelp("Reset the custom user agent")
+            thenLiteral("crash") {
+                thenExecute {
+                    throw object : Error("L") {
+                        @Override
+                        fun printStackTrace() {
+                            throw Error("L")
+                        }
+                    }
+                }
+            }.withHelp("Crash the game")
         }
         hook.beforeCommand = Predicate {
             if (!canPlayerExecute(it.context.source)) {
diff --git a/src/main/resources/mixins.notenoughupdates.json b/src/main/resources/mixins.notenoughupdates.json
index 16b473fc..b72c1ba4 100644
--- a/src/main/resources/mixins.notenoughupdates.json
+++ b/src/main/resources/mixins.notenoughupdates.json
@@ -11,6 +11,7 @@
     "AccessorGuiPlayerTabOverlay",
     "MixinAbstractClientPlayer",
     "MixinContainer",
+    "MixinCrashReport",
     "MixinEffectRenderer",
     "MixinEntity",
     "MixinEntityAgeable",
@@ -37,8 +38,8 @@
     "MixinMinecraft",
     "MixinMouseHelper",
     "MixinNetHandlerPlayClient",
-    "MixinOptifineCustomItems",
     "MixinOFDynamicLights",
+    "MixinOptifineCustomItems",
     "MixinPlayerControllerMP",
     "MixinRender",
     "MixinRendererLivingEntity",
-- 
cgit