Fix all warnings turning off advanced opengl when clicked

makamys · May 16, 2023 · 41ee830 · 41ee830
1 parent e09b4ea
commit 41ee830
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/main/java/makamys/neodymium/Compat.java b/src/main/java/makamys/neodymium/Compat.java
@@ -40,7 +40,7 @@ private static void disableTriangulator() {
 
     public static void getCompatibilityWarnings(List<Warning> warns, List<Warning> criticalWarns, boolean statusCommand){
         if(Minecraft.getMinecraft().gameSettings.advancedOpengl) {
-            warns.add(new Warning("Advanced OpenGL is enabled, performance may be poor." + (statusCommand ? " Click here to disable it." : "")).action(Compat::disableAdvancedOpenGL));
+            warns.add(new Warning("Advanced OpenGL is enabled, performance may be poor." + (statusCommand ? " Click here to disable it." : "")).chatAction("neodymium disable_advanced_opengl"));
         }
 
         try {
@@ -131,14 +131,14 @@ public InputStream getInputStream(String path) {
 
     public static class Warning {
         public String text;
-        public Runnable action;
+        public String chatAction;
 
         public Warning(String text) {
             this.text = text;
         }
 
-        public Warning action(Runnable action) {
-            this.action = action;
+        public Warning chatAction(String command) {
+            this.chatAction = command;
             return this;
         }
     }

diff --git a/src/main/java/makamys/neodymium/command/NeodymiumCommand.java b/src/main/java/makamys/neodymium/command/NeodymiumCommand.java
@@ -113,17 +113,19 @@ public void processCommand(ICommandSender sender, String[] args) {
             List<Warning> warns = allWarns.getLeft();
             List<Warning> criticalWarns = allWarns.getRight();
             for(Warning line : warns) {
-                addColoredChatMessageWithAction(sender, "* " + line.text, HELP_WARNING_COLOR, line.action);
+                addColoredChatMessageWithAction(sender, "* " + line.text, HELP_WARNING_COLOR, line.chatAction);
             }
             for(Warning line : criticalWarns) {
-                addColoredChatMessageWithAction(sender, "* " + line.text, ERROR_COLOR, line.action);
+                addColoredChatMessageWithAction(sender, "* " + line.text, ERROR_COLOR, line.chatAction);
             }
         }
 
-        private void addColoredChatMessageWithAction(ICommandSender sender, String text, EnumChatFormatting color, Runnable action) {
+        private void addColoredChatMessageWithAction(ICommandSender sender, String text, EnumChatFormatting color, String command) {
             ChatComponentText msg = new ChatComponentText(text);
             msg.getChatStyle().setColor(color);
-            msg.getChatStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "neodymium disable_advanced_opengl"));
+            if(command != null) {
+                msg.getChatStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command));
+            }
             sender.addChatMessage(msg);
         }