From 4fb743e780efce0ecabd48f4f7355599d784d235 Mon Sep 17 00:00:00 2001 From: mmvanheusden Date: Tue, 1 Mar 2022 17:24:18 +0100 Subject: [PATCH 1/3] Add more information to the troubleshoot command --- .../lambda/client/command/commands/TroubleshootCommand.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/lambda/client/command/commands/TroubleshootCommand.kt b/src/main/kotlin/com/lambda/client/command/commands/TroubleshootCommand.kt index 6b2fa5dcd..c849da88d 100644 --- a/src/main/kotlin/com/lambda/client/command/commands/TroubleshootCommand.kt +++ b/src/main/kotlin/com/lambda/client/command/commands/TroubleshootCommand.kt @@ -6,8 +6,8 @@ import com.lambda.client.module.ModuleManager import com.lambda.client.util.text.MessageSendHelper import net.minecraft.client.renderer.GlStateManager import net.minecraft.client.renderer.OpenGlHelper -import net.minecraftforge.common.ForgeVersion import org.lwjgl.opengl.GL11 +import java.util.* object TroubleshootCommand : ClientCommand( name = "troubleshoot", @@ -18,9 +18,11 @@ object TroubleshootCommand : ClientCommand( execute("Print troubleshooting information") { MessageSendHelper.sendErrorMessage("&l&cSend a screenshot of all information below this line!") MessageSendHelper.sendChatMessage("Enabled Modules:\n" + ModuleManager.modules.filter { it.isEnabled }.joinToString { it.name }) - MessageSendHelper.sendChatMessage("Forge ${ForgeVersion.getMajorVersion()}.${ForgeVersion.getMinorVersion()}.${ForgeVersion.getRevisionVersion()}.${ForgeVersion.getBuildVersion()}") MessageSendHelper.sendChatMessage("${LambdaMod.NAME} ${LambdaMod.LAMBDA} ${LambdaMod.VERSION}") - MessageSendHelper.sendChatMessage("CPU: ${OpenGlHelper.getCpu()} GPU: ${GlStateManager.glGetString(GL11.GL_VENDOR)}") + MessageSendHelper.sendChatMessage("Operating System: ${System.getProperty("os.name").lowercase(Locale.getDefault()).replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }} ${System.getProperty("os.version")} ") + MessageSendHelper.sendChatMessage("JVM: ${System.getProperty("java.version")} ${System.getProperty("java.vendor")}") + MessageSendHelper.sendChatMessage("GPU: ${GlStateManager.glGetString(GL11.GL_VENDOR)}") + MessageSendHelper.sendChatMessage("CPU: ${System.getProperty("os.arch")} ${OpenGlHelper.getCpu()}") MessageSendHelper.sendErrorMessage("&l&cPlease send a screenshot of the full output to the developer or moderator who's helping you!") } } From 99a93034e3fb3b17114ee3577fcb3d95179cde4e Mon Sep 17 00:00:00 2001 From: mmvanheusden <50550545+mmvanheusden@users.noreply.github.com> Date: Tue, 1 Mar 2022 20:54:29 +0100 Subject: [PATCH 2/3] Add back the Forge version check --- .../com/lambda/client/command/commands/TroubleshootCommand.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/kotlin/com/lambda/client/command/commands/TroubleshootCommand.kt b/src/main/kotlin/com/lambda/client/command/commands/TroubleshootCommand.kt index c849da88d..570576554 100644 --- a/src/main/kotlin/com/lambda/client/command/commands/TroubleshootCommand.kt +++ b/src/main/kotlin/com/lambda/client/command/commands/TroubleshootCommand.kt @@ -19,6 +19,7 @@ object TroubleshootCommand : ClientCommand( MessageSendHelper.sendErrorMessage("&l&cSend a screenshot of all information below this line!") MessageSendHelper.sendChatMessage("Enabled Modules:\n" + ModuleManager.modules.filter { it.isEnabled }.joinToString { it.name }) MessageSendHelper.sendChatMessage("${LambdaMod.NAME} ${LambdaMod.LAMBDA} ${LambdaMod.VERSION}") + MessageSendHelper.sendChatMessage("Forge ${ForgeVersion.getMajorVersion()}.${ForgeVersion.getMinorVersion()}.${ForgeVersion.getRevisionVersion()}.${ForgeVersion.getBuildVersion()}") MessageSendHelper.sendChatMessage("Operating System: ${System.getProperty("os.name").lowercase(Locale.getDefault()).replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }} ${System.getProperty("os.version")} ") MessageSendHelper.sendChatMessage("JVM: ${System.getProperty("java.version")} ${System.getProperty("java.vendor")}") MessageSendHelper.sendChatMessage("GPU: ${GlStateManager.glGetString(GL11.GL_VENDOR)}") From abf5f5f63f6330b632afd88e2b58d66e515aa466 Mon Sep 17 00:00:00 2001 From: mmvanheusden Date: Wed, 2 Mar 2022 07:34:15 +0100 Subject: [PATCH 3/3] Fix --- .../com/lambda/client/command/commands/TroubleshootCommand.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/kotlin/com/lambda/client/command/commands/TroubleshootCommand.kt b/src/main/kotlin/com/lambda/client/command/commands/TroubleshootCommand.kt index 570576554..ab2ff161c 100644 --- a/src/main/kotlin/com/lambda/client/command/commands/TroubleshootCommand.kt +++ b/src/main/kotlin/com/lambda/client/command/commands/TroubleshootCommand.kt @@ -6,6 +6,7 @@ import com.lambda.client.module.ModuleManager import com.lambda.client.util.text.MessageSendHelper import net.minecraft.client.renderer.GlStateManager import net.minecraft.client.renderer.OpenGlHelper +import net.minecraftforge.common.ForgeVersion import org.lwjgl.opengl.GL11 import java.util.*