- Refactored usage of live objects in the IDE

- Save collapse state of the project browser tree

DrawableGui/build.gradle

@@ -14,11 +14,5 @@ if (!hasProperty('mainClass')) {
 }
 
 dependencies {
-    // TODO: Add dependencies here
-    //   but note that JUnit should have already been added in parent.gradle.
-    //   By default, only the Maven Central Repository is specified in
-    //   parent.gradle.
-    //
-    // You can read more about how to add dependency here:
-    //   http://www.gradle.org/docs/current/userguide/dependency_management.html#sec:how_to_declare_your_dependencies
+    compile project(':Shared')
 }

DrawableGui/src/main/java/org/openzen/drawablegui/DButton.java

@@ -5,12 +5,13 @@
  */
 package org.openzen.drawablegui;
 
+import live.LiveBool;
+import live.LiveObject;
+import live.LiveString;
+import live.MutableLiveObject;
+
 import org.openzen.drawablegui.draw.DDrawnShape;
 import org.openzen.drawablegui.draw.DDrawnText;
-import org.openzen.drawablegui.live.LiveBool;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.LiveString;
-import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.style.DShadow;
 import org.openzen.drawablegui.style.DStyleClass;
 

DrawableGui/src/main/java/org/openzen/drawablegui/DComponent.java

@@ -5,7 +5,7 @@
  */
 package org.openzen.drawablegui;
 
-import org.openzen.drawablegui.live.LiveObject;
+import live.LiveObject;
 
 /**
  *

DrawableGui/src/main/java/org/openzen/drawablegui/DEmptyView.java

@@ -5,8 +5,8 @@
  */
 package org.openzen.drawablegui;
 
-import org.openzen.drawablegui.live.ImmutableLiveObject;
-import org.openzen.drawablegui.live.LiveObject;
+import live.ImmutableLiveObject;
+import live.LiveObject;
 
 /**
  *

DrawableGui/src/main/java/org/openzen/drawablegui/DInputField.java

@@ -5,14 +5,15 @@
  */
 package org.openzen.drawablegui;
 
+import java.util.function.BiConsumer;
+import listeners.ListenerHandle;
+import live.LiveObject;
+import live.MutableLiveObject;
+import live.MutableLiveString;
+
 import org.openzen.drawablegui.draw.DDrawnRectangle;
 import org.openzen.drawablegui.draw.DDrawnShape;
 import org.openzen.drawablegui.draw.DDrawnText;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.LiveString;
-import org.openzen.drawablegui.live.MutableLiveObject;
-import org.openzen.drawablegui.live.MutableLiveString;
 import org.openzen.drawablegui.style.DDimension;
 import org.openzen.drawablegui.style.DStyleClass;
 
@@ -22,7 +23,7 @@ import org.openzen.drawablegui.style.DStyleClass;
  */
 public class DInputField implements DComponent {
 	public final MutableLiveString value;
-	private final ListenerHandle<LiveString.Listener> valueListener;
+	private final ListenerHandle<BiConsumer<String, String>> valueListener;
 	
 	private final DStyleClass styleClass;
 	private final MutableLiveObject<DSizing> sizing = DSizing.create();

DrawableGui/src/main/java/org/openzen/drawablegui/DLabel.java

@@ -5,11 +5,13 @@
  */
 package org.openzen.drawablegui;
 
+import java.util.function.BiConsumer;
+import listeners.ListenerHandle;
+import live.LiveString;
+import live.LiveObject;
+import live.MutableLiveObject;
+
 import org.openzen.drawablegui.draw.DDrawnText;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.LiveString;
-import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
 
 /**
@@ -20,7 +22,7 @@ public class DLabel implements DComponent {
 	private final LiveString label;
 	private final DStyleClass styleClass;
 	private final MutableLiveObject<DSizing> sizing = DSizing.create();
-	private final ListenerHandle<LiveString.Listener> labelListener;
+	private final ListenerHandle<BiConsumer<String, String>> labelListener;
 	
 	private DComponentContext context;
 	private DIRectangle bounds;

DrawableGui/src/main/java/org/openzen/drawablegui/DSimpleTooltip.java

@@ -5,7 +5,8 @@
  */
 package org.openzen.drawablegui;
 
-import org.openzen.drawablegui.live.LiveString;
+import live.LiveString;
+
 import org.openzen.drawablegui.style.DStyleClass;
 
 /**

DrawableGui/src/main/java/org/openzen/drawablegui/DSimpleTooltipComponent.java

@@ -5,12 +5,14 @@
  */
 package org.openzen.drawablegui;
 
+import java.util.function.BiConsumer;
+import listeners.ListenerHandle;
+import live.LiveObject;
+import live.LiveString;
+import live.MutableLiveObject;
+
 import org.openzen.drawablegui.draw.DDrawnRectangle;
 import org.openzen.drawablegui.draw.DDrawnText;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.LiveString;
-import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
 
 /**
@@ -21,7 +23,7 @@ public class DSimpleTooltipComponent implements DComponent {
 	private final DStyleClass styleClass;
 	private final LiveString tooltip;
 	private final MutableLiveObject<DSizing> sizing = DSizing.create();
-	private final ListenerHandle<LiveString.Listener> tooltipListener;
+	private final ListenerHandle<BiConsumer<String, String>> tooltipListener;
 	
 	private DComponentContext context;
 	private DIRectangle bounds;

DrawableGui/src/main/java/org/openzen/drawablegui/DSizing.java

@@ -5,8 +5,8 @@
  */
 package org.openzen.drawablegui;
 
-import org.openzen.drawablegui.live.MutableLiveObject;
-import org.openzen.drawablegui.live.SimpleLiveObject;
+import live.MutableLiveObject;
+import live.SimpleLiveObject;
 
 /**
  *

DrawableGui/src/main/java/org/openzen/drawablegui/DUIWindow.java

@@ -5,8 +5,8 @@
  */
 package org.openzen.drawablegui;
 
-import org.openzen.drawablegui.live.LiveBool;
-import org.openzen.drawablegui.live.LiveObject;
+import live.LiveBool;
+import live.LiveObject;
 
 /**
  *

DrawableGui/src/main/java/org/openzen/drawablegui/border/DCustomWindowBorder.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.drawablegui.border;
 
+import java.util.function.BiConsumer;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DComponentContext;
 import org.openzen.drawablegui.DSizing;
@@ -15,11 +16,12 @@ import org.openzen.drawablegui.DUIWindow;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.draw.DDrawnRectangle;
 import org.openzen.drawablegui.draw.DDrawnShape;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.live.ImmutableLiveObject;
-import org.openzen.drawablegui.live.LiveBool;
-import org.openzen.drawablegui.live.LiveObject;
+import listeners.ListenerHandle;
+import live.ImmutableLiveObject;
+import live.LiveBool;
+import live.LiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
+import zsynthetic.FunctionBoolBoolToVoid;
 
 /**
  *
@@ -35,10 +37,10 @@ public class DCustomWindowBorder implements DComponent {
 	private DIRectangle bounds;
 	
 	private LiveBool active;
-	private LiveObject<DUIWindow.State> state;
+	private live.LiveObject<DUIWindow.State> state;
 	
-	private ListenerHandle<LiveObject.Listener<DUIWindow.State>> stateListener;
-	private ListenerHandle<LiveBool.Listener> activeListener;
+	private ListenerHandle<BiConsumer<DUIWindow.State, DUIWindow.State>> stateListener;
+	private ListenerHandle<FunctionBoolBoolToVoid> activeListener;
 	
 	private DDrawnRectangle background;
 	private DDrawnShape shadowedBackground;

DrawableGui/src/main/java/org/openzen/drawablegui/form/DForm.java

@@ -7,6 +7,9 @@ package org.openzen.drawablegui.form;
 
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import live.LiveObject;
+import live.MutableLiveObject;
+
 import org.openzen.drawablegui.BaseComponentGroup;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DComponentContext;
@@ -14,8 +17,6 @@ import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.DFontMetrics;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.draw.DDrawnText;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
 
 /**

DrawableGui/src/main/java/org/openzen/drawablegui/layout/DLinearLayout.java

@@ -5,8 +5,13 @@
  */
 package org.openzen.drawablegui.layout;
 
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import listeners.ListenerHandle;
+import live.LiveObject;
+import live.MutableLiveObject;
+
 import org.openzen.drawablegui.BaseComponentGroup;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DComponentContext;
@@ -14,9 +19,6 @@ import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.draw.DDrawnShape;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
 
 /**
@@ -28,7 +30,7 @@ public class DLinearLayout extends BaseComponentGroup {
 	private final Orientation orientation;
 	private final Alignment alignment;
 	private final Element[] components;
-	private final ListenerHandle<LiveObject.Listener<DSizing>>[] componentSizeListeners;
+	private final ListenerHandle<BiConsumer<DSizing, DSizing>>[] componentSizeListeners;
 	private final MutableLiveObject<DSizing> sizing = DSizing.create();
 	
 	private DComponentContext context;
@@ -118,7 +120,7 @@ public class DLinearLayout extends BaseComponentGroup {
 
 	@Override
 	public void close() {
-		for (ListenerHandle<LiveObject.Listener<DSizing>> listener : componentSizeListeners) {
+		for (ListenerHandle<BiConsumer<DSizing, DSizing>> listener : componentSizeListeners) {
 			listener.close();
 		}
 		for (Element element : components)

DrawableGui/src/main/java/org/openzen/drawablegui/layout/DSideLayout.java

@@ -8,17 +8,19 @@ package org.openzen.drawablegui.layout;
 import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import listeners.ListenerHandle;
+import live.LiveObject;
+import live.MutableLiveObject;
+
 import org.openzen.drawablegui.BaseComponentGroup;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DComponentContext;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.draw.DDrawnRectangle;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
 
 /**
@@ -257,10 +259,10 @@ public class DSideLayout extends BaseComponentGroup {
 		background.close();
 	}
 	
-	public class SideComponent implements Closeable, LiveObject.Listener<DSizing> {
+	public class SideComponent implements Closeable, BiConsumer<DSizing, DSizing> {
 		public final Side side;
 		public final DComponent component;
-		public final ListenerHandle<LiveObject.Listener<DSizing>> listenerHandle;
+		public final ListenerHandle<BiConsumer<DSizing, DSizing>> listenerHandle;
 
 		public SideComponent(Side side, DComponent component) {
 			this.side = side;
@@ -274,7 +276,7 @@ public class DSideLayout extends BaseComponentGroup {
 		}
 
 		@Override
-		public void onUpdated(DSizing oldValue, DSizing newValue) {
+		public void accept(DSizing oldValue, DSizing newValue) {
 			recalculateSize();
 		}
 	}

DrawableGui/src/main/java/org/openzen/drawablegui/live/SimpleLiveObject.java

@@ -1,42 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.openzen.drawablegui.live;
-
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.listeners.ListenerList;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public class SimpleLiveObject<T> implements MutableLiveObject<T> {
-	private final ListenerList<Listener<T>> listeners = new ListenerList<>();
-	private T value;
-	
-	public SimpleLiveObject(T value) {
-		this.value = value;
-	}
-	
-	@Override
-	public T getValue() {
-		return value;
-	}
-	
-	@Override
-	public void setValue(T value) {
-		if (value == this.value)
-			return;
-		
-		T oldValue = this.value;
-		this.value = value;
-		listeners.accept(listener -> listener.onUpdated(oldValue, value));
-	}
-	
-	@Override
-	public ListenerHandle<Listener<T>> addListener(Listener<T> listener) {
-		return listeners.add(listener);
-	}
-}

DrawableGui/src/main/java/org/openzen/drawablegui/scroll/DScrollBar.java

@@ -5,6 +5,11 @@
  */
 package org.openzen.drawablegui.scroll;
 
+import listeners.ListenerHandle;
+import live.LiveInt;
+import live.LiveObject;
+import live.MutableLiveObject;
+
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DComponentContext;
 import org.openzen.drawablegui.DSizing;
@@ -12,13 +17,10 @@ import org.openzen.drawablegui.DMouseEvent;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.live.LiveInt;
-import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.draw.DDrawnRectangle;
 import org.openzen.drawablegui.draw.DDrawnShape;
-import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
+import zsynthetic.FunctionIntIntToVoid;
 
 /**
  *
@@ -32,8 +34,8 @@ public class DScrollBar implements DComponent {
 	private final LiveInt offset;
 	private final boolean horizontal;
 	
-	private final ListenerHandle<LiveInt.Listener> targetHeightListener;
-	private final ListenerHandle<LiveInt.Listener> offsetListener;
+	private final ListenerHandle<FunctionIntIntToVoid> targetHeightListener;
+	private final ListenerHandle<FunctionIntIntToVoid> offsetListener;
 	
 	private DComponentContext context;
 	private DScrollBarStyle style;
@@ -227,9 +229,9 @@ public class DScrollBar implements DComponent {
 		updateBarColor();
 	}
 	
-	private class ScrollListener implements LiveInt.Listener {
+	private class ScrollListener implements FunctionIntIntToVoid {
 		@Override
-		public void onChanged(int oldValue, int newValue) {
+		public void invoke(int oldValue, int newValue) {
 			recalculate();
 		}
 	}

DrawableGui/src/main/java/org/openzen/drawablegui/scroll/DScrollPane.java

@@ -5,6 +5,13 @@
  */
 package org.openzen.drawablegui.scroll;
 
+import java.util.function.BiConsumer;
+import listeners.ListenerHandle;
+import live.LiveInt;
+import live.LiveObject;
+import live.SimpleLiveInt;
+import live.SimpleLiveObject;
+
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DComponentContext;
 import org.openzen.drawablegui.DSizing;
@@ -12,14 +19,10 @@ import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DMouseEvent;
 import org.openzen.drawablegui.DScalableSize;
 import org.openzen.drawablegui.DTransform2D;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.live.LiveInt;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.SimpleLiveInt;
 import org.openzen.drawablegui.draw.DDrawnShape;
 import org.openzen.drawablegui.draw.DSubSurface;
-import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
+import zsynthetic.FunctionIntIntToVoid;
 
 /**
  *
@@ -44,11 +47,11 @@ public class DScrollPane implements DComponent, DScrollContext {
 	private final SimpleLiveObject<DSizing> sizing = new SimpleLiveObject<>(DSizing.EMPTY);
 	private final LiveObject<DScalableSize> size;
 	
-	private final ListenerHandle<LiveInt.Listener> contentsWidthListener;
-	private final ListenerHandle<LiveInt.Listener> contentsHeightListener;
-	private final ListenerHandle<LiveInt.Listener> offsetXListener;
-	private final ListenerHandle<LiveInt.Listener> offsetYListener;
-	private final ListenerHandle<LiveObject.Listener<DSizing>> contentsSizingListener;
+	private final ListenerHandle<FunctionIntIntToVoid> contentsWidthListener;
+	private final ListenerHandle<FunctionIntIntToVoid> contentsHeightListener;
+	private final ListenerHandle<FunctionIntIntToVoid> offsetXListener;
+	private final ListenerHandle<FunctionIntIntToVoid> offsetYListener;
+	private final ListenerHandle<BiConsumer<DSizing, DSizing>> contentsSizingListener;
 	
 	private DComponent hovering = null;
 	
@@ -311,10 +314,10 @@ public class DScrollPane implements DComponent, DScrollContext {
 		return bounds.height;
 	}
 	
-	private class ScrollListener implements LiveInt.Listener {
+	private class ScrollListener implements FunctionIntIntToVoid {
 
 		@Override
-		public void onChanged(int oldValue, int newValue) {
+		public void invoke(int oldValue, int newValue) {
 			int valueX = offsetX.getValue();
 			if (valueX > contentsWidth.getValue() - bounds.width)
 				valueX = contentsWidth.getValue() - bounds.width;

DrawableGui/src/main/java/org/openzen/drawablegui/swing/SwingDialog.java

@@ -13,18 +13,19 @@ import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
 import java.awt.event.WindowStateListener;
 import javax.swing.JDialog;
-import javax.swing.JFrame;
+
+import live.LiveBool;
+import live.LiveObject;
+import live.MutableLiveObject;
+import live.SimpleLiveBool;
+import live.SimpleLiveObject;
+
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DUIContext;
 import org.openzen.drawablegui.DUIWindow;
 import org.openzen.drawablegui.border.DCustomWindowBorder;
-import org.openzen.drawablegui.live.LiveBool;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.MutableLiveObject;
-import org.openzen.drawablegui.live.SimpleLiveBool;
-import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
 
 /**

DrawableGui/src/main/java/org/openzen/drawablegui/swing/SwingInlineWindow.java

@@ -12,16 +12,18 @@ import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
 import java.awt.event.WindowStateListener;
 import javax.swing.JWindow;
+
+import live.ImmutableLiveObject;
+import live.LiveBool;
+import live.LiveObject;
+import live.MutableLiveObject;
+import live.SimpleLiveBool;
+import live.SimpleLiveObject;
+
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DUIContext;
 import org.openzen.drawablegui.DUIWindow;
-import org.openzen.drawablegui.live.ImmutableLiveObject;
-import org.openzen.drawablegui.live.LiveBool;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.MutableLiveObject;
-import org.openzen.drawablegui.live.SimpleLiveBool;
-import org.openzen.drawablegui.live.SimpleLiveObject;
 
 /**
  *

DrawableGui/src/main/java/org/openzen/drawablegui/swing/SwingWindow.java

@@ -13,17 +13,19 @@ import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
 import java.awt.event.WindowStateListener;
 import javax.swing.JFrame;
+
+import live.LiveBool;
+import live.LiveObject;
+import live.MutableLiveObject;
+import live.SimpleLiveBool;
+import live.SimpleLiveObject;
+
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DUIContext;
 import org.openzen.drawablegui.DUIWindow;
 import org.openzen.drawablegui.border.DCustomWindowBorder;
-import org.openzen.drawablegui.live.LiveBool;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.MutableLiveObject;
-import org.openzen.drawablegui.live.SimpleLiveBool;
-import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
 
 /**

DrawableGui/src/main/java/org/openzen/drawablegui/tree/DTreeNode.java

@@ -5,10 +5,11 @@
  */
 package org.openzen.drawablegui.tree;
 
+import live.LiveList;
+import live.MutableLiveBool;
+
 import org.openzen.drawablegui.DColorableIcon;
 import org.openzen.drawablegui.DMouseEvent;
-import org.openzen.drawablegui.live.LiveList;
-import org.openzen.drawablegui.live.MutableLiveBool;
 
 /**
  *

DrawableGui/src/main/java/org/openzen/drawablegui/tree/DTreeView.java

@@ -7,6 +7,12 @@ package org.openzen.drawablegui.tree;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import listeners.ListenerHandle;
+import live.LiveList;
+import live.LiveObject;
+import live.MutableLiveObject;
+
 import org.openzen.drawablegui.DColorableIcon;
 import org.openzen.drawablegui.DColorableIconInstance;
 import org.openzen.drawablegui.DComponent;
@@ -19,14 +25,10 @@ import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DDrawableInstance;
 import org.openzen.drawablegui.Destructible;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.draw.DDrawnRectangle;
 import org.openzen.drawablegui.draw.DDrawnText;
-import org.openzen.drawablegui.live.LiveList;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
+import zsynthetic.FunctionBoolBoolToVoid;
 
 /**
  *
@@ -252,12 +254,12 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 		// nothing to clean up
 	}
 	
-	private class Row implements Destructible, LiveBool.Listener, LiveList.Listener<N> {
+	private class Row implements Destructible, LiveList.Listener<N> {
 		private final int x;
 		private final int index;
 		private final N node;
 		private final DDrawable icon;
-		private final ListenerHandle<LiveBool.Listener> collapseListener;
+		private final ListenerHandle<FunctionBoolBoolToVoid> collapseListener;
 		private final ListenerHandle<LiveList.Listener<N>> childListener;
 		
 		private DDrawnText text;
@@ -268,7 +270,7 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 			this.x = x;
 			this.index = index;
 			this.node = node;
-			this.collapseListener = node.isCollapsed().addListener(this);
+			this.collapseListener = node.isCollapsed().addListener(this::onCollapsedChanged);
 			this.childListener = node.getChildren().addListener(this);
 			
 			if (node == selectedNode)
@@ -319,9 +321,8 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 					baseX + style.iconTextSpacing + getIconWidth(icon) + style.iconTextSpacing + getIconWidth(node.getIcon()),
 					baseY + fontMetrics.getAscent());
 		}
-
-		@Override
-		public void onChanged(boolean oldValue, boolean newValue) {
+		
+		public void onCollapsedChanged(boolean oldValue, boolean newValue) {
 			updateLayout();
 		}
 

IDE/src/main/java/org/openzen/zenscript/ide/Main.java

@@ -1,8 +1,11 @@
 package org.openzen.zenscript.ide;
 
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.io.File;
 import java.io.IOException;
 import javax.swing.JFrame;
+import live.MutableLiveBool;
 import org.openzen.drawablegui.DUIWindow;
 import org.openzen.zenscript.ide.host.DevelopmentHost;
 import org.openzen.zenscript.ide.host.local.LocalProjectDevelopmentHost;
@@ -37,15 +40,15 @@ public class Main {
 		IDEPropertyDirectory runState = properties.getRoot().getSubdirectory("runState");
 		if (target == null)
 			target = runState.getString("target", null);
-		if (target == null && host.getTargets().size() > 0)
-			target = host.getTargets().get(0).getName();
-		
-		IDEWindow window = new IDEWindow(host, target);
-		WindowView root = new WindowView(window, host);
+		if (target == null && host.getTargets().getLength() > 0)
+			target = host.getTargets().getAt(0).getName();
 		
 		IDEPropertyDirectory uiState = properties.getRoot().getSubdirectory("uiState");
+		IDEWindow window = new IDEWindow(host, target);
+		WindowView root = new WindowView(window, host, uiState);
 		
 		int pixelPerInch = java.awt.Toolkit.getDefaultToolkit().getScreenResolution();
+		MutableLiveBool maximized = uiState.getLiveBool("maximized", false);
 		SwingWindow swingWindow = new SwingWindow("ZenCode IDE - " + host.getName(), root, false);
 		swingWindow.setSize(
 				uiState.getInt("width", 800 * pixelPerInch / 96),
@@ -54,8 +57,9 @@ public class Main {
 				uiState.getInt("x", 0),
 				uiState.getInt("y", 0));
 		swingWindow.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		swingWindow.setExtendedState(uiState.getBool("maximized", false) ? JFrame.MAXIMIZED_BOTH : JFrame.NORMAL);
+		swingWindow.setExtendedState(maximized.getValue() ? JFrame.MAXIMIZED_BOTH : JFrame.NORMAL);
 		swingWindow.setVisible(true);
+		swingWindow.addWindowListener(new MyWindowListener(properties));
 		
 		swingWindow.getWindowBounds().addListener((oldBounds, newBounds) -> {
 			if (swingWindow.getWindowState().getValue() == DUIWindow.State.NORMAL) {
@@ -63,15 +67,23 @@ public class Main {
 				uiState.setInt("y", newBounds.y);
 				uiState.setInt("width", newBounds.width);
 				uiState.setInt("height", newBounds.height);
-				properties.save();
 			}
 		});
 		swingWindow.getWindowState().addListener((oldState, newState) -> {
-			boolean isMaximized = newState == DUIWindow.State.MAXIMIZED;
-			if (isMaximized != uiState.getBool("maximized", false)) {
-				uiState.setBool("maximized", isMaximized);
-				properties.save();
-			}
+			maximized.setValue(newState == DUIWindow.State.MAXIMIZED);
 		});
 	}
+	
+	private static class MyWindowListener extends WindowAdapter {
+		private final IDEPropertyStore properties;
+		
+		public MyWindowListener(IDEPropertyStore properties) {
+			this.properties = properties;
+		}
+		
+		@Override
+		public void windowClosing(WindowEvent e) {
+			properties.save();
+		}
+	}
 }

IDE/src/main/java/org/openzen/zenscript/ide/codemodel/IDECodeSpace.java

@@ -32,7 +32,7 @@ public class IDECodeSpace {
 		ZSPackage stdlib = new ZSPackage(root, "stdlib");
 		GlobalTypeRegistry registry = new GlobalTypeRegistry(stdlib);
 		ModuleLoader loader = new ModuleLoader(registry, exception -> {
-			
+			exception.printStackTrace();
 		});
 		for (IDEModule module : host.getModules()) {
 			module.prebuild(loader, this::addError);

IDE/src/main/java/org/openzen/zenscript/ide/host/DevelopmentHost.java

@@ -5,7 +5,7 @@
  */
 package org.openzen.zenscript.ide.host;
 
-import org.openzen.drawablegui.live.LiveList;
+import live.LiveList;
 
 /**
  *

IDE/src/main/java/org/openzen/zenscript/ide/host/IDELibrary.java

@@ -5,7 +5,7 @@
  */
 package org.openzen.zenscript.ide.host;
 
-import org.openzen.drawablegui.live.LiveList;
+import live.LiveList;
 
 /**
  *

IDE/src/main/java/org/openzen/zenscript/ide/host/IDEModule.java

@@ -16,6 +16,8 @@ import org.openzen.zenscript.ide.codemodel.IDECodeError;
 public interface IDEModule {
 	public String getName();
 	
+	public IDEModuleType getType();
+	
 	public IDEPackage getRootPackage();
 	
 	void prebuild(ModuleLoader loader, Consumer<IDECodeError> errors);

DrawableGui/src/main/java/org/openzen/drawablegui/live/MutableLiveObject.java → IDE/src/main/java/org/openzen/zenscript/ide/host/IDEModuleType.java

@@ -3,12 +3,12 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.drawablegui.live;
+package org.openzen.zenscript.ide.host;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public interface MutableLiveObject<T> extends LiveObject<T> {
-	public void setValue(T value);
+public interface IDEModuleType {
+	public String getName();
 }

IDE/src/main/java/org/openzen/zenscript/ide/host/IDEPackage.java

@@ -5,7 +5,7 @@
  */
 package org.openzen.zenscript.ide.host;
 
-import org.openzen.drawablegui.live.LiveList;
+import live.LiveList;
 
 /**
  *

IDE/src/main/java/org/openzen/zenscript/ide/host/IDEPropertyDirectory.java

@@ -5,6 +5,8 @@
  */
 package org.openzen.zenscript.ide.host;
 
+import live.MutableLiveBool;
+
 /**
  *
  * @author Hoofdgebruiker
@@ -14,6 +16,8 @@ public interface IDEPropertyDirectory {
 	
 	public void setBool(String name, boolean value);
 	
+	public MutableLiveBool getLiveBool(String name, boolean defaultValue);
+	
 	public int getInt(String name, int defaultValue);
 	
 	public void setInt(String name, int value);

IDE/src/main/java/org/openzen/zenscript/ide/host/IDESourceFile.java

@@ -5,7 +5,8 @@
  */
 package org.openzen.zenscript.ide.host;
 
-import org.openzen.drawablegui.live.LiveString;
+import live.LiveString;
+
 import org.openzen.zencode.shared.SourceFile;
 
 /**

IDE/src/main/java/org/openzen/zenscript/ide/host/local/JSONPropertyDirectory.java

@@ -5,8 +5,12 @@
  */
 package org.openzen.zenscript.ide.host.local;
 
+import listeners.ListenerHandle;
+import listeners.ListenerList;
+import live.MutableLiveBool;
 import org.json.JSONObject;
 import org.openzen.zenscript.ide.host.IDEPropertyDirectory;
+import zsynthetic.FunctionBoolBoolToVoid;
 
 /**
  *
@@ -29,6 +33,11 @@ public class JSONPropertyDirectory implements IDEPropertyDirectory {
 		data.put(name, value);
 	}
 	
+	@Override
+	public MutableLiveBool getLiveBool(String name, boolean defaultValue) {
+		return new JSONLiveBool(name, defaultValue);
+	}
+	
 	@Override
 	public int getInt(String name, int defaultValue) {
 		return data.optInt(name, defaultValue);
@@ -57,4 +66,32 @@ public class JSONPropertyDirectory implements IDEPropertyDirectory {
 		
 		return new JSONPropertyDirectory(data.getJSONObject(name));
 	}
+	
+	private class JSONLiveBool implements MutableLiveBool {
+		private final ListenerList<FunctionBoolBoolToVoid> listeners = new ListenerList<>();
+		private final String key;
+		private final boolean defaultValue;
+		
+		public JSONLiveBool(String key, boolean defaultValue) {
+			this.key = key;
+			this.defaultValue = defaultValue;
+		}
+
+		@Override
+		public boolean getValue() {
+			return data.optBoolean(key, defaultValue);
+		}
+		
+		@Override
+		public void setValue(boolean value) {
+			boolean current = getValue();
+			data.put(key, value);
+			listeners.accept(listener -> listener.invoke(current, value));
+		}
+
+		@Override
+		public ListenerHandle<FunctionBoolBoolToVoid> addListener(FunctionBoolBoolToVoid listener) {
+			return listeners.add(listener);
+		}
+	}
 }

IDE/src/main/java/org/openzen/zenscript/ide/host/local/LocalLibrary.java

@@ -5,9 +5,10 @@
  */
 package org.openzen.zenscript.ide.host.local;
 
-import org.openzen.drawablegui.live.LiveArrayList;
-import org.openzen.drawablegui.live.LiveList;
-import org.openzen.drawablegui.live.MutableLiveList;
+import live.LiveArrayList;
+import live.LiveList;
+import live.MutableLiveList;
+
 import org.openzen.zenscript.constructor.Library;
 import org.openzen.zenscript.constructor.module.ModuleReference;
 import org.openzen.zenscript.ide.host.IDELibrary;

IDE/src/main/java/org/openzen/zenscript/ide/host/local/LocalModule.java

@@ -11,6 +11,7 @@ import org.openzen.zenscript.constructor.ModuleLoader;
 import org.openzen.zenscript.constructor.module.ModuleReference;
 import org.openzen.zenscript.ide.codemodel.IDECodeError;
 import org.openzen.zenscript.ide.host.IDEModule;
+import org.openzen.zenscript.ide.host.IDEModuleType;
 import org.openzen.zenscript.ide.host.IDEPackage;
 import org.openzen.zenscript.validator.Validator;
 
@@ -31,6 +32,11 @@ public class LocalModule implements IDEModule {
 	public String getName() {
 		return module.getName();
 	}
+	
+	@Override
+	public IDEModuleType getType() {
+		return UniversalModuleType.INSTANCE;
+	}
 
 	@Override
 	public IDEPackage getRootPackage() {

IDE/src/main/java/org/openzen/zenscript/ide/host/local/LocalPackage.java

@@ -8,10 +8,12 @@ package org.openzen.zenscript.ide.host.local;
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
-import org.openzen.drawablegui.live.LiveArrayList;
-import org.openzen.drawablegui.live.LiveList;
-import org.openzen.drawablegui.live.MutableLiveList;
-import org.openzen.drawablegui.live.SortedLiveList;
+
+import live.LiveArrayList;
+import live.LiveList;
+import live.MutableLiveList;
+import live.SortedLiveList;
+
 import org.openzen.zencode.shared.FileSourceFile;
 import org.openzen.zencode.shared.SourceFile;
 import org.openzen.zenscript.constructor.module.SourcePackage;

IDE/src/main/java/org/openzen/zenscript/ide/host/local/LocalProjectDevelopmentHost.java

@@ -6,9 +6,11 @@
 package org.openzen.zenscript.ide.host.local;
 
 import java.io.File;
-import org.openzen.drawablegui.live.LiveArrayList;
-import org.openzen.drawablegui.live.LiveList;
-import org.openzen.drawablegui.live.MutableLiveList;
+
+import live.LiveArrayList;
+import live.LiveList;
+import live.MutableLiveList;
+
 import org.openzen.zenscript.constructor.Library;
 import org.openzen.zenscript.constructor.Project;
 import org.openzen.zenscript.constructor.module.ModuleReference;

IDE/src/main/java/org/openzen/zenscript/ide/host/local/LocalSourceFile.java

@@ -11,9 +11,11 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
-import org.openzen.drawablegui.live.LiveString;
-import org.openzen.drawablegui.live.MutableLiveString;
-import org.openzen.drawablegui.live.SimpleLiveString;
+
+import live.LiveString;
+import live.MutableLiveString;
+import live.SimpleLiveString;
+
 import org.openzen.zencode.shared.FileSourceFile;
 import org.openzen.zencode.shared.SourceFile;
 import org.openzen.zenscript.ide.host.IDESourceFile;

IDE/src/main/java/org/openzen/zenscript/ide/host/local/UniversalModuleType.java

@@ -0,0 +1,23 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.ide.host.local;
+
+import org.openzen.zenscript.ide.host.IDEModuleType;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class UniversalModuleType implements IDEModuleType {
+	public static final UniversalModuleType INSTANCE = new UniversalModuleType();
+	
+	private UniversalModuleType() {}
+
+	@Override
+	public String getName() {
+		return "universal";
+	}
+}

IDE/src/main/java/org/openzen/zenscript/ide/ui/IDEAspectBar.java

@@ -5,10 +5,10 @@
  */
 package org.openzen.zenscript.ide.ui;
 
-import org.openzen.drawablegui.live.LiveArrayList;
-import org.openzen.drawablegui.live.MutableLiveList;
-import org.openzen.drawablegui.live.MutableLiveObject;
-import org.openzen.drawablegui.live.SimpleLiveObject;
+import live.LiveArrayList;
+import live.MutableLiveList;
+import live.MutableLiveObject;
+import live.SimpleLiveObject;
 
 /**
  *

IDE/src/main/java/org/openzen/zenscript/ide/ui/IDEAspectToolbar.java

@@ -5,9 +5,10 @@
  */
 package org.openzen.zenscript.ide.ui;
 
+import live.LiveArrayList;
+import live.MutableLiveList;
+
 import org.openzen.drawablegui.DDrawable;
-import org.openzen.drawablegui.live.LiveArrayList;
-import org.openzen.drawablegui.live.MutableLiveList;
 
 /**
  *

IDE/src/main/java/org/openzen/zenscript/ide/ui/IDEDockWindow.java

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.ide.ui;
 
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.listeners.ListenerList;
+import listeners.ListenerHandle;
+import listeners.ListenerList;
 import org.openzen.zenscript.ide.host.IDESourceFile;
 
 /**

IDE/src/main/java/org/openzen/zenscript/ide/ui/IDEStatusBar.java

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.ide.ui;
 
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.listeners.ListenerList;
+import listeners.ListenerHandle;
+import listeners.ListenerList;
 
 /**
  *

IDE/src/main/java/org/openzen/zenscript/ide/ui/IDEWindow.java

@@ -5,9 +5,10 @@
  */
 package org.openzen.zenscript.ide.ui;
 
-import org.openzen.drawablegui.live.ImmutableLiveString;
-import org.openzen.drawablegui.live.LiveArrayList;
-import org.openzen.drawablegui.live.MutableLiveList;
+import live.ImmutableLiveString;
+import live.LiveArrayList;
+import live.MutableLiveList;
+
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.zenscript.ide.host.DevelopmentHost;
 import org.openzen.zenscript.ide.host.IDESourceFile;

IDE/src/main/java/org/openzen/zenscript/ide/ui/dialog/CreatePackageDialog.java

@@ -19,9 +19,9 @@ import org.openzen.drawablegui.layout.DLinearLayout.Alignment;
 import org.openzen.drawablegui.layout.DLinearLayout.Element;
 import org.openzen.drawablegui.layout.DLinearLayout.ElementAlignment;
 import org.openzen.drawablegui.layout.DLinearLayout.Orientation;
-import org.openzen.drawablegui.live.ImmutableLiveBool;
-import org.openzen.drawablegui.live.ImmutableLiveString;
-import org.openzen.drawablegui.live.SimpleLiveString;
+import live.ImmutableLiveBool;
+import live.ImmutableLiveString;
+import live.SimpleLiveString;
 import org.openzen.drawablegui.style.DDpDimension;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.zenscript.ide.host.IDEModule;

IDE/src/main/java/org/openzen/zenscript/ide/ui/dialog/CreateSourceFileDialog.java

@@ -5,6 +5,10 @@
  */
 package org.openzen.zenscript.ide.ui.dialog;
 
+import live.ImmutableLiveBool;
+import live.ImmutableLiveString;
+import live.SimpleLiveString;
+
 import org.openzen.drawablegui.DAnchor;
 import org.openzen.drawablegui.DButton;
 import org.openzen.drawablegui.DComponent;
@@ -19,11 +23,7 @@ import org.openzen.drawablegui.layout.DLinearLayout.Alignment;
 import org.openzen.drawablegui.layout.DLinearLayout.Element;
 import org.openzen.drawablegui.layout.DLinearLayout.ElementAlignment;
 import org.openzen.drawablegui.layout.DLinearLayout.Orientation;
-import org.openzen.drawablegui.live.ImmutableLiveBool;
-import org.openzen.drawablegui.live.ImmutableLiveString;
-import org.openzen.drawablegui.live.SimpleLiveString;
 import org.openzen.drawablegui.style.DDpDimension;
-import org.openzen.drawablegui.style.DSimpleStylesheet;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.style.DStylesheetBuilder;
 import org.openzen.zenscript.ide.host.IDEModule;

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/IconButtonControl.java

@@ -6,6 +6,14 @@
 package org.openzen.zenscript.ide.ui.view;
 
 import java.util.function.Consumer;
+
+import listeners.ListenerHandle;
+import live.ImmutableLiveBool;
+import live.LiveBool;
+import live.LiveObject;
+import live.LiveString;
+import live.MutableLiveObject;
+
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DComponentContext;
 import org.openzen.drawablegui.DSizing;
@@ -17,14 +25,9 @@ import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DSimpleTooltip;
 import org.openzen.drawablegui.draw.DDrawnShape;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.live.ImmutableLiveBool;
-import org.openzen.drawablegui.live.LiveBool;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.LiveString;
-import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.style.DShadow;
 import org.openzen.drawablegui.style.DStyleClass;
+import zsynthetic.FunctionBoolBoolToVoid;
 
 /**
  *
@@ -36,7 +39,7 @@ public class IconButtonControl implements DComponent {
 	private final DDrawable iconDisabled;
 	private final Consumer<DMouseEvent> onClick;
 	private final LiveBool disabled;
-	private final ListenerHandle<LiveBool.Listener> disabledListener;
+	private final ListenerHandle<FunctionBoolBoolToVoid> disabledListener;
 	private final DSimpleTooltip tooltip;
 	private final MutableLiveObject<DSizing> sizing = DSizing.create();
 	

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/StatusBarView.java

@@ -5,6 +5,10 @@
  */
 package org.openzen.zenscript.ide.ui.view;
 
+import live.LiveObject;
+import live.LiveString;
+import live.SimpleLiveObject;
+
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DComponentContext;
 import org.openzen.drawablegui.DSizing;
@@ -12,11 +16,8 @@ import org.openzen.drawablegui.DFontMetrics;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.drawablegui.draw.DDrawnShape;
 import org.openzen.drawablegui.draw.DDrawnText;
-import org.openzen.drawablegui.live.LiveString;
 import org.openzen.drawablegui.style.DStyleClass;
 
 /**

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/TabbedView.java

@@ -7,25 +7,26 @@ package org.openzen.zenscript.ide.ui.view;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+
+import listeners.ListenerHandle;
+import live.LiveArrayList;
+import live.LiveList;
+import live.LiveMappedList;
+import live.LiveObject;
+import live.MutableLiveList;
+import live.MutableLiveObject;
+import live.SimpleLiveObject;
+
 import org.openzen.drawablegui.BaseComponentGroup;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DComponentContext;
 import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.DFontMetrics;
 import org.openzen.drawablegui.DIRectangle;
-import org.openzen.drawablegui.draw.DDrawSurface;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.live.LiveArrayList;
-import org.openzen.drawablegui.live.LiveList;
-import org.openzen.drawablegui.live.LiveMappedList;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.MutableLiveList;
-import org.openzen.drawablegui.live.MutableLiveObject;
-import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
-import org.openzen.drawablegui.style.DStylePath;
 
 /**
  *
@@ -37,7 +38,7 @@ public class TabbedView extends BaseComponentGroup {
 	private final MutableLiveObject<DSizing> sizing = DSizing.create();
 	public final MutableLiveObject<TabbedViewComponent> currentTab = new SimpleLiveObject<>(null);
 	
-	private final Map<TabbedViewTab, ListenerHandle<LiveObject.Listener<DSizing>>> tabSizeListeners = new HashMap<>();
+	private final Map<TabbedViewTab, ListenerHandle<BiConsumer<DSizing, DSizing>>> tabSizeListeners = new HashMap<>();
 	
 	private DComponentContext context;
 	private TabbedViewStyle style;
@@ -127,7 +128,7 @@ public class TabbedView extends BaseComponentGroup {
 
 	@Override
 	public void close() {
-		for (Map.Entry<TabbedViewTab, ListenerHandle<LiveObject.Listener<DSizing>>> entry : tabSizeListeners.entrySet()) {
+		for (Map.Entry<TabbedViewTab, ListenerHandle<BiConsumer<DSizing, DSizing>>> entry : tabSizeListeners.entrySet()) {
 			entry.getValue().close();
 		}
 		
@@ -199,7 +200,7 @@ public class TabbedView extends BaseComponentGroup {
 		@Override
 		public void onRemoved(int index, TabbedViewComponent oldValue) {
 			if (oldValue == currentTab.getValue())
-				currentTab.setValue(tabs.size() == 0 ? null : tabs.get(Math.max(index - 1, 0)));
+				currentTab.setValue(tabs.getLength() == 0 ? null : tabs.getAt(Math.max(index - 1, 0)));
 			
 			layoutTabs();
 		}

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/TabbedViewComponent.java

@@ -5,10 +5,11 @@
  */
 package org.openzen.zenscript.ide.ui.view;
 
+import live.LiveBool;
+import live.LiveString;
+
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DDrawable;
-import org.openzen.drawablegui.live.LiveBool;
-import org.openzen.drawablegui.live.LiveString;
 
 /**
  *

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/TabbedViewTab.java

@@ -5,6 +5,11 @@
  */
 package org.openzen.zenscript.ide.ui.view;
 
+import java.util.function.BiConsumer;
+import listeners.ListenerHandle;
+import live.LiveObject;
+import live.MutableLiveObject;
+
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DComponentContext;
 import org.openzen.drawablegui.DSizing;
@@ -15,12 +20,8 @@ import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.draw.DDrawnShape;
 import org.openzen.drawablegui.draw.DDrawnText;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.live.LiveBool;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.LiveString;
-import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
+import zsynthetic.FunctionBoolBoolToVoid;
 
 /**
  *
@@ -41,9 +42,9 @@ public class TabbedViewTab implements DComponent {
 	private int textWidth;
 	private DIRectangle bounds;
 	
-	private final ListenerHandle<LiveString.Listener> titleListener;
-	private final ListenerHandle<LiveBool.Listener> updatedListener;
-	private final ListenerHandle<LiveObject.Listener<TabbedViewComponent>> currentTabListener;
+	private final ListenerHandle<BiConsumer<String, String>> titleListener;
+	private final ListenerHandle<FunctionBoolBoolToVoid> updatedListener;
+	private final ListenerHandle<BiConsumer<TabbedViewComponent, TabbedViewComponent>> currentTabListener;
 	
 	private boolean hover;
 	private boolean press;
@@ -61,7 +62,7 @@ public class TabbedViewTab implements DComponent {
 		
 		titleListener = tab.title.addListener((oldValue, newValue) -> calculateSizing());
 		updatedListener = tab.updated.addListener((oldValue, newValue) -> calculateSizing());
-		currentTabListener = currentTab.addListener((oldTab, newTab) -> update());
+		currentTabListener = currentTab.addListener((oldTab, newTab) -> update(newTab));
 	}
 	
 	public void closeTab() {
@@ -199,11 +200,16 @@ public class TabbedViewTab implements DComponent {
 	}
 	
 	private void update() {
+		update(currentTab.getValue());
+	}
+	
+	private void update(TabbedViewComponent currentTab) {
 		if (style == null || shape == null)
 			return;
 		
+		System.out.println("Updating tab " + tab.title.getValue() + (currentTab == tab ? " (current)" : ""));
 		int color = style.tabColorNormal;
-		if (currentTab.getValue() == tab)
+		if (currentTab == tab)
 			color = style.tabColorActive;
 		else if (press)
 			color = style.tabColorPress;

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/TabbedViewTabClose.java

@@ -5,6 +5,9 @@
  */
 package org.openzen.zenscript.ide.ui.view;
 
+import live.LiveObject;
+import live.MutableLiveObject;
+
 import org.openzen.drawablegui.DColorableIcon;
 import org.openzen.drawablegui.DColorableIconInstance;
 import org.openzen.drawablegui.DComponent;
@@ -14,8 +17,6 @@ import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DMouseEvent;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.draw.DDrawnRectangle;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.zenscript.ide.ui.icons.ScalableCloseIcon;
 

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/WindowView.java

@@ -5,19 +5,21 @@
  */
 package org.openzen.zenscript.ide.ui.view;
 
+import live.LiveString;
+import live.SimpleLiveObject;
+import live.SimpleLiveString;
+
 import org.openzen.drawablegui.DEmptyView;
 import org.openzen.drawablegui.DScalableSize;
 import org.openzen.drawablegui.border.DLineBorder;
 import org.openzen.drawablegui.scroll.DScrollPane;
 import org.openzen.drawablegui.layout.DSideLayout;
-import org.openzen.drawablegui.live.LiveString;
-import org.openzen.drawablegui.live.SimpleLiveObject;
-import org.openzen.drawablegui.live.SimpleLiveString;
 import org.openzen.drawablegui.style.DDpDimension;
 import org.openzen.drawablegui.style.DShadow;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.style.DStylesheetBuilder;
 import org.openzen.zenscript.ide.host.DevelopmentHost;
+import org.openzen.zenscript.ide.host.IDEPropertyDirectory;
 import org.openzen.zenscript.ide.host.IDESourceFile;
 import org.openzen.zenscript.ide.ui.IDEDockWindow;
 import org.openzen.zenscript.ide.ui.IDEWindow;
@@ -36,13 +38,13 @@ public final class WindowView extends DSideLayout {
 	public final LiveString status = new SimpleLiveString("IDE initialized");
 	private final ProjectBrowser projectBrowser;
 	
-	public WindowView(IDEWindow window, DevelopmentHost host) {
+	public WindowView(IDEWindow window, DevelopmentHost host, IDEPropertyDirectory settings) {
 		super(DStyleClass.inline(
 				new DStylesheetBuilder().color("backgroundColor", 0xFFEEEEEE).build()),
 				DEmptyView.INSTANCE);
 		this.window = window;
 		
-		projectBrowser = new ProjectBrowser(window, host);
+		projectBrowser = new ProjectBrowser(window, host, settings.getSubdirectory("projectBrowserExpansionState"));
 		
 		OutputView output = new OutputView(DStyleClass.EMPTY, window.output);
 		

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/aspectbar/AspectBarSelectorButton.java

@@ -6,6 +6,13 @@
 package org.openzen.zenscript.ide.ui.view.aspectbar;
 
 import java.util.function.Consumer;
+
+import listeners.ListenerHandle;
+import live.ImmutableLiveString;
+import live.LiveBool;
+import live.LiveObject;
+import live.MutableLiveObject;
+
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DComponentContext;
 import org.openzen.drawablegui.DSizing;
@@ -17,13 +24,9 @@ import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DSimpleTooltip;
 import org.openzen.drawablegui.draw.DDrawnShape;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.live.ImmutableLiveString;
-import org.openzen.drawablegui.live.LiveBool;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.style.DShadow;
 import org.openzen.drawablegui.style.DStyleClass;
+import zsynthetic.FunctionBoolBoolToVoid;
 
 /**
  *
@@ -48,7 +51,7 @@ public class AspectBarSelectorButton implements DComponent {
 	private boolean pressing;
 	private final DSimpleTooltip tooltip;
 	
-	private final ListenerHandle<LiveBool.Listener> activeListener;
+	private final ListenerHandle<FunctionBoolBoolToVoid> activeListener;
 	
 	public AspectBarSelectorButton(DStyleClass styleClass, DDrawable icon, LiveBool active, String tooltip, Consumer<DMouseEvent> onClick) {
 		this.active = active;

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/aspectbar/AspectBarView.java

@@ -5,8 +5,18 @@
  */
 package org.openzen.zenscript.ide.ui.view.aspectbar;
 
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+
+import listeners.ListenerHandle;
+import live.LiveBool;
+import live.LiveList;
+import live.LiveMappedList;
+import live.LiveObject;
+import live.LivePredicateBool;
+import live.MutableLiveObject;
+
 import org.openzen.drawablegui.BaseComponentGroup;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DComponentContext;
@@ -15,22 +25,13 @@ import org.openzen.drawablegui.DFontMetrics;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.DIRectangle;
-import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.zenscript.ide.ui.IDEAspectBar;
 import org.openzen.zenscript.ide.ui.IDEAspectToolbar;
 import org.openzen.drawablegui.DUIWindow;
-import org.openzen.drawablegui.draw.DDrawSurface;
 import org.openzen.drawablegui.draw.DDrawnRectangle;
 import org.openzen.drawablegui.draw.DDrawnShape;
 import org.openzen.drawablegui.draw.DDrawnText;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.live.LiveBool;
-import org.openzen.drawablegui.live.LiveList;
-import org.openzen.drawablegui.live.LiveMappedList;
-import org.openzen.drawablegui.live.LivePredicateBool;
-import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
-import org.openzen.drawablegui.style.DStylePath;
 import org.openzen.zenscript.ide.ui.IDEAspectBarControl;
 import org.openzen.zenscript.ide.ui.icons.ScalableCloseIcon;
 import org.openzen.zenscript.ide.ui.icons.ScalableMaximizeIcon;
@@ -62,9 +63,9 @@ public class AspectBarView extends BaseComponentGroup {
 	private WindowActionButton maximizeRestore;
 	private WindowActionButton close;
 	
-	private final ListenerHandle<LiveObject.Listener<DSizing>> minimizeRelayout;
-	private final ListenerHandle<LiveObject.Listener<DSizing>> maximizeRestoreRelayout;
-	private final ListenerHandle<LiveObject.Listener<DSizing>> closeRelayout;
+	private final ListenerHandle<BiConsumer<DSizing, DSizing>> minimizeRelayout;
+	private final ListenerHandle<BiConsumer<DSizing, DSizing>> maximizeRestoreRelayout;
+	private final ListenerHandle<BiConsumer<DSizing, DSizing>> closeRelayout;
 	
 	private DDrawnRectangle topBackground;
 	private DDrawnRectangle bottomBackground;
@@ -105,8 +106,8 @@ public class AspectBarView extends BaseComponentGroup {
 				});
 		selectorButtons.addListener(new SelectorButtonListListener());
 		
-		if (aspectBar.toolbars.size() > 0)
-			aspectBar.active.setValue(aspectBar.toolbars.get(0));
+		if (aspectBar.toolbars.getLength() > 0)
+			aspectBar.active.setValue(aspectBar.toolbars.getAt(0));
 	}
 	
 	@Override
@@ -451,7 +452,7 @@ public class AspectBarView extends BaseComponentGroup {
 		@Override
 		public void onRemoved(int index, IDEAspectToolbar oldValue) {
 			if (oldValue == aspectBar.active.getValue())
-				aspectBar.active.setValue(aspectBar.toolbars.size() == 0 ? null : aspectBar.toolbars.get(0));
+				aspectBar.active.setValue(aspectBar.toolbars.getLength() == 0 ? null : aspectBar.toolbars.getAt(0));
 		}
 	}
 	

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/aspectbar/WindowActionButton.java

@@ -7,6 +7,12 @@ package org.openzen.zenscript.ide.ui.view.aspectbar;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
+
+import listeners.ListenerHandle;
+import live.LiveBool;
+import live.LiveObject;
+import live.MutableLiveObject;
+
 import org.openzen.drawablegui.DColorableIcon;
 import org.openzen.drawablegui.DColorableIconInstance;
 import org.openzen.drawablegui.DComponent;
@@ -16,12 +22,9 @@ import org.openzen.drawablegui.DMouseEvent;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.draw.DDrawnRectangle;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.live.LiveBool;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.zenscript.ide.ui.icons.ScalableCloseIcon;
+import zsynthetic.FunctionBoolBoolToVoid;
 
 /**
  *
@@ -34,7 +37,7 @@ public class WindowActionButton implements DComponent {
 	private final Consumer<DMouseEvent> action;
 	
 	private LiveBool windowFocused;
-	private ListenerHandle<LiveBool.Listener> windowFocusedListener;
+	private ListenerHandle<FunctionBoolBoolToVoid> windowFocusedListener;
 	
 	private DComponentContext context;
 	private DColorableIcon icon;

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/editor/SourceEditor.java

@@ -9,6 +9,15 @@ import java.io.IOException;
 import java.io.Reader;
 import java.util.ArrayList;
 import java.util.List;
+
+import listeners.ListenerHandle;
+import live.ImmutableLiveString;
+import live.InverseLiveBool;
+import live.LiveObject;
+import live.LiveBool;
+import live.MutableLiveObject;
+import live.SimpleLiveBool;
+
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DComponentContext;
 import org.openzen.drawablegui.DSizing;
@@ -20,8 +29,6 @@ import org.openzen.drawablegui.DKeyEvent;
 import org.openzen.drawablegui.DMouseEvent;
 import org.openzen.drawablegui.DTimerHandle;
 import org.openzen.drawablegui.DTransform2D;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.zenscript.ide.host.IDESourceFile;
 import org.openzen.zenscript.ide.ui.IDEAspectToolbar;
 import org.openzen.zenscript.ide.ui.IDEWindow;
@@ -35,11 +42,6 @@ import org.openzen.drawablegui.Destructible;
 import org.openzen.drawablegui.draw.DDrawnRectangle;
 import org.openzen.drawablegui.draw.DDrawnShape;
 import org.openzen.drawablegui.draw.DDrawnText;
-import org.openzen.drawablegui.live.ImmutableLiveString;
-import org.openzen.drawablegui.live.InverseLiveBool;
-import org.openzen.drawablegui.live.LiveBool;
-import org.openzen.drawablegui.live.MutableLiveObject;
-import org.openzen.drawablegui.live.SimpleLiveBool;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.zenscript.ide.ui.icons.SaveIcon;
 import org.openzen.zenscript.ide.ui.icons.ShadedCodeIcon;

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/editor/TokenModel.java

@@ -11,8 +11,10 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.listeners.ListenerList;
+
+import listeners.ListenerHandle;
+import listeners.ListenerList;
+
 import org.openzen.zencode.shared.SourceFile;
 import org.openzen.zenscript.lexer.ParseException;
 import org.openzen.zenscript.lexer.TokenStream;

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/output/OutputView.java

@@ -7,6 +7,11 @@ package org.openzen.zenscript.ide.ui.view.output;
 
 import java.util.ArrayList;
 import java.util.List;
+import listeners.ListenerHandle;
+import live.LiveList;
+import live.LiveObject;
+import live.MutableLiveObject;
+
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DComponentContext;
 import org.openzen.drawablegui.DFontMetrics;
@@ -16,10 +21,6 @@ import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.Destructible;
 import org.openzen.drawablegui.draw.DDrawnShape;
 import org.openzen.drawablegui.draw.DDrawnText;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.live.LiveList;
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
 
 /**
@@ -108,7 +109,7 @@ public class OutputView implements DComponent {
 	}
 	
 	private void updateSizing() {
-		sizing.setValue(new DSizing(100, lines.size() * fontMetrics.getLineHeight() + style.margin.getVertical() + style.border.getPaddingVertical()));
+		sizing.setValue(new DSizing(100, lines.getLength() * fontMetrics.getLineHeight() + style.margin.getVertical() + style.border.getPaddingVertical()));
 	}
 	
 	private List<DDrawnText> draw(OutputLine line) {

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/LibraryTreeNode.java

@@ -5,11 +5,12 @@
  */
 package org.openzen.zenscript.ide.ui.view.project;
 
+import live.LiveList;
+import live.LiveMappedList;
+
 import org.openzen.drawablegui.DColorableIcon;
-import org.openzen.drawablegui.live.LiveList;
-import org.openzen.drawablegui.live.LiveMappedList;
 import org.openzen.zenscript.ide.host.IDELibrary;
-import org.openzen.zenscript.ide.ui.IDEWindow;
+import org.openzen.zenscript.ide.host.IDEPropertyDirectory;
 import org.openzen.zenscript.ide.ui.icons.LibraryIcon;
 
 /**
@@ -20,10 +21,12 @@ public class LibraryTreeNode extends ProjectOverviewNode {
 	private final IDELibrary library;
 	private final LiveList<ProjectOverviewNode> modules;
 	
-	public LibraryTreeNode(ProjectBrowser browser, IDELibrary library) {
+	public LibraryTreeNode(ProjectBrowser browser, IDELibrary library, IDEPropertyDirectory treeState) {
+		super(treeState.getLiveBool("collapsed", false));
+		
 		this.library = library;
 		
-		modules = new LiveMappedList<>(library.getModules(), module -> new ModuleTreeNode(browser, module));
+		modules = new LiveMappedList<>(library.getModules(), module -> new ModuleTreeNode(browser, module, treeState.getSubdirectory(module.getName())));
 	}
 	
 	@Override

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/ModuleTreeNode.java

@@ -8,7 +8,7 @@ package org.openzen.zenscript.ide.ui.view.project;
 import org.openzen.drawablegui.DColorableIcon;
 import org.openzen.drawablegui.DMouseEvent;
 import org.openzen.zenscript.ide.host.IDEModule;
-import org.openzen.zenscript.ide.ui.IDEWindow;
+import org.openzen.zenscript.ide.host.IDEPropertyDirectory;
 import org.openzen.zenscript.ide.ui.icons.ModuleIcon;
 
 /**
@@ -16,10 +16,10 @@ import org.openzen.zenscript.ide.ui.icons.ModuleIcon;
  * @author Hoofdgebruiker
  */
 public class ModuleTreeNode extends PackageTreeNode {
-	public ModuleTreeNode(ProjectBrowser projectBrowser, IDEModule module) {
-		super(projectBrowser, module.getRootPackage());
+	public ModuleTreeNode(ProjectBrowser projectBrowser, IDEModule module, IDEPropertyDirectory treeState) {
+		super(projectBrowser, module.getRootPackage(), treeState);
 		
-		init(module);
+		init(module, treeState);
 	}
 
 	@Override
@@ -34,7 +34,7 @@ public class ModuleTreeNode extends PackageTreeNode {
 
 	@Override
 	public String getTitle() {
-		return module.getName();
+		return module.getName() + " [" + module.getType().getName() + "]";
 	}
 	
 	@Override

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/PackageTreeNode.java

@@ -7,11 +7,12 @@ package org.openzen.zenscript.ide.ui.view.project;
 
 import org.openzen.drawablegui.DColorableIcon;
 import org.openzen.drawablegui.DMouseEvent;
-import org.openzen.drawablegui.live.LiveConcatList;
-import org.openzen.drawablegui.live.LiveList;
-import org.openzen.drawablegui.live.LiveMappedList;
+import live.LiveConcatList;
+import live.LiveList;
+import live.LiveMappedList;
 import org.openzen.zenscript.ide.host.IDEModule;
 import org.openzen.zenscript.ide.host.IDEPackage;
+import org.openzen.zenscript.ide.host.IDEPropertyDirectory;
 import org.openzen.zenscript.ide.ui.icons.FolderIcon;
 
 /**
@@ -24,23 +25,27 @@ public class PackageTreeNode extends ProjectOverviewNode {
 	private final IDEPackage pkg;
 	private LiveList<ProjectOverviewNode> contents;
 	
-	public PackageTreeNode(ProjectBrowser browser, IDEPackage pkg) {
+	public PackageTreeNode(ProjectBrowser browser, IDEPackage pkg, IDEPropertyDirectory treeState) {
+		super(treeState.getLiveBool("collapsed", true));
+		
 		this.browser = browser;
 		this.pkg = pkg;
 	}
 	
-	public PackageTreeNode(ProjectBrowser browser, IDEModule module, IDEPackage pkg) {
+	public PackageTreeNode(ProjectBrowser browser, IDEModule module, IDEPackage pkg, IDEPropertyDirectory treeState) {
+		super(treeState.getLiveBool("collapsed", true));
+		
 		this.browser = browser;
 		this.module = module;
 		this.pkg = pkg;
 		
-		init(module);
+		init(module, treeState);
 	}
 	
-	protected final void init(IDEModule module) {
+	protected final void init(IDEModule module, IDEPropertyDirectory treeState) {
 		this.module = module;
 		contents = new LiveConcatList<>(
-				new LiveMappedList<>(pkg.getSubPackages(), sub -> new PackageTreeNode(browser, module, sub)),
+				new LiveMappedList<>(pkg.getSubPackages(), sub -> new PackageTreeNode(browser, module, sub, treeState.getSubdirectory(sub.getName()))),
 				new LiveMappedList<>(pkg.getSourceFiles(), source -> new SourceFileTreeNode(browser, source))
 		);
 	}

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/ProjectBrowser.java

@@ -5,12 +5,18 @@
  */
 package org.openzen.zenscript.ide.ui.view.project;
 
+import live.ImmutableLiveString;
+import live.LiveBool;
+import live.LivePredicateBool;
+import live.MutableLiveObject;
+import live.SimpleLiveObject;
+import live.SimpleLiveString;
+
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DFont;
 import org.openzen.drawablegui.DFontFamily;
 import org.openzen.drawablegui.DLabel;
 import org.openzen.drawablegui.DScalableSize;
-import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.border.DEmptyBorder;
 import org.openzen.drawablegui.border.DPaddedBorder;
 import org.openzen.drawablegui.layout.DLinearLayout;
@@ -18,12 +24,6 @@ import org.openzen.drawablegui.layout.DLinearLayout.Alignment;
 import org.openzen.drawablegui.layout.DLinearLayout.Element;
 import org.openzen.drawablegui.layout.DLinearLayout.ElementAlignment;
 import org.openzen.drawablegui.layout.DLinearLayout.Orientation;
-import org.openzen.drawablegui.live.ImmutableLiveString;
-import org.openzen.drawablegui.live.LiveBool;
-import org.openzen.drawablegui.live.LivePredicateBool;
-import org.openzen.drawablegui.live.MutableLiveObject;
-import org.openzen.drawablegui.live.SimpleLiveObject;
-import org.openzen.drawablegui.live.SimpleLiveString;
 import org.openzen.drawablegui.scroll.DScrollPane;
 import org.openzen.drawablegui.style.DDpDimension;
 import org.openzen.drawablegui.style.DRoundedRectangleShape;
@@ -36,6 +36,7 @@ import org.openzen.drawablegui.tree.ExpandedArrow;
 import org.openzen.zenscript.ide.host.DevelopmentHost;
 import org.openzen.zenscript.ide.host.IDEModule;
 import org.openzen.zenscript.ide.host.IDEPackage;
+import org.openzen.zenscript.ide.host.IDEPropertyDirectory;
 import org.openzen.zenscript.ide.host.IDESourceFile;
 import org.openzen.zenscript.ide.ui.IDEWindow;
 import org.openzen.zenscript.ide.ui.dialog.CreatePackageDialog;
@@ -56,7 +57,7 @@ public class ProjectBrowser {
 	public final MutableLiveObject<IDESourceFile> contextFile = new SimpleLiveObject<>(null);
 	public final LiveBool addContentDisabled = new LivePredicateBool(contextPackage, pkg -> pkg == null);
 	
-	public ProjectBrowser(IDEWindow window, DevelopmentHost host) {
+	public ProjectBrowser(IDEWindow window, DevelopmentHost host, IDEPropertyDirectory expanded) {
 		this.window = window;
 		
 		DStyleClass minimalButtonPadding = DStyleClass.inline(new DStylesheetBuilder()
@@ -108,7 +109,7 @@ public class ProjectBrowser {
 				DStyleClass.EMPTY,
 				ExpandedArrow.INSTANCE,
 				CollapsedArrow.INSTANCE,
-				new RootTreeNode(this, host), false);
+				new RootTreeNode(this, host, expanded), false);
 		
 		DScalableSize treeSize = new DScalableSize(new DDpDimension(280), new DDpDimension(280));
 		DScrollPane treeScrollPane = new DScrollPane(

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/ProjectOverviewNode.java

@@ -5,8 +5,7 @@
  */
 package org.openzen.zenscript.ide.ui.view.project;
 
-import org.openzen.drawablegui.live.MutableLiveBool;
-import org.openzen.drawablegui.live.SimpleLiveBool;
+import live.MutableLiveBool;
 import org.openzen.drawablegui.tree.DTreeNode;
 
 /**
@@ -14,7 +13,11 @@ import org.openzen.drawablegui.tree.DTreeNode;
  * @author Hoofdgebruiker
  */
 public abstract class ProjectOverviewNode implements DTreeNode<ProjectOverviewNode> {
-	private final MutableLiveBool collapsed = new SimpleLiveBool();
+	private final MutableLiveBool collapsed;
+	
+	public ProjectOverviewNode(MutableLiveBool collapsed) {
+		this.collapsed = collapsed;
+	}
 	
 	public abstract Kind getKind();
 	

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/ProjectTreeNode.java

@@ -5,11 +5,13 @@
  */
 package org.openzen.zenscript.ide.ui.view.project;
 
+import live.LiveList;
+import live.LiveMappedList;
+
 import org.openzen.drawablegui.DColorableIcon;
 import org.openzen.drawablegui.DMouseEvent;
-import org.openzen.drawablegui.live.LiveList;
-import org.openzen.drawablegui.live.LiveMappedList;
 import org.openzen.zenscript.ide.host.DevelopmentHost;
+import org.openzen.zenscript.ide.host.IDEPropertyDirectory;
 import org.openzen.zenscript.ide.ui.icons.ProjectIcon;
 
 /**
@@ -21,11 +23,13 @@ public class ProjectTreeNode extends ProjectOverviewNode {
 	private final DevelopmentHost host;
 	private final LiveList<ProjectOverviewNode> modules;
 	
-	public ProjectTreeNode(ProjectBrowser browser, DevelopmentHost host) {
+	public ProjectTreeNode(ProjectBrowser browser, DevelopmentHost host, IDEPropertyDirectory treeState) {
+		super(treeState.getLiveBool("collapsed", false));
+		
 		this.browser = browser;
 		this.host = host;
 		
-		modules = new LiveMappedList<>(host.getModules(), module -> new ModuleTreeNode(browser, module));
+		modules = new LiveMappedList<>(host.getModules(), module -> new ModuleTreeNode(browser, module, treeState.getSubdirectory(module.getName())));
 	}
 	
 	@Override

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/RootTreeNode.java

@@ -5,11 +5,14 @@
  */
 package org.openzen.zenscript.ide.ui.view.project;
 
+import live.SimpleLiveBool;
+import live.LiveList;
+import live.LiveMappedList;
+import live.LivePrefixedList;
+
 import org.openzen.drawablegui.DColorableIcon;
-import org.openzen.drawablegui.live.LiveList;
-import org.openzen.drawablegui.live.LiveMappedList;
-import org.openzen.drawablegui.live.LivePrefixedList;
 import org.openzen.zenscript.ide.host.DevelopmentHost;
+import org.openzen.zenscript.ide.host.IDEPropertyDirectory;
 import org.openzen.zenscript.ide.ui.icons.ProjectIcon;
 
 /**
@@ -20,12 +23,14 @@ public class RootTreeNode extends ProjectOverviewNode {
 	private final DevelopmentHost host;
 	private final LiveList<ProjectOverviewNode> children;
 	
-	public RootTreeNode(ProjectBrowser browser, DevelopmentHost host) {
+	public RootTreeNode(ProjectBrowser browser, DevelopmentHost host, IDEPropertyDirectory treeState) {
+		super(new SimpleLiveBool(false));
+		
 		this.host = host;
 		
 		children = new LivePrefixedList<>(
-				new ProjectTreeNode(browser, host),
-				new LiveMappedList<>(host.getLibraries(), library -> new LibraryTreeNode(browser, library)));
+				new ProjectTreeNode(browser, host, treeState.getSubdirectory("project")),
+				new LiveMappedList<>(host.getLibraries(), library -> new LibraryTreeNode(browser, library, treeState.getSubdirectory(library.getName()))));
 	}
 	
 	@Override

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/project/SourceFileTreeNode.java

@@ -5,10 +5,11 @@
  */
 package org.openzen.zenscript.ide.ui.view.project;
 
+import live.SimpleLiveBool;
 import org.openzen.drawablegui.DColorableIcon;
 import org.openzen.drawablegui.DMouseEvent;
-import org.openzen.drawablegui.live.LiveEmptyList;
-import org.openzen.drawablegui.live.LiveList;
+import live.LiveEmptyList;
+import live.LiveList;
 import org.openzen.zenscript.ide.host.IDESourceFile;
 import org.openzen.zenscript.ide.ui.icons.CodeIcon;
 
@@ -21,6 +22,8 @@ public class SourceFileTreeNode extends ProjectOverviewNode {
 	private final IDESourceFile sourceFile;
 	
 	public SourceFileTreeNode(ProjectBrowser browser, IDESourceFile sourceFile) {
+		super(new SimpleLiveBool(false));
+		
 		this.browser = browser;
 		this.sourceFile = sourceFile;
 	}

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaClass.java

@@ -32,6 +32,7 @@ public class JavaClass implements Comparable<JavaClass> {
 	public static final JavaClass DOUBLE = new JavaClass("java.lang", "Double", Kind.CLASS);
 	public static final JavaClass CHARACTER = new JavaClass("java.lang", "Character", Kind.CLASS);
 	public static final JavaClass COLLECTION = new JavaClass("java.util", "Collection", Kind.INTERFACE);
+	public static final JavaClass COLLECTIONS = new JavaClass("java.util", "Collections", Kind.CLASS);
 	
 	public static final JavaClass SHARED = new JavaClass("zsynthetic", "Shared", Kind.CLASS);
 	

JavaShared/src/main/java/org/openzen/zenscript/javashared/prepare/JavaPrepareDefinitionVisitor.java

@@ -32,6 +32,7 @@ import org.openzen.zenscript.javashared.JavaClass;
 import org.openzen.zenscript.javashared.JavaCompiledModule;
 import org.openzen.zenscript.javashared.JavaContext;
 import org.openzen.zenscript.javashared.JavaMethod;
+import org.openzen.zenscript.javashared.JavaModifiers;
 import org.openzen.zenscript.javashared.JavaVariantOption;
 
 /**
@@ -94,6 +95,7 @@ public class JavaPrepareDefinitionVisitor implements DefinitionVisitor<JavaClass
 		
 		{
 			JavaNativeClass iterator = new JavaNativeClass(JavaClass.ITERATOR);
+			iterator.addMethod("empty", new JavaMethod(JavaClass.COLLECTIONS, JavaMethod.Kind.STATIC, "emptyIterator", false, "()Ljava/lang/Iterator;", JavaModifiers.STATIC | JavaModifiers.PUBLIC, false));
 			iterator.addInstanceMethod("hasNext", "hasNext", "()Z");
 			iterator.addInstanceMethod("next", "next", "()Ljava/lang/Object;");
 			nativeClasses.put("stdlib::Iterator", iterator);

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/BaseMemberCompiler.java

@@ -84,7 +84,7 @@ public abstract class BaseMemberCompiler implements MemberVisitor<Void> {
 			output.append("abstract ");
 		if (Modifiers.isStatic(modifiers))
 			output.append("static ");
-		if (Modifiers.isFinal(modifiers))
+		if (Modifiers.isFinal(modifiers) && !definition.isInterface())
 			output.append("final ");
 	}
 	

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/FormattingUtils.java

@@ -45,7 +45,7 @@ public class FormattingUtils {
 		}
 	}
 	
-	public static void formatCall(StringBuilder result, StatementFormattingTarget target, JavaSourceStatementScope scope, CallArguments arguments) {
+	public static void formatCall(StringBuilder result, StatementFormattingTarget target, JavaSourceStatementScope scope, String name, CallArguments arguments) {
 		if (arguments == null || arguments.typeArguments == null)
 			throw new IllegalArgumentException("Arguments cannot be null!");
 		
@@ -61,6 +61,7 @@ public class FormattingUtils {
 			}
 			result.append(">");
 		}
+		result.append(name);
 		result.append("(");
 		int index = 0;
 		for (Expression argument : arguments.arguments) {

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/JavaMemberCompiler.java

@@ -35,7 +35,6 @@ import org.openzen.zenscript.codemodel.statement.BlockStatement;
 import org.openzen.zenscript.codemodel.statement.EmptyStatement;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.codemodel.type.member.BuiltinID;
 import org.openzen.zenscript.codemodel.type.storage.UniqueStorageTag;
 import org.openzen.zenscript.javasource.scope.JavaSourceFileScope;
 import org.openzen.zenscript.javashared.JavaClass;

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/JavaSourceExpressionFormatter.java

@@ -203,8 +203,7 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 				StringBuilder output = new StringBuilder();
 				output.append(getValue(target).value);
 				output.append('.');
-				output.append(method.name);
-				FormattingUtils.formatCall(output, this.target, scope, arguments);
+				FormattingUtils.formatCall(output, this.target, scope, method.name, arguments);
 				return new ExpressionString(output.toString(), JavaOperator.CALL);
 			}
 			default:
@@ -227,8 +226,7 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 		StringBuilder result = new StringBuilder();
 		result.append(scope.type(method.cls));
 		result.append('.');
-		result.append(method.name);
-		FormattingUtils.formatCall(result, target, scope, expression.arguments);
+		FormattingUtils.formatCall(result, target, scope, method.name, expression.arguments);
 		return new ExpressionString(result.toString(), JavaOperator.CALL);
 	}
 
@@ -394,16 +392,14 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 	@Override
 	public ExpressionString visitConstructorThisCall(ConstructorThisCallExpression expression) {
 		StringBuilder result = new StringBuilder();
-		result.append("this");
-		FormattingUtils.formatCall(result, target, scope, expression.arguments);
+		FormattingUtils.formatCall(result, target, scope, "this", expression.arguments);
 		return new ExpressionString(result.toString(), JavaOperator.PRIMARY);
 	}
 
 	@Override
 	public ExpressionString visitConstructorSuperCall(ConstructorSuperCallExpression expression) {
 		StringBuilder result = new StringBuilder();
-		result.append("super");
-		FormattingUtils.formatCall(result, target, scope, expression.arguments);
+		FormattingUtils.formatCall(result, target, scope, "super", expression.arguments);
 		return new ExpressionString(result.toString(), JavaOperator.PRIMARY);
 	}
 
@@ -500,8 +496,7 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 	@Override
 	public ExpressionString visitGlobalCall(GlobalCallExpression expression) {
 		StringBuilder result = new StringBuilder();
-		result.append(expression.name);
-		FormattingUtils.formatCall(result, target, scope, expression.arguments);
+		FormattingUtils.formatCall(result, target, scope, expression.name, expression.arguments);
 		return new ExpressionString(result.toString(), JavaOperator.PRIMARY);
 	}
 
@@ -566,15 +561,14 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 				StringBuilder output = new StringBuilder();
 				output.append(scope.type(method.cls));
 				output.append('.');
-				output.append(method.name);
-				FormattingUtils.formatCall(output, this.target, scope, expression.arguments);
+				FormattingUtils.formatCall(output, this.target, scope, method.name, expression.arguments);
 				return new ExpressionString(output.toString(), JavaOperator.CALL);
 			}
 			case CONSTRUCTOR: {
 				StringBuilder output = new StringBuilder();
 				output.append("new ");
 				output.append(scope.type(expression.type, method.cls));
-				FormattingUtils.formatCall(output, this.target, scope, expression.arguments);
+				FormattingUtils.formatCall(output, this.target, scope, "", expression.arguments);
 				return new ExpressionString(output.toString(), JavaOperator.PRIMARY);
 			}
 			default:
@@ -663,9 +657,10 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 
 	@Override
 	public ExpressionString visitSetter(SetterExpression expression) {
+		JavaMethod setter = context.getJavaMethod(expression.setter);
 		return new ExpressionString(
-				getValue(expression.target) + "." + expression.setter.member.name + " = " + expression.value.accept(this),
-				JavaOperator.ASSIGN);
+				getValue(expression.target) + "." + setter.name + "(" + expression.value.accept(this) + ")",
+				JavaOperator.CALL);
 	}
 
 	@Override
@@ -771,7 +766,7 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 		
 		StringBuilder result = new StringBuilder();
 		result.append("new ").append(scope.type(option.variantOptionClass));
-		FormattingUtils.formatCall(result, this.target, scope, new CallArguments(expression.arguments));
+		FormattingUtils.formatCall(result, this.target, scope, "", new CallArguments(expression.arguments));
 		return new ExpressionString(result.toString(), JavaOperator.PRIMARY);
 	}
 

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/TestInterface.java

@@ -0,0 +1,17 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.scriptingexample;
+
+import org.openzen.zencode.java.ZenCodeType;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface TestInterface extends ZenCodeType {
+	@Method
+	String interfaceMethod();
+}

DrawableGui/src/main/java/org/openzen/drawablegui/live/LiveConcatList.java → Shared/src/main/java/live/LiveConcatList.java

@@ -3,18 +3,17 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.drawablegui.live;
+package live;
 
 import java.util.Iterator;
-import org.openzen.drawablegui.Destructible;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.listeners.ListenerList;
+import listeners.ListenerHandle;
+import listeners.ListenerList;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public class LiveConcatList<T> implements Destructible, LiveList<T> {
+public class LiveConcatList<T> implements AutoCloseable, LiveList<T> {
 	private final ListenerList<Listener<T>> listeners = new ListenerList<>();
 	private final LiveList<T> a;
 	private final LiveList<T> b;
@@ -43,17 +42,17 @@ public class LiveConcatList<T> implements Destructible, LiveList<T> {
 			return result;
 		
 		result = b.indexOf(value);
-		return result < 0 ? -1 : result + a.size();
+		return result < 0 ? -1 : result + a.getLength();
 	}
 
 	@Override
-	public int size() {
-		return a.size() + b.size();
+	public int getLength() {
+		return a.getLength() + b.getLength();
 	}
 
 	@Override
-	public T get(int index) {
-		return index < a.size() ? a.get(index) : b.get(index - a.size());
+	public T getAt(int index) {
+		return index < a.getLength() ? a.getAt(index) : b.getAt(index - a.getLength());
 	}
 
 	@Override
@@ -114,17 +113,17 @@ public class LiveConcatList<T> implements Destructible, LiveList<T> {
 	private class SecondListListener implements Listener<T> {
 		@Override
 		public void onInserted(int index, T value) {
-			listeners.accept(listener -> listener.onInserted(a.size() + index, value));
+			listeners.accept(listener -> listener.onInserted(a.getLength() + index, value));
 		}
 
 		@Override
 		public void onChanged(int index, T oldValue, T newValue) {
-			listeners.accept(listener -> listener.onChanged(a.size() + index, oldValue, newValue));
+			listeners.accept(listener -> listener.onChanged(a.getLength() + index, oldValue, newValue));
 		}
 
 		@Override
 		public void onRemoved(int index, T oldValue) {
-			listeners.accept(listener -> listener.onRemoved(a.size() + index, oldValue));
+			listeners.accept(listener -> listener.onRemoved(a.getLength() + index, oldValue));
 		}
 	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/live/LiveEmptyList.java → Shared/src/main/java/live/LiveEmptyList.java

@@ -3,12 +3,12 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.drawablegui.live;
+package live;
 
 import java.util.Collections;
 import java.util.Iterator;
-import org.openzen.drawablegui.listeners.DummyListenerHandle;
-import org.openzen.drawablegui.listeners.ListenerHandle;
+import listeners.DummyListenerHandle;
+import listeners.ListenerHandle;
 
 /**
  *
@@ -32,12 +32,12 @@ public class LiveEmptyList<T> implements LiveList<T> {
 	}
 	
 	@Override
-	public int size() {
+	public int getLength() {
 		return 0;
 	}
 	
 	@Override
-	public T get(int index) {
+	public T getAt(int index) {
 		throw new ArrayIndexOutOfBoundsException(index);
 	}
 

DrawableGui/src/main/java/org/openzen/drawablegui/live/LiveMappedList.java → Shared/src/main/java/live/LiveMappedList.java

@@ -3,21 +3,17 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.drawablegui.live;
+package live;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.function.Function;
-import org.openzen.drawablegui.Destructible;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.listeners.ListenerList;
+import listeners.ListenerHandle;
+import listeners.ListenerList;
 
-/**
- *
- * @author Hoofdgebruiker
- */
-public class LiveMappedList<T, U> implements Destructible, LiveList<U> {
+// TODO: rewrite to zencode
+public class LiveMappedList<T, U> implements AutoCloseable, LiveList<U> {
 	private final ListenerList<Listener<U>> listeners = new ListenerList<>();
 	private final Function<T, U> projection;
 	private final List<U> mapped;
@@ -43,12 +39,12 @@ public class LiveMappedList<T, U> implements Destructible, LiveList<U> {
 	}
 	
 	@Override
-	public int size() {
+	public int getLength() {
 		return mapped.size();
 	}
 
 	@Override
-	public U get(int index) {
+	public U getAt(int index) {
 		return mapped.get(index);
 	}
 

DrawableGui/src/main/java/org/openzen/drawablegui/live/LivePredicateBool.java → Shared/src/main/java/live/LivePredicateBool.java

@@ -3,22 +3,20 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.drawablegui.live;
+package live;
 
+import java.util.function.BiConsumer;
 import java.util.function.Predicate;
-import org.openzen.drawablegui.Destructible;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.listeners.ListenerList;
+import listeners.ListenerHandle;
+import listeners.ListenerList;
+import zsynthetic.FunctionBoolBoolToVoid;
 
-/**
- *
- * @author Hoofdgebruiker
- */
-public class LivePredicateBool<T> implements LiveBool, Destructible, LiveObject.Listener<T> {
-	private final ListenerList<LiveBool.Listener> listeners = new ListenerList<>();
+// TODO: rewrite to zencode
+public class LivePredicateBool<T> implements LiveBool, AutoCloseable, BiConsumer<T, T> {
+	private final ListenerList<FunctionBoolBoolToVoid> listeners = new ListenerList<>();
 	private final LiveObject<T> source;
 	private final Predicate<T> predicate;
-	private final ListenerHandle<LiveObject.Listener<T>> sourceListener;
+	private final ListenerHandle<BiConsumer<T, T>> sourceListener;
 	private boolean value;
 	
 	public LivePredicateBool(LiveObject<T> source, Predicate<T> predicate) {
@@ -39,7 +37,7 @@ public class LivePredicateBool<T> implements LiveBool, Destructible, LiveObject.
 	}
 
 	@Override
-	public ListenerHandle<Listener> addListener(Listener listener) {
+	public ListenerHandle<FunctionBoolBoolToVoid> addListener(FunctionBoolBoolToVoid listener) {
 		return listeners.add(listener);
 	}
 	
@@ -49,11 +47,11 @@ public class LivePredicateBool<T> implements LiveBool, Destructible, LiveObject.
 		
 		boolean oldValue = this.value;
 		this.value = value;
-		listeners.accept(listener -> listener.onChanged(oldValue, value));
+		listeners.accept(listener -> listener.invoke(oldValue, value));
 	}
 
 	@Override
-	public void onUpdated(T oldValue, T newValue) {
+	public void accept(T oldValue, T newValue) {
 		setValueInternal(predicate.test(newValue));
 	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/live/LivePrefixedList.java → Shared/src/main/java/live/LivePrefixedList.java

@@ -1,18 +1,10 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.openzen.drawablegui.live;
+package live;
 
 import java.util.Iterator;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.listeners.ListenerList;
+import listeners.ListenerHandle;
+import listeners.ListenerList;
 
-/**
- *
- * @author Hoofdgebruiker
- */
+// TODO: convert to zencode
 public class LivePrefixedList<T> implements LiveList<T> {
 	private final ListenerList<Listener<T>> listeners = new ListenerList<>();
 	private final T prefix;
@@ -73,13 +65,13 @@ public class LivePrefixedList<T> implements LiveList<T> {
 	}
 
 	@Override
-	public int size() {
-		return values.size() + 1;
+	public int getLength() {
+		return values.getLength() + 1;
 	}
 	
 	@Override
-	public T get(int index) {
-		return index == 0 ? prefix : values.get(index);
+	public T getAt(int index) {
+		return index == 0 ? prefix : values.getAt(index);
 	}
 
 	@Override

Shared/src/main/java/live/MutableLiveBool.java

@@ -2,8 +2,8 @@ package live;
 
 public interface MutableLiveBool extends LiveBool {
     void setValue(boolean value);
-	
-	default void toggle() {
-		setValue(!getValue());
-	}
+    
+    default void toggle() {
+        this.setValue(!getValue());
+    }
 }

Shared/src/main/java/live/MutableLiveObject.java

@@ -0,0 +1,6 @@
+package live;
+
+// TODO: write in ZenCode
+public interface MutableLiveObject<T> extends LiveObject<T> {
+	public void setValue(T value);
+}

Shared/src/main/java/live/SimpleLiveObject.java

@@ -0,0 +1,35 @@
+package live;
+
+import java.util.function.BiConsumer;
+import listeners.ListenerHandle;
+import listeners.ListenerList;
+
+// TODO: write in ZenCode
+public class SimpleLiveObject<T> implements MutableLiveObject<T> {
+	private final ListenerList<BiConsumer<T, T>> listeners = new ListenerList<>();
+	private T value;
+	
+	public SimpleLiveObject(T value) {
+		this.value = value;
+	}
+	
+	@Override
+	public T getValue() {
+		return value;
+	}
+	
+	@Override
+	public void setValue(T value) {
+		if (value == this.value)
+			return;
+		
+		T oldValue = this.value;
+		this.value = value;
+		listeners.accept(listener -> listener.accept(oldValue, value));
+	}
+	
+	@Override
+	public ListenerHandle<BiConsumer<T, T>> addListener(BiConsumer<T, T> listener) {
+		return listeners.add(listener);
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/live/SortedLiveList.java → Shared/src/main/java/live/SortedLiveList.java

@@ -3,15 +3,16 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.drawablegui.live;
+package live;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.listeners.ListenerList;
+
+import listeners.ListenerHandle;
+import listeners.ListenerList;
 
 /**
  *
@@ -48,12 +49,12 @@ public class SortedLiveList<T> implements LiveList<T>, LiveList.Listener<T> {
 	}
 
 	@Override
-	public int size() {
+	public int getLength() {
 		return sorted.size();
 	}
 
 	@Override
-	public T get(int index) {
+	public T getAt(int index) {
 		return sorted.get(index);
 	}
 

Shared/src/main/java/org/openzen/zencode/shared/CompileException.java

@@ -8,12 +8,12 @@ public final class CompileException extends Exception {
     public final CodePosition position;
     public final CompileExceptionCode code;
     public final String message;
-	
+    
     public CompileException(CodePosition position, CompileExceptionCode code, String message) {
         super(position.toString() + ": [" + code.toString() + "] " + message);
         this.position = position;
         this.code = code;
-		this.message = message;
+        this.message = message;
     }
     
     public CodePosition getPosition() {
@@ -23,4 +23,8 @@ public final class CompileException extends Exception {
     public CompileExceptionCode getCode() {
         return code;
     }
+    
+    public String getMessage() {
+        return message;
+    }
 }