6 files changed, 55 insertions, 9 deletions

diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java
index 77065a9..86c97aa 100644
--- a/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -15,6 +15,7 @@ import com.google.common.collect.Lists;
 import cuchaz.enigma.Constants;
 import cuchaz.enigma.ExceptionIgnorer;
 import cuchaz.enigma.analysis.*;
+import cuchaz.enigma.config.Config;
 import cuchaz.enigma.gui.dialog.CrashDialog;
 import cuchaz.enigma.gui.elements.MenuBar;
 import cuchaz.enigma.gui.elements.PopupMenuBar;
@@ -47,10 +48,8 @@ import java.awt.*;
 import java.awt.event.*;
 import java.io.File;
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
+import java.util.*;
 import java.util.List;
-import java.util.Vector;
 import java.util.function.Function;
 
 public class Gui {
@@ -127,13 +126,15 @@ public class Gui {
 
                 // init editor
                 DefaultSyntaxKit.initKit();
+                DefaultSyntaxKit.registerContentType("text/minecraft", MinecraftSyntaxKit.class.getName());
                 obfuscatedHighlightPainter = new ObfuscatedHighlightPainter();
                 deobfuscatedHighlightPainter = new DeobfuscatedHighlightPainter();
                 otherHighlightPainter = new OtherHighlightPainter();
                 selectionHighlightPainter = new SelectionHighlightPainter();
                 this.editor = new PanelEditor(this);
                 JScrollPane sourceScroller = new JScrollPane(this.editor);
-                this.editor.setContentType("text/java");
+                this.editor.setContentType("text/minecraft");
+                this.editor.setBackground(new Color(Config.INSTANCE.editorBackground));
                 DefaultSyntaxKit kit = (DefaultSyntaxKit) this.editor.getEditorKit();
                 kit.toggleComponent(this.editor, "de.sciss.syntaxpane.components.TokenMarker");
 
diff --git a/src/main/java/cuchaz/enigma/gui/MinecraftSyntaxKit.java b/src/main/java/cuchaz/enigma/gui/MinecraftSyntaxKit.java
new file mode 100644
index 0000000..41de035
--- /dev/null
+++ b/src/main/java/cuchaz/enigma/gui/MinecraftSyntaxKit.java
@@ -0,0 +1,38 @@
+package cuchaz.enigma.gui;
+
+import cuchaz.enigma.config.Config;
+import de.sciss.syntaxpane.syntaxkits.JavaSyntaxKit;
+import de.sciss.syntaxpane.util.Configuration;
+
+/**
+ * Created by Mark on 04/06/2017.
+ */
+public class MinecraftSyntaxKit extends JavaSyntaxKit {
+
+    public Configuration configuration = null;
+
+    @Override
+    public Configuration getConfig() {
+        if(configuration == null){
+            initConfig(super.getConfig(JavaSyntaxKit.class));
+        }
+        return configuration;
+    }
+
+    public void initConfig(Configuration baseConfig){
+        configuration = baseConfig;
+        //See de.sciss.syntaxpane.TokenType
+        configuration.put("Style.KEYWORD", Config.INSTANCE.highlightColor + ", 0");
+        configuration.put("Style.KEYWORD2", Config.INSTANCE.highlightColor + ", 3");
+        configuration.put("Style.STRING", Config.INSTANCE.stringColor + ", 0");
+        configuration.put("Style.STRING2", Config.INSTANCE.stringColor + ", 1");
+        configuration.put("Style.NUMBER", Config.INSTANCE.numberColor + ", 1");
+        configuration.put("Style.OPERATOR", Config.INSTANCE.operatorColor + ", 0");
+        configuration.put("Style.DELIMITER", Config.INSTANCE.delimiterColor + ", 1");
+        configuration.put("Style.TYPE", Config.INSTANCE.typeColor + ", 2");
+        configuration.put("Style.TYPE2", Config.INSTANCE.typeColor + ", 1");
+        configuration.put("Style.IDENTIFIER", Config.INSTANCE.identifierColor + ", 0");
+        configuration.put("Style.DEFAULT", Config.INSTANCE.defaultTextColor + ", 0");
+        configuration.put("RightMarginColumn", "999"); //No need to have a right margin, if someone wants it add a config
+    }
+}
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java b/src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java
index 0f64927..976c215 100644
--- a/src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java
+++ b/src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java
@@ -58,4 +58,9 @@ public abstract class BoxHighlightPainter implements Highlighter.HighlightPainte
                 g.setColor(this.borderColor);
                 g.drawRoundRect(bounds.x, bounds.y, bounds.width, bounds.height, 4, 4);
         }
+
+        protected static Color getColor(int rgb, float alpha){
+                Color baseColor = new Color(rgb);
+                return new Color(baseColor.getRed(), baseColor.getGreen(), baseColor.getBlue(), (int)(255 * alpha));
+        }
 }
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java b/src/main/java/cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java
index a2d2884..ef651e3 100644
--- a/src/main/java/cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java
+++ b/src/main/java/cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java
@@ -11,11 +11,11 @@
 
 package cuchaz.enigma.gui.highlight;
 
-import java.awt.*;
+import cuchaz.enigma.config.Config;
 
 public class DeobfuscatedHighlightPainter extends BoxHighlightPainter {
 
         public DeobfuscatedHighlightPainter() {
-                super(new Color(220, 255, 220), new Color(80, 160, 80));
+                super(getColor(Config.INSTANCE.deobfuscatedColor, Config.INSTANCE.deobfuscatedHiglightAlpha), getColor(Config.INSTANCE.deobfuscatedColorOutline, Config.INSTANCE.deobfuscatedOutlineAlpha));
         }
 }
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/ObfuscatedHighlightPainter.java b/src/main/java/cuchaz/enigma/gui/highlight/ObfuscatedHighlightPainter.java
index 0947d4b..7887906 100644
--- a/src/main/java/cuchaz/enigma/gui/highlight/ObfuscatedHighlightPainter.java
+++ b/src/main/java/cuchaz/enigma/gui/highlight/ObfuscatedHighlightPainter.java
@@ -11,11 +11,13 @@
 
 package cuchaz.enigma.gui.highlight;
 
+import cuchaz.enigma.config.Config;
+
 import java.awt.*;
 
 public class ObfuscatedHighlightPainter extends BoxHighlightPainter {
 
         public ObfuscatedHighlightPainter() {
-                super(new Color(255, 220, 220), new Color(160, 80, 80));
+                super(getColor(Config.INSTANCE.obfuscatedColor, Config.INSTANCE.obfuscatedHiglightAlpha), getColor(Config.INSTANCE.obfuscatedColorOutline, Config.INSTANCE.obfuscatedOutlineAlpha));
         }
 }
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/OtherHighlightPainter.java b/src/main/java/cuchaz/enigma/gui/highlight/OtherHighlightPainter.java
index 74e7273..c5154e1 100644
--- a/src/main/java/cuchaz/enigma/gui/highlight/OtherHighlightPainter.java
+++ b/src/main/java/cuchaz/enigma/gui/highlight/OtherHighlightPainter.java
@@ -11,11 +11,11 @@
 
 package cuchaz.enigma.gui.highlight;
 
-import java.awt.*;
+import cuchaz.enigma.config.Config;
 
 public class OtherHighlightPainter extends BoxHighlightPainter {
 
         public OtherHighlightPainter() {
-                super(null, new Color(180, 180, 180));
+                super(null, getColor(Config.INSTANCE.otherColorOutline, Config.INSTANCE.otherOutlineAlpha));
         }
 }