From f13fcf39e1ed2ec6343dc3ea947c27d2bab02030 Mon Sep 17 00:00:00 2001
From: Evenprime <Evenprime@example.com>
Date: Mon, 2 May 2011 19:04:34 +0200
Subject: [PATCH 1/9] Initial test for GUI configuration tool

---
 src/cc/co/evenprime/bukkit/nocheat/Main.java  |  15 ++
 .../bukkit/nocheat/wizard/BooleanOption.java  |  41 ++++
 .../bukkit/nocheat/wizard/ChildOption.java    |  24 +++
 .../bukkit/nocheat/wizard/EmptyOption.java    |  16 ++
 .../bukkit/nocheat/wizard/EmptyVerifier.java  |  24 +++
 .../bukkit/nocheat/wizard/IntegerOption.java  |  16 ++
 .../nocheat/wizard/IntegerVerifier.java       |  34 ++++
 .../bukkit/nocheat/wizard/LogLevelOption.java |  51 +++++
 .../bukkit/nocheat/wizard/Option.java         |  25 +++
 .../bukkit/nocheat/wizard/ParentOption.java   |  44 +++++
 .../bukkit/nocheat/wizard/StringOption.java   |  14 ++
 .../nocheat/wizard/TextFieldOption.java       |  32 +++
 .../bukkit/nocheat/wizard/Wizard.java         | 184 ++++++++++++++++++
 13 files changed, 520 insertions(+)
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/Main.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/BooleanOption.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/ChildOption.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/EmptyOption.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/EmptyVerifier.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/IntegerOption.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/IntegerVerifier.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/LogLevelOption.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/Option.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/ParentOption.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/StringOption.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/TextFieldOption.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java

diff --git a/src/cc/co/evenprime/bukkit/nocheat/Main.java b/src/cc/co/evenprime/bukkit/nocheat/Main.java
new file mode 100644
index 00000000..fbfd9094
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/Main.java
@@ -0,0 +1,15 @@
+package cc.co.evenprime.bukkit.nocheat;
+
+import cc.co.evenprime.bukkit.nocheat.wizard.Wizard;
+
+public class Main {
+
+	/**
+	 * @param args
+	 */
+	public static void main(String[] args) {
+
+		Wizard w = new Wizard();
+		w.setVisible(true);
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/BooleanOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/BooleanOption.java
new file mode 100644
index 00000000..514f8807
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/BooleanOption.java
@@ -0,0 +1,41 @@
+package cc.co.evenprime.bukkit.nocheat.wizard;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+public class BooleanOption extends ChildOption {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2258827414736580449L;
+	
+	public BooleanOption(String name, boolean initialValue) {
+		
+		super(name, String.valueOf(initialValue));
+		
+		this.setLayout(new BorderLayout());
+
+		JLabel l = new JLabel(this.getIdentifier());
+		l.setPreferredSize(new Dimension(l.getPreferredSize().width+10, l.getPreferredSize().height));
+		
+		this.add(l, BorderLayout.CENTER);
+		
+		JCheckBox checkBox = new JCheckBox();
+		checkBox.setSelected(initialValue);
+		checkBox.addChangeListener(new ChangeListener() {
+
+			@Override
+			public void stateChanged(ChangeEvent arg0) {
+				setValue(String.valueOf(((JCheckBox)arg0.getSource()).isSelected()));
+			}
+		});
+		
+		this.add(checkBox, BorderLayout.WEST);
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/ChildOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/ChildOption.java
new file mode 100644
index 00000000..5b9c6d4d
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/ChildOption.java
@@ -0,0 +1,24 @@
+package cc.co.evenprime.bukkit.nocheat.wizard;
+
+public abstract class ChildOption extends Option {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -4648294833934457776L;
+
+	private String value;
+	
+	public ChildOption(String identifier, String value) {
+		super(identifier);
+		this.value = value;
+	}
+	
+	public final void setValue(String value) {
+		this.value = value;
+	}
+	
+	public final String getValue() {
+		return value;
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/EmptyOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/EmptyOption.java
new file mode 100644
index 00000000..72488c3c
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/EmptyOption.java
@@ -0,0 +1,16 @@
+package cc.co.evenprime.bukkit.nocheat.wizard;
+
+public class EmptyOption extends Option {
+
+	public EmptyOption() {
+		super("");
+	}
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 5058363675498808020L;
+
+
+
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/EmptyVerifier.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/EmptyVerifier.java
new file mode 100644
index 00000000..70f4b1b7
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/EmptyVerifier.java
@@ -0,0 +1,24 @@
+package cc.co.evenprime.bukkit.nocheat.wizard;
+
+import javax.swing.InputVerifier;
+import javax.swing.JComponent;
+import javax.swing.JTextField;
+
+public class EmptyVerifier extends InputVerifier {
+
+	@Override
+	public boolean verify(JComponent input) {
+		JTextField text = (JTextField)input;
+		ChildOption parent = (ChildOption) text.getParent();
+
+		try{
+			parent.setValue(text.getText());
+			return true;
+		}
+		catch(Exception e) {
+			text.setText(parent.getValue());
+			return false;
+		}
+	}
+
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/IntegerOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/IntegerOption.java
new file mode 100644
index 00000000..ffc78d59
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/IntegerOption.java
@@ -0,0 +1,16 @@
+package cc.co.evenprime.bukkit.nocheat.wizard;
+
+
+public class IntegerOption extends TextFieldOption {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2258827414736580449L;
+		
+	public IntegerOption(String name, int initialValue, int width) {
+		
+		super(name, String.valueOf(initialValue), width, new IntegerVerifier("Only integers are allowed in this field."));
+		
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/IntegerVerifier.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/IntegerVerifier.java
new file mode 100644
index 00000000..22ebafdf
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/IntegerVerifier.java
@@ -0,0 +1,34 @@
+package cc.co.evenprime.bukkit.nocheat.wizard;
+
+import javax.swing.InputVerifier;
+import javax.swing.JComponent;
+import javax.swing.JOptionPane;
+import javax.swing.JTextField;
+
+public class IntegerVerifier extends InputVerifier {
+
+	private String errorMessage;
+	
+	public IntegerVerifier(String errorMessage) {
+		this.errorMessage = errorMessage;
+	}
+	
+	@Override
+	public boolean verify(JComponent input) {
+		JTextField text = (JTextField)input;
+		ChildOption parent = (ChildOption) text.getParent();
+
+		try{
+			Integer.parseInt(text.getText());
+			parent.setValue(text.getText());
+			return true;
+		}
+		catch(Exception e) {
+			JOptionPane.showMessageDialog(text, errorMessage);
+
+			text.setText(parent.getValue());
+			return false;
+		}
+	}
+
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/LogLevelOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/LogLevelOption.java
new file mode 100644
index 00000000..83ebde56
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/LogLevelOption.java
@@ -0,0 +1,51 @@
+package cc.co.evenprime.bukkit.nocheat.wizard;
+
+import java.awt.BorderLayout;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+
+public class LogLevelOption extends ChildOption {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1609308017422576285L;
+
+	public LogLevelOption(String identifier, String initialValue) {
+
+		super(identifier, initialValue);
+
+		this.setLayout(new BorderLayout());
+
+		this.add(new JLabel(this.getIdentifier()), BorderLayout.CENTER);
+		
+		JComboBox box = new JComboBox();
+
+		String options[] = { "off", "low", "med", "high" };
+
+		boolean found = false;
+		
+		box.addItemListener(new ItemListener() {
+
+			@Override
+			public void itemStateChanged(ItemEvent arg0) {
+				setValue(arg0.getItem().toString());
+			}
+		});
+		
+		for(String s : options) {
+			box.addItem(s);
+			if(s.equals(initialValue)) { box.setSelectedItem(s); found = true; }
+		}
+		
+		
+		if(!found) box.setSelectedItem("off");
+		
+		this.add(box, BorderLayout.WEST);
+		
+		
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/Option.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/Option.java
new file mode 100644
index 00000000..1c0245ee
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/Option.java
@@ -0,0 +1,25 @@
+package cc.co.evenprime.bukkit.nocheat.wizard;
+
+
+import java.awt.Dimension;
+
+import javax.swing.JPanel;
+
+public abstract class Option extends JPanel {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 6710455693749974103L;
+		
+	private final String identifier;
+	
+	public Option(String identifier) { 
+		this.identifier = identifier; 
+		this.setMinimumSize(new Dimension(this.getPreferredSize().height, this.getPreferredSize().width));
+	}
+		
+	public String getIdentifier() {
+		return identifier;
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/ParentOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/ParentOption.java
new file mode 100644
index 00000000..989e8f25
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/ParentOption.java
@@ -0,0 +1,44 @@
+package cc.co.evenprime.bukkit.nocheat.wizard;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+
+public class ParentOption extends Option {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 3162246550749560727L;
+
+	private LinkedList<Option> children = new LinkedList<Option>();
+
+	public ParentOption(String identifier) {
+		super(identifier);
+
+		this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+		this.setAlignmentX(1.0F);
+
+		if(identifier.length() > 0) {
+			this.setBorder(
+					BorderFactory.createCompoundBorder(
+							BorderFactory.createTitledBorder(identifier),
+							BorderFactory.createEmptyBorder(5,5,5,5)));
+		}
+		else
+			this.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+	}
+
+	public final Collection<Option> getChildOptions() {
+		return Collections.unmodifiableCollection(children);
+	}
+
+	public final void add(Option option) {
+		children.addLast(option);
+
+		super.add(option);
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/StringOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/StringOption.java
new file mode 100644
index 00000000..b4dd2fdb
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/StringOption.java
@@ -0,0 +1,14 @@
+package cc.co.evenprime.bukkit.nocheat.wizard;
+
+public class StringOption extends TextFieldOption {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2258827414736580449L;
+		
+	public StringOption(String name, String initialValue, int width) {
+		super(name, initialValue, width, new EmptyVerifier());
+		
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/TextFieldOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/TextFieldOption.java
new file mode 100644
index 00000000..c6d78fdf
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/TextFieldOption.java
@@ -0,0 +1,32 @@
+package cc.co.evenprime.bukkit.nocheat.wizard;
+
+import java.awt.BorderLayout;
+
+import javax.swing.InputVerifier;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+
+public abstract class TextFieldOption extends ChildOption {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8189248456599421250L;
+
+	public TextFieldOption(String name, String initialValue, int width, final InputVerifier inputVerifier) {
+
+		super(name, String.valueOf(initialValue));
+
+		this.setLayout(new BorderLayout());
+
+		this.add(new JLabel(this.getIdentifier()), BorderLayout.CENTER);
+
+		JTextField textField = new JTextField();
+		textField.setText(this.getValue());
+		textField.setColumns(width);
+		textField.setInputVerifier(inputVerifier);
+
+		this.add(textField, BorderLayout.WEST);
+
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java
new file mode 100644
index 00000000..3b60c1d5
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java
@@ -0,0 +1,184 @@
+package cc.co.evenprime.bukkit.nocheat.wizard;
+
+import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+
+public class Wizard extends JFrame {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 8798111079958779207L;
+
+	private static final String pre = "    ";
+	
+	private static final int numberWidth = 4;
+	private static final int wordWidth = 10;
+	private static final int fileWidth = 20;
+	private static final int textWidth = 60;
+
+	public Wizard() {
+		
+		JScrollPane scrollable = new JScrollPane();
+
+		this.setDefaultCloseOperation(EXIT_ON_CLOSE);
+		
+		this.setContentPane(scrollable);
+		
+		JPanel inside = new JPanel();
+		scrollable.setViewportView(inside);
+		
+		inside.setLayout(new FlowLayout());
+
+
+		final ParentOption root = new ParentOption("");
+		inside.add(root);
+		
+		ParentOption loggingNode = new ParentOption("logging");
+		root.add(loggingNode);
+
+		loggingNode.add(new StringOption("filename", "plugins/NoCheat/nocheat.log", fileWidth));
+		loggingNode.add(new LogLevelOption("logtofile", "low"));
+		loggingNode.add(new LogLevelOption("logtoconsole", "high"));
+		loggingNode.add(new LogLevelOption("logtochat", "med"));
+		loggingNode.add(new LogLevelOption("logtoirc", "med"));
+		loggingNode.add(new StringOption("logtoirctag", "nocheat", wordWidth));
+
+		ParentOption activeNode = new ParentOption("active");
+		root.add(activeNode);
+
+		activeNode.add(new BooleanOption("speedhack", true));
+		activeNode.add(new BooleanOption("moving", true));
+		activeNode.add(new BooleanOption("airbuild", false));
+		activeNode.add(new BooleanOption("bedteleport", true));
+		activeNode.add(new BooleanOption("itemdupe", true));
+		activeNode.add(new BooleanOption("bogusitems", false));
+
+		ParentOption speedhackNode = new ParentOption("speedhack");
+		root.add(speedhackNode);
+
+		speedhackNode.add(new StringOption("logmessage", "\"%1$s sent %2$d move events, but only %3$d were allowed. Speedhack?\"", textWidth));
+
+		{
+			ParentOption speedhackLimitsNode = new ParentOption("limits");
+			speedhackNode.add(speedhackLimitsNode);
+
+			speedhackLimitsNode.add(new IntegerOption("low", 30, numberWidth));
+			speedhackLimitsNode.add(new IntegerOption("med", 45, numberWidth));
+			speedhackLimitsNode.add(new IntegerOption("high", 60, numberWidth));
+
+			ParentOption speedhackActionNode = new ParentOption("action");
+			speedhackNode.add(speedhackActionNode);
+
+			speedhackActionNode.add(new StringOption("low", "loglow cancel", fileWidth));
+			speedhackActionNode.add(new StringOption("med", "logmed cancel", fileWidth));
+			speedhackActionNode.add(new StringOption("high", "loghigh cancel", fileWidth));
+		}
+		
+		ParentOption movingNode = new ParentOption("moving");
+		root.add(movingNode);
+		
+		movingNode.add(new StringOption("logmessage", "\"Moving violation: %1$s from %2$s (%4$.1f, %5$.1f, %6$.1f) to %3$s (%7$.1f, %8$.1f, %9$.1f)\"", textWidth));
+		movingNode.add(new StringOption("summarymessage", "\"Moving summary of last ~%2$d seconds: %1$s total Violations: (%3$d,%4$d,%5$d)\"", textWidth));
+		movingNode.add(new BooleanOption("allowflying", false));
+		movingNode.add(new BooleanOption("allowfakesneak", true));
+		
+		{
+			ParentOption movingActionNode = new ParentOption("action");
+			movingNode.add(movingActionNode);
+			
+			movingActionNode.add(new StringOption("low", "loglow cancel", fileWidth));
+			movingActionNode.add(new StringOption("med", "logmed cancel", fileWidth));
+			movingActionNode.add(new StringOption("high", "loghigh cancel", fileWidth));
+		}
+		
+		ParentOption airbuildNode = new ParentOption("airbuild");
+		root.add(airbuildNode);
+		
+		{
+			ParentOption airbuildLimitsNode = new ParentOption("limits");
+			airbuildNode.add(airbuildLimitsNode);
+
+			airbuildLimitsNode.add(new IntegerOption("low", 30, numberWidth));
+			airbuildLimitsNode.add(new IntegerOption("med", 45, numberWidth));
+			airbuildLimitsNode.add(new IntegerOption("high", 60, numberWidth));
+
+			ParentOption airbuildActionNode = new ParentOption("action");
+			airbuildNode.add(airbuildActionNode);
+
+			airbuildActionNode.add(new StringOption("low", "loglow cancel", fileWidth));
+			airbuildActionNode.add(new StringOption("med", "logmed cancel", fileWidth));
+			airbuildActionNode.add(new StringOption("high", "loghigh cancel", fileWidth));
+		}
+		
+		ParentOption bedteleportNode = new ParentOption("bedteleport");
+		root.add(bedteleportNode);
+		
+		bedteleportNode.add(new EmptyOption());
+		
+		ParentOption itemdupeNode = new ParentOption("itemdupe");
+		root.add(itemdupeNode);
+		
+		itemdupeNode.add(new EmptyOption());
+		
+		ParentOption bogusitemsNode = new ParentOption("bogusitems");
+		root.add(bogusitemsNode);
+		
+		bogusitemsNode.add(new EmptyOption());
+		
+		JButton b = new JButton("TEST");
+
+		b.addActionListener(new ActionListener() {
+
+			@Override
+			public void actionPerformed(ActionEvent arg0) {
+				String s = parseParent(root, "");
+
+				JOptionPane.showMessageDialog(null, s);
+			} });
+
+
+		inside.add(b);
+		
+		inside.doLayout();
+		
+		this.pack();
+	}
+
+	private String parseParent(ParentOption option, String prefix) {
+
+		String s = "";
+		if(option.getIdentifier().length() > 0) {
+			s += prefix + option.getIdentifier() + ":\r\n";
+		}
+
+		for(Option o : option.getChildOptions()) {
+			if(o instanceof ChildOption) 
+				s += parseChild((ChildOption)o, prefix + pre);
+			else if(o instanceof ParentOption)
+				s += parseParent((ParentOption)o, prefix + pre);
+			else
+				parse(o, prefix + "  ");
+		}
+
+		return s;
+	}
+
+	private String parseChild(ChildOption option, String prefix) {
+
+		return prefix + option.getIdentifier() + ": " + option.getValue() + "\r\n";
+	}
+
+	private String parse(Object option, String prefix) {
+
+		return "";
+	}
+}

From c989b9f0252bd5aeda98f32dbdecdf0140260030 Mon Sep 17 00:00:00 2001
From: Evenprime <Evenprime@example.com>
Date: Tue, 3 May 2011 18:05:14 +0200
Subject: [PATCH 2/9] Finished automated GUI generation out of a Options Tree

---
 .../bukkit/nocheat/wizard/BooleanOption.java  | 41 --------
 .../bukkit/nocheat/wizard/ChildOption.java    | 24 -----
 .../bukkit/nocheat/wizard/EmptyOption.java    | 16 ---
 .../bukkit/nocheat/wizard/EmptyVerifier.java  | 24 -----
 .../bukkit/nocheat/wizard/IntegerOption.java  | 16 ---
 .../nocheat/wizard/IntegerVerifier.java       | 34 -------
 .../bukkit/nocheat/wizard/LogLevelOption.java | 51 ----------
 .../bukkit/nocheat/wizard/Option.java         | 25 -----
 .../bukkit/nocheat/wizard/StringOption.java   | 14 ---
 .../nocheat/wizard/TextFieldOption.java       | 32 ------
 .../bukkit/nocheat/wizard/Wizard.java         | 81 +++++++--------
 .../wizard/gui/ChildOptionGuiFactory.java     | 99 +++++++++++++++++++
 .../nocheat/wizard/gui/ParentOptionGui.java   | 97 ++++++++++++++++++
 .../nocheat/wizard/options/BooleanOption.java | 31 ++++++
 .../nocheat/wizard/options/ChildOption.java   | 17 ++++
 .../nocheat/wizard/options/IntegerOption.java | 29 ++++++
 .../wizard/options/LogLevelOption.java        | 63 ++++++++++++
 .../wizard/options/LongStringOption.java      | 13 +++
 .../wizard/options/MediumStringOption.java    | 13 +++
 .../bukkit/nocheat/wizard/options/Option.java | 15 +++
 .../wizard/{ => options}/ParentOption.java    | 19 +---
 .../wizard/options/ShortStringOption.java     | 13 +++
 .../wizard/options/TextFieldOption.java       | 51 ++++++++++
 23 files changed, 486 insertions(+), 332 deletions(-)
 delete mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/BooleanOption.java
 delete mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/ChildOption.java
 delete mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/EmptyOption.java
 delete mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/EmptyVerifier.java
 delete mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/IntegerOption.java
 delete mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/IntegerVerifier.java
 delete mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/LogLevelOption.java
 delete mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/Option.java
 delete mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/StringOption.java
 delete mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/TextFieldOption.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ChildOptionGuiFactory.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ParentOptionGui.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/options/BooleanOption.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/options/ChildOption.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/options/IntegerOption.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/options/LogLevelOption.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/options/LongStringOption.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/options/MediumStringOption.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/options/Option.java
 rename src/cc/co/evenprime/bukkit/nocheat/wizard/{ => options}/ParentOption.java (50%)
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/options/ShortStringOption.java
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/options/TextFieldOption.java

diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/BooleanOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/BooleanOption.java
deleted file mode 100644
index 514f8807..00000000
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/BooleanOption.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package cc.co.evenprime.bukkit.nocheat.wizard;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-public class BooleanOption extends ChildOption {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 2258827414736580449L;
-	
-	public BooleanOption(String name, boolean initialValue) {
-		
-		super(name, String.valueOf(initialValue));
-		
-		this.setLayout(new BorderLayout());
-
-		JLabel l = new JLabel(this.getIdentifier());
-		l.setPreferredSize(new Dimension(l.getPreferredSize().width+10, l.getPreferredSize().height));
-		
-		this.add(l, BorderLayout.CENTER);
-		
-		JCheckBox checkBox = new JCheckBox();
-		checkBox.setSelected(initialValue);
-		checkBox.addChangeListener(new ChangeListener() {
-
-			@Override
-			public void stateChanged(ChangeEvent arg0) {
-				setValue(String.valueOf(((JCheckBox)arg0.getSource()).isSelected()));
-			}
-		});
-		
-		this.add(checkBox, BorderLayout.WEST);
-	}
-}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/ChildOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/ChildOption.java
deleted file mode 100644
index 5b9c6d4d..00000000
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/ChildOption.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cc.co.evenprime.bukkit.nocheat.wizard;
-
-public abstract class ChildOption extends Option {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -4648294833934457776L;
-
-	private String value;
-	
-	public ChildOption(String identifier, String value) {
-		super(identifier);
-		this.value = value;
-	}
-	
-	public final void setValue(String value) {
-		this.value = value;
-	}
-	
-	public final String getValue() {
-		return value;
-	}
-}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/EmptyOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/EmptyOption.java
deleted file mode 100644
index 72488c3c..00000000
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/EmptyOption.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cc.co.evenprime.bukkit.nocheat.wizard;
-
-public class EmptyOption extends Option {
-
-	public EmptyOption() {
-		super("");
-	}
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 5058363675498808020L;
-
-
-
-}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/EmptyVerifier.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/EmptyVerifier.java
deleted file mode 100644
index 70f4b1b7..00000000
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/EmptyVerifier.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cc.co.evenprime.bukkit.nocheat.wizard;
-
-import javax.swing.InputVerifier;
-import javax.swing.JComponent;
-import javax.swing.JTextField;
-
-public class EmptyVerifier extends InputVerifier {
-
-	@Override
-	public boolean verify(JComponent input) {
-		JTextField text = (JTextField)input;
-		ChildOption parent = (ChildOption) text.getParent();
-
-		try{
-			parent.setValue(text.getText());
-			return true;
-		}
-		catch(Exception e) {
-			text.setText(parent.getValue());
-			return false;
-		}
-	}
-
-}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/IntegerOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/IntegerOption.java
deleted file mode 100644
index ffc78d59..00000000
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/IntegerOption.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cc.co.evenprime.bukkit.nocheat.wizard;
-
-
-public class IntegerOption extends TextFieldOption {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 2258827414736580449L;
-		
-	public IntegerOption(String name, int initialValue, int width) {
-		
-		super(name, String.valueOf(initialValue), width, new IntegerVerifier("Only integers are allowed in this field."));
-		
-	}
-}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/IntegerVerifier.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/IntegerVerifier.java
deleted file mode 100644
index 22ebafdf..00000000
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/IntegerVerifier.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package cc.co.evenprime.bukkit.nocheat.wizard;
-
-import javax.swing.InputVerifier;
-import javax.swing.JComponent;
-import javax.swing.JOptionPane;
-import javax.swing.JTextField;
-
-public class IntegerVerifier extends InputVerifier {
-
-	private String errorMessage;
-	
-	public IntegerVerifier(String errorMessage) {
-		this.errorMessage = errorMessage;
-	}
-	
-	@Override
-	public boolean verify(JComponent input) {
-		JTextField text = (JTextField)input;
-		ChildOption parent = (ChildOption) text.getParent();
-
-		try{
-			Integer.parseInt(text.getText());
-			parent.setValue(text.getText());
-			return true;
-		}
-		catch(Exception e) {
-			JOptionPane.showMessageDialog(text, errorMessage);
-
-			text.setText(parent.getValue());
-			return false;
-		}
-	}
-
-}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/LogLevelOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/LogLevelOption.java
deleted file mode 100644
index 83ebde56..00000000
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/LogLevelOption.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package cc.co.evenprime.bukkit.nocheat.wizard;
-
-import java.awt.BorderLayout;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-
-public class LogLevelOption extends ChildOption {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -1609308017422576285L;
-
-	public LogLevelOption(String identifier, String initialValue) {
-
-		super(identifier, initialValue);
-
-		this.setLayout(new BorderLayout());
-
-		this.add(new JLabel(this.getIdentifier()), BorderLayout.CENTER);
-		
-		JComboBox box = new JComboBox();
-
-		String options[] = { "off", "low", "med", "high" };
-
-		boolean found = false;
-		
-		box.addItemListener(new ItemListener() {
-
-			@Override
-			public void itemStateChanged(ItemEvent arg0) {
-				setValue(arg0.getItem().toString());
-			}
-		});
-		
-		for(String s : options) {
-			box.addItem(s);
-			if(s.equals(initialValue)) { box.setSelectedItem(s); found = true; }
-		}
-		
-		
-		if(!found) box.setSelectedItem("off");
-		
-		this.add(box, BorderLayout.WEST);
-		
-		
-	}
-}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/Option.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/Option.java
deleted file mode 100644
index 1c0245ee..00000000
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/Option.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cc.co.evenprime.bukkit.nocheat.wizard;
-
-
-import java.awt.Dimension;
-
-import javax.swing.JPanel;
-
-public abstract class Option extends JPanel {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 6710455693749974103L;
-		
-	private final String identifier;
-	
-	public Option(String identifier) { 
-		this.identifier = identifier; 
-		this.setMinimumSize(new Dimension(this.getPreferredSize().height, this.getPreferredSize().width));
-	}
-		
-	public String getIdentifier() {
-		return identifier;
-	}
-}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/StringOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/StringOption.java
deleted file mode 100644
index b4dd2fdb..00000000
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/StringOption.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cc.co.evenprime.bukkit.nocheat.wizard;
-
-public class StringOption extends TextFieldOption {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 2258827414736580449L;
-		
-	public StringOption(String name, String initialValue, int width) {
-		super(name, initialValue, width, new EmptyVerifier());
-		
-	}
-}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/TextFieldOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/TextFieldOption.java
deleted file mode 100644
index c6d78fdf..00000000
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/TextFieldOption.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package cc.co.evenprime.bukkit.nocheat.wizard;
-
-import java.awt.BorderLayout;
-
-import javax.swing.InputVerifier;
-import javax.swing.JLabel;
-import javax.swing.JTextField;
-
-public abstract class TextFieldOption extends ChildOption {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -8189248456599421250L;
-
-	public TextFieldOption(String name, String initialValue, int width, final InputVerifier inputVerifier) {
-
-		super(name, String.valueOf(initialValue));
-
-		this.setLayout(new BorderLayout());
-
-		this.add(new JLabel(this.getIdentifier()), BorderLayout.CENTER);
-
-		JTextField textField = new JTextField();
-		textField.setText(this.getValue());
-		textField.setColumns(width);
-		textField.setInputVerifier(inputVerifier);
-
-		this.add(textField, BorderLayout.WEST);
-
-	}
-}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java
index 3b60c1d5..bd74d106 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java
@@ -1,16 +1,26 @@
 package cc.co.evenprime.bukkit.nocheat.wizard;
 
-import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JFrame;
-import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 
+import cc.co.evenprime.bukkit.nocheat.wizard.gui.ParentOptionGui;
+import cc.co.evenprime.bukkit.nocheat.wizard.options.BooleanOption;
+import cc.co.evenprime.bukkit.nocheat.wizard.options.ChildOption;
+import cc.co.evenprime.bukkit.nocheat.wizard.options.IntegerOption;
+import cc.co.evenprime.bukkit.nocheat.wizard.options.LogLevelOption;
+import cc.co.evenprime.bukkit.nocheat.wizard.options.MediumStringOption;
+import cc.co.evenprime.bukkit.nocheat.wizard.options.Option;
+import cc.co.evenprime.bukkit.nocheat.wizard.options.ParentOption;
+import cc.co.evenprime.bukkit.nocheat.wizard.options.LongStringOption;
+import cc.co.evenprime.bukkit.nocheat.wizard.options.ShortStringOption;
+
 public class Wizard extends JFrame {
 
 	/**
@@ -20,11 +30,6 @@ public class Wizard extends JFrame {
 
 	private static final String pre = "    ";
 	
-	private static final int numberWidth = 4;
-	private static final int wordWidth = 10;
-	private static final int fileWidth = 20;
-	private static final int textWidth = 60;
-
 	public Wizard() {
 		
 		JScrollPane scrollable = new JScrollPane();
@@ -36,21 +41,19 @@ public class Wizard extends JFrame {
 		JPanel inside = new JPanel();
 		scrollable.setViewportView(inside);
 		
-		inside.setLayout(new FlowLayout());
-
-
+		inside.setLayout(new BoxLayout(inside,BoxLayout.Y_AXIS));
+		
 		final ParentOption root = new ParentOption("");
-		inside.add(root);
 		
 		ParentOption loggingNode = new ParentOption("logging");
 		root.add(loggingNode);
 
-		loggingNode.add(new StringOption("filename", "plugins/NoCheat/nocheat.log", fileWidth));
-		loggingNode.add(new LogLevelOption("logtofile", "low"));
-		loggingNode.add(new LogLevelOption("logtoconsole", "high"));
-		loggingNode.add(new LogLevelOption("logtochat", "med"));
-		loggingNode.add(new LogLevelOption("logtoirc", "med"));
-		loggingNode.add(new StringOption("logtoirctag", "nocheat", wordWidth));
+		loggingNode.add(new MediumStringOption("filename", "plugins/NoCheat/nocheat.log"));
+		loggingNode.add(new LogLevelOption("logtofile", LogLevelOption.Options.LOW));
+		loggingNode.add(new LogLevelOption("logtoconsole", LogLevelOption.Options.HIGH));
+		loggingNode.add(new LogLevelOption("logtochat", LogLevelOption.Options.MED));
+		loggingNode.add(new LogLevelOption("logtoirc", LogLevelOption.Options.MED));
+		loggingNode.add(new ShortStringOption("logtoirctag", "nocheat"));
 
 		ParentOption activeNode = new ParentOption("active");
 		root.add(activeNode);
@@ -65,29 +68,29 @@ public class Wizard extends JFrame {
 		ParentOption speedhackNode = new ParentOption("speedhack");
 		root.add(speedhackNode);
 
-		speedhackNode.add(new StringOption("logmessage", "\"%1$s sent %2$d move events, but only %3$d were allowed. Speedhack?\"", textWidth));
+		speedhackNode.add(new LongStringOption("logmessage", "\"%1$s sent %2$d move events, but only %3$d were allowed. Speedhack?\""));
 
 		{
 			ParentOption speedhackLimitsNode = new ParentOption("limits");
 			speedhackNode.add(speedhackLimitsNode);
 
-			speedhackLimitsNode.add(new IntegerOption("low", 30, numberWidth));
-			speedhackLimitsNode.add(new IntegerOption("med", 45, numberWidth));
-			speedhackLimitsNode.add(new IntegerOption("high", 60, numberWidth));
+			speedhackLimitsNode.add(new IntegerOption("low", 30));
+			speedhackLimitsNode.add(new IntegerOption("med", 45));
+			speedhackLimitsNode.add(new IntegerOption("high", 60));
 
 			ParentOption speedhackActionNode = new ParentOption("action");
 			speedhackNode.add(speedhackActionNode);
 
-			speedhackActionNode.add(new StringOption("low", "loglow cancel", fileWidth));
-			speedhackActionNode.add(new StringOption("med", "logmed cancel", fileWidth));
-			speedhackActionNode.add(new StringOption("high", "loghigh cancel", fileWidth));
+			speedhackActionNode.add(new MediumStringOption("low", "loglow cancel"));
+			speedhackActionNode.add(new MediumStringOption("med", "logmed cancel"));
+			speedhackActionNode.add(new MediumStringOption("high", "loghigh cancel"));
 		}
 		
 		ParentOption movingNode = new ParentOption("moving");
 		root.add(movingNode);
 		
-		movingNode.add(new StringOption("logmessage", "\"Moving violation: %1$s from %2$s (%4$.1f, %5$.1f, %6$.1f) to %3$s (%7$.1f, %8$.1f, %9$.1f)\"", textWidth));
-		movingNode.add(new StringOption("summarymessage", "\"Moving summary of last ~%2$d seconds: %1$s total Violations: (%3$d,%4$d,%5$d)\"", textWidth));
+		movingNode.add(new LongStringOption("logmessage", "\"Moving violation: %1$s from %2$s (%4$.1f, %5$.1f, %6$.1f) to %3$s (%7$.1f, %8$.1f, %9$.1f)\""));
+		movingNode.add(new LongStringOption("summarymessage", "\"Moving summary of last ~%2$d seconds: %1$s total Violations: (%3$d,%4$d,%5$d)\""));
 		movingNode.add(new BooleanOption("allowflying", false));
 		movingNode.add(new BooleanOption("allowfakesneak", true));
 		
@@ -95,9 +98,9 @@ public class Wizard extends JFrame {
 			ParentOption movingActionNode = new ParentOption("action");
 			movingNode.add(movingActionNode);
 			
-			movingActionNode.add(new StringOption("low", "loglow cancel", fileWidth));
-			movingActionNode.add(new StringOption("med", "logmed cancel", fileWidth));
-			movingActionNode.add(new StringOption("high", "loghigh cancel", fileWidth));
+			movingActionNode.add(new MediumStringOption("low", "loglow cancel"));
+			movingActionNode.add(new MediumStringOption("med", "logmed cancel"));
+			movingActionNode.add(new MediumStringOption("high", "loghigh cancel"));
 		}
 		
 		ParentOption airbuildNode = new ParentOption("airbuild");
@@ -107,32 +110,32 @@ public class Wizard extends JFrame {
 			ParentOption airbuildLimitsNode = new ParentOption("limits");
 			airbuildNode.add(airbuildLimitsNode);
 
-			airbuildLimitsNode.add(new IntegerOption("low", 30, numberWidth));
-			airbuildLimitsNode.add(new IntegerOption("med", 45, numberWidth));
-			airbuildLimitsNode.add(new IntegerOption("high", 60, numberWidth));
+			airbuildLimitsNode.add(new IntegerOption("low", 30));
+			airbuildLimitsNode.add(new IntegerOption("med", 45));
+			airbuildLimitsNode.add(new IntegerOption("high", 60));
 
 			ParentOption airbuildActionNode = new ParentOption("action");
 			airbuildNode.add(airbuildActionNode);
 
-			airbuildActionNode.add(new StringOption("low", "loglow cancel", fileWidth));
-			airbuildActionNode.add(new StringOption("med", "logmed cancel", fileWidth));
-			airbuildActionNode.add(new StringOption("high", "loghigh cancel", fileWidth));
+			airbuildActionNode.add(new MediumStringOption("low", "loglow cancel"));
+			airbuildActionNode.add(new MediumStringOption("med", "logmed cancel"));
+			airbuildActionNode.add(new MediumStringOption("high", "loghigh cancel"));
 		}
 		
 		ParentOption bedteleportNode = new ParentOption("bedteleport");
 		root.add(bedteleportNode);
 		
-		bedteleportNode.add(new EmptyOption());
 		
 		ParentOption itemdupeNode = new ParentOption("itemdupe");
 		root.add(itemdupeNode);
 		
-		itemdupeNode.add(new EmptyOption());
 		
 		ParentOption bogusitemsNode = new ParentOption("bogusitems");
 		root.add(bogusitemsNode);
 		
-		bogusitemsNode.add(new EmptyOption());
+		ParentOptionGui root2 = new ParentOptionGui(root);
+		
+		inside.add(root2);
 		
 		JButton b = new JButton("TEST");
 
@@ -145,7 +148,7 @@ public class Wizard extends JFrame {
 				JOptionPane.showMessageDialog(null, s);
 			} });
 
-
+		b.setAlignmentY(0.0F);
 		inside.add(b);
 		
 		inside.doLayout();
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ChildOptionGuiFactory.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ChildOptionGuiFactory.java
new file mode 100644
index 00000000..588675a8
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ChildOptionGuiFactory.java
@@ -0,0 +1,99 @@
+package cc.co.evenprime.bukkit.nocheat.wizard.gui;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.InputVerifier;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JOptionPane;
+import javax.swing.JTextField;
+
+import cc.co.evenprime.bukkit.nocheat.wizard.options.BooleanOption;
+import cc.co.evenprime.bukkit.nocheat.wizard.options.ChildOption;
+import cc.co.evenprime.bukkit.nocheat.wizard.options.LogLevelOption;
+import cc.co.evenprime.bukkit.nocheat.wizard.options.TextFieldOption;
+
+public class ChildOptionGuiFactory {
+
+	public static JComponent create(ChildOption option) {
+
+		if(option instanceof BooleanOption) {
+			return createBoolean((BooleanOption)option);
+		}
+		else if(option instanceof TextFieldOption) {
+			return createTextField((TextFieldOption)option);
+		}
+		else if(option instanceof LogLevelOption) {
+			return createLogLevel((LogLevelOption)option);
+		}
+
+		throw new RuntimeException("Unknown ChildOption " + option);
+	}
+
+	private static JComboBox createLogLevel(final LogLevelOption option) {
+
+		final JComboBox comboBox = new JComboBox();
+
+		for(LogLevelOption.Options o : LogLevelOption.Options.values())
+			comboBox.addItem(o);
+
+		comboBox.setSelectedItem(option.getOptionValue());
+
+		comboBox.addActionListener(new ActionListener() {
+
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				option.setValue((LogLevelOption.Options)comboBox.getSelectedItem());
+
+			}
+
+		});
+
+		return comboBox;
+	}
+
+	private static JCheckBox createBoolean(final BooleanOption option) {
+
+		final JCheckBox checkBox = new JCheckBox();
+		checkBox.setSelected(option.getBooleanValue());
+		checkBox.addActionListener(new ActionListener() {
+
+			@Override
+			public void actionPerformed(ActionEvent arg0) {
+				option.setValue(checkBox.isSelected());
+
+			}
+		});
+
+		return checkBox;
+	}
+
+	private static JTextField createTextField(final TextFieldOption option) {
+
+		final JTextField textField = new JTextField(option.getValue());
+		
+		if(option.hasPreferredLength()) {
+			textField.setColumns(option.getPreferredLength());
+		}
+		
+		textField.setInputVerifier(new InputVerifier() {
+
+			@Override
+			public boolean verify(JComponent arg0) {
+
+				if(option.setValue(textField.getText())){
+					return true;
+				}
+				else {
+					JOptionPane.showMessageDialog(textField, "Illegal value for this field");
+					textField.setText(option.getValue());
+					return false;
+				}
+			}
+		});
+
+		return textField;
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ParentOptionGui.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ParentOptionGui.java
new file mode 100644
index 00000000..472d934a
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ParentOptionGui.java
@@ -0,0 +1,97 @@
+package cc.co.evenprime.bukkit.nocheat.wizard.gui;
+
+import java.awt.Color;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.util.LinkedList;
+
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+import cc.co.evenprime.bukkit.nocheat.wizard.options.ChildOption;
+import cc.co.evenprime.bukkit.nocheat.wizard.options.Option;
+import cc.co.evenprime.bukkit.nocheat.wizard.options.ParentOption;
+
+public class ParentOptionGui extends JPanel {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 5277750257203546802L;
+	
+	private ParentOption option;
+	private LinkedList<Option> children = new LinkedList<Option>();
+
+	public ParentOptionGui(ParentOption option) {
+		this.option = option;
+
+		if(option.getIdentifier().length() > 0) {
+			this.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,5,5,5), BorderFactory.createCompoundBorder(
+					BorderFactory.createTitledBorder(BorderFactory.createMatteBorder(2, 2,
+					        2, 2, Color.BLACK), "  " + option.getIdentifier() + "  "), 
+					BorderFactory.createEmptyBorder(5,5,5,5))));
+		}
+		this.setLayout(new GridBagLayout());
+
+		for(Option o : this.option.getChildOptions()) {
+			add(o);
+			children.add(o);
+		}
+	}	
+
+	public void add(Option option) {
+		if(option instanceof ParentOption) {
+			GridBagConstraints c = new GridBagConstraints();
+
+			c.gridx = 0;
+			c.gridy = children.size();
+			c.gridwidth = 3; // Spans over both columns
+			c.anchor = GridBagConstraints.WEST;
+			c.ipadx = 5;
+			c.ipady = 15;
+			c.weightx = 1;
+			c.fill = GridBagConstraints.HORIZONTAL;
+			
+			this.add(new ParentOptionGui((ParentOption)option), c);
+		}
+		else if(option instanceof ChildOption)
+		{
+			GridBagConstraints c = new GridBagConstraints();
+
+			c.gridx = 0;
+			c.gridy = children.size();
+			c.gridwidth = 1; // Spans over both columns
+			c.anchor = GridBagConstraints.WEST;
+			c.ipadx = 10;
+			c.weightx = 0;
+			
+			this.add(new JLabel(option.getIdentifier()  + ":"), c);
+			
+			c.gridx = 1;
+			c.gridy = children.size();
+			c.gridwidth = 1; // Spans over both columns
+			c.anchor = GridBagConstraints.WEST;
+			c.ipadx = 5;
+			c.weightx = 0;
+			
+			JComponent child = ChildOptionGuiFactory.create((ChildOption)option);
+			
+			this.add(child, c);
+			
+			c.gridx = 2;
+			c.gridy = children.size();
+			c.gridwidth = 1; // Spans over both columns
+			c.anchor = GridBagConstraints.WEST;
+			c.ipadx = 5;
+			c.weightx = 1;
+			c.fill = GridBagConstraints.HORIZONTAL;
+						
+			this.add(Box.createHorizontalGlue(), c);
+			
+		}
+
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/BooleanOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/BooleanOption.java
new file mode 100644
index 00000000..97615923
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/BooleanOption.java
@@ -0,0 +1,31 @@
+package cc.co.evenprime.bukkit.nocheat.wizard.options;
+
+
+public class BooleanOption extends ChildOption {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2258827414736580449L;
+	
+	private boolean value;
+		
+	public BooleanOption(String name, boolean initialValue) {
+		
+		super(name);
+		this.value = initialValue;
+	}
+	
+	public void setValue(boolean value) {
+		this.value = value;
+	}
+	
+	@Override
+	public String getValue() {
+		return Boolean.toString(value);
+	}
+	
+	public boolean getBooleanValue() {
+		return value;
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/ChildOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/ChildOption.java
new file mode 100644
index 00000000..33f506ae
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/ChildOption.java
@@ -0,0 +1,17 @@
+package cc.co.evenprime.bukkit.nocheat.wizard.options;
+
+public abstract class ChildOption extends Option {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -4648294833934457776L;
+	
+	public ChildOption(String identifier) {
+		
+		super(identifier);
+	}
+	
+	
+	public abstract String getValue();
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/IntegerOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/IntegerOption.java
new file mode 100644
index 00000000..062ff259
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/IntegerOption.java
@@ -0,0 +1,29 @@
+package cc.co.evenprime.bukkit.nocheat.wizard.options;
+
+
+public class IntegerOption extends TextFieldOption {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2258827414736580449L;
+		
+	public IntegerOption(String name, int initialValue) {
+		
+		super(name, String.valueOf(initialValue), 5);		
+	}
+
+	@Override
+	public boolean isValid(String value) {
+		
+		if(!super.isValid(value)) return false;
+		
+		try {
+			Integer.parseInt(value);
+			return true;
+		}
+		catch(Exception e) {
+			return false;
+		}
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/LogLevelOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/LogLevelOption.java
new file mode 100644
index 00000000..4edffd81
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/LogLevelOption.java
@@ -0,0 +1,63 @@
+package cc.co.evenprime.bukkit.nocheat.wizard.options;
+
+
+public class LogLevelOption extends ChildOption {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1609308017422576285L;
+
+	private Options value;
+
+
+	public enum Options {
+		OFF("never"), LOW("all messages"), MED("important messages"), HIGH("very important messages");
+
+		private final String value;
+
+		private Options(String s) {
+			this.value = s;
+		}
+
+		public String getValue() { return this.value; }
+
+		public static Options getOption(String s) {
+			if("off".equals(s))
+				return OFF;
+			else if("low".equals(s))
+				return LOW;
+			else if("med".equals(s))
+				return MED;
+			else if("high".equals(s))
+				return HIGH;
+			else
+				return OFF;
+		}
+
+
+		public String toString() {
+			return this.name() + ": " + getValue();
+		}
+	}
+
+	public LogLevelOption(String identifier, Options initialValue) {
+
+		super(identifier);
+		this.value = initialValue;
+	}
+
+
+	@Override
+	public String getValue() {
+		return value.getValue();
+	}
+
+	public void setValue(Options value) {
+		this.value = value;
+	}
+
+	public Options getOptionValue() {
+		return this.value;
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/LongStringOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/LongStringOption.java
new file mode 100644
index 00000000..1b018110
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/LongStringOption.java
@@ -0,0 +1,13 @@
+package cc.co.evenprime.bukkit.nocheat.wizard.options;
+
+public class LongStringOption extends TextFieldOption {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2258827414736580449L;
+		
+	public LongStringOption(String name, String initialValue) {
+		super(name, initialValue, 60);
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/MediumStringOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/MediumStringOption.java
new file mode 100644
index 00000000..c31db5f3
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/MediumStringOption.java
@@ -0,0 +1,13 @@
+package cc.co.evenprime.bukkit.nocheat.wizard.options;
+
+public class MediumStringOption extends TextFieldOption {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2258827414736580449L;
+		
+	public MediumStringOption(String name, String initialValue) {
+		super(name, initialValue, 30);
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/Option.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/Option.java
new file mode 100644
index 00000000..db4c3edb
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/Option.java
@@ -0,0 +1,15 @@
+package cc.co.evenprime.bukkit.nocheat.wizard.options;
+
+
+public class Option {
+			
+	private final String identifier;
+	
+	public Option(String identifier) {
+		this.identifier = identifier;
+	}
+	
+	public String getIdentifier() {
+		return identifier;
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/ParentOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/ParentOption.java
similarity index 50%
rename from src/cc/co/evenprime/bukkit/nocheat/wizard/ParentOption.java
rename to src/cc/co/evenprime/bukkit/nocheat/wizard/options/ParentOption.java
index 989e8f25..8742fcde 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/ParentOption.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/ParentOption.java
@@ -1,11 +1,9 @@
-package cc.co.evenprime.bukkit.nocheat.wizard;
+package cc.co.evenprime.bukkit.nocheat.wizard.options;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 
-import javax.swing.BorderFactory;
-import javax.swing.BoxLayout;
 
 public class ParentOption extends Option {
 
@@ -18,18 +16,6 @@ public class ParentOption extends Option {
 
 	public ParentOption(String identifier) {
 		super(identifier);
-
-		this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
-		this.setAlignmentX(1.0F);
-
-		if(identifier.length() > 0) {
-			this.setBorder(
-					BorderFactory.createCompoundBorder(
-							BorderFactory.createTitledBorder(identifier),
-							BorderFactory.createEmptyBorder(5,5,5,5)));
-		}
-		else
-			this.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
 	}
 
 	public final Collection<Option> getChildOptions() {
@@ -37,8 +23,9 @@ public class ParentOption extends Option {
 	}
 
 	public final void add(Option option) {
+
 		children.addLast(option);
 
-		super.add(option);
+
 	}
 }
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/ShortStringOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/ShortStringOption.java
new file mode 100644
index 00000000..ed737185
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/ShortStringOption.java
@@ -0,0 +1,13 @@
+package cc.co.evenprime.bukkit.nocheat.wizard.options;
+
+public class ShortStringOption extends TextFieldOption {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2258827414736580449L;
+		
+	public ShortStringOption(String name, String initialValue) {
+		super(name, initialValue, 10);
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/TextFieldOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/TextFieldOption.java
new file mode 100644
index 00000000..5f026117
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/TextFieldOption.java
@@ -0,0 +1,51 @@
+package cc.co.evenprime.bukkit.nocheat.wizard.options;
+
+public abstract class TextFieldOption extends ChildOption {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8189248456599421250L;
+
+	private String value;
+	private int length = -1;
+
+	public TextFieldOption(String name, String initialValue, int preferredLength) {
+
+		super(name);
+		this.value = initialValue;
+		this.length = preferredLength;
+	}
+	
+	public TextFieldOption(String name, String initialValue) {
+
+		super(name);
+		this.value = initialValue;
+	}
+
+	@Override
+	public String getValue() {
+		return this.value;
+	}
+
+	public boolean setValue(String value) {
+		if(isValid(value)) {
+			this.value = value;
+			return true;
+		}
+		else
+			return false;
+	}
+
+	protected boolean isValid(String value) {
+		return value != null;
+	}
+	
+	public int getPreferredLength() {
+		return length;
+	}
+	
+	public boolean hasPreferredLength() {
+		return length != -1;
+	}
+}

From fe9a8681693505c660fca626126dd306987b69d7 Mon Sep 17 00:00:00 2001
From: Evenprime <Evenprime@example.com>
Date: Wed, 4 May 2011 07:58:39 +0200
Subject: [PATCH 3/9] Further integration of the new configuration system +
 package refactoring

---
 .../nocheat/ConfigurationException.java       |  13 +
 .../co/evenprime/bukkit/nocheat/NoCheat.java  |  66 ++-
 .../bukkit/nocheat/NoCheatConfiguration.java  | 302 ------------
 .../bukkit/nocheat/checks/AirbuildCheck.java  |  28 +-
 .../nocheat/checks/BedteleportCheck.java      |  19 +-
 .../nocheat/checks/BogusitemsCheck.java       |  19 +-
 .../bukkit/nocheat/checks/Check.java          |  11 +-
 .../bukkit/nocheat/checks/ItemdupeCheck.java  |  16 +-
 .../bukkit/nocheat/checks/MovingCheck.java    |  39 +-
 .../bukkit/nocheat/checks/SpeedhackCheck.java |  36 +-
 .../options => config}/BooleanOption.java     |   2 +-
 .../options => config}/ChildOption.java       |   7 +-
 .../options => config}/IntegerOption.java     |   6 +-
 .../bukkit/nocheat/config/LevelOption.java    |  82 ++++
 .../options => config}/LongStringOption.java  |   2 +-
 .../MediumStringOption.java                   |   2 +-
 .../nocheat/config/NoCheatConfiguration.java  | 434 ++++++++++++++++++
 .../{wizard/options => config}/Option.java    |   8 +-
 .../options => config}/ParentOption.java      |  25 +-
 .../options => config}/ShortStringOption.java |   2 +-
 .../options => config}/TextFieldOption.java   |   2 +-
 .../bukkit/nocheat/wizard/Wizard.java         | 137 +-----
 .../wizard/gui/ChildOptionGuiFactory.java     |  18 +-
 .../nocheat/wizard/gui/ParentOptionGui.java   |  10 +-
 .../wizard/options/LogLevelOption.java        |  63 ---
 25 files changed, 776 insertions(+), 573 deletions(-)
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/ConfigurationException.java
 delete mode 100644 src/cc/co/evenprime/bukkit/nocheat/NoCheatConfiguration.java
 rename src/cc/co/evenprime/bukkit/nocheat/{wizard/options => config}/BooleanOption.java (84%)
 rename src/cc/co/evenprime/bukkit/nocheat/{wizard/options => config}/ChildOption.java (55%)
 rename src/cc/co/evenprime/bukkit/nocheat/{wizard/options => config}/IntegerOption.java (74%)
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/config/LevelOption.java
 rename src/cc/co/evenprime/bukkit/nocheat/{wizard/options => config}/LongStringOption.java (78%)
 rename src/cc/co/evenprime/bukkit/nocheat/{wizard/options => config}/MediumStringOption.java (78%)
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java
 rename src/cc/co/evenprime/bukkit/nocheat/{wizard/options => config}/Option.java (50%)
 rename src/cc/co/evenprime/bukkit/nocheat/{wizard/options => config}/ParentOption.java (53%)
 rename src/cc/co/evenprime/bukkit/nocheat/{wizard/options => config}/ShortStringOption.java (78%)
 rename src/cc/co/evenprime/bukkit/nocheat/{wizard/options => config}/TextFieldOption.java (89%)
 delete mode 100644 src/cc/co/evenprime/bukkit/nocheat/wizard/options/LogLevelOption.java

diff --git a/src/cc/co/evenprime/bukkit/nocheat/ConfigurationException.java b/src/cc/co/evenprime/bukkit/nocheat/ConfigurationException.java
new file mode 100644
index 00000000..56f6bbc0
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/ConfigurationException.java
@@ -0,0 +1,13 @@
+package cc.co.evenprime.bukkit.nocheat;
+
+public class ConfigurationException extends Exception {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -457634587532590464L;
+
+	public ConfigurationException(String message) {
+		super(message);
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/NoCheat.java b/src/cc/co/evenprime/bukkit/nocheat/NoCheat.java
index 6fa922eb..8c46108d 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/NoCheat.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/NoCheat.java
@@ -1,6 +1,7 @@
 package cc.co.evenprime.bukkit.nocheat;
 
 
+import java.io.File;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -20,6 +21,7 @@ import cc.co.evenprime.bukkit.nocheat.checks.Check;
 import cc.co.evenprime.bukkit.nocheat.checks.ItemdupeCheck;
 import cc.co.evenprime.bukkit.nocheat.checks.MovingCheck;
 import cc.co.evenprime.bukkit.nocheat.checks.SpeedhackCheck;
+import cc.co.evenprime.bukkit.nocheat.config.NoCheatConfiguration;
 import cc.co.evenprime.bukkit.nocheat.data.PermissionData;
 
 import com.ensifera.animosity.craftirc.CraftIRC;
@@ -37,12 +39,12 @@ import org.bukkit.plugin.Plugin;
  */
 public class NoCheat extends JavaPlugin {
 
-	public MovingCheck movingCheck;
-	public BedteleportCheck bedteleportCheck;
-	public SpeedhackCheck speedhackCheck;
-	public AirbuildCheck airbuildCheck;
-	public ItemdupeCheck itemdupeCheck;
-	public BogusitemsCheck bogusitemsCheck;
+	private MovingCheck movingCheck;
+	private BedteleportCheck bedteleportCheck;
+	private SpeedhackCheck speedhackCheck;
+	private AirbuildCheck airbuildCheck;
+	private ItemdupeCheck itemdupeCheck;
+	private BogusitemsCheck bogusitemsCheck;
 
 	private Check[] checks;
 
@@ -63,6 +65,12 @@ public class NoCheat extends JavaPlugin {
 	// CraftIRC 2.x, if available
 	private CraftIRC irc;
 
+	private Level chatLevel;
+	private Level ircLevel;
+	private Level consoleLevel;
+	private String ircTag;
+
+	
 	public NoCheat() { 	
 
 	}
@@ -116,20 +124,19 @@ public class NoCheat extends JavaPlugin {
 
 	public void onEnable() {
 
-		movingCheck = new MovingCheck(this);
-		bedteleportCheck = new BedteleportCheck(this);
-		speedhackCheck = new SpeedhackCheck(this);
-		airbuildCheck = new AirbuildCheck(this);
-		itemdupeCheck = new ItemdupeCheck(this);
-		bogusitemsCheck = new BogusitemsCheck(this);
+		// parse the nocheat.yml config file
+		setupConfig();
+		
+		movingCheck = new MovingCheck(this, config);
+		bedteleportCheck = new BedteleportCheck(this, config);
+		speedhackCheck = new SpeedhackCheck(this, config);
+		airbuildCheck = new AirbuildCheck(this, config);
+		itemdupeCheck = new ItemdupeCheck(this, config);
+		bogusitemsCheck = new BogusitemsCheck(this, config);
 
 		// just for convenience
 		checks = new Check[] { movingCheck, bedteleportCheck, speedhackCheck, airbuildCheck, itemdupeCheck, bogusitemsCheck };
-
-		// parse the nocheat.yml config file
-		setupConfig();
-
-
+		
 		PluginDescriptionFile pdfFile = this.getDescription();
 
 		// Get, if available, the Permissions and irc plugin
@@ -236,7 +243,7 @@ public class NoCheat extends JavaPlugin {
 	}
 
 	private void logToChat(Level l, String message) {
-		if(config.chatLevel.intValue() <= l.intValue()) {
+		if(chatLevel.intValue() <= l.intValue()) {
 			for(Player player : getServer().getOnlinePlayers()) {
 				if(hasPermission(player, PermissionData.PERMISSION_NOTIFY)) {
 					player.sendMessage("["+l.getName()+"] " + message);
@@ -246,13 +253,13 @@ public class NoCheat extends JavaPlugin {
 	}
 
 	private void logToIRC(Level l, String message) {
-		if(irc != null && config.ircLevel.intValue() <= l.intValue()) {
-			irc.sendMessageToTag("["+l.getName()+"] " + message , config.ircTag);
+		if(irc != null && ircLevel.intValue() <= l.intValue()) {
+			irc.sendMessageToTag("["+l.getName()+"] " + message , ircTag);
 		}
 	}
 
 	private void logToConsole(Level l, String message) {
-		if( config.consoleLevel.intValue() <= l.intValue()) {
+		if( consoleLevel.intValue() <= l.intValue()) {
 			Logger.getLogger("Minecraft").log(l, message);
 		}
 	}
@@ -295,9 +302,22 @@ public class NoCheat extends JavaPlugin {
 	 */
 	private void setupConfig() {
 		if(this.config == null)
-			this.config = new NoCheatConfiguration(this);
+			this.config = new NoCheatConfiguration(new File(NoCheatConfiguration.configFile));
 		else
-			this.config.config();
+			this.config.config(new File(NoCheatConfiguration.configFile));
+		
+		config.setupFileLogger();
+
+		try {
+			this.chatLevel = config.getLogLevelValue("logging.logtochat");
+			this.ircLevel = config.getLogLevelValue("logging.logtoirc");
+			this.consoleLevel = config.getLogLevelValue("logging.logtoconsole");
+			this.ircTag = config.getStringValue("logging.logtoirctag");
+		} catch (ConfigurationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			this.setEnabled(false);
+		}
 	}
 
 
diff --git a/src/cc/co/evenprime/bukkit/nocheat/NoCheatConfiguration.java b/src/cc/co/evenprime/bukkit/nocheat/NoCheatConfiguration.java
deleted file mode 100644
index ac4371f1..00000000
--- a/src/cc/co/evenprime/bukkit/nocheat/NoCheatConfiguration.java
+++ /dev/null
@@ -1,302 +0,0 @@
-package cc.co.evenprime.bukkit.nocheat;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.logging.FileHandler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.bukkit.util.config.Configuration;
-
-import cc.co.evenprime.bukkit.nocheat.actions.Action;
-import cc.co.evenprime.bukkit.nocheat.actions.CancelAction;
-import cc.co.evenprime.bukkit.nocheat.actions.LogAction;
-
-/**
- * Central location for everything that's described in the configuration file
- * 
- * @author Evenprime
- *
- */
-public class NoCheatConfiguration {
-
-
-	private final static String configFile = "plugins/NoCheat/nocheat.yml";
-
-	// Our personal logger
-	private final static String loggerName = "cc.co.evenprime.nocheat";
-	public final Logger logger = Logger.getLogger(loggerName);
-
-	// The log level above which information gets logged to the specified logger
-	public Level chatLevel = Level.WARNING;
-	public Level ircLevel = Level.WARNING;
-	public Level consoleLevel = Level.SEVERE;
-	public Level fileLevel = Level.INFO;
-
-	public String fileName = "plugins/NoCheat/nocheat.log";
-
-	public String ircTag = "nocheat";
-
-	// Our log output to a file
-	private FileHandler fh = null;
-
-	private final NoCheat plugin;
-
-	public NoCheatConfiguration(NoCheat plugin) {
-
-		this.plugin = plugin;
-
-		config();
-	}
-
-	/**
-	 * Read the configuration file and assign either standard values or whatever is declared in the file
-	 * @param configurationFile
-	 */
-	public void config() {
-
-		File configurationFile = new File(configFile);
-
-		if(!configurationFile.exists()) {
-			createStandardConfigFile(configurationFile);
-		}
-
-		Configuration c = new Configuration(configurationFile);
-		c.load();
-
-		logger.setLevel(Level.INFO);
-		logger.setUseParentHandlers(false);
-
-		chatLevel = stringToLevel(c.getString("logging.logtochat"), chatLevel);
-		consoleLevel = stringToLevel(c.getString("logging.logtoconsole"), consoleLevel);
-		fileLevel = stringToLevel(c.getString("logging.logtofile"), fileLevel);
-		ircLevel = stringToLevel(c.getString("logging.logtoirc"), ircLevel);
-		ircTag = c.getString("logging.logtoirctag", ircTag);
-
-		if(fh == null) {
-			try {
-				fh = new FileHandler(fileName, true);
-				fh.setLevel(fileLevel);
-				fh.setFormatter(Logger.getLogger("Minecraft").getHandlers()[0].getFormatter());
-				logger.addHandler(fh);
-
-			} catch (Exception e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		plugin.speedhackCheck.limits[0] = c.getInt("speedhack.limits.low", plugin.speedhackCheck.limits[0]);
-		plugin.speedhackCheck.limits[1] = c.getInt("speedhack.limits.med", plugin.speedhackCheck.limits[1]);
-		plugin.speedhackCheck.limits[2] = c.getInt("speedhack.limits.high", plugin.speedhackCheck.limits[2]);
-
-		plugin.speedhackCheck.logMessage = c.getString("speedhack.logmessage", plugin.speedhackCheck.logMessage);
-
-		plugin.movingCheck.actions[0] = stringToActions(c.getString("moving.action.low"), plugin.movingCheck.actions[0]);
-		plugin.movingCheck.actions[1] = stringToActions(c.getString("moving.action.med"), plugin.movingCheck.actions[1]);
-		plugin.movingCheck.actions[2] = stringToActions(c.getString("moving.action.high"), plugin.movingCheck.actions[2]);
-
-
-		plugin.movingCheck.logMessage = c.getString("moving.logmessage", plugin.movingCheck.logMessage);
-		plugin.movingCheck.summaryMessage = c.getString("moving.summarymessage", plugin.movingCheck.summaryMessage);
-
-		plugin.movingCheck.allowFlying = c.getBoolean("moving.allowflying", plugin.movingCheck.allowFlying);
-		plugin.movingCheck.allowFakeSneak = c.getBoolean("moving.allowfakesneak", plugin.movingCheck.allowFakeSneak);
-
-		plugin.speedhackCheck.actions[0] = stringToActions(c.getString("speedhack.action.low"), plugin.speedhackCheck.actions[0]);
-		plugin.speedhackCheck.actions[1] = stringToActions(c.getString("speedhack.action.med"), plugin.speedhackCheck.actions[1]);
-		plugin.speedhackCheck.actions[2] = stringToActions(c.getString("speedhack.action.high"), plugin.speedhackCheck.actions[2]);
-
-		plugin.airbuildCheck.limits[0] = c.getInt("airbuild.limits.low", plugin.airbuildCheck.limits[0]);
-		plugin.airbuildCheck.limits[1] = c.getInt("airbuild.limits.med", plugin.airbuildCheck.limits[1]);
-		plugin.airbuildCheck.limits[2] = c.getInt("airbuild.limits.high", plugin.airbuildCheck.limits[2]);
-
-		plugin.airbuildCheck.actions[0] = stringToActions(c.getString("airbuild.action.low"), plugin.airbuildCheck.actions[0]);
-		plugin.airbuildCheck.actions[1] = stringToActions(c.getString("airbuild.action.med"), plugin.airbuildCheck.actions[1]);
-		plugin.airbuildCheck.actions[2] = stringToActions(c.getString("airbuild.action.high"), plugin.airbuildCheck.actions[2]);
-
-		plugin.speedhackCheck.setActive(c.getBoolean("active.speedhack", true));
-		plugin.movingCheck.setActive(c.getBoolean("active.moving", true));
-		plugin.airbuildCheck.setActive(c.getBoolean("active.airbuild", false));
-		plugin.bedteleportCheck.setActive(c.getBoolean("active.bedteleport", true));
-		plugin.itemdupeCheck.setActive(c.getBoolean("active.itemdupe", true));
-		plugin.bogusitemsCheck.setActive(c.getBoolean("active.bogusitems", false));
-	}
-
-	public void cleanup() {
-
-		if(fh != null) {
-			try {
-				logger.removeHandler(fh);
-				fh.flush();
-				fh.close();
-
-			} catch (Exception e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-	}
-
-	private Action[] stringToActions(String string, Action[] def) {
-
-		if(string == null) return def;
-
-		List<Action> as = new LinkedList<Action>();
-		String[] parts = string.split(" ");
-
-		for(String s : parts) {
-			if(s.equals("loglow"))
-				as.add(LogAction.loglow);
-			else if(s.equals("logmed"))
-				as.add(LogAction.logmed);
-			else if(s.equals("loghigh"))
-				as.add(LogAction.loghigh);
-			else if(s.equals("deny"))
-				as.add(CancelAction.cancel);
-			else if(s.equals("reset"))
-				as.add(CancelAction.cancel);
-			else if(s.equals("cancel"))
-				as.add(CancelAction.cancel);
-			else if(s.startsWith("custom")) {
-				try {
-					// TODO: Implement Custom Action
-					//as.add(new CustomAction(Integer.parseInt(s.substring(6))));
-				}
-				catch(Exception e) {
-					System.out.println("NC: Couldn't parse number of custom action '" + s + "'");
-				}
-			}
-			else {
-				System.out.println("NC: Can't parse action "+ s);
-			}
-		}
-
-
-		return as.toArray(def);
-	}
-
-	private String actionsToString(Action[] actions) {
-
-		StringBuffer s = new StringBuffer();
-
-		if(actions != null) {
-			for(Action a : actions) {
-				s.append(' ').append(a.getName());
-			}
-		}
-
-		return s.toString().trim();
-	}
-	/**
-	 * Convert a string into a log level
-	 * @param string
-	 * @return
-	 */
-	private static Level stringToLevel(String string, Level def) {
-
-		if(string == null) {
-			return def;
-		}
-
-		if(string.trim().equals("info") || string.trim().equals("low")) return Level.INFO;
-		if(string.trim().equals("warn") || string.trim().equals("med")) return Level.WARNING;
-		if(string.trim().equals("severe")|| string.trim().equals("high")) return Level.SEVERE;
-
-		return Level.OFF;
-	}
-
-	private static String levelToString(Level level) {
-
-		if(level == null) {
-			return "off";
-		}
-
-		if(level.equals(Level.INFO)) return "low";
-		else if(level.equals(Level.WARNING)) return "med";
-		else if(level.equals(Level.SEVERE)) return "high";
-
-		return "off";
-	}
-
-	/**
-	 * Standard configuration file for people who haven't got one yet
-	 * @param f
-	 */
-	private void createStandardConfigFile(File f) {
-		try {
-			f.getParentFile().mkdirs();
-			f.createNewFile();
-			BufferedWriter w = new BufferedWriter(new FileWriter(f));
-
-			w.write("# Logging: potential log levels are low (info), med (warn), high (severe), off"); w.newLine();
-			w.write("logging:"); w.newLine();
-			w.write("    filename: "+fileName); w.newLine();
-			w.write("    logtofile: "+levelToString(fileLevel)); w.newLine();
-			w.write("    logtoconsole: "+levelToString(consoleLevel)); w.newLine();
-			w.write("    logtochat: "+levelToString(chatLevel)); w.newLine();
-			w.write("    logtoirc: "+levelToString(ircLevel)); w.newLine();
-			w.write("    logtoirctag: "+ircTag); w.newLine();
-			w.write("# Checks and Bugfixes that are activated (true or false)"); w.newLine();
-			w.write("active:");  w.newLine();
-			w.write("    speedhack: true"); w.newLine();
-			w.write("    moving: true"); w.newLine();
-			w.write("    airbuild: false"); w.newLine();
-			w.write("    bedteleport: true"); w.newLine();
-			w.write("    itemdupe: true"); w.newLine();
-			w.write("    bogusitems: false"); w.newLine();
-			w.write("# Speedhack specific options"); w.newLine();
-			w.write("speedhack:"); w.newLine();
-			w.write("    logmessage: \"" + plugin.speedhackCheck.logMessage+"\""); w.newLine();
-			w.write("    limits:"); w.newLine();
-			w.write("        low: "+plugin.speedhackCheck.limits[0]); w.newLine();
-			w.write("        med: "+plugin.speedhackCheck.limits[1]); w.newLine();
-			w.write("        high: "+plugin.speedhackCheck.limits[2]); w.newLine();
-			w.write("#   Speedhack Action, one or more of 'loglow logmed loghigh cancel'"); w.newLine();
-			w.write("    action:"); w.newLine();
-			w.write("        low: "+actionsToString(plugin.speedhackCheck.actions[0])); w.newLine();
-			w.write("        med: "+actionsToString(plugin.speedhackCheck.actions[1])); w.newLine();
-			w.write("        high: "+actionsToString(plugin.speedhackCheck.actions[2])); w.newLine();
-			w.write("# Moving specific options") ; w.newLine();
-			w.write("moving:"); w.newLine();
-			w.write("    logmessage: \"" + plugin.movingCheck.logMessage+"\""); w.newLine();
-			w.write("    summarymessage: \"" + plugin.movingCheck.summaryMessage+"\""); w.newLine();
-			w.write("#   Should (normal speed) flying be generally allowed?"); w.newLine();
-			w.write("    allowflying: " + plugin.movingCheck.allowFlying); w.newLine();
-			w.write("#   Should sneaking with normal walking speed be generally allowed?"); w.newLine();
-			w.write("    allowfakesneak: " + plugin.movingCheck.allowFakeSneak); w.newLine();
-			w.write("#   Moving Action, one or more of 'loglow logmed loghigh cancel'"); w.newLine();
-			w.write("    action:"); w.newLine();
-			w.write("        low: "+actionsToString(plugin.movingCheck.actions[0])); w.newLine();
-			w.write("        med: "+actionsToString(plugin.movingCheck.actions[1])); w.newLine();
-			w.write("        high: "+actionsToString(plugin.movingCheck.actions[2])); w.newLine();
-			w.write("# Airbuild specific options"); w.newLine();
-			w.write("airbuild:"); w.newLine();
-			w.write("#   How many blocks per second are placed by the player in midair to trigger corresponding action"); w.newLine();
-			w.write("    limits:"); w.newLine();
-			w.write("        low: "+plugin.airbuildCheck.limits[0]); w.newLine();
-			w.write("        med: "+plugin.airbuildCheck.limits[1]); w.newLine();
-			w.write("        high: "+plugin.airbuildCheck.limits[2]); w.newLine();
-			w.write("#   Airbuild Action, one or more of 'loglow logmed loghigh cancel'"); w.newLine();
-			w.write("    action:"); w.newLine();
-			w.write("        low: "+actionsToString(plugin.airbuildCheck.actions[0])); w.newLine();
-			w.write("        med: "+actionsToString(plugin.airbuildCheck.actions[1])); w.newLine();
-			w.write("        high: "+actionsToString(plugin.airbuildCheck.actions[2])); w.newLine();
-			w.write("# Bedteleport specific options (none exist yet)"); w.newLine();
-			w.write("bedteleport:"); w.newLine();
-			w.write("# Itemdupe specific options (none exist yet)"); w.newLine();
-			w.write("itemdupe:"); w.newLine();
-			w.write("# Bogusitems specific options (none exist yet)"); w.newLine();
-			w.write("bogusitems:"); w.newLine();
-
-			w.flush(); w.close();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java
index d1d8855a..a8209164 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java
@@ -9,11 +9,13 @@ import org.bukkit.event.Event.Priority;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.plugin.PluginManager;
 
+import cc.co.evenprime.bukkit.nocheat.ConfigurationException;
 import cc.co.evenprime.bukkit.nocheat.NoCheat;
 import cc.co.evenprime.bukkit.nocheat.actions.Action;
 import cc.co.evenprime.bukkit.nocheat.actions.CancelAction;
 import cc.co.evenprime.bukkit.nocheat.actions.CustomAction;
 import cc.co.evenprime.bukkit.nocheat.actions.LogAction;
+import cc.co.evenprime.bukkit.nocheat.config.NoCheatConfiguration;
 import cc.co.evenprime.bukkit.nocheat.data.AirbuildData;
 import cc.co.evenprime.bukkit.nocheat.data.PermissionData;
 import cc.co.evenprime.bukkit.nocheat.listeners.AirbuildBlockListener;
@@ -28,15 +30,15 @@ import cc.co.evenprime.bukkit.nocheat.listeners.AirbuildBlockListener;
 public class AirbuildCheck extends Check {
 
 	// How should airbuild violations be treated?
-	public final Action actions[][] = { 
+	private final Action actions[][] = { 
 			{ LogAction.loglow,  CancelAction.cancel }, 
 			{ LogAction.logmed,  CancelAction.cancel },
 			{ LogAction.loghigh, CancelAction.cancel } };
 
-	public final int limits[] = { 1, 3, 10 };
+	private int limits[];
 
-	public AirbuildCheck(NoCheat plugin) {
-		super(plugin, "airbuild", PermissionData.PERMISSION_AIRBUILD);
+	public AirbuildCheck(NoCheat plugin, NoCheatConfiguration config) {
+		super(plugin, "airbuild", PermissionData.PERMISSION_AIRBUILD, config);
 	}
 
 	public void check(BlockPlaceEvent event) {
@@ -123,6 +125,24 @@ public class AirbuildCheck extends Check {
 		data.perSecond = 0;
 	}
 
+	@Override
+	public void configure(NoCheatConfiguration config) {
+
+		try {
+			limits = new int[3];
+			
+			limits[0] = config.getIntegerValue("airbuild.limits.low");
+			limits[1] = config.getIntegerValue("airbuild.limits.med");
+			limits[2] = config.getIntegerValue("airbuild.limits.high");
+
+			setActive(config.getBooleanValue("active.airbuild"));
+
+		} catch (ConfigurationException e) {
+			setActive(false);
+			e.printStackTrace();
+		}
+	}
+
 	@Override
 	protected void registerListeners() {
 		PluginManager pm = Bukkit.getServer().getPluginManager();
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/BedteleportCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/BedteleportCheck.java
index 885d2df6..e63507be 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/BedteleportCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/BedteleportCheck.java
@@ -6,7 +6,9 @@ import org.bukkit.event.Event.Priority;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.plugin.PluginManager;
 
+import cc.co.evenprime.bukkit.nocheat.ConfigurationException;
 import cc.co.evenprime.bukkit.nocheat.NoCheat;
+import cc.co.evenprime.bukkit.nocheat.config.NoCheatConfiguration;
 import cc.co.evenprime.bukkit.nocheat.data.PermissionData;
 import cc.co.evenprime.bukkit.nocheat.listeners.BedteleportPlayerListener;
 
@@ -18,8 +20,8 @@ import cc.co.evenprime.bukkit.nocheat.listeners.BedteleportPlayerListener;
 
 public class BedteleportCheck extends Check {
 
-	public BedteleportCheck(NoCheat plugin) {
-		super(plugin, "bedteleport",  PermissionData.PERMISSION_BEDTELEPORT);
+	public BedteleportCheck(NoCheat plugin, NoCheatConfiguration config) {
+		super(plugin, "bedteleport",  PermissionData.PERMISSION_BEDTELEPORT, config);
 	}
 
 	public void check(PlayerMoveEvent event) {
@@ -31,7 +33,18 @@ public class BedteleportCheck extends Check {
 		if(event.getPlayer().isSleeping())
 			event.setCancelled(true);
 	}
-
+	
+	@Override
+	public void configure(NoCheatConfiguration config) {
+		
+		try {
+			setActive(config.getBooleanValue("active.bedteleport"));
+		} catch (ConfigurationException e) {
+			setActive(false);
+			e.printStackTrace();
+		}
+	}
+	
 	@Override
 	protected void registerListeners() {
 		PluginManager pm = Bukkit.getServer().getPluginManager();
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/BogusitemsCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/BogusitemsCheck.java
index dc764dbd..87ca949b 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/BogusitemsCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/BogusitemsCheck.java
@@ -15,14 +15,16 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.PluginManager;
 
+import cc.co.evenprime.bukkit.nocheat.ConfigurationException;
 import cc.co.evenprime.bukkit.nocheat.NoCheat;
+import cc.co.evenprime.bukkit.nocheat.config.NoCheatConfiguration;
 import cc.co.evenprime.bukkit.nocheat.data.PermissionData;
 import cc.co.evenprime.bukkit.nocheat.listeners.BogusitemsPlayerListener;
 
 public class BogusitemsCheck extends Check {
 
-	public BogusitemsCheck(NoCheat plugin){
-		super(plugin, "bogusitems", PermissionData.PERMISSION_BOGUSITEMS);
+	public BogusitemsCheck(NoCheat plugin, NoCheatConfiguration config){
+		super(plugin, "bogusitems", PermissionData.PERMISSION_BOGUSITEMS, config);
 	}
 
 	public void check(PlayerPickupItemEvent event) {
@@ -86,11 +88,22 @@ public class BogusitemsCheck extends Check {
 		for(int i = 0; i < stacks.length; i++) {
 			if(stacks[i] != null && stacks[i].getAmount() <= 0) {
 				inv.clear(i);
-				plugin.log(Level.WARNING, "Removed illegal item from inventory of " + player.getName());
+				plugin.log(Level.WARNING, "Removed invalid item from inventory of " + player.getName());
 			}
 		}
 	}
 
+	@Override
+	public void configure(NoCheatConfiguration config) {
+
+		try {
+			setActive(config.getBooleanValue("active.bogusitems"));
+		} catch (ConfigurationException e) {
+			setActive(false);
+			e.printStackTrace();
+		}
+	}
+
 	@Override
 	protected void registerListeners() {
 		PluginManager pm = Bukkit.getServer().getPluginManager();
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/Check.java b/src/cc/co/evenprime/bukkit/nocheat/checks/Check.java
index 3826ae49..1156e3c7 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/Check.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/Check.java
@@ -4,6 +4,7 @@ package cc.co.evenprime.bukkit.nocheat.checks;
 import org.bukkit.entity.Player;
 
 import cc.co.evenprime.bukkit.nocheat.NoCheat;
+import cc.co.evenprime.bukkit.nocheat.config.NoCheatConfiguration;
 
 /**
  *
@@ -18,16 +19,20 @@ public abstract class Check {
 	private String name;
 	protected NoCheat plugin;
 
-	public Check(NoCheat plugin, String name, int permission) {
+	protected Check(NoCheat plugin, String name, int permission, NoCheatConfiguration config) {
 		this.plugin = plugin;
 		this.permission = permission;
 		this.name = name;
+		
+		configure(config);
 	}
 
 	public boolean skipCheck(Player player) {
 		// Should we check at all?
 		return !active || plugin.hasPermission(player, permission); 
 	}
+	
+	protected abstract void configure(NoCheatConfiguration config);
 
 	protected abstract void registerListeners();
 
@@ -35,7 +40,7 @@ public abstract class Check {
 		return active;
 	}
 
-	public void setActive(boolean active) {
+	protected void setActive(boolean active) {
 		synchronized(this) {
 			if(active && !listenersRegistered) {
 				listenersRegistered = true;
@@ -50,4 +55,6 @@ public abstract class Check {
 	public String getName() {
 		return name;
 	}
+
+
 }
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/ItemdupeCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/ItemdupeCheck.java
index b5b092dd..0eb2edca 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/ItemdupeCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/ItemdupeCheck.java
@@ -8,14 +8,16 @@ import org.bukkit.event.Event.Priority;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.plugin.PluginManager;
 
+import cc.co.evenprime.bukkit.nocheat.ConfigurationException;
 import cc.co.evenprime.bukkit.nocheat.NoCheat;
+import cc.co.evenprime.bukkit.nocheat.config.NoCheatConfiguration;
 import cc.co.evenprime.bukkit.nocheat.data.PermissionData;
 import cc.co.evenprime.bukkit.nocheat.listeners.ItemdupeEntityListener;
 
 public class ItemdupeCheck extends Check {
 
-	public ItemdupeCheck(NoCheat plugin){
-		super(plugin, "itemdupe", PermissionData.PERMISSION_ITEMDUPE);
+	public ItemdupeCheck(NoCheat plugin, NoCheatConfiguration config){
+		super(plugin, "itemdupe", PermissionData.PERMISSION_ITEMDUPE, config);
 	}
 
 
@@ -28,6 +30,16 @@ public class ItemdupeCheck extends Check {
 		}
 	}
 
+	@Override
+	public void configure(NoCheatConfiguration config) {
+
+		try {
+			setActive(config.getBooleanValue("active.itemdupe"));
+		} catch (ConfigurationException e) {
+			setActive(false);
+			e.printStackTrace();
+		}
+	}
 
 	@Override
 	protected void registerListeners() {
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
index c0789ca1..5893ae71 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
@@ -16,11 +16,13 @@ import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.util.Vector;
 
+import cc.co.evenprime.bukkit.nocheat.ConfigurationException;
 import cc.co.evenprime.bukkit.nocheat.NoCheat;
 import cc.co.evenprime.bukkit.nocheat.actions.Action;
 import cc.co.evenprime.bukkit.nocheat.actions.CancelAction;
 import cc.co.evenprime.bukkit.nocheat.actions.CustomAction;
 import cc.co.evenprime.bukkit.nocheat.actions.LogAction;
+import cc.co.evenprime.bukkit.nocheat.config.NoCheatConfiguration;
 import cc.co.evenprime.bukkit.nocheat.data.MovingData;
 import cc.co.evenprime.bukkit.nocheat.data.PermissionData;
 import cc.co.evenprime.bukkit.nocheat.listeners.MovingEntityListener;
@@ -35,8 +37,9 @@ import cc.co.evenprime.bukkit.nocheat.listeners.MovingPlayerMonitor;
  */
 public class MovingCheck extends Check {
 
-	public MovingCheck(NoCheat plugin) {
-		super(plugin, "moving", PermissionData.PERMISSION_MOVING);
+	public MovingCheck(NoCheat plugin, NoCheatConfiguration config) {
+		super(plugin, "moving", PermissionData.PERMISSION_MOVING, config);
+
 	}
 
 	// How many move events can a player have in air before he is expected to lose altitude (or land somewhere)
@@ -51,22 +54,22 @@ public class MovingCheck extends Check {
 	private final static double stepWidth = 0.6D;
 	private final static double sneakStepWidth = 0.25D;
 
-	public int ticksBeforeSummary = 100;
+	private int ticksBeforeSummary = 100;
 
 	public long statisticElapsedTimeNano = 0;
 
-	public boolean allowFlying = false;
-	public boolean allowFakeSneak = true;
+	public boolean allowFlying;
+	public boolean allowFakeSneak;
+
+	private String logMessage;
+	private String summaryMessage;
 
 	// How should moving violations be treated?
-	public final Action actions[][] = { 
+	private final Action actions[][] = { 
 			{ LogAction.loglow,  CancelAction.cancel },
 			{ LogAction.logmed,  CancelAction.cancel },
 			{ LogAction.loghigh, CancelAction.cancel } };
 
-	public String logMessage = "Moving violation: %1$s from %2$s (%4$.1f, %5$.1f, %6$.1f) to %3$s (%7$.1f, %8$.1f, %9$.1f)";
-	public String summaryMessage = "Moving summary of last ~%2$d seconds: %1$s total Violations: (%3$d,%4$d,%5$d)";
-
 	public long statisticTotalEvents = 1; // Prevent accidental division by 0 at some point
 
 	private static final double magic =  0.30000001192092896D;
@@ -646,6 +649,24 @@ public class MovingCheck extends Check {
 		data.teleportTo = null;
 	}
 
+	@Override
+	public void configure(NoCheatConfiguration config) {
+
+		try {
+			allowFlying = config.getBooleanValue("moving.allowflying");
+			allowFakeSneak = config.getBooleanValue("moving.allowfakesneak");
+
+			logMessage = config.getStringValue("moving.logmessage");
+			summaryMessage = config.getStringValue("moving.summarymessage");
+
+			setActive(config.getBooleanValue("active.moving"));
+		} catch (ConfigurationException e) {
+			setActive(false);
+			e.printStackTrace();
+		}
+
+	}
+
 	@Override
 	protected void registerListeners() {
 		PluginManager pm = Bukkit.getServer().getPluginManager();
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java
index 3274a8c2..98239682 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java
@@ -10,11 +10,13 @@ import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.plugin.PluginManager;
 
+import cc.co.evenprime.bukkit.nocheat.ConfigurationException;
 import cc.co.evenprime.bukkit.nocheat.NoCheat;
 import cc.co.evenprime.bukkit.nocheat.actions.Action;
 import cc.co.evenprime.bukkit.nocheat.actions.CancelAction;
 import cc.co.evenprime.bukkit.nocheat.actions.CustomAction;
 import cc.co.evenprime.bukkit.nocheat.actions.LogAction;
+import cc.co.evenprime.bukkit.nocheat.config.NoCheatConfiguration;
 import cc.co.evenprime.bukkit.nocheat.data.PermissionData;
 import cc.co.evenprime.bukkit.nocheat.data.SpeedhackData;
 import cc.co.evenprime.bukkit.nocheat.listeners.SpeedhackPlayerListener;
@@ -27,23 +29,23 @@ import cc.co.evenprime.bukkit.nocheat.listeners.SpeedhackPlayerListener;
  */
 public class SpeedhackCheck extends Check {
 
-	public SpeedhackCheck(NoCheat plugin) {
-		super(plugin, "speedhack", PermissionData.PERMISSION_SPEEDHACK);
+	public SpeedhackCheck(NoCheat plugin, NoCheatConfiguration config) {
+		super(plugin, "speedhack", PermissionData.PERMISSION_SPEEDHACK, config);
 	}
 
 	private static final int violationsLimit = 2;
 
 	// Limits for the speedhack check per second
-	public int limits[] = { 30, 45, 60 };
+	private int limits[];
+
+	private String logMessage;
 
 	// How should speedhack violations be treated?
-	public Action actions[][] = { 
+	private Action actions[][] = { 
 			{ LogAction.loglow, CancelAction.cancel }, 
 			{ LogAction.logmed, CancelAction.cancel },
 			{ LogAction.loghigh, CancelAction.cancel } };
 
-	public String logMessage = "%1$s sent %2$d move events, but only %3$d were allowed. Speedhack?";
-
 	public void check(PlayerMoveEvent event) {
 
 		Player player = event.getPlayer();
@@ -145,6 +147,28 @@ public class SpeedhackCheck extends Check {
 		}
 	}
 
+	@Override
+	public void configure(NoCheatConfiguration config) {
+
+		try {
+
+			limits = new int[3];
+			
+			limits[0] = config.getIntegerValue("speedhack.limits.low");
+			limits[1] = config.getIntegerValue("speedhack.limits.med");
+			limits[2] = config.getIntegerValue("speedhack.limits.high");
+
+			logMessage = config.getStringValue("speedhack.logmessage");
+
+			setActive(config.getBooleanValue("active.speedhack"));
+		} catch (ConfigurationException e) {
+			setActive(false);
+			e.printStackTrace();
+		}
+	}
+
+
+
 	@Override
 	protected void registerListeners() {
 		PluginManager pm = Bukkit.getServer().getPluginManager();
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/BooleanOption.java b/src/cc/co/evenprime/bukkit/nocheat/config/BooleanOption.java
similarity index 84%
rename from src/cc/co/evenprime/bukkit/nocheat/wizard/options/BooleanOption.java
rename to src/cc/co/evenprime/bukkit/nocheat/config/BooleanOption.java
index 97615923..5d709c61 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/BooleanOption.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/BooleanOption.java
@@ -1,4 +1,4 @@
-package cc.co.evenprime.bukkit.nocheat.wizard.options;
+package cc.co.evenprime.bukkit.nocheat.config;
 
 
 public class BooleanOption extends ChildOption {
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/ChildOption.java b/src/cc/co/evenprime/bukkit/nocheat/config/ChildOption.java
similarity index 55%
rename from src/cc/co/evenprime/bukkit/nocheat/wizard/options/ChildOption.java
rename to src/cc/co/evenprime/bukkit/nocheat/config/ChildOption.java
index 33f506ae..9d04c007 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/ChildOption.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/ChildOption.java
@@ -1,4 +1,4 @@
-package cc.co.evenprime.bukkit.nocheat.wizard.options;
+package cc.co.evenprime.bukkit.nocheat.config;
 
 public abstract class ChildOption extends Option {
 
@@ -14,4 +14,9 @@ public abstract class ChildOption extends Option {
 	
 	
 	public abstract String getValue();
+	
+	@Override
+	public String toYAMLString(String prefix) {
+		return prefix + getIdentifier() + ": \"" + getValue() + "\"\r\n";
+	}
 }
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/IntegerOption.java b/src/cc/co/evenprime/bukkit/nocheat/config/IntegerOption.java
similarity index 74%
rename from src/cc/co/evenprime/bukkit/nocheat/wizard/options/IntegerOption.java
rename to src/cc/co/evenprime/bukkit/nocheat/config/IntegerOption.java
index 062ff259..27f88eeb 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/IntegerOption.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/IntegerOption.java
@@ -1,4 +1,4 @@
-package cc.co.evenprime.bukkit.nocheat.wizard.options;
+package cc.co.evenprime.bukkit.nocheat.config;
 
 
 public class IntegerOption extends TextFieldOption {
@@ -26,4 +26,8 @@ public class IntegerOption extends TextFieldOption {
 			return false;
 		}
 	}
+
+	public int getIntegerValue() {
+		return Integer.parseInt(this.getValue());
+	}
 }
diff --git a/src/cc/co/evenprime/bukkit/nocheat/config/LevelOption.java b/src/cc/co/evenprime/bukkit/nocheat/config/LevelOption.java
new file mode 100644
index 00000000..771ba0a7
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/LevelOption.java
@@ -0,0 +1,82 @@
+package cc.co.evenprime.bukkit.nocheat.config;
+
+import java.util.logging.Level;
+
+
+public class LevelOption extends ChildOption {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1609308017422576285L;
+
+	private LogLevel option;
+
+	public enum LogLevel {
+		
+		
+		OFF("off", "never", Level.OFF), 
+		LOW("low", "all messages", Level.INFO), 
+		MED("med", "important messages", Level.WARNING), 
+		HIGH("high", "very important messages", Level.SEVERE);
+
+		private final String value;
+		private String description;
+		private Level level;
+
+		private LogLevel(String value, String description, Level level) {
+			this.value = value;
+			this.description = description;
+			this.level = level;
+		}
+
+		public String asString() { return this.value; }
+
+		public static LogLevel getLogLevelFromString(String s) {
+			if(s == null) return OFF;
+			if("off".equals(s))
+				return OFF;
+			else if("low".equals(s))
+				return LOW;
+			else if("med".equals(s))
+				return MED;
+			else if("high".equals(s))
+				return HIGH;
+			else
+				return OFF;
+		}
+
+
+		public String toString() {
+			return this.name() + ": " + description;
+		}
+
+		public Level getLevel() {
+			return level;
+		}
+	}
+
+	public LevelOption(String identifier, LogLevel initialValue) {
+
+		super(identifier);
+		this.option = initialValue;
+	}
+
+
+	@Override
+	public String getValue() {
+		return option.asString();
+	}
+
+	public void setValue(LogLevel value) {
+		this.option = value;
+	}
+
+	public LogLevel getOptionValue() {
+		return this.option;
+	}
+	
+	public Level getLevelValue() {
+		return this.option.getLevel();
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/LongStringOption.java b/src/cc/co/evenprime/bukkit/nocheat/config/LongStringOption.java
similarity index 78%
rename from src/cc/co/evenprime/bukkit/nocheat/wizard/options/LongStringOption.java
rename to src/cc/co/evenprime/bukkit/nocheat/config/LongStringOption.java
index 1b018110..4254ca75 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/LongStringOption.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/LongStringOption.java
@@ -1,4 +1,4 @@
-package cc.co.evenprime.bukkit.nocheat.wizard.options;
+package cc.co.evenprime.bukkit.nocheat.config;
 
 public class LongStringOption extends TextFieldOption {
 
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/MediumStringOption.java b/src/cc/co/evenprime/bukkit/nocheat/config/MediumStringOption.java
similarity index 78%
rename from src/cc/co/evenprime/bukkit/nocheat/wizard/options/MediumStringOption.java
rename to src/cc/co/evenprime/bukkit/nocheat/config/MediumStringOption.java
index c31db5f3..6c57029f 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/MediumStringOption.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/MediumStringOption.java
@@ -1,4 +1,4 @@
-package cc.co.evenprime.bukkit.nocheat.wizard.options;
+package cc.co.evenprime.bukkit.nocheat.config;
 
 public class MediumStringOption extends TextFieldOption {
 
diff --git a/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java b/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java
new file mode 100644
index 00000000..e5c56d9d
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java
@@ -0,0 +1,434 @@
+package cc.co.evenprime.bukkit.nocheat.config;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.logging.FileHandler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.bukkit.util.config.Configuration;
+
+import cc.co.evenprime.bukkit.nocheat.ConfigurationException;
+import cc.co.evenprime.bukkit.nocheat.actions.Action;
+import cc.co.evenprime.bukkit.nocheat.actions.CancelAction;
+import cc.co.evenprime.bukkit.nocheat.actions.LogAction;
+import cc.co.evenprime.bukkit.nocheat.config.LevelOption.LogLevel;
+
+/**
+ * Central location for everything that's described in the configuration file
+ * 
+ * @author Evenprime
+ *
+ */
+public class NoCheatConfiguration {
+
+
+	public final static String configFile = "plugins/NoCheat/nocheat.yml";
+
+	private ParentOption root;
+
+	// Our personal logger
+	private final static String loggerName = "cc.co.evenprime.nocheat";
+	public final Logger logger = Logger.getLogger(loggerName);
+
+	// Our log output to a file
+	private FileHandler fh = null;
+
+	public NoCheatConfiguration(File configurationFile) {
+
+		// Setup the configuration tree
+		config(configurationFile);
+	}
+
+	/**
+	 * Read the configuration file and assign either standard values or whatever is declared in the file
+	 * @param configurationFile
+	 */
+	public void config(File configurationFile) {
+
+		Configuration CONFIG = new Configuration(configurationFile);
+		CONFIG.load();
+
+		root = new ParentOption("");
+
+
+		/*** LOGGING section ***/
+		{
+			ParentOption loggingNode = new ParentOption("logging");
+			root.add(loggingNode);
+
+			loggingNode.add(new MediumStringOption("filename", 
+					CONFIG.getString("logging.filename", "plugins/NoCheat/nocheat.log")));
+
+			loggingNode.add(new LevelOption("logtofile", 
+					LogLevel.getLogLevelFromString(CONFIG.getString("logging.logtofile", LogLevel.LOW.asString()))));
+			loggingNode.add(new LevelOption("logtoconsole",
+					LogLevel.getLogLevelFromString(CONFIG.getString("logging.logtoconsole", LogLevel.HIGH.asString()))));
+			loggingNode.add(new LevelOption("logtochat", 
+					LogLevel.getLogLevelFromString(CONFIG.getString("logging.logtochat", LogLevel.MED.asString()))));
+			loggingNode.add(new LevelOption("logtoirc",
+					LogLevel.getLogLevelFromString(CONFIG.getString("logging.logtoirc", LogLevel.MED.asString()))));
+
+			loggingNode.add(new ShortStringOption("logtoirctag", 
+					CONFIG.getString("logging.logtoirctag", "nocheat")));
+		}
+
+		/*** ACTIVE section ***/
+		{
+			ParentOption activeNode = new ParentOption("active");
+			root.add(activeNode);
+
+			activeNode.add(new BooleanOption("speedhack", 
+					CONFIG.getBoolean("active.speedhack", true)));
+			activeNode.add(new BooleanOption("moving", 
+					CONFIG.getBoolean("active.moving", true)));
+			activeNode.add(new BooleanOption("airbuild",
+					CONFIG.getBoolean("active.airbuild", false)));
+			activeNode.add(new BooleanOption("bedteleport",
+					CONFIG.getBoolean("active.bedteleport", true)));
+			activeNode.add(new BooleanOption("itemdupe", 
+					CONFIG.getBoolean("active.itemdupe", true)));
+			activeNode.add(new BooleanOption("bogusitems",
+					CONFIG.getBoolean("active.bogusitems", false)));
+		}
+
+		/*** SPEEDHACK section ***/
+		{
+			ParentOption speedhackNode = new ParentOption("speedhack");
+			root.add(speedhackNode);
+
+			speedhackNode.add(new LongStringOption("logmessage", 
+					CONFIG.getString("logging.filename", "%1$s sent %2$d move events, but only %3$d were allowed. Speedhack?")));
+
+			/*** SPEEDHACK LIMITS section ***/
+			{
+				ParentOption speedhackLimitsNode = new ParentOption("limits");
+				speedhackNode.add(speedhackLimitsNode);
+
+				speedhackLimitsNode.add(new IntegerOption("low", 
+						CONFIG.getInt("speedhack.limits.low", 30)));
+				speedhackLimitsNode.add(new IntegerOption("med",
+						CONFIG.getInt("speedhack.limits.med", 45)));
+				speedhackLimitsNode.add(new IntegerOption("high",
+						CONFIG.getInt("speedhack.limits.high", 60)));
+			}
+
+			/*** SPEEDHACK ACTIONS section ***/
+			{
+				ParentOption speedhackActionNode = new ParentOption("action");
+				speedhackNode.add(speedhackActionNode);
+
+				speedhackActionNode.add(new MediumStringOption("low", 
+						CONFIG.getString("speedhack.action.low", "loglow cancel")));
+				speedhackActionNode.add(new MediumStringOption("med", 
+						CONFIG.getString("speedhack.action.med", "logmed cancel")));
+				speedhackActionNode.add(new MediumStringOption("high", 
+						CONFIG.getString("speedhack.action.high", "loghigh cancel")));
+			}
+		}
+
+		/*** MOVING section ***/
+		{
+			ParentOption movingNode = new ParentOption("moving");
+			root.add(movingNode);
+
+			movingNode.add(new LongStringOption("logmessage",
+					CONFIG.getString("moving.logmessage", "Moving violation: %1$s from %2$s (%4$.1f, %5$.1f, %6$.1f) to %3$s (%7$.1f, %8$.1f, %9$.1f)")));
+			movingNode.add(new LongStringOption("summarymessage", 
+					CONFIG.getString("moving.summarymessage", "Moving summary of last ~%2$d seconds: %1$s total Violations: (%3$d,%4$d,%5$d)")));
+			movingNode.add(new BooleanOption("allowflying", 
+					CONFIG.getBoolean("moving.allowflying", false)));
+			movingNode.add(new BooleanOption("allowfakesneak", 
+					CONFIG.getBoolean("moving.allowfakesneak", true)));
+
+			/*** MOVING ACTION section ***/
+			{
+				ParentOption movingActionNode = new ParentOption("action");
+				movingNode.add(movingActionNode);
+
+				movingActionNode.add(new MediumStringOption("low", 
+						CONFIG.getString("moving.action.low", "loglow cancel")));
+				movingActionNode.add(new MediumStringOption("med", 
+						CONFIG.getString("moving.action.med", "logmed cancel")));
+				movingActionNode.add(new MediumStringOption("high", 
+						CONFIG.getString("moving.action.high", "loghigh cancel")));
+			}
+		}
+
+		/*** AIRBUILD section ***/
+		{
+			ParentOption airbuildNode = new ParentOption("airbuild");
+			root.add(airbuildNode);
+
+			/*** AIRBUILD LIMITS section ***/
+			{
+				ParentOption airbuildLimitsNode = new ParentOption("limits");
+				airbuildNode.add(airbuildLimitsNode);
+
+				airbuildLimitsNode.add(new IntegerOption("low", 
+						CONFIG.getInt("airbuild.limits.low", 1)));
+				airbuildLimitsNode.add(new IntegerOption("med",
+						CONFIG.getInt("airbuild.limits.med", 3)));
+				airbuildLimitsNode.add(new IntegerOption("high",
+						CONFIG.getInt("airbuild.limits.high", 10)));
+			}
+
+			/*** AIRBUILD ACTION section ***/
+			{
+				ParentOption airbuildActionNode = new ParentOption("action");
+				airbuildNode.add(airbuildActionNode);
+
+				airbuildActionNode.add(new MediumStringOption("low", 
+						CONFIG.getString("airbuild.action.low", "loglow cancel")));
+				airbuildActionNode.add(new MediumStringOption("med",
+						CONFIG.getString("airbuild.action.med", "logmed cancel")));
+				airbuildActionNode.add(new MediumStringOption("high",
+						CONFIG.getString("airbuild.action.high", "loghigh cancel")));
+			}
+		}
+
+		/*** BEDTELEPORT section ***/
+		{
+			ParentOption bedteleportNode = new ParentOption("bedteleport");
+			root.add(bedteleportNode);
+		}
+
+		/*** ITEMDUPE section ***/
+		{
+			ParentOption itemdupeNode = new ParentOption("itemdupe");
+			root.add(itemdupeNode);
+		}
+
+		/*** BOGUSITEMS section ***/
+		{
+			ParentOption bogusitemsNode = new ParentOption("bogusitems");
+			root.add(bogusitemsNode);
+		}
+
+		if(!configurationFile.exists()) {
+			writeConfigFile(configurationFile, this);
+		}
+	}
+
+	public void setupFileLogger() {
+
+		logger.setLevel(Level.INFO);
+		logger.setUseParentHandlers(false);
+
+		if(fh == null) {
+			try {
+				fh = new FileHandler(getStringValue("logging.filename"), true);
+				fh.setLevel(getLogLevelValue("logging.logtofile"));
+				fh.setFormatter(Logger.getLogger("Minecraft").getHandlers()[0].getFormatter());
+				logger.addHandler(fh);
+
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	public void cleanup() {
+
+		if(fh != null) {
+			try {
+				logger.removeHandler(fh);
+				fh.flush();
+				fh.close();
+
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	private Action[] stringToActions(String string, Action[] def) {
+
+		if(string == null) return def;
+
+		List<Action> as = new LinkedList<Action>();
+		String[] parts = string.split(" ");
+
+		for(String s : parts) {
+			if(s.equals("loglow"))
+				as.add(LogAction.loglow);
+			else if(s.equals("logmed"))
+				as.add(LogAction.logmed);
+			else if(s.equals("loghigh"))
+				as.add(LogAction.loghigh);
+			else if(s.equals("deny"))
+				as.add(CancelAction.cancel);
+			else if(s.equals("reset"))
+				as.add(CancelAction.cancel);
+			else if(s.equals("cancel"))
+				as.add(CancelAction.cancel);
+			else if(s.startsWith("custom")) {
+				try {
+					// TODO: Implement Custom Action
+					//as.add(new CustomAction(Integer.parseInt(s.substring(6))));
+				}
+				catch(Exception e) {
+					System.out.println("NC: Couldn't parse number of custom action '" + s + "'");
+				}
+			}
+			else {
+				System.out.println("NC: Can't parse action "+ s);
+			}
+		}
+
+
+		return as.toArray(def);
+	}
+
+	private String actionsToString(Action[] actions) {
+
+		StringBuffer s = new StringBuffer();
+
+		if(actions != null) {
+			for(Action a : actions) {
+				s.append(' ').append(a.getName());
+			}
+		}
+
+		return s.toString().trim();
+	}
+
+	/**
+	 * Convert a string into a log level
+	 * @param string
+	 * @return
+	 */
+	private static Level stringToLevel(String string, Level def) {
+
+		if(string == null) {
+			return def;
+		}
+
+		if(string.trim().equals("info") || string.trim().equals("low")) return Level.INFO;
+		if(string.trim().equals("warn") || string.trim().equals("med")) return Level.WARNING;
+		if(string.trim().equals("severe")|| string.trim().equals("high")) return Level.SEVERE;
+
+		return Level.OFF;
+	}
+
+	private static String levelToString(Level level) {
+
+		if(level == null) {
+			return "off";
+		}
+
+		if(level.equals(Level.INFO)) return "low";
+		else if(level.equals(Level.WARNING)) return "med";
+		else if(level.equals(Level.SEVERE)) return "high";
+
+		return "off";
+	}
+
+	/**
+	 * Write configuration file to specific filename
+	 * @param f
+	 */
+	public static void writeConfigFile(File f, NoCheatConfiguration configuration) {
+		try {
+			if(f.getParentFile() != null)
+				f.getParentFile().mkdirs();
+			f.createNewFile();
+			BufferedWriter w = new BufferedWriter(new FileWriter(f));
+
+			w.write(configuration.getRoot().toYAMLString(""));
+
+			w.flush(); w.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+
+	public int getIntegerValue(String optionName) throws ConfigurationException {	
+		return getIntegerOption(optionName).getIntegerValue();
+	}
+	public IntegerOption getIntegerOption(String optionName) throws ConfigurationException {
+
+		Option o = getOption(optionName) ;
+		if(o instanceof IntegerOption) {
+			return (IntegerOption)o;
+		}
+
+		throw new ConfigurationException("Config Node " + optionName + " is not an integer");
+	}
+
+	public String getStringValue(String optionName) throws ConfigurationException {
+		return getStringOption(optionName).getValue();
+	}
+	public TextFieldOption getStringOption(String optionName) throws ConfigurationException {
+
+		Option o = getOption(optionName);
+		if(o instanceof TextFieldOption) {
+			return (TextFieldOption)o;
+		}
+
+		throw new ConfigurationException("Config Node " + optionName + " is not a string");
+	}
+
+	public Level getLogLevelValue(String optionName) throws ConfigurationException {
+		return getLogLevelOption(optionName).getLevelValue();
+	}
+	public LevelOption getLogLevelOption(String optionName) throws ConfigurationException {
+
+		Option o = getOption(optionName);
+		if(o instanceof LevelOption) {
+			return (LevelOption)o;
+		}
+
+		throw new ConfigurationException("Config Node " + optionName + " is not a loglevel");
+	}
+
+
+	public boolean getBooleanValue(String optionName) throws ConfigurationException {
+		return getBooleanOption(optionName).getBooleanValue();
+	}
+	public BooleanOption getBooleanOption(String optionName) throws ConfigurationException {
+
+		Option o = getOption(optionName);
+		if(o instanceof BooleanOption) {
+			return (BooleanOption)o;
+		}
+
+		throw new ConfigurationException("Config Node " + optionName + " is not a boolean");
+	}
+
+
+	private Option getOption(String optionName) throws ConfigurationException {
+		LinkedList<String> l = new LinkedList<String>();
+		for(String s : optionName.split("\\.")) {
+			l.addLast(s);
+		}
+		return getOption(root, l);
+	}
+
+	private Option getOption(Option parent, LinkedList<String> names) throws ConfigurationException {
+
+		if(names.size() == 0) {
+			return parent;
+		}
+		else if(parent instanceof ParentOption) {
+			for(Option o2 : ((ParentOption)parent).getChildOptions()) {
+				if(o2.getIdentifier().equals(names.getFirst())) {
+
+					names.removeFirst();
+					return getOption(o2, names);
+				}
+			}
+		}
+
+		throw new ConfigurationException("Config Node doesn't exist");
+	}
+
+	public ParentOption getRoot() {
+		return root;
+	}
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/Option.java b/src/cc/co/evenprime/bukkit/nocheat/config/Option.java
similarity index 50%
rename from src/cc/co/evenprime/bukkit/nocheat/wizard/options/Option.java
rename to src/cc/co/evenprime/bukkit/nocheat/config/Option.java
index db4c3edb..219411c9 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/Option.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/Option.java
@@ -1,7 +1,7 @@
-package cc.co.evenprime.bukkit.nocheat.wizard.options;
+package cc.co.evenprime.bukkit.nocheat.config;
 
 
-public class Option {
+public abstract class Option {
 			
 	private final String identifier;
 	
@@ -12,4 +12,8 @@ public class Option {
 	public String getIdentifier() {
 		return identifier;
 	}
+	
+	public String toYAMLString(String prefix) {
+		return prefix + "\r\n";
+	}
 }
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/ParentOption.java b/src/cc/co/evenprime/bukkit/nocheat/config/ParentOption.java
similarity index 53%
rename from src/cc/co/evenprime/bukkit/nocheat/wizard/options/ParentOption.java
rename to src/cc/co/evenprime/bukkit/nocheat/config/ParentOption.java
index 8742fcde..e50aefa4 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/ParentOption.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/ParentOption.java
@@ -1,4 +1,4 @@
-package cc.co.evenprime.bukkit.nocheat.wizard.options;
+package cc.co.evenprime.bukkit.nocheat.config;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -23,9 +23,28 @@ public class ParentOption extends Option {
 	}
 
 	public final void add(Option option) {
-
+		
 		children.addLast(option);
+	}
+	
+	@Override
+	public String toYAMLString(String prefix) {
 
-
+		String s = "";
+		if(getIdentifier().length() > 0) {
+			s += prefix + getIdentifier() + ":\r\n";
+			
+			for(Option o : getChildOptions()) {
+				s += o.toYAMLString(prefix + "    ");
+			}
+		}
+		else
+		{
+			for(Option o : getChildOptions()) {
+				s += o.toYAMLString(prefix);
+			}
+		}
+		
+		return s;
 	}
 }
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/ShortStringOption.java b/src/cc/co/evenprime/bukkit/nocheat/config/ShortStringOption.java
similarity index 78%
rename from src/cc/co/evenprime/bukkit/nocheat/wizard/options/ShortStringOption.java
rename to src/cc/co/evenprime/bukkit/nocheat/config/ShortStringOption.java
index ed737185..1725c463 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/ShortStringOption.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/ShortStringOption.java
@@ -1,4 +1,4 @@
-package cc.co.evenprime.bukkit.nocheat.wizard.options;
+package cc.co.evenprime.bukkit.nocheat.config;
 
 public class ShortStringOption extends TextFieldOption {
 
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/TextFieldOption.java b/src/cc/co/evenprime/bukkit/nocheat/config/TextFieldOption.java
similarity index 89%
rename from src/cc/co/evenprime/bukkit/nocheat/wizard/options/TextFieldOption.java
rename to src/cc/co/evenprime/bukkit/nocheat/config/TextFieldOption.java
index 5f026117..c549441c 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/TextFieldOption.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/TextFieldOption.java
@@ -1,4 +1,4 @@
-package cc.co.evenprime.bukkit.nocheat.wizard.options;
+package cc.co.evenprime.bukkit.nocheat.config;
 
 public abstract class TextFieldOption extends ChildOption {
 
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java
index bd74d106..c2db856b 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java
@@ -2,6 +2,7 @@ package cc.co.evenprime.bukkit.nocheat.wizard;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.io.File;
 
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
@@ -10,16 +11,8 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 
+import cc.co.evenprime.bukkit.nocheat.config.NoCheatConfiguration;
 import cc.co.evenprime.bukkit.nocheat.wizard.gui.ParentOptionGui;
-import cc.co.evenprime.bukkit.nocheat.wizard.options.BooleanOption;
-import cc.co.evenprime.bukkit.nocheat.wizard.options.ChildOption;
-import cc.co.evenprime.bukkit.nocheat.wizard.options.IntegerOption;
-import cc.co.evenprime.bukkit.nocheat.wizard.options.LogLevelOption;
-import cc.co.evenprime.bukkit.nocheat.wizard.options.MediumStringOption;
-import cc.co.evenprime.bukkit.nocheat.wizard.options.Option;
-import cc.co.evenprime.bukkit.nocheat.wizard.options.ParentOption;
-import cc.co.evenprime.bukkit.nocheat.wizard.options.LongStringOption;
-import cc.co.evenprime.bukkit.nocheat.wizard.options.ShortStringOption;
 
 public class Wizard extends JFrame {
 
@@ -28,7 +21,6 @@ public class Wizard extends JFrame {
 	 */
 	private static final long serialVersionUID = 8798111079958779207L;
 
-	private static final String pre = "    ";
 	
 	public Wizard() {
 		
@@ -43,97 +35,9 @@ public class Wizard extends JFrame {
 		
 		inside.setLayout(new BoxLayout(inside,BoxLayout.Y_AXIS));
 		
-		final ParentOption root = new ParentOption("");
+		final NoCheatConfiguration config = new NoCheatConfiguration(new File("config.yml"));
 		
-		ParentOption loggingNode = new ParentOption("logging");
-		root.add(loggingNode);
-
-		loggingNode.add(new MediumStringOption("filename", "plugins/NoCheat/nocheat.log"));
-		loggingNode.add(new LogLevelOption("logtofile", LogLevelOption.Options.LOW));
-		loggingNode.add(new LogLevelOption("logtoconsole", LogLevelOption.Options.HIGH));
-		loggingNode.add(new LogLevelOption("logtochat", LogLevelOption.Options.MED));
-		loggingNode.add(new LogLevelOption("logtoirc", LogLevelOption.Options.MED));
-		loggingNode.add(new ShortStringOption("logtoirctag", "nocheat"));
-
-		ParentOption activeNode = new ParentOption("active");
-		root.add(activeNode);
-
-		activeNode.add(new BooleanOption("speedhack", true));
-		activeNode.add(new BooleanOption("moving", true));
-		activeNode.add(new BooleanOption("airbuild", false));
-		activeNode.add(new BooleanOption("bedteleport", true));
-		activeNode.add(new BooleanOption("itemdupe", true));
-		activeNode.add(new BooleanOption("bogusitems", false));
-
-		ParentOption speedhackNode = new ParentOption("speedhack");
-		root.add(speedhackNode);
-
-		speedhackNode.add(new LongStringOption("logmessage", "\"%1$s sent %2$d move events, but only %3$d were allowed. Speedhack?\""));
-
-		{
-			ParentOption speedhackLimitsNode = new ParentOption("limits");
-			speedhackNode.add(speedhackLimitsNode);
-
-			speedhackLimitsNode.add(new IntegerOption("low", 30));
-			speedhackLimitsNode.add(new IntegerOption("med", 45));
-			speedhackLimitsNode.add(new IntegerOption("high", 60));
-
-			ParentOption speedhackActionNode = new ParentOption("action");
-			speedhackNode.add(speedhackActionNode);
-
-			speedhackActionNode.add(new MediumStringOption("low", "loglow cancel"));
-			speedhackActionNode.add(new MediumStringOption("med", "logmed cancel"));
-			speedhackActionNode.add(new MediumStringOption("high", "loghigh cancel"));
-		}
-		
-		ParentOption movingNode = new ParentOption("moving");
-		root.add(movingNode);
-		
-		movingNode.add(new LongStringOption("logmessage", "\"Moving violation: %1$s from %2$s (%4$.1f, %5$.1f, %6$.1f) to %3$s (%7$.1f, %8$.1f, %9$.1f)\""));
-		movingNode.add(new LongStringOption("summarymessage", "\"Moving summary of last ~%2$d seconds: %1$s total Violations: (%3$d,%4$d,%5$d)\""));
-		movingNode.add(new BooleanOption("allowflying", false));
-		movingNode.add(new BooleanOption("allowfakesneak", true));
-		
-		{
-			ParentOption movingActionNode = new ParentOption("action");
-			movingNode.add(movingActionNode);
-			
-			movingActionNode.add(new MediumStringOption("low", "loglow cancel"));
-			movingActionNode.add(new MediumStringOption("med", "logmed cancel"));
-			movingActionNode.add(new MediumStringOption("high", "loghigh cancel"));
-		}
-		
-		ParentOption airbuildNode = new ParentOption("airbuild");
-		root.add(airbuildNode);
-		
-		{
-			ParentOption airbuildLimitsNode = new ParentOption("limits");
-			airbuildNode.add(airbuildLimitsNode);
-
-			airbuildLimitsNode.add(new IntegerOption("low", 30));
-			airbuildLimitsNode.add(new IntegerOption("med", 45));
-			airbuildLimitsNode.add(new IntegerOption("high", 60));
-
-			ParentOption airbuildActionNode = new ParentOption("action");
-			airbuildNode.add(airbuildActionNode);
-
-			airbuildActionNode.add(new MediumStringOption("low", "loglow cancel"));
-			airbuildActionNode.add(new MediumStringOption("med", "logmed cancel"));
-			airbuildActionNode.add(new MediumStringOption("high", "loghigh cancel"));
-		}
-		
-		ParentOption bedteleportNode = new ParentOption("bedteleport");
-		root.add(bedteleportNode);
-		
-		
-		ParentOption itemdupeNode = new ParentOption("itemdupe");
-		root.add(itemdupeNode);
-		
-		
-		ParentOption bogusitemsNode = new ParentOption("bogusitems");
-		root.add(bogusitemsNode);
-		
-		ParentOptionGui root2 = new ParentOptionGui(root);
+		ParentOptionGui root2 = new ParentOptionGui(config.getRoot());
 		
 		inside.add(root2);
 		
@@ -143,9 +47,11 @@ public class Wizard extends JFrame {
 
 			@Override
 			public void actionPerformed(ActionEvent arg0) {
-				String s = parseParent(root, "");
+				String s = config.getRoot().toYAMLString("");
 
 				JOptionPane.showMessageDialog(null, s);
+				
+				NoCheatConfiguration.writeConfigFile(new File("config.yml"), config);
 			} });
 
 		b.setAlignmentY(0.0F);
@@ -155,33 +61,4 @@ public class Wizard extends JFrame {
 		
 		this.pack();
 	}
-
-	private String parseParent(ParentOption option, String prefix) {
-
-		String s = "";
-		if(option.getIdentifier().length() > 0) {
-			s += prefix + option.getIdentifier() + ":\r\n";
-		}
-
-		for(Option o : option.getChildOptions()) {
-			if(o instanceof ChildOption) 
-				s += parseChild((ChildOption)o, prefix + pre);
-			else if(o instanceof ParentOption)
-				s += parseParent((ParentOption)o, prefix + pre);
-			else
-				parse(o, prefix + "  ");
-		}
-
-		return s;
-	}
-
-	private String parseChild(ChildOption option, String prefix) {
-
-		return prefix + option.getIdentifier() + ": " + option.getValue() + "\r\n";
-	}
-
-	private String parse(Object option, String prefix) {
-
-		return "";
-	}
 }
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ChildOptionGuiFactory.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ChildOptionGuiFactory.java
index 588675a8..c11c36db 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ChildOptionGuiFactory.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ChildOptionGuiFactory.java
@@ -10,10 +10,10 @@ import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.JTextField;
 
-import cc.co.evenprime.bukkit.nocheat.wizard.options.BooleanOption;
-import cc.co.evenprime.bukkit.nocheat.wizard.options.ChildOption;
-import cc.co.evenprime.bukkit.nocheat.wizard.options.LogLevelOption;
-import cc.co.evenprime.bukkit.nocheat.wizard.options.TextFieldOption;
+import cc.co.evenprime.bukkit.nocheat.config.BooleanOption;
+import cc.co.evenprime.bukkit.nocheat.config.ChildOption;
+import cc.co.evenprime.bukkit.nocheat.config.LevelOption;
+import cc.co.evenprime.bukkit.nocheat.config.TextFieldOption;
 
 public class ChildOptionGuiFactory {
 
@@ -25,18 +25,18 @@ public class ChildOptionGuiFactory {
 		else if(option instanceof TextFieldOption) {
 			return createTextField((TextFieldOption)option);
 		}
-		else if(option instanceof LogLevelOption) {
-			return createLogLevel((LogLevelOption)option);
+		else if(option instanceof LevelOption) {
+			return createLogLevel((LevelOption)option);
 		}
 
 		throw new RuntimeException("Unknown ChildOption " + option);
 	}
 
-	private static JComboBox createLogLevel(final LogLevelOption option) {
+	private static JComboBox createLogLevel(final LevelOption option) {
 
 		final JComboBox comboBox = new JComboBox();
 
-		for(LogLevelOption.Options o : LogLevelOption.Options.values())
+		for(LevelOption.LogLevel o : LevelOption.LogLevel.values())
 			comboBox.addItem(o);
 
 		comboBox.setSelectedItem(option.getOptionValue());
@@ -45,7 +45,7 @@ public class ChildOptionGuiFactory {
 
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				option.setValue((LogLevelOption.Options)comboBox.getSelectedItem());
+				option.setValue((LevelOption.LogLevel)comboBox.getSelectedItem());
 
 			}
 
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ParentOptionGui.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ParentOptionGui.java
index 472d934a..c78af84e 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ParentOptionGui.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ParentOptionGui.java
@@ -11,9 +11,9 @@ import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
-import cc.co.evenprime.bukkit.nocheat.wizard.options.ChildOption;
-import cc.co.evenprime.bukkit.nocheat.wizard.options.Option;
-import cc.co.evenprime.bukkit.nocheat.wizard.options.ParentOption;
+import cc.co.evenprime.bukkit.nocheat.config.ChildOption;
+import cc.co.evenprime.bukkit.nocheat.config.Option;
+import cc.co.evenprime.bukkit.nocheat.config.ParentOption;
 
 public class ParentOptionGui extends JPanel {
 
@@ -31,7 +31,7 @@ public class ParentOptionGui extends JPanel {
 		if(option.getIdentifier().length() > 0) {
 			this.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,5,5,5), BorderFactory.createCompoundBorder(
 					BorderFactory.createTitledBorder(BorderFactory.createMatteBorder(2, 2,
-					        2, 2, Color.BLACK), "  " + option.getIdentifier() + "  "), 
+					        2, 2, Color.BLACK), "  " + option.getIdentifier() + ":  "), 
 					BorderFactory.createEmptyBorder(5,5,5,5))));
 		}
 		this.setLayout(new GridBagLayout());
@@ -42,7 +42,7 @@ public class ParentOptionGui extends JPanel {
 		}
 	}	
 
-	public void add(Option option) {
+	private void add(Option option) {
 		if(option instanceof ParentOption) {
 			GridBagConstraints c = new GridBagConstraints();
 
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/LogLevelOption.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/options/LogLevelOption.java
deleted file mode 100644
index 4edffd81..00000000
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/options/LogLevelOption.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package cc.co.evenprime.bukkit.nocheat.wizard.options;
-
-
-public class LogLevelOption extends ChildOption {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -1609308017422576285L;
-
-	private Options value;
-
-
-	public enum Options {
-		OFF("never"), LOW("all messages"), MED("important messages"), HIGH("very important messages");
-
-		private final String value;
-
-		private Options(String s) {
-			this.value = s;
-		}
-
-		public String getValue() { return this.value; }
-
-		public static Options getOption(String s) {
-			if("off".equals(s))
-				return OFF;
-			else if("low".equals(s))
-				return LOW;
-			else if("med".equals(s))
-				return MED;
-			else if("high".equals(s))
-				return HIGH;
-			else
-				return OFF;
-		}
-
-
-		public String toString() {
-			return this.name() + ": " + getValue();
-		}
-	}
-
-	public LogLevelOption(String identifier, Options initialValue) {
-
-		super(identifier);
-		this.value = initialValue;
-	}
-
-
-	@Override
-	public String getValue() {
-		return value.getValue();
-	}
-
-	public void setValue(Options value) {
-		this.value = value;
-	}
-
-	public Options getOptionValue() {
-		return this.value;
-	}
-}

From c5f910de21fc56d83655d3df9217aed98d6d3347 Mon Sep 17 00:00:00 2001
From: Evenprime <Evenprime@example.com>
Date: Tue, 10 May 2011 14:04:03 +0200
Subject: [PATCH 4/9] Additional implementations for the configuration GUI and
 custom actions

---
 .../bukkit/nocheat/actions/Action.java        |  4 +-
 .../bukkit/nocheat/actions/CancelAction.java  |  2 +-
 .../bukkit/nocheat/actions/CustomAction.java  |  2 +-
 .../bukkit/nocheat/actions/LogAction.java     |  8 +-
 .../bukkit/nocheat/checks/AirbuildCheck.java  | 11 ++-
 .../bukkit/nocheat/checks/MovingCheck.java    | 11 ++-
 .../bukkit/nocheat/checks/SpeedhackCheck.java | 11 ++-
 .../nocheat/config/CustomActionOption.java    | 87 +++++++++++++++++++
 .../nocheat/config/NoCheatConfiguration.java  | 60 +++++--------
 .../wizard/gui/ChildOptionGuiFactory.java     | 80 ++++++++++++++++-
 .../nocheat/wizard/gui/ParentOptionGui.java   | 11 +--
 11 files changed, 223 insertions(+), 64 deletions(-)
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/config/CustomActionOption.java

diff --git a/src/cc/co/evenprime/bukkit/nocheat/actions/Action.java b/src/cc/co/evenprime/bukkit/nocheat/actions/Action.java
index 002f1720..3643fe66 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/actions/Action.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/actions/Action.java
@@ -9,9 +9,9 @@ package cc.co.evenprime.bukkit.nocheat.actions;
 public abstract class Action {
 
 	public final int firstAfter;
-	public final boolean repeat;
+	public final int repeat;
 
-	public Action(int firstAfter, boolean repeat) {
+	public Action(int firstAfter, int repeat) {
 		this.firstAfter = firstAfter;
 		this.repeat = repeat;
 	}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/actions/CancelAction.java b/src/cc/co/evenprime/bukkit/nocheat/actions/CancelAction.java
index 2af5361d..5c6909fd 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/actions/CancelAction.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/actions/CancelAction.java
@@ -9,7 +9,7 @@ public class CancelAction extends Action {
 
 	public final static CancelAction cancel = new CancelAction();
 
-	private CancelAction() { super(1, true); }
+	private CancelAction() { super(1, 1); }
 
 	public String getName() {
 		return "cancel";
diff --git a/src/cc/co/evenprime/bukkit/nocheat/actions/CustomAction.java b/src/cc/co/evenprime/bukkit/nocheat/actions/CustomAction.java
index ca9c89e0..4575cf06 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/actions/CustomAction.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/actions/CustomAction.java
@@ -10,7 +10,7 @@ public class CustomAction extends Action {
 
 	public final String command;
 
-	public CustomAction(int firstAfter, boolean repeat, String command) {
+	public CustomAction(int firstAfter, int repeat, String command) {
 		super(firstAfter, repeat);
 		this.command = command;
 	}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/actions/LogAction.java b/src/cc/co/evenprime/bukkit/nocheat/actions/LogAction.java
index 3f9cf78a..0752c9fe 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/actions/LogAction.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/actions/LogAction.java
@@ -11,13 +11,13 @@ public class LogAction extends Action {
 
 	public final Level level;
 
-	public final static LogAction loglow = new LogAction(1, false, Level.INFO);
-	public final static LogAction logmed = new LogAction(1, false, Level.WARNING);
-	public final static LogAction loghigh = new LogAction(1, false, Level.SEVERE);
+	public final static LogAction loglow = new LogAction(1, 0, Level.INFO);
+	public final static LogAction logmed = new LogAction(1, 0, Level.WARNING);
+	public final static LogAction loghigh = new LogAction(1, 0, Level.SEVERE);
 
 	public final static LogAction[] log = { loglow, logmed, loghigh };
 
-	public LogAction(int firstAfter, boolean repeat, Level level) {
+	public LogAction(int firstAfter, int repeat, Level level) {
 		super(firstAfter, repeat);
 		this.level = level;
 	}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java
index a8209164..0da4b1a1 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java
@@ -30,10 +30,7 @@ import cc.co.evenprime.bukkit.nocheat.listeners.AirbuildBlockListener;
 public class AirbuildCheck extends Check {
 
 	// How should airbuild violations be treated?
-	private final Action actions[][] = { 
-			{ LogAction.loglow,  CancelAction.cancel }, 
-			{ LogAction.logmed,  CancelAction.cancel },
-			{ LogAction.loghigh, CancelAction.cancel } };
+	private Action actions[][];
 
 	private int limits[];
 
@@ -134,6 +131,12 @@ public class AirbuildCheck extends Check {
 			limits[0] = config.getIntegerValue("airbuild.limits.low");
 			limits[1] = config.getIntegerValue("airbuild.limits.med");
 			limits[2] = config.getIntegerValue("airbuild.limits.high");
+			
+			actions = new Action[3][];
+			
+			actions[0] = config.getActionValue("airbuild.action.low");
+			actions[1] = config.getActionValue("airbuild.action.med");
+			actions[2] = config.getActionValue("airbuild.action.high");
 
 			setActive(config.getBooleanValue("active.airbuild"));
 
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
index 5893ae71..082cd9ec 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
@@ -65,10 +65,7 @@ public class MovingCheck extends Check {
 	private String summaryMessage;
 
 	// How should moving violations be treated?
-	private final Action actions[][] = { 
-			{ LogAction.loglow,  CancelAction.cancel },
-			{ LogAction.logmed,  CancelAction.cancel },
-			{ LogAction.loghigh, CancelAction.cancel } };
+	private Action actions[][];
 
 	public long statisticTotalEvents = 1; // Prevent accidental division by 0 at some point
 
@@ -659,6 +656,12 @@ public class MovingCheck extends Check {
 			logMessage = config.getStringValue("moving.logmessage");
 			summaryMessage = config.getStringValue("moving.summarymessage");
 
+			actions = new Action[3][];
+			
+			actions[0] = config.getActionValue("moving.action.low");
+			actions[1] = config.getActionValue("moving.action.med");
+			actions[2] = config.getActionValue("moving.action.high");
+			
 			setActive(config.getBooleanValue("active.moving"));
 		} catch (ConfigurationException e) {
 			setActive(false);
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java
index 98239682..b1386110 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java
@@ -41,10 +41,7 @@ public class SpeedhackCheck extends Check {
 	private String logMessage;
 
 	// How should speedhack violations be treated?
-	private Action actions[][] = { 
-			{ LogAction.loglow, CancelAction.cancel }, 
-			{ LogAction.logmed, CancelAction.cancel },
-			{ LogAction.loghigh, CancelAction.cancel } };
+	private Action actions[][];
 
 	public void check(PlayerMoveEvent event) {
 
@@ -160,6 +157,12 @@ public class SpeedhackCheck extends Check {
 
 			logMessage = config.getStringValue("speedhack.logmessage");
 
+			actions = new Action[3][];
+			
+			actions[0] = config.getActionValue("speedhack.action.low");
+			actions[1] = config.getActionValue("speedhack.action.med");
+			actions[2] = config.getActionValue("speedhack.action.high");
+			
 			setActive(config.getBooleanValue("active.speedhack"));
 		} catch (ConfigurationException e) {
 			setActive(false);
diff --git a/src/cc/co/evenprime/bukkit/nocheat/config/CustomActionOption.java b/src/cc/co/evenprime/bukkit/nocheat/config/CustomActionOption.java
new file mode 100644
index 00000000..2ff871ca
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/CustomActionOption.java
@@ -0,0 +1,87 @@
+package cc.co.evenprime.bukkit.nocheat.config;
+
+import cc.co.evenprime.bukkit.nocheat.actions.CustomAction;
+
+public class CustomActionOption extends ChildOption {
+
+	private int firstAfter;
+	private int repeat;
+	private String command;
+	
+	
+	public CustomActionOption(String identifier, String command) {
+			
+		super(identifier);
+		
+		this.parseCommand(command);
+	}
+
+	
+	private void parseCommand(String command) {
+		
+		if(command.matches("\\[[0-9]*,[0-9]*\\] .*")) {
+			String s[] = command.split(" ", 2);
+			String s2[] = s[0].replace("[", "").replace("]", "").split(",");
+			this.firstAfter = Integer.parseInt(s2[0]);
+			this.repeat = Integer.parseInt(s2[1]);
+			this.command = s[1];
+		}
+		else if(command.matches("\\[[0-9]*\\] .*")) {
+			String s[] = command.split(" ", 2);
+			this.firstAfter = Integer.parseInt(s[0].replace("[", "").replace("]", ""));
+			this.repeat = 1;
+			this.command = s[1];
+		}
+		else
+		{
+			this.command = command;
+			this.firstAfter = 1;
+			this.repeat = 1;
+		}
+	}
+	
+	@Override
+	public String getValue() {
+		if(firstAfter <= 1) {
+			return command;
+		}
+		else if(repeat <= 0) {
+			return "["+firstAfter+"] "+ command;
+		}
+		else {
+			return "["+firstAfter+","+repeat+"] "+ command;
+		}
+	}
+	
+	
+	public CustomAction getCustomActionValue() {
+		return new CustomAction(firstAfter, repeat, command);		
+	}
+
+	public String getCommandValue() {
+		return command;
+	}
+	
+	public void setCommandValue(String command) {
+		this.command = command;
+	}
+
+	public void setRepeatValue(int value) {
+		this.repeat = value;
+		
+	}
+
+	public int getRepeatValue() {
+		return repeat;
+	}
+
+	public int getFirstAfterValue() {
+		return firstAfter;
+	}
+
+	public void setFirsttAfterValue(int value) {
+		this.firstAfter = value;
+		
+	}
+
+}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java b/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java
index e5c56d9d..4e15fb4e 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java
@@ -208,6 +208,21 @@ public class NoCheatConfiguration {
 			ParentOption bogusitemsNode = new ParentOption("bogusitems");
 			root.add(bogusitemsNode);
 		}
+		
+		/*** CUSTOMACTIONS section ***/
+		{
+			ParentOption customActionsNode = new ParentOption("customactions");
+			root.add(customActionsNode);
+			
+			customActionsNode.add(new CustomActionOption("mycommand", 
+					CONFIG.getString("customactions.mycommand", "[4,8] TESTCOMMAND")));
+			
+			customActionsNode.add(new CustomActionOption("mycommand2", 
+					CONFIG.getString("customactions.mycommand2", "TESTCOMMAND2")));
+			
+			customActionsNode.add(new CustomActionOption("mycommand3", 
+					CONFIG.getString("customactions.mycommand3", "[7] TESTCOMMAND3")));
+		}
 
 		if(!configurationFile.exists()) {
 			writeConfigFile(configurationFile, this);
@@ -246,9 +261,7 @@ public class NoCheatConfiguration {
 		}
 	}
 
-	private Action[] stringToActions(String string, Action[] def) {
-
-		if(string == null) return def;
+	public static Action[] stringToActions(String string) {
 
 		List<Action> as = new LinkedList<Action>();
 		String[] parts = string.split(" ");
@@ -280,8 +293,7 @@ public class NoCheatConfiguration {
 			}
 		}
 
-
-		return as.toArray(def);
+		return as.toArray(new Action[as.size()]);
 	}
 
 	private String actionsToString(Action[] actions) {
@@ -297,37 +309,6 @@ public class NoCheatConfiguration {
 		return s.toString().trim();
 	}
 
-	/**
-	 * Convert a string into a log level
-	 * @param string
-	 * @return
-	 */
-	private static Level stringToLevel(String string, Level def) {
-
-		if(string == null) {
-			return def;
-		}
-
-		if(string.trim().equals("info") || string.trim().equals("low")) return Level.INFO;
-		if(string.trim().equals("warn") || string.trim().equals("med")) return Level.WARNING;
-		if(string.trim().equals("severe")|| string.trim().equals("high")) return Level.SEVERE;
-
-		return Level.OFF;
-	}
-
-	private static String levelToString(Level level) {
-
-		if(level == null) {
-			return "off";
-		}
-
-		if(level.equals(Level.INFO)) return "low";
-		else if(level.equals(Level.WARNING)) return "med";
-		else if(level.equals(Level.SEVERE)) return "high";
-
-		return "off";
-	}
-
 	/**
 	 * Write configuration file to specific filename
 	 * @param f
@@ -336,6 +317,7 @@ public class NoCheatConfiguration {
 		try {
 			if(f.getParentFile() != null)
 				f.getParentFile().mkdirs();
+			
 			f.createNewFile();
 			BufferedWriter w = new BufferedWriter(new FileWriter(f));
 
@@ -347,7 +329,11 @@ public class NoCheatConfiguration {
 		}
 	}
 
-
+	public Action[] getActionValue(String optionName) throws ConfigurationException {
+		return stringToActions(getStringOption(optionName).getValue());
+	}
+	
+	
 	public int getIntegerValue(String optionName) throws ConfigurationException {	
 		return getIntegerOption(optionName).getIntegerValue();
 	}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ChildOptionGuiFactory.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ChildOptionGuiFactory.java
index c11c36db..de79cc40 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ChildOptionGuiFactory.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ChildOptionGuiFactory.java
@@ -1,17 +1,21 @@
 package cc.co.evenprime.bukkit.nocheat.wizard.gui;
 
+
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import javax.swing.BoxLayout;
 import javax.swing.InputVerifier;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
+import javax.swing.JPanel;
 import javax.swing.JTextField;
 
 import cc.co.evenprime.bukkit.nocheat.config.BooleanOption;
 import cc.co.evenprime.bukkit.nocheat.config.ChildOption;
+import cc.co.evenprime.bukkit.nocheat.config.CustomActionOption;
 import cc.co.evenprime.bukkit.nocheat.config.LevelOption;
 import cc.co.evenprime.bukkit.nocheat.config.TextFieldOption;
 
@@ -28,6 +32,9 @@ public class ChildOptionGuiFactory {
 		else if(option instanceof LevelOption) {
 			return createLogLevel((LevelOption)option);
 		}
+		else if(option instanceof CustomActionOption) {
+			return createCustomAction((CustomActionOption)option);
+		}
 
 		throw new RuntimeException("Unknown ChildOption " + option);
 	}
@@ -54,6 +61,75 @@ public class ChildOptionGuiFactory {
 		return comboBox;
 	}
 
+	private static JPanel createCustomAction(final CustomActionOption option) {
+
+		final JPanel panel = new JPanel();
+
+		panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS));
+
+		final JTextField command = new JTextField(option.getCommandValue());
+
+		command.setColumns(55);
+		command.setInputVerifier(new InputVerifier() {
+
+			@Override
+			public boolean verify(JComponent arg0) {
+				option.setCommandValue(command.getText());
+				return true;
+			}
+		});
+
+		final JTextField repeat = new JTextField(String.valueOf(option.getRepeatValue()));
+
+		repeat.setColumns(3);
+
+		repeat.setInputVerifier(new InputVerifier() {
+
+			@Override
+			public boolean verify(JComponent arg0) {
+				int value;
+				try {
+					value = Integer.parseInt(repeat.getText());
+					option.setRepeatValue(value);
+					return true;
+				}
+				catch(Exception e) {
+					JOptionPane.showMessageDialog(repeat, "Illegal value for this field");
+					repeat.setText(String.valueOf(option.getRepeatValue()));
+					return false;
+				}
+			}
+		});
+
+		final JTextField firstAfter = new JTextField(String.valueOf(option.getFirstAfterValue()));
+
+		firstAfter.setColumns(3);
+
+		firstAfter.setInputVerifier(new InputVerifier() {
+
+			@Override
+			public boolean verify(JComponent arg0) {
+				int value;
+				try {
+					value = Integer.parseInt(firstAfter.getText());
+					option.setFirsttAfterValue(value);
+					return true;
+				}
+				catch(Exception e) {
+					JOptionPane.showMessageDialog(firstAfter, "Illegal value for this field");
+					firstAfter.setText(String.valueOf(option.getFirstAfterValue()));
+					return false;
+				}
+			}
+		});
+
+		panel.add(firstAfter);
+		panel.add(repeat);
+		panel.add(command);
+
+		return panel;
+	}
+
 	private static JCheckBox createBoolean(final BooleanOption option) {
 
 		final JCheckBox checkBox = new JCheckBox();
@@ -73,11 +149,11 @@ public class ChildOptionGuiFactory {
 	private static JTextField createTextField(final TextFieldOption option) {
 
 		final JTextField textField = new JTextField(option.getValue());
-		
+
 		if(option.hasPreferredLength()) {
 			textField.setColumns(option.getPreferredLength());
 		}
-		
+
 		textField.setInputVerifier(new InputVerifier() {
 
 			@Override
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ParentOptionGui.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ParentOptionGui.java
index c78af84e..9c932256 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ParentOptionGui.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ParentOptionGui.java
@@ -48,7 +48,7 @@ public class ParentOptionGui extends JPanel {
 
 			c.gridx = 0;
 			c.gridy = children.size();
-			c.gridwidth = 3; // Spans over both columns
+			c.gridwidth = 3; // Spans over three columns
 			c.anchor = GridBagConstraints.WEST;
 			c.ipadx = 5;
 			c.ipady = 15;
@@ -63,7 +63,7 @@ public class ParentOptionGui extends JPanel {
 
 			c.gridx = 0;
 			c.gridy = children.size();
-			c.gridwidth = 1; // Spans over both columns
+			c.gridwidth = 1;
 			c.anchor = GridBagConstraints.WEST;
 			c.ipadx = 10;
 			c.weightx = 0;
@@ -72,10 +72,11 @@ public class ParentOptionGui extends JPanel {
 			
 			c.gridx = 1;
 			c.gridy = children.size();
-			c.gridwidth = 1; // Spans over both columns
+			c.gridwidth = 1;
 			c.anchor = GridBagConstraints.WEST;
 			c.ipadx = 5;
 			c.weightx = 0;
+			c.fill = GridBagConstraints.HORIZONTAL;
 			
 			JComponent child = ChildOptionGuiFactory.create((ChildOption)option);
 			
@@ -83,11 +84,11 @@ public class ParentOptionGui extends JPanel {
 			
 			c.gridx = 2;
 			c.gridy = children.size();
-			c.gridwidth = 1; // Spans over both columns
+			c.gridwidth = 1;
 			c.anchor = GridBagConstraints.WEST;
 			c.ipadx = 5;
 			c.weightx = 1;
-			c.fill = GridBagConstraints.HORIZONTAL;
+
 						
 			this.add(Box.createHorizontalGlue(), c);
 			

From d10b85c12d6ce763a3af2c2e118c667a01896f3c Mon Sep 17 00:00:00 2001
From: Evenprime <Evenprime@example.com>
Date: Tue, 10 May 2011 17:19:26 +0200
Subject: [PATCH 5/9] Integration of custom actions into existing checks

---
 .../co/evenprime/bukkit/nocheat/NoCheat.java  |  6 +-
 .../bukkit/nocheat/actions/LogAction.java     |  1 +
 .../bukkit/nocheat/checks/AirbuildCheck.java  | 62 ++++++++-----------
 .../bukkit/nocheat/checks/MovingCheck.java    | 42 +++++++------
 .../bukkit/nocheat/checks/SpeedhackCheck.java | 52 ++++++++++------
 .../bukkit/nocheat/data/AirbuildData.java     |  2 +-
 .../bukkit/nocheat/data/SpeedhackData.java    |  3 +-
 7 files changed, 88 insertions(+), 80 deletions(-)

diff --git a/src/cc/co/evenprime/bukkit/nocheat/NoCheat.java b/src/cc/co/evenprime/bukkit/nocheat/NoCheat.java
index 8c46108d..d22914fe 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/NoCheat.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/NoCheat.java
@@ -13,7 +13,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import cc.co.evenprime.bukkit.nocheat.actions.Action;
+import cc.co.evenprime.bukkit.nocheat.actions.CustomAction;
 import cc.co.evenprime.bukkit.nocheat.checks.AirbuildCheck;
 import cc.co.evenprime.bukkit.nocheat.checks.BedteleportCheck;
 import cc.co.evenprime.bukkit.nocheat.checks.BogusitemsCheck;
@@ -359,8 +359,8 @@ public class NoCheat extends JavaPlugin {
 		return this.serverLagInMilliSeconds;
 	}
 
-	public void handleCustomAction(Action a, Player player) {
-		// TODO Auto-generated method stub
+	public void handleCustomAction(CustomAction a, Player player) {
+		System.out.println("Would execute "+a.command + " now for Player " + player.getName() );
 
 	}
 }
\ No newline at end of file
diff --git a/src/cc/co/evenprime/bukkit/nocheat/actions/LogAction.java b/src/cc/co/evenprime/bukkit/nocheat/actions/LogAction.java
index 0752c9fe..63905f5c 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/actions/LogAction.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/actions/LogAction.java
@@ -11,6 +11,7 @@ public class LogAction extends Action {
 
 	public final Level level;
 
+	// Log messages are shown after 1 violation and don't get repeated
 	public final static LogAction loglow = new LogAction(1, 0, Level.INFO);
 	public final static LogAction logmed = new LogAction(1, 0, Level.WARNING);
 	public final static LogAction loghigh = new LogAction(1, 0, Level.SEVERE);
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java
index 0da4b1a1..26a3c178 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java
@@ -59,52 +59,42 @@ public class AirbuildCheck extends Check {
 					}
 				};
 
-				// Give a summary in 20 ticks ~ 1 second
-				plugin.getServer().getScheduler().scheduleAsyncDelayedTask(plugin, data.summaryTask, 20);
+				// Give a summary in 100 ticks ~ 1 second
+				plugin.getServer().getScheduler().scheduleAsyncDelayedTask(plugin, data.summaryTask, 100);
 			}
 
-			data.perSecond++;
+			data.perFiveSeconds++;
 
 			// which limit has been reached
 			for(int i = limits.length-1; i >= 0; i--) {
-				if(data.perSecond >= limits[i]) {
-					// Only explicitly log certain "milestones"
-					if(data.perSecond == limits[i]) {
-						action(actions[i], event, true);
-					}
-					else {
-						action(actions[i], event, false);
-					}
+				if(data.perFiveSeconds >= limits[i]) {
+					action(actions[i], event, data.perFiveSeconds - limits[i]+1);
 					break;
 				}
 			}
 		}
 	}
 
-	private void action(Action actions[], BlockPlaceEvent event, boolean loggingAllowed) {
+	private void action(Action actions[], BlockPlaceEvent event, int violations) {
 
 		if(actions == null) return;
 
-		boolean cancelled = false;
-
-		// Prepare log message if needed
-		String logMessage = null;
-		if(loggingAllowed) {
-			final Location l = event.getBlockPlaced().getLocation();
-			logMessage = "Airbuild: "+event.getPlayer().getName()+" tried to place block " + event.getBlockPlaced().getType() + " in the air at " + l.getBlockX() + "," + l.getBlockY() +"," + l.getBlockZ();
-		}
-
 		// Execute actions in order
 		for(Action a : actions) {
-			if(loggingAllowed && a instanceof LogAction) {
-				plugin.log(((LogAction)a).level, logMessage);
-			}
-			else if(!cancelled && a instanceof CancelAction) {
-				event.setCancelled(true);
-				cancelled = true;
-			}
-			else if(a instanceof CustomAction) {
-				plugin.handleCustomAction(a, event.getPlayer());
+			if(a.firstAfter >= violations) {
+				if(a.firstAfter == violations || (a.repeat > 0 && (violations - a.firstAfter) % a.repeat == 0)) {
+					if(a instanceof LogAction) {
+						final Location l = event.getBlockPlaced().getLocation();
+						String logMessage = "Airbuild: "+event.getPlayer().getName()+" tried to place block " + event.getBlockPlaced().getType() + " in the air at " + l.getBlockX() + "," + l.getBlockY() +"," + l.getBlockZ();
+						plugin.log(((LogAction)a).level, logMessage);
+					}
+					else if(a instanceof CancelAction) {
+						event.setCancelled(true);
+					}
+					else if(a instanceof CustomAction) {
+						plugin.handleCustomAction((CustomAction)a, event.getPlayer());
+					}
+				}
 			}
 		}
 	}
@@ -113,13 +103,13 @@ public class AirbuildCheck extends Check {
 
 		// Give a summary according to the highest violation level we encountered in that second
 		for(int i = limits.length-1; i >= 0; i--) {
-			if(data.perSecond >= limits[i]) {
-				plugin.log(LogAction.log[i].level, "Airbuild summary: " +player.getName() + " total violations per second: " + data.perSecond);
+			if(data.perFiveSeconds >= limits[i]) {
+				plugin.log(LogAction.log[i].level, "Airbuild summary: " +player.getName() + " total violations per 5 seconds: " + data.perFiveSeconds);
 				break;
 			}
 		}
 
-		data.perSecond = 0;
+		data.perFiveSeconds = 0;
 	}
 
 	@Override
@@ -127,13 +117,13 @@ public class AirbuildCheck extends Check {
 
 		try {
 			limits = new int[3];
-			
+
 			limits[0] = config.getIntegerValue("airbuild.limits.low");
 			limits[1] = config.getIntegerValue("airbuild.limits.med");
 			limits[2] = config.getIntegerValue("airbuild.limits.high");
-			
+
 			actions = new Action[3][];
-			
+
 			actions[0] = config.getActionValue("airbuild.action.low");
 			actions[1] = config.getActionValue("airbuild.action.med");
 			actions[2] = config.getActionValue("airbuild.action.high");
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
index 082cd9ec..ad1f8752 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
@@ -259,10 +259,9 @@ public class MovingCheck extends Check {
 		if(violationLevel >= 0) {
 			setupSummaryTask(event.getPlayer(), data);
 
-			boolean log = !(data.violationsInARow[violationLevel] > 0);
 			data.violationsInARow[violationLevel]++;
 
-			action(event, event.getPlayer(), from, to, actions[violationLevel], log, data);
+			action(event, event.getPlayer(), from, to, actions[violationLevel], data.violationsInARow[violationLevel], data);
 		}
 
 		/****** Violation Handling END *****/
@@ -447,30 +446,33 @@ public class MovingCheck extends Check {
 	 * @param event
 	 * @param action
 	 */
-	private void action(PlayerMoveEvent event, Player player, Location from, Location to, Action[] actions, boolean loggingAllowed, MovingData data) {
+	private void action(PlayerMoveEvent event, Player player, Location from, Location to, Action[] actions, int violations, MovingData data) {
 
 		if(actions == null) return;
 		boolean cancelled = false;
 
-		// prepare log message if necessary
-		String log = null;
-
-		if(loggingAllowed) {
-			log = String.format(logMessage, player.getName(), from.getWorld().getName(), to.getWorld().getName(), from.getX(), from.getY(), from.getZ(), to.getX(), to.getY(), to.getZ());
-		}
-
+		
 		for(Action a : actions) {
-			if(loggingAllowed && a instanceof LogAction)  {
-				plugin.log(((LogAction)a).level, log);
-				if(data.highestLogLevel == null) data.highestLogLevel = Level.ALL;
-				if(data.highestLogLevel.intValue() < ((LogAction)a).level.intValue()) data.highestLogLevel = ((LogAction)a).level;
+			if(a.firstAfter >= violations) {
+				if(a.firstAfter == violations || (a.repeat > 0 && (violations - a.firstAfter) % a.repeat == 0)) {
+					if(a instanceof LogAction)  {
+						// prepare log message if necessary
+						String log = String.format(logMessage, player.getName(), from.getWorld().getName(), to.getWorld().getName(), from.getX(), from.getY(), from.getZ(), to.getX(), to.getY(), to.getZ());
+
+						plugin.log(((LogAction)a).level, log);
+						
+						// Remember the highest log level we encountered to determine what level the summary log message should have
+						if(data.highestLogLevel == null) data.highestLogLevel = Level.ALL;
+						if(data.highestLogLevel.intValue() < ((LogAction)a).level.intValue()) data.highestLogLevel = ((LogAction)a).level;
+					}
+					else if(!cancelled && a instanceof CancelAction) {
+						resetPlayer(event, from);
+						cancelled = true;
+					}
+					else if(a instanceof CustomAction)
+						plugin.handleCustomAction((CustomAction)a, player);
+				}
 			}
-			else if(!cancelled && a instanceof CancelAction) {
-				resetPlayer(event, from);
-				cancelled = true;
-			}
-			else if(a instanceof CustomAction)
-				plugin.handleCustomAction(a, player);
 		}
 	}
 
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java
index b1386110..30249bcb 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java
@@ -83,16 +83,21 @@ public class SpeedhackCheck extends Check {
 				final int med  = (limits[1]+1) / 2;
 				final int high = (limits[2]+1) / 2;
 
-				if(data.eventsSinceLastCheck > high) action = actions[2];
-				else if(data.eventsSinceLastCheck > med) action = actions[1];
-				else if(data.eventsSinceLastCheck > low) action = actions[0];
+				int level = -1;
+
+				if(data.eventsSinceLastCheck > high) level = 2;
+				else if(data.eventsSinceLastCheck > med)  level = 1;
+				else if(data.eventsSinceLastCheck > low)  level = 0;
 				else resetData(data, event.getFrom(), ticks);
 
 
-				if(action != null)	data.violationsInARow++;
+				if(level >= 0)	{
+					data.violationsInARowTotal++;
+				}
 
-				if(data.violationsInARow >= violationsLimit) {
-					action(action, event, data);
+				if(data.violationsInARowTotal >= violationsLimit) {
+					data.violationsInARow[level]++;
+					action(action, event, data.violationsInARow[level], data);
 				}
 
 				// Reset value for next check
@@ -109,25 +114,34 @@ public class SpeedhackCheck extends Check {
 	}
 
 	private static void resetData(SpeedhackData data, Location l, int ticks) {
-		data.violationsInARow = 0;
+		data.violationsInARow[0] = 0;
+		data.violationsInARow[1] = 0;
+		data.violationsInARow[2] = 0;
+		data.violationsInARowTotal = 0;
 		data.eventsSinceLastCheck = 0;
 		data.setBackPoint = l;
 		data.lastCheckTicks = ticks;
 	}
 
-	private void action(Action actions[], PlayerMoveEvent event, SpeedhackData data) {
+	private void action(Action actions[], PlayerMoveEvent event, int violations, SpeedhackData data) {
 
 		if(actions == null) return;
 
-		String log = String.format(logMessage, event.getPlayer().getName(), data.eventsSinceLastCheck*2, limits[0]);
-
 		for(Action a : actions) {
-			if(a instanceof LogAction) 
-				plugin.log(((LogAction)a).level, log);
-			else if(a instanceof CancelAction)
-				resetPlayer(event, data);
-			else if(a instanceof CustomAction)
-				plugin.handleCustomAction(a, event.getPlayer());
+			if(a.firstAfter >= violations) {
+				if(a.firstAfter == violations || (a.repeat > 0 && (violations - a.firstAfter) % a.repeat == 0)) {
+					if(a instanceof LogAction) {
+						String log = String.format(logMessage, event.getPlayer().getName(), data.eventsSinceLastCheck*2, limits[0]);
+						plugin.log(((LogAction)a).level, log);
+					}
+					else if(a instanceof CancelAction) {
+						resetPlayer(event, data);
+					}
+					else if(a instanceof CustomAction) {
+						plugin.handleCustomAction((CustomAction)a, event.getPlayer());
+					}
+				}
+			}
 		}
 	}
 
@@ -150,7 +164,7 @@ public class SpeedhackCheck extends Check {
 		try {
 
 			limits = new int[3];
-			
+
 			limits[0] = config.getIntegerValue("speedhack.limits.low");
 			limits[1] = config.getIntegerValue("speedhack.limits.med");
 			limits[2] = config.getIntegerValue("speedhack.limits.high");
@@ -158,11 +172,11 @@ public class SpeedhackCheck extends Check {
 			logMessage = config.getStringValue("speedhack.logmessage");
 
 			actions = new Action[3][];
-			
+
 			actions[0] = config.getActionValue("speedhack.action.low");
 			actions[1] = config.getActionValue("speedhack.action.med");
 			actions[2] = config.getActionValue("speedhack.action.high");
-			
+
 			setActive(config.getBooleanValue("active.speedhack"));
 		} catch (ConfigurationException e) {
 			setActive(false);
diff --git a/src/cc/co/evenprime/bukkit/nocheat/data/AirbuildData.java b/src/cc/co/evenprime/bukkit/nocheat/data/AirbuildData.java
index 15d47089..2db6da9b 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/data/AirbuildData.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/data/AirbuildData.java
@@ -5,7 +5,7 @@ import org.bukkit.entity.Player;
 import cc.co.evenprime.bukkit.nocheat.NoCheatData;
 
 public class AirbuildData {
-	public int perSecond = 0;
+	public int perFiveSeconds = 0;
 	public Runnable summaryTask = null;
 
 	public static AirbuildData get(Player p) {
diff --git a/src/cc/co/evenprime/bukkit/nocheat/data/SpeedhackData.java b/src/cc/co/evenprime/bukkit/nocheat/data/SpeedhackData.java
index 678cead8..d95ebb35 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/data/SpeedhackData.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/data/SpeedhackData.java
@@ -10,7 +10,8 @@ public class SpeedhackData {
 	public int lastCheckTicks = 0; // timestamp of last check for speedhacks
 	public Location setBackPoint = null;
 	public int eventsSinceLastCheck = 0; // used to identify speedhacks
-	public int violationsInARow = 0;
+	public final int violationsInARow[] =  { 0, 0, 0 };
+	public int violationsInARowTotal = 0;
 
 	public static SpeedhackData get(Player p) {
 

From cc5c946141222ddbddfe49943d5e4f3195d4440e Mon Sep 17 00:00:00 2001
From: Evenprime <Evenprime@example.com>
Date: Thu, 12 May 2011 18:05:19 +0200
Subject: [PATCH 6/9] Simpified custom commands - only allow choice if
 repetition is wanted or not, but no longer choice about intervals for
 repetition.

---
 .../bukkit/nocheat/actions/Action.java        |  4 ++--
 .../bukkit/nocheat/actions/CancelAction.java  |  2 +-
 .../bukkit/nocheat/actions/CustomAction.java  |  2 +-
 .../bukkit/nocheat/actions/LogAction.java     |  8 +++----
 .../bukkit/nocheat/checks/AirbuildCheck.java  |  2 +-
 .../bukkit/nocheat/checks/MovingCheck.java    |  2 +-
 .../bukkit/nocheat/checks/SpeedhackCheck.java |  2 +-
 .../nocheat/config/CustomActionOption.java    | 18 +++++++--------
 .../wizard/gui/ChildOptionGuiFactory.java     | 22 +++++--------------
 9 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/src/cc/co/evenprime/bukkit/nocheat/actions/Action.java b/src/cc/co/evenprime/bukkit/nocheat/actions/Action.java
index 3643fe66..002f1720 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/actions/Action.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/actions/Action.java
@@ -9,9 +9,9 @@ package cc.co.evenprime.bukkit.nocheat.actions;
 public abstract class Action {
 
 	public final int firstAfter;
-	public final int repeat;
+	public final boolean repeat;
 
-	public Action(int firstAfter, int repeat) {
+	public Action(int firstAfter, boolean repeat) {
 		this.firstAfter = firstAfter;
 		this.repeat = repeat;
 	}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/actions/CancelAction.java b/src/cc/co/evenprime/bukkit/nocheat/actions/CancelAction.java
index 5c6909fd..2af5361d 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/actions/CancelAction.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/actions/CancelAction.java
@@ -9,7 +9,7 @@ public class CancelAction extends Action {
 
 	public final static CancelAction cancel = new CancelAction();
 
-	private CancelAction() { super(1, 1); }
+	private CancelAction() { super(1, true); }
 
 	public String getName() {
 		return "cancel";
diff --git a/src/cc/co/evenprime/bukkit/nocheat/actions/CustomAction.java b/src/cc/co/evenprime/bukkit/nocheat/actions/CustomAction.java
index 4575cf06..ca9c89e0 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/actions/CustomAction.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/actions/CustomAction.java
@@ -10,7 +10,7 @@ public class CustomAction extends Action {
 
 	public final String command;
 
-	public CustomAction(int firstAfter, int repeat, String command) {
+	public CustomAction(int firstAfter, boolean repeat, String command) {
 		super(firstAfter, repeat);
 		this.command = command;
 	}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/actions/LogAction.java b/src/cc/co/evenprime/bukkit/nocheat/actions/LogAction.java
index 63905f5c..8ca270e3 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/actions/LogAction.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/actions/LogAction.java
@@ -12,13 +12,13 @@ public class LogAction extends Action {
 	public final Level level;
 
 	// Log messages are shown after 1 violation and don't get repeated
-	public final static LogAction loglow = new LogAction(1, 0, Level.INFO);
-	public final static LogAction logmed = new LogAction(1, 0, Level.WARNING);
-	public final static LogAction loghigh = new LogAction(1, 0, Level.SEVERE);
+	public final static LogAction loglow = new LogAction(1, false, Level.INFO);
+	public final static LogAction logmed = new LogAction(1, false, Level.WARNING);
+	public final static LogAction loghigh = new LogAction(1, false, Level.SEVERE);
 
 	public final static LogAction[] log = { loglow, logmed, loghigh };
 
-	public LogAction(int firstAfter, int repeat, Level level) {
+	public LogAction(int firstAfter, boolean repeat, Level level) {
 		super(firstAfter, repeat);
 		this.level = level;
 	}
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java
index 26a3c178..306b76ee 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java
@@ -82,7 +82,7 @@ public class AirbuildCheck extends Check {
 		// Execute actions in order
 		for(Action a : actions) {
 			if(a.firstAfter >= violations) {
-				if(a.firstAfter == violations || (a.repeat > 0 && (violations - a.firstAfter) % a.repeat == 0)) {
+				if(a.firstAfter == violations || a.repeat) {
 					if(a instanceof LogAction) {
 						final Location l = event.getBlockPlaced().getLocation();
 						String logMessage = "Airbuild: "+event.getPlayer().getName()+" tried to place block " + event.getBlockPlaced().getType() + " in the air at " + l.getBlockX() + "," + l.getBlockY() +"," + l.getBlockZ();
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
index ad1f8752..36b6c999 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
@@ -454,7 +454,7 @@ public class MovingCheck extends Check {
 		
 		for(Action a : actions) {
 			if(a.firstAfter >= violations) {
-				if(a.firstAfter == violations || (a.repeat > 0 && (violations - a.firstAfter) % a.repeat == 0)) {
+				if(a.firstAfter == violations || a.repeat) {
 					if(a instanceof LogAction)  {
 						// prepare log message if necessary
 						String log = String.format(logMessage, player.getName(), from.getWorld().getName(), to.getWorld().getName(), from.getX(), from.getY(), from.getZ(), to.getX(), to.getY(), to.getZ());
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java
index 30249bcb..7d1baa8f 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java
@@ -129,7 +129,7 @@ public class SpeedhackCheck extends Check {
 
 		for(Action a : actions) {
 			if(a.firstAfter >= violations) {
-				if(a.firstAfter == violations || (a.repeat > 0 && (violations - a.firstAfter) % a.repeat == 0)) {
+				if(a.firstAfter == violations || a.repeat) {
 					if(a instanceof LogAction) {
 						String log = String.format(logMessage, event.getPlayer().getName(), data.eventsSinceLastCheck*2, limits[0]);
 						plugin.log(((LogAction)a).level, log);
diff --git a/src/cc/co/evenprime/bukkit/nocheat/config/CustomActionOption.java b/src/cc/co/evenprime/bukkit/nocheat/config/CustomActionOption.java
index 2ff871ca..24846676 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/config/CustomActionOption.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/CustomActionOption.java
@@ -5,7 +5,7 @@ import cc.co.evenprime.bukkit.nocheat.actions.CustomAction;
 public class CustomActionOption extends ChildOption {
 
 	private int firstAfter;
-	private int repeat;
+	private boolean repeat;
 	private String command;
 	
 	
@@ -19,33 +19,33 @@ public class CustomActionOption extends ChildOption {
 	
 	private void parseCommand(String command) {
 		
-		if(command.matches("\\[[0-9]*,[0-9]*\\] .*")) {
+		if(command.matches("\\[[0-9]*,[a-z]*\\] .*")) {
 			String s[] = command.split(" ", 2);
 			String s2[] = s[0].replace("[", "").replace("]", "").split(",");
 			this.firstAfter = Integer.parseInt(s2[0]);
-			this.repeat = Integer.parseInt(s2[1]);
+			this.repeat = Boolean.parseBoolean(s2[1]);
 			this.command = s[1];
 		}
 		else if(command.matches("\\[[0-9]*\\] .*")) {
 			String s[] = command.split(" ", 2);
 			this.firstAfter = Integer.parseInt(s[0].replace("[", "").replace("]", ""));
-			this.repeat = 1;
+			this.repeat = true;
 			this.command = s[1];
 		}
 		else
 		{
 			this.command = command;
 			this.firstAfter = 1;
-			this.repeat = 1;
+			this.repeat = true;
 		}
 	}
 	
 	@Override
 	public String getValue() {
-		if(firstAfter <= 1) {
+		if(firstAfter <= 1 && repeat) {
 			return command;
 		}
-		else if(repeat <= 0) {
+		else if(repeat) {
 			return "["+firstAfter+"] "+ command;
 		}
 		else {
@@ -66,12 +66,12 @@ public class CustomActionOption extends ChildOption {
 		this.command = command;
 	}
 
-	public void setRepeatValue(int value) {
+	public void setRepeatValue(boolean value) {
 		this.repeat = value;
 		
 	}
 
-	public int getRepeatValue() {
+	public boolean getRepeatValue() {
 		return repeat;
 	}
 
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ChildOptionGuiFactory.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ChildOptionGuiFactory.java
index de79cc40..28216552 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ChildOptionGuiFactory.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ChildOptionGuiFactory.java
@@ -79,26 +79,16 @@ public class ChildOptionGuiFactory {
 			}
 		});
 
-		final JTextField repeat = new JTextField(String.valueOf(option.getRepeatValue()));
+		final JCheckBox repeat = new JCheckBox();
+		repeat.setSelected(option.getRepeatValue());
 
-		repeat.setColumns(3);
-
-		repeat.setInputVerifier(new InputVerifier() {
+		repeat.addActionListener(new ActionListener() {
 
 			@Override
-			public boolean verify(JComponent arg0) {
-				int value;
-				try {
-					value = Integer.parseInt(repeat.getText());
-					option.setRepeatValue(value);
-					return true;
-				}
-				catch(Exception e) {
-					JOptionPane.showMessageDialog(repeat, "Illegal value for this field");
-					repeat.setText(String.valueOf(option.getRepeatValue()));
-					return false;
-				}
+			public void actionPerformed(ActionEvent arg0) {
+				option.setRepeatValue(repeat.isSelected());
 			}
+		
 		});
 
 		final JTextField firstAfter = new JTextField(String.valueOf(option.getFirstAfterValue()));

From 29361d0867248b2d8b466ed7ad55d5c823737f73 Mon Sep 17 00:00:00 2001
From: Evenprime <Evenprime@example.com>
Date: Fri, 13 May 2011 14:00:00 +0200
Subject: [PATCH 7/9] Fixed bug related to new action handling + finished
 implementing custom Actions

---
 .../co/evenprime/bukkit/nocheat/NoCheat.java  | 26 +++++--
 .../bukkit/nocheat/actions/CustomAction.java  | 12 ++++
 .../bukkit/nocheat/checks/AirbuildCheck.java  |  2 +-
 .../bukkit/nocheat/checks/MovingCheck.java    |  2 +-
 .../bukkit/nocheat/checks/SpeedhackCheck.java |  2 +-
 .../nocheat/config/CustomActionOption.java    | 29 ++++----
 .../nocheat/config/NoCheatConfiguration.java  | 67 +++++++------------
 7 files changed, 75 insertions(+), 65 deletions(-)

diff --git a/src/cc/co/evenprime/bukkit/nocheat/NoCheat.java b/src/cc/co/evenprime/bukkit/nocheat/NoCheat.java
index d22914fe..3e49505b 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/NoCheat.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/NoCheat.java
@@ -37,7 +37,7 @@ import org.bukkit.plugin.Plugin;
  * 
  * @author Evenprime
  */
-public class NoCheat extends JavaPlugin {
+public class NoCheat extends JavaPlugin implements CommandSender {
 
 	private MovingCheck movingCheck;
 	private BedteleportCheck bedteleportCheck;
@@ -70,7 +70,7 @@ public class NoCheat extends JavaPlugin {
 	private Level consoleLevel;
 	private String ircTag;
 
-	
+
 	public NoCheat() { 	
 
 	}
@@ -126,7 +126,7 @@ public class NoCheat extends JavaPlugin {
 
 		// parse the nocheat.yml config file
 		setupConfig();
-		
+
 		movingCheck = new MovingCheck(this, config);
 		bedteleportCheck = new BedteleportCheck(this, config);
 		speedhackCheck = new SpeedhackCheck(this, config);
@@ -136,7 +136,7 @@ public class NoCheat extends JavaPlugin {
 
 		// just for convenience
 		checks = new Check[] { movingCheck, bedteleportCheck, speedhackCheck, airbuildCheck, itemdupeCheck, bogusitemsCheck };
-		
+
 		PluginDescriptionFile pdfFile = this.getDescription();
 
 		// Get, if available, the Permissions and irc plugin
@@ -305,7 +305,7 @@ public class NoCheat extends JavaPlugin {
 			this.config = new NoCheatConfiguration(new File(NoCheatConfiguration.configFile));
 		else
 			this.config.config(new File(NoCheatConfiguration.configFile));
-		
+
 		config.setupFileLogger();
 
 		try {
@@ -360,7 +360,23 @@ public class NoCheat extends JavaPlugin {
 	}
 
 	public void handleCustomAction(CustomAction a, Player player) {
+
+		Bukkit.getServer().dispatchCommand(this, a.command.replace("[player]", player.getName()));
 		System.out.println("Would execute "+a.command + " now for Player " + player.getName() );
 
 	}
+
+
+
+	@Override
+	public void sendMessage(String message) {
+		// we don't receive messages
+
+	}
+
+	@Override
+	public boolean isOp() {
+		// We declare ourselves to be OP to be allowed to do more commands
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/src/cc/co/evenprime/bukkit/nocheat/actions/CustomAction.java b/src/cc/co/evenprime/bukkit/nocheat/actions/CustomAction.java
index ca9c89e0..ba7c2670 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/actions/CustomAction.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/actions/CustomAction.java
@@ -18,4 +18,16 @@ public class CustomAction extends Action {
 	public String getName() {
 		return "custom";
 	}
+	
+	public String getValue() {
+		if(firstAfter <= 1 && repeat) {
+			return command;
+		}
+		else if(repeat) {
+			return "["+firstAfter+"] "+ command;
+		}
+		else {
+			return "["+firstAfter+","+repeat+"] "+ command;
+		}
+	}
 }
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java
index 306b76ee..e047d9ec 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/AirbuildCheck.java
@@ -81,7 +81,7 @@ public class AirbuildCheck extends Check {
 
 		// Execute actions in order
 		for(Action a : actions) {
-			if(a.firstAfter >= violations) {
+			if(a.firstAfter <= violations) {
 				if(a.firstAfter == violations || a.repeat) {
 					if(a instanceof LogAction) {
 						final Location l = event.getBlockPlaced().getLocation();
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
index 36b6c999..36a1546a 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
@@ -453,7 +453,7 @@ public class MovingCheck extends Check {
 
 		
 		for(Action a : actions) {
-			if(a.firstAfter >= violations) {
+			if(a.firstAfter <= violations) {
 				if(a.firstAfter == violations || a.repeat) {
 					if(a instanceof LogAction)  {
 						// prepare log message if necessary
diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java
index 7d1baa8f..4b4cb321 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/SpeedhackCheck.java
@@ -128,7 +128,7 @@ public class SpeedhackCheck extends Check {
 		if(actions == null) return;
 
 		for(Action a : actions) {
-			if(a.firstAfter >= violations) {
+			if(a.firstAfter <= violations) {
 				if(a.firstAfter == violations || a.repeat) {
 					if(a instanceof LogAction) {
 						String log = String.format(logMessage, event.getPlayer().getName(), data.eventsSinceLastCheck*2, limits[0]);
diff --git a/src/cc/co/evenprime/bukkit/nocheat/config/CustomActionOption.java b/src/cc/co/evenprime/bukkit/nocheat/config/CustomActionOption.java
index 24846676..0f4afdc9 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/config/CustomActionOption.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/CustomActionOption.java
@@ -15,28 +15,27 @@ public class CustomActionOption extends ChildOption {
 		
 		this.parseCommand(command);
 	}
-
 	
-	private void parseCommand(String command) {
+	private void parseCommand(String com) {
 		
-		if(command.matches("\\[[0-9]*,[a-z]*\\] .*")) {
-			String s[] = command.split(" ", 2);
+		if(com.matches("\\[[0-9]*,[a-z]*\\] .*")) {
+			String s[] = com.split(" ", 2);
 			String s2[] = s[0].replace("[", "").replace("]", "").split(",");
-			this.firstAfter = Integer.parseInt(s2[0]);
-			this.repeat = Boolean.parseBoolean(s2[1]);
-			this.command = s[1];
+			firstAfter = Integer.parseInt(s2[0]);
+			repeat = Boolean.parseBoolean(s2[1]);
+			command = s[1];
 		}
-		else if(command.matches("\\[[0-9]*\\] .*")) {
-			String s[] = command.split(" ", 2);
-			this.firstAfter = Integer.parseInt(s[0].replace("[", "").replace("]", ""));
-			this.repeat = true;
-			this.command = s[1];
+		else if(com.matches("\\[[0-9]*\\] .*")) {
+			String s[] = com.split(" ", 2);
+			firstAfter = Integer.parseInt(s[0].replace("[", "").replace("]", ""));
+			repeat = true;
+			command = s[1];
 		}
 		else
 		{
-			this.command = command;
-			this.firstAfter = 1;
-			this.repeat = true;
+			firstAfter = 1;
+			repeat = true;
+			command = com;
 		}
 	}
 	
diff --git a/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java b/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java
index 4e15fb4e..ae25f6eb 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java
@@ -4,8 +4,10 @@ import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.FileHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -31,6 +33,8 @@ public class NoCheatConfiguration {
 
 	private ParentOption root;
 
+	private Map<String, Action> actionMap = new HashMap<String,Action>();
+
 	// Our personal logger
 	private final static String loggerName = "cc.co.evenprime.nocheat";
 	public final Logger logger = Logger.getLogger(loggerName);
@@ -208,20 +212,22 @@ public class NoCheatConfiguration {
 			ParentOption bogusitemsNode = new ParentOption("bogusitems");
 			root.add(bogusitemsNode);
 		}
-		
+
 		/*** CUSTOMACTIONS section ***/
 		{
 			ParentOption customActionsNode = new ParentOption("customactions");
 			root.add(customActionsNode);
-			
-			customActionsNode.add(new CustomActionOption("mycommand", 
-					CONFIG.getString("customactions.mycommand", "[4,8] TESTCOMMAND")));
-			
-			customActionsNode.add(new CustomActionOption("mycommand2", 
-					CONFIG.getString("customactions.mycommand2", "TESTCOMMAND2")));
-			
-			customActionsNode.add(new CustomActionOption("mycommand3", 
-					CONFIG.getString("customactions.mycommand3", "[7] TESTCOMMAND3")));
+
+			List<String> customs = CONFIG.getKeys("customactions");
+			if(customs != null) {
+				for(String s : customs) {
+
+					CustomActionOption o = new CustomActionOption(s, CONFIG.getString("customactions."+s, "unknown"));
+
+					customActionsNode.add(o);
+					actionMap.put(s, o.getCustomActionValue());
+				}
+			}
 		}
 
 		if(!configurationFile.exists()) {
@@ -261,7 +267,7 @@ public class NoCheatConfiguration {
 		}
 	}
 
-	public static Action[] stringToActions(String string) {
+	public Action[] stringToActions(String string) {
 
 		List<Action> as = new LinkedList<Action>();
 		String[] parts = string.split(" ");
@@ -273,42 +279,19 @@ public class NoCheatConfiguration {
 				as.add(LogAction.logmed);
 			else if(s.equals("loghigh"))
 				as.add(LogAction.loghigh);
-			else if(s.equals("deny"))
-				as.add(CancelAction.cancel);
-			else if(s.equals("reset"))
-				as.add(CancelAction.cancel);
 			else if(s.equals("cancel"))
 				as.add(CancelAction.cancel);
-			else if(s.startsWith("custom")) {
-				try {
-					// TODO: Implement Custom Action
-					//as.add(new CustomAction(Integer.parseInt(s.substring(6))));
-				}
-				catch(Exception e) {
-					System.out.println("NC: Couldn't parse number of custom action '" + s + "'");
-				}
-			}
-			else {
-				System.out.println("NC: Can't parse action "+ s);
+			else if(actionMap.get(s) != null)
+				as.add(actionMap.get(s));
+			else
+			{
+				System.out.println("NC: Couldn't parse custom action '" + s + "'");
 			}
 		}
 
 		return as.toArray(new Action[as.size()]);
 	}
 
-	private String actionsToString(Action[] actions) {
-
-		StringBuffer s = new StringBuffer();
-
-		if(actions != null) {
-			for(Action a : actions) {
-				s.append(' ').append(a.getName());
-			}
-		}
-
-		return s.toString().trim();
-	}
-
 	/**
 	 * Write configuration file to specific filename
 	 * @param f
@@ -317,7 +300,7 @@ public class NoCheatConfiguration {
 		try {
 			if(f.getParentFile() != null)
 				f.getParentFile().mkdirs();
-			
+
 			f.createNewFile();
 			BufferedWriter w = new BufferedWriter(new FileWriter(f));
 
@@ -332,8 +315,8 @@ public class NoCheatConfiguration {
 	public Action[] getActionValue(String optionName) throws ConfigurationException {
 		return stringToActions(getStringOption(optionName).getValue());
 	}
-	
-	
+
+
 	public int getIntegerValue(String optionName) throws ConfigurationException {	
 		return getIntegerOption(optionName).getIntegerValue();
 	}

From c6aa6b213b28098b985aee0c739f0cd89c1f34a8 Mon Sep 17 00:00:00 2001
From: Evenprime <Evenprime@example.com>
Date: Sat, 14 May 2011 17:54:11 +0200
Subject: [PATCH 8/9] Implemented extremely simple (and incomplete) YAML parser
 to no longer depend on external libraries like SnakeYAML.

---
 manifest                                      |   3 +
 .../nocheat/config/NoCheatConfiguration.java  |  92 ++++++------
 .../bukkit/nocheat/wizard/Wizard.java         |   2 +-
 .../bukkit/nocheat/yaml/SimpleYaml.java       | 138 ++++++++++++++++++
 4 files changed, 191 insertions(+), 44 deletions(-)
 create mode 100644 manifest
 create mode 100644 src/cc/co/evenprime/bukkit/nocheat/yaml/SimpleYaml.java

diff --git a/manifest b/manifest
new file mode 100644
index 00000000..f0c7423f
--- /dev/null
+++ b/manifest
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: cc.co.evenprime.bukkit.nocheat.Main
+Class-Path: snakeyaml.jar
\ No newline at end of file
diff --git a/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java b/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java
index ae25f6eb..d3e3716c 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java
@@ -8,17 +8,17 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.FileHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.bukkit.util.config.Configuration;
-
 import cc.co.evenprime.bukkit.nocheat.ConfigurationException;
 import cc.co.evenprime.bukkit.nocheat.actions.Action;
 import cc.co.evenprime.bukkit.nocheat.actions.CancelAction;
 import cc.co.evenprime.bukkit.nocheat.actions.LogAction;
 import cc.co.evenprime.bukkit.nocheat.config.LevelOption.LogLevel;
+import cc.co.evenprime.bukkit.nocheat.yaml.SimpleYaml;
 
 /**
  * Central location for everything that's described in the configuration file
@@ -35,6 +35,8 @@ public class NoCheatConfiguration {
 
 	private Map<String, Action> actionMap = new HashMap<String,Action>();
 
+	private Map<String, Object> yamlContent = new HashMap<String, Object>();
+
 	// Our personal logger
 	private final static String loggerName = "cc.co.evenprime.nocheat";
 	public final Logger logger = Logger.getLogger(loggerName);
@@ -54,8 +56,13 @@ public class NoCheatConfiguration {
 	 */
 	public void config(File configurationFile) {
 
-		Configuration CONFIG = new Configuration(configurationFile);
-		CONFIG.load();
+
+		try {
+			yamlContent = (Map<String, Object>) SimpleYaml.read(configurationFile);
+		} catch (Exception e) {
+			yamlContent = new HashMap<String, Object>();
+		}
+
 
 		root = new ParentOption("");
 
@@ -66,19 +73,19 @@ public class NoCheatConfiguration {
 			root.add(loggingNode);
 
 			loggingNode.add(new MediumStringOption("filename", 
-					CONFIG.getString("logging.filename", "plugins/NoCheat/nocheat.log")));
+					SimpleYaml.getString("logging.filename", "plugins/NoCheat/nocheat.log", yamlContent)));
 
 			loggingNode.add(new LevelOption("logtofile", 
-					LogLevel.getLogLevelFromString(CONFIG.getString("logging.logtofile", LogLevel.LOW.asString()))));
+					LogLevel.getLogLevelFromString(SimpleYaml.getString("logging.logtofile", LogLevel.LOW.asString(), yamlContent))));
 			loggingNode.add(new LevelOption("logtoconsole",
-					LogLevel.getLogLevelFromString(CONFIG.getString("logging.logtoconsole", LogLevel.HIGH.asString()))));
+					LogLevel.getLogLevelFromString(SimpleYaml.getString("logging.logtoconsole", LogLevel.HIGH.asString(), yamlContent))));
 			loggingNode.add(new LevelOption("logtochat", 
-					LogLevel.getLogLevelFromString(CONFIG.getString("logging.logtochat", LogLevel.MED.asString()))));
+					LogLevel.getLogLevelFromString(SimpleYaml.getString("logging.logtochat", LogLevel.MED.asString(), yamlContent))));
 			loggingNode.add(new LevelOption("logtoirc",
-					LogLevel.getLogLevelFromString(CONFIG.getString("logging.logtoirc", LogLevel.MED.asString()))));
+					LogLevel.getLogLevelFromString(SimpleYaml.getString("logging.logtoirc", LogLevel.MED.asString(), yamlContent))));
 
 			loggingNode.add(new ShortStringOption("logtoirctag", 
-					CONFIG.getString("logging.logtoirctag", "nocheat")));
+					SimpleYaml.getString("logging.logtoirctag", "nocheat", yamlContent)));
 		}
 
 		/*** ACTIVE section ***/
@@ -87,17 +94,17 @@ public class NoCheatConfiguration {
 			root.add(activeNode);
 
 			activeNode.add(new BooleanOption("speedhack", 
-					CONFIG.getBoolean("active.speedhack", true)));
+					SimpleYaml.getBoolean("active.speedhack", true, yamlContent)));
 			activeNode.add(new BooleanOption("moving", 
-					CONFIG.getBoolean("active.moving", true)));
+					SimpleYaml.getBoolean("active.moving", true, yamlContent)));
 			activeNode.add(new BooleanOption("airbuild",
-					CONFIG.getBoolean("active.airbuild", false)));
+					SimpleYaml.getBoolean("active.airbuild", false, yamlContent)));
 			activeNode.add(new BooleanOption("bedteleport",
-					CONFIG.getBoolean("active.bedteleport", true)));
+					SimpleYaml.getBoolean("active.bedteleport", true, yamlContent)));
 			activeNode.add(new BooleanOption("itemdupe", 
-					CONFIG.getBoolean("active.itemdupe", true)));
+					SimpleYaml.getBoolean("active.itemdupe", true, yamlContent)));
 			activeNode.add(new BooleanOption("bogusitems",
-					CONFIG.getBoolean("active.bogusitems", false)));
+					SimpleYaml.getBoolean("active.bogusitems", false, yamlContent)));
 		}
 
 		/*** SPEEDHACK section ***/
@@ -106,7 +113,7 @@ public class NoCheatConfiguration {
 			root.add(speedhackNode);
 
 			speedhackNode.add(new LongStringOption("logmessage", 
-					CONFIG.getString("logging.filename", "%1$s sent %2$d move events, but only %3$d were allowed. Speedhack?")));
+					SimpleYaml.getString("logging.filename", "%1$s sent %2$d move events, but only %3$d were allowed. Speedhack?", yamlContent)));
 
 			/*** SPEEDHACK LIMITS section ***/
 			{
@@ -114,11 +121,11 @@ public class NoCheatConfiguration {
 				speedhackNode.add(speedhackLimitsNode);
 
 				speedhackLimitsNode.add(new IntegerOption("low", 
-						CONFIG.getInt("speedhack.limits.low", 30)));
+						SimpleYaml.getInt("speedhack.limits.low", 30, yamlContent)));
 				speedhackLimitsNode.add(new IntegerOption("med",
-						CONFIG.getInt("speedhack.limits.med", 45)));
+						SimpleYaml.getInt("speedhack.limits.med", 45, yamlContent)));
 				speedhackLimitsNode.add(new IntegerOption("high",
-						CONFIG.getInt("speedhack.limits.high", 60)));
+						SimpleYaml.getInt("speedhack.limits.high", 60, yamlContent)));
 			}
 
 			/*** SPEEDHACK ACTIONS section ***/
@@ -127,11 +134,11 @@ public class NoCheatConfiguration {
 				speedhackNode.add(speedhackActionNode);
 
 				speedhackActionNode.add(new MediumStringOption("low", 
-						CONFIG.getString("speedhack.action.low", "loglow cancel")));
+						SimpleYaml.getString("speedhack.action.low", "loglow cancel", yamlContent)));
 				speedhackActionNode.add(new MediumStringOption("med", 
-						CONFIG.getString("speedhack.action.med", "logmed cancel")));
+						SimpleYaml.getString("speedhack.action.med", "logmed cancel", yamlContent)));
 				speedhackActionNode.add(new MediumStringOption("high", 
-						CONFIG.getString("speedhack.action.high", "loghigh cancel")));
+						SimpleYaml.getString("speedhack.action.high", "loghigh cancel", yamlContent)));
 			}
 		}
 
@@ -141,13 +148,13 @@ public class NoCheatConfiguration {
 			root.add(movingNode);
 
 			movingNode.add(new LongStringOption("logmessage",
-					CONFIG.getString("moving.logmessage", "Moving violation: %1$s from %2$s (%4$.1f, %5$.1f, %6$.1f) to %3$s (%7$.1f, %8$.1f, %9$.1f)")));
+					SimpleYaml.getString("moving.logmessage", "Moving violation: %1$s from %2$s (%4$.1f, %5$.1f, %6$.1f) to %3$s (%7$.1f, %8$.1f, %9$.1f)", yamlContent)));
 			movingNode.add(new LongStringOption("summarymessage", 
-					CONFIG.getString("moving.summarymessage", "Moving summary of last ~%2$d seconds: %1$s total Violations: (%3$d,%4$d,%5$d)")));
+					SimpleYaml.getString("moving.summarymessage", "Moving summary of last ~%2$d seconds: %1$s total Violations: (%3$d,%4$d,%5$d)", yamlContent)));
 			movingNode.add(new BooleanOption("allowflying", 
-					CONFIG.getBoolean("moving.allowflying", false)));
+					SimpleYaml.getBoolean("moving.allowflying", false, yamlContent)));
 			movingNode.add(new BooleanOption("allowfakesneak", 
-					CONFIG.getBoolean("moving.allowfakesneak", true)));
+					SimpleYaml.getBoolean("moving.allowfakesneak", true, yamlContent)));
 
 			/*** MOVING ACTION section ***/
 			{
@@ -155,11 +162,11 @@ public class NoCheatConfiguration {
 				movingNode.add(movingActionNode);
 
 				movingActionNode.add(new MediumStringOption("low", 
-						CONFIG.getString("moving.action.low", "loglow cancel")));
+						SimpleYaml.getString("moving.action.low", "loglow cancel", yamlContent)));
 				movingActionNode.add(new MediumStringOption("med", 
-						CONFIG.getString("moving.action.med", "logmed cancel")));
+						SimpleYaml.getString("moving.action.med", "logmed cancel", yamlContent)));
 				movingActionNode.add(new MediumStringOption("high", 
-						CONFIG.getString("moving.action.high", "loghigh cancel")));
+						SimpleYaml.getString("moving.action.high", "loghigh cancel", yamlContent)));
 			}
 		}
 
@@ -174,11 +181,11 @@ public class NoCheatConfiguration {
 				airbuildNode.add(airbuildLimitsNode);
 
 				airbuildLimitsNode.add(new IntegerOption("low", 
-						CONFIG.getInt("airbuild.limits.low", 1)));
+						SimpleYaml.getInt("airbuild.limits.low", 1, yamlContent)));
 				airbuildLimitsNode.add(new IntegerOption("med",
-						CONFIG.getInt("airbuild.limits.med", 3)));
+						SimpleYaml.getInt("airbuild.limits.med", 3, yamlContent)));
 				airbuildLimitsNode.add(new IntegerOption("high",
-						CONFIG.getInt("airbuild.limits.high", 10)));
+						SimpleYaml.getInt("airbuild.limits.high", 10, yamlContent)));
 			}
 
 			/*** AIRBUILD ACTION section ***/
@@ -187,11 +194,11 @@ public class NoCheatConfiguration {
 				airbuildNode.add(airbuildActionNode);
 
 				airbuildActionNode.add(new MediumStringOption("low", 
-						CONFIG.getString("airbuild.action.low", "loglow cancel")));
+						SimpleYaml.getString("airbuild.action.low", "loglow cancel", yamlContent)));
 				airbuildActionNode.add(new MediumStringOption("med",
-						CONFIG.getString("airbuild.action.med", "logmed cancel")));
+						SimpleYaml.getString("airbuild.action.med", "logmed cancel", yamlContent)));
 				airbuildActionNode.add(new MediumStringOption("high",
-						CONFIG.getString("airbuild.action.high", "loghigh cancel")));
+						SimpleYaml.getString("airbuild.action.high", "loghigh cancel", yamlContent)));
 			}
 		}
 
@@ -218,15 +225,14 @@ public class NoCheatConfiguration {
 			ParentOption customActionsNode = new ParentOption("customactions");
 			root.add(customActionsNode);
 
-			List<String> customs = CONFIG.getKeys("customactions");
-			if(customs != null) {
-				for(String s : customs) {
+			Set<String> customs = SimpleYaml.getKeys("customactions", yamlContent);
 
-					CustomActionOption o = new CustomActionOption(s, CONFIG.getString("customactions."+s, "unknown"));
+			for(String s : customs) {
 
-					customActionsNode.add(o);
-					actionMap.put(s, o.getCustomActionValue());
-				}
+				CustomActionOption o = new CustomActionOption(s, SimpleYaml.getString("customactions."+s, "unknown", yamlContent));
+
+				customActionsNode.add(o);
+				actionMap.put(s, o.getCustomActionValue());
 			}
 		}
 
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java
index c2db856b..c2914804 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java
@@ -35,7 +35,7 @@ public class Wizard extends JFrame {
 		
 		inside.setLayout(new BoxLayout(inside,BoxLayout.Y_AXIS));
 		
-		final NoCheatConfiguration config = new NoCheatConfiguration(new File("config.yml"));
+		final NoCheatConfiguration config = new NoCheatConfiguration(new File("NoCheat/nocheat.yml"));
 		
 		ParentOptionGui root2 = new ParentOptionGui(config.getRoot());
 		
diff --git a/src/cc/co/evenprime/bukkit/nocheat/yaml/SimpleYaml.java b/src/cc/co/evenprime/bukkit/nocheat/yaml/SimpleYaml.java
new file mode 100644
index 00000000..d522f543
--- /dev/null
+++ b/src/cc/co/evenprime/bukkit/nocheat/yaml/SimpleYaml.java
@@ -0,0 +1,138 @@
+package cc.co.evenprime.bukkit.nocheat.yaml;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * An extremely simple YAML parser, not feature complete, but good enough for me
+ * 
+ * @author Evenprime
+ *
+ */
+public class SimpleYaml {
+
+	private static final String prefix = "    ";
+	
+	private SimpleYaml() {}
+	
+		
+	public static Map<String, Object> read(File file) throws IOException {
+		
+		Map<String, Object> root = new HashMap<String, Object>();
+		
+		BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8"));
+		
+		LinkedList<String> lines = new LinkedList<String>();
+		
+		String line = null;
+		
+ 		while(( line = r.readLine()) != null) {
+ 			lines.add(line);
+ 		}
+ 		
+ 		r.close();
+ 		
+		return parse(root, lines, "");
+		
+	}
+
+	private static Map<String, Object> parse(Map<String, Object> root, LinkedList<String> lines,  String prefix) throws IOException {
+
+		String line = null;
+		
+		while(!lines.isEmpty()) {
+			line = lines.getFirst();
+			if(line.trim().startsWith("#")) { lines.removeFirst();  }
+			else if(line.trim().isEmpty()) { lines.removeFirst(); }
+			else if(line.startsWith(prefix)) {
+				lines.removeFirst(); 
+				if(line.contains(":")) {
+					String pair[] = line.split(":", 2);
+					if(pair[1].trim().isEmpty()) { 
+						Map<String, Object> m = new HashMap<String, Object>();
+						root.put(pair[0].trim(), parse(m, lines, prefix + SimpleYaml.prefix));
+					}
+					else
+					{
+						root.put(pair[0].trim(), removeQuotationMarks(pair[1].trim()));
+					}
+				}
+			}
+			else break;
+		}
+		
+		return root;
+	}
+	
+	private static String removeQuotationMarks(String s) {
+		if(s.startsWith("\"") && s.endsWith("\"")) {
+			return s.substring(1, s.length() -1);
+		}
+		else if(s.startsWith("\'") && s.endsWith("\'")) {
+			return s.substring(1, s.length() -1);
+		}
+		
+		return s;
+
+	}
+	
+	/* Convenience methods for retrieving values start here */
+	
+	@SuppressWarnings("unchecked")
+	public static Object getProperty(String path, Map<String, Object> node) {
+		if (!path.contains(".")) {
+			return node.get(path);
+		}
+		else
+		{
+			String[] parts = path.split("\\.", 2);
+			return getProperty(parts[1], (Map<String, Object>) node.get(parts[0]));
+		}
+	}
+	
+	@SuppressWarnings("unchecked")
+	public static Set<String> getKeys(String path, Map<String, Object> node) {
+		try {
+			return ((Map<String, Object>)getProperty(path, node)).keySet();
+		}
+		catch(Exception e) {
+			e.printStackTrace();
+			return new HashSet<String>();
+		}
+	}
+
+	public static int getInt(String path, int defaultValue, Map<String, Object> node) {
+		try {
+			return (Integer) getProperty(path, node);
+		}
+		catch(Exception e) {
+			return defaultValue;
+		}
+	}
+
+	public static boolean getBoolean(String path, boolean defaultValue, Map<String, Object> node) {
+		try {
+			return (Boolean) getProperty(path, node);
+		}
+		catch(Exception e) {
+			return defaultValue;
+		}
+	}
+
+	public static String getString(String path, String defaultValue, Map<String, Object> node) {
+		try {
+			return (String) getProperty(path, node);
+		}
+		catch(Exception e) {
+			return defaultValue;
+		}
+	}
+}

From ed0a36879ce8522bb7d8a24bc2699aa1ede7ab09 Mon Sep 17 00:00:00 2001
From: Evenprime <Evenprime@example.com>
Date: Mon, 16 May 2011 14:27:01 +0200
Subject: [PATCH 9/9] Option to add and remove custom actions in the wizard

---
 .../nocheat/config/NoCheatConfiguration.java  |  30 ++--
 .../bukkit/nocheat/config/ParentOption.java   |  14 +-
 .../bukkit/nocheat/wizard/Wizard.java         |  14 +-
 .../nocheat/wizard/gui/ParentOptionGui.java   | 152 ++++++++++++++----
 4 files changed, 161 insertions(+), 49 deletions(-)

diff --git a/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java b/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java
index d3e3716c..29f6cd32 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/NoCheatConfiguration.java
@@ -64,12 +64,12 @@ public class NoCheatConfiguration {
 		}
 
 
-		root = new ParentOption("");
+		root = new ParentOption("", false);
 
 
 		/*** LOGGING section ***/
 		{
-			ParentOption loggingNode = new ParentOption("logging");
+			ParentOption loggingNode = new ParentOption("logging", false);
 			root.add(loggingNode);
 
 			loggingNode.add(new MediumStringOption("filename", 
@@ -90,7 +90,7 @@ public class NoCheatConfiguration {
 
 		/*** ACTIVE section ***/
 		{
-			ParentOption activeNode = new ParentOption("active");
+			ParentOption activeNode = new ParentOption("active", false);
 			root.add(activeNode);
 
 			activeNode.add(new BooleanOption("speedhack", 
@@ -109,7 +109,7 @@ public class NoCheatConfiguration {
 
 		/*** SPEEDHACK section ***/
 		{
-			ParentOption speedhackNode = new ParentOption("speedhack");
+			ParentOption speedhackNode = new ParentOption("speedhack", false);
 			root.add(speedhackNode);
 
 			speedhackNode.add(new LongStringOption("logmessage", 
@@ -117,7 +117,7 @@ public class NoCheatConfiguration {
 
 			/*** SPEEDHACK LIMITS section ***/
 			{
-				ParentOption speedhackLimitsNode = new ParentOption("limits");
+				ParentOption speedhackLimitsNode = new ParentOption("limits", false);
 				speedhackNode.add(speedhackLimitsNode);
 
 				speedhackLimitsNode.add(new IntegerOption("low", 
@@ -130,7 +130,7 @@ public class NoCheatConfiguration {
 
 			/*** SPEEDHACK ACTIONS section ***/
 			{
-				ParentOption speedhackActionNode = new ParentOption("action");
+				ParentOption speedhackActionNode = new ParentOption("action", false);
 				speedhackNode.add(speedhackActionNode);
 
 				speedhackActionNode.add(new MediumStringOption("low", 
@@ -144,7 +144,7 @@ public class NoCheatConfiguration {
 
 		/*** MOVING section ***/
 		{
-			ParentOption movingNode = new ParentOption("moving");
+			ParentOption movingNode = new ParentOption("moving", false);
 			root.add(movingNode);
 
 			movingNode.add(new LongStringOption("logmessage",
@@ -158,7 +158,7 @@ public class NoCheatConfiguration {
 
 			/*** MOVING ACTION section ***/
 			{
-				ParentOption movingActionNode = new ParentOption("action");
+				ParentOption movingActionNode = new ParentOption("action", false);
 				movingNode.add(movingActionNode);
 
 				movingActionNode.add(new MediumStringOption("low", 
@@ -172,12 +172,12 @@ public class NoCheatConfiguration {
 
 		/*** AIRBUILD section ***/
 		{
-			ParentOption airbuildNode = new ParentOption("airbuild");
+			ParentOption airbuildNode = new ParentOption("airbuild", false);
 			root.add(airbuildNode);
 
 			/*** AIRBUILD LIMITS section ***/
 			{
-				ParentOption airbuildLimitsNode = new ParentOption("limits");
+				ParentOption airbuildLimitsNode = new ParentOption("limits", false);
 				airbuildNode.add(airbuildLimitsNode);
 
 				airbuildLimitsNode.add(new IntegerOption("low", 
@@ -190,7 +190,7 @@ public class NoCheatConfiguration {
 
 			/*** AIRBUILD ACTION section ***/
 			{
-				ParentOption airbuildActionNode = new ParentOption("action");
+				ParentOption airbuildActionNode = new ParentOption("action", false);
 				airbuildNode.add(airbuildActionNode);
 
 				airbuildActionNode.add(new MediumStringOption("low", 
@@ -204,25 +204,25 @@ public class NoCheatConfiguration {
 
 		/*** BEDTELEPORT section ***/
 		{
-			ParentOption bedteleportNode = new ParentOption("bedteleport");
+			ParentOption bedteleportNode = new ParentOption("bedteleport", false);
 			root.add(bedteleportNode);
 		}
 
 		/*** ITEMDUPE section ***/
 		{
-			ParentOption itemdupeNode = new ParentOption("itemdupe");
+			ParentOption itemdupeNode = new ParentOption("itemdupe", false);
 			root.add(itemdupeNode);
 		}
 
 		/*** BOGUSITEMS section ***/
 		{
-			ParentOption bogusitemsNode = new ParentOption("bogusitems");
+			ParentOption bogusitemsNode = new ParentOption("bogusitems", false);
 			root.add(bogusitemsNode);
 		}
 
 		/*** CUSTOMACTIONS section ***/
 		{
-			ParentOption customActionsNode = new ParentOption("customactions");
+			ParentOption customActionsNode = new ParentOption("customactions", true);
 			root.add(customActionsNode);
 
 			Set<String> customs = SimpleYaml.getKeys("customactions", yamlContent);
diff --git a/src/cc/co/evenprime/bukkit/nocheat/config/ParentOption.java b/src/cc/co/evenprime/bukkit/nocheat/config/ParentOption.java
index e50aefa4..c4442419 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/config/ParentOption.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/config/ParentOption.java
@@ -13,9 +13,11 @@ public class ParentOption extends Option {
 	private static final long serialVersionUID = 3162246550749560727L;
 
 	private LinkedList<Option> children = new LinkedList<Option>();
+	private boolean editable;
 
-	public ParentOption(String identifier) {
+	public ParentOption(String identifier, boolean editable) {
 		super(identifier);
+		this.editable = editable;
 	}
 
 	public final Collection<Option> getChildOptions() {
@@ -27,6 +29,16 @@ public class ParentOption extends Option {
 		children.addLast(option);
 	}
 	
+	public final void remove(Option option) {
+		
+		if(editable)
+		children.remove(option);
+	}
+	
+	public boolean isEditable() {
+		return editable;
+	}
+	
 	@Override
 	public String toYAMLString(String prefix) {
 
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java
index c2914804..2d3c226f 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/Wizard.java
@@ -41,7 +41,7 @@ public class Wizard extends JFrame {
 		
 		inside.add(root2);
 		
-		JButton b = new JButton("TEST");
+		JButton b = new JButton("Save");
 
 		b.addActionListener(new ActionListener() {
 
@@ -49,16 +49,22 @@ public class Wizard extends JFrame {
 			public void actionPerformed(ActionEvent arg0) {
 				String s = config.getRoot().toYAMLString("");
 
-				JOptionPane.showMessageDialog(null, s);
+
 				
-				NoCheatConfiguration.writeConfigFile(new File("config.yml"), config);
+				NoCheatConfiguration.writeConfigFile(new File("NoCheat/nocheat.yml"), config);
+				
+				JOptionPane.showMessageDialog(null, "Saved");
 			} });
 
 		b.setAlignmentY(0.0F);
 		inside.add(b);
 		
-		inside.doLayout();
+		this.doLayout();
 		
 		this.pack();
+		
+		this.setSize(900, 700);
+		
+		this.setTitle("NoCheat configuration utility");
 	}
 }
diff --git a/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ParentOptionGui.java b/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ParentOptionGui.java
index 9c932256..876502a2 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ParentOptionGui.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/wizard/gui/ParentOptionGui.java
@@ -3,15 +3,20 @@ package cc.co.evenprime.bukkit.nocheat.wizard.gui;
 import java.awt.Color;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.LinkedList;
 
 import javax.swing.BorderFactory;
 import javax.swing.Box;
+import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.JTextField;
 
 import cc.co.evenprime.bukkit.nocheat.config.ChildOption;
+import cc.co.evenprime.bukkit.nocheat.config.CustomActionOption;
 import cc.co.evenprime.bukkit.nocheat.config.Option;
 import cc.co.evenprime.bukkit.nocheat.config.ParentOption;
 
@@ -21,9 +26,9 @@ public class ParentOptionGui extends JPanel {
 	 * 
 	 */
 	private static final long serialVersionUID = 5277750257203546802L;
-	
-	private ParentOption option;
-	private LinkedList<Option> children = new LinkedList<Option>();
+
+	private final ParentOption option;
+	private final LinkedList<Option> children = new LinkedList<Option>();
 
 	public ParentOptionGui(ParentOption option) {
 		this.option = option;
@@ -31,67 +36,156 @@ public class ParentOptionGui extends JPanel {
 		if(option.getIdentifier().length() > 0) {
 			this.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,5,5,5), BorderFactory.createCompoundBorder(
 					BorderFactory.createTitledBorder(BorderFactory.createMatteBorder(2, 2,
-					        2, 2, Color.BLACK), "  " + option.getIdentifier() + ":  "), 
-					BorderFactory.createEmptyBorder(5,5,5,5))));
+							2, 2, Color.BLACK), "  " + option.getIdentifier() + ":  "), 
+							BorderFactory.createEmptyBorder(5,5,5,5))));
 		}
 		this.setLayout(new GridBagLayout());
 
-		for(Option o : this.option.getChildOptions()) {
-			add(o);
-			children.add(o);
-		}
-	}	
+		recreateContent();
+	}
 
-	private void add(Option option) {
-		if(option instanceof ParentOption) {
+	private void recreateContent() {
+
+		this.removeAll();
+		this.children.clear();
+
+		int line = 0;
+
+		if(this.option.isEditable()) {
+			
+			final JTextField nameField = new JTextField("actionname");
+			nameField.setColumns(14);
+
+			JPanel p2 = new JPanel();
+			p2.add(nameField);
+			
+			JButton createNew = new JButton("new");
+			
+			createNew.addActionListener(new ActionListener() {
+
+				@Override
+				public void actionPerformed(ActionEvent arg0) {
+					option.add(new CustomActionOption(nameField.getText(), "yourcommand [player]"));
+					recreateContent();
+				}
+			});
+			
+			JPanel p = new JPanel();
+			p.add(createNew);
+			
+			GridBagConstraints c = new GridBagConstraints();
+
+
+			
+			c.gridx = 0;
+			c.gridy = line;
+			c.gridwidth = 1;
+			c.anchor = GridBagConstraints.WEST;
+			c.ipadx = 5;
+			c.ipady = 15;
+			c.weightx = 1;
+			
+			this.add(p, c);
+			
+			c.gridx = 1;
+			c.gridy = line;
+			c.gridwidth = 3;
+			c.anchor = GridBagConstraints.WEST;
+			c.ipadx = 5;
+			c.ipady = 15;
+			c.weightx = 1;
+			
+
+			
+			
+			this.add(p2, c);
+			line++;
+		}
+
+		for(Option o : this.option.getChildOptions()) {
+			add(o, line);
+			children.add(o);
+			line++;
+		}
+		
+
+		this.revalidate();
+	}
+
+	private void add(final Option child, int line) {
+		if(child instanceof ParentOption) {
 			GridBagConstraints c = new GridBagConstraints();
 
 			c.gridx = 0;
-			c.gridy = children.size();
+			c.gridy = line;
+
 			c.gridwidth = 3; // Spans over three columns
+			if(this.option.isEditable()) c.gridwidth = 4; // Spans over four columns
 			c.anchor = GridBagConstraints.WEST;
 			c.ipadx = 5;
 			c.ipady = 15;
 			c.weightx = 1;
 			c.fill = GridBagConstraints.HORIZONTAL;
-			
-			this.add(new ParentOptionGui((ParentOption)option), c);
+
+			this.add(new ParentOptionGui((ParentOption)child), c);
 		}
-		else if(option instanceof ChildOption)
+		else if(child instanceof ChildOption)
 		{
 			GridBagConstraints c = new GridBagConstraints();
 
 			c.gridx = 0;
-			c.gridy = children.size();
+			c.gridy = line;
 			c.gridwidth = 1;
 			c.anchor = GridBagConstraints.WEST;
 			c.ipadx = 10;
 			c.weightx = 0;
-			
-			this.add(new JLabel(option.getIdentifier()  + ":"), c);
-			
+
+			this.add(new JLabel(child.getIdentifier()  + ":"), c);
+
 			c.gridx = 1;
-			c.gridy = children.size();
+			c.gridy = line;
 			c.gridwidth = 1;
 			c.anchor = GridBagConstraints.WEST;
 			c.ipadx = 5;
 			c.weightx = 0;
 			c.fill = GridBagConstraints.HORIZONTAL;
-			
-			JComponent child = ChildOptionGuiFactory.create((ChildOption)option);
-			
-			this.add(child, c);
-			
+
+			JComponent tmp = ChildOptionGuiFactory.create((ChildOption)child);
+
+			this.add(tmp, c);
+
 			c.gridx = 2;
-			c.gridy = children.size();
+			c.gridy = line;
 			c.gridwidth = 1;
 			c.anchor = GridBagConstraints.WEST;
 			c.ipadx = 5;
 			c.weightx = 1;
 
-						
+
 			this.add(Box.createHorizontalGlue(), c);
-			
+
+			if(this.option.isEditable()) {
+				c.gridx = 3;
+				c.gridy = line;
+				c.gridwidth = 1;
+				c.anchor = GridBagConstraints.WEST;
+				c.ipadx = 5;
+				c.weightx = 1;
+
+				JButton removeButton = new JButton("delete");
+
+				removeButton.addActionListener(new ActionListener() {
+
+					@Override
+					public void actionPerformed(ActionEvent arg0) {
+						option.remove(child);
+						recreateContent();
+					}
+				});
+
+				this.add(removeButton, c);
+			}
+
 		}
 
 	}