From db3da1554d102f931861ef5ecc0a9213eba97737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <hruskon5@fel.cvut.cz>
Date: Sat, 19 Apr 2014 03:43:18 +0200
Subject: [PATCH] WorldMap now successfully IONIZABLE!

---
 fuck.ion                                      | Bin 0 -> 140 bytes
 hello.ion                                     | Bin 0 -> 8204 bytes
 maptest.ion                                   | Bin 0 -> 282 bytes
 moo.ion                                       | Bin 0 -> 50 bytes
 .../render/textures/FilteredTexture.java      |   1 -
 src/mightypork/rogue/App.java                 |   3 +
 .../rogue/screens/CrossfadeOverlay.java       |   4 +-
 .../rogue/screens/CrossfadeRequest.java       |   2 +-
 .../rogue/screens/ingame/GameGui.java         |  24 +--
 .../rogue/screens/ingame/HeartBar.java        |  18 +-
 .../rogue/screens/ingame/NavItemSlot.java     |  17 +-
 .../rogue/screens/ingame/ScreenGame.java      |   6 +-
 .../rogue/screens/main_menu/MenuLayer.java    |  20 ++-
 src/mightypork/rogue/world/Entity.java        |   9 +
 src/mightypork/rogue/world/EntityModel.java   |   7 +-
 src/mightypork/rogue/world/WorldMap.java      |  60 ++++++-
 src/mightypork/rogue/world/item/ItemData.java |   2 +-
 src/mightypork/rogue/world/item/Items.java    |   2 +-
 src/mightypork/rogue/world/tile/Tile.java     |  16 +-
 src/mightypork/rogue/world/tile/TileData.java |   6 +-
 src/mightypork/rogue/world/tile/Tiles.java    |   2 +-
 src/mightypork/test/FakeTile.java             |  84 ++++++++++
 src/mightypork/test/TestIonArray.java         |   4 +-
 src/mightypork/test/TestIonArray2.java        |  30 ++--
 src/mightypork/test/TestPerlin.java           |  12 +-
 src/mightypork/test/TestTileMap.java          |  46 ++++++
 .../constraints/num/mutable/NumAnimated.java  |   3 +-
 .../util/control/timing/TimedTask.java        |  18 +-
 src/mightypork/util/files/ion/Ion.java        |  84 +++++-----
 .../util/files/ion/IonDataBundle.java         |   2 -
 src/mightypork/util/math/noise/NoiseGen.java  |   2 +-
 .../util/math/noise/PerlinNoiseGenerator.java | 154 +++++++++---------
 32 files changed, 413 insertions(+), 225 deletions(-)
 create mode 100644 fuck.ion
 create mode 100644 hello.ion
 create mode 100644 maptest.ion
 create mode 100644 moo.ion
 create mode 100644 src/mightypork/test/FakeTile.java
 create mode 100644 src/mightypork/test/TestTileMap.java

diff --git a/fuck.ion b/fuck.ion
new file mode 100644
index 0000000000000000000000000000000000000000..44b42b221823e172fc3a7f2bf8e2baef8d7ef705
GIT binary patch
literal 140
zcmW-YK?;Ik7zM|)G~Bgn`MdH8Zp8!_qM=53p*lv;Ngd@e@Oa;RKn_H5l2{Ts%SBSj
y<Vy7U@%>l!8yzjZ83{aiNo#w%*DTB~Prdu$P2NhkpgkO3V;lVr+LNhSDfVm!i4EHT

literal 0
HcmV?d00001

diff --git a/hello.ion b/hello.ion
new file mode 100644
index 0000000000000000000000000000000000000000..40c6801324a99c4044733491dd94b65000f579b8
GIT binary patch
literal 8204
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

literal 0
HcmV?d00001

diff --git a/maptest.ion b/maptest.ion
new file mode 100644
index 0000000000000000000000000000000000000000..f5fd464b295655a258fac677d40ce35a4e8a8cf3
GIT binary patch
literal 282
zcmZSD$H2hA1;#c&5(HS8_5evnAZBK8WN>0|2D1J$fMh{p40vTZamq3QwX)-sWdWIv
VSC$R0EN*+*@Y)NK<-lsPEdbs58a)62

literal 0
HcmV?d00001

diff --git a/moo.ion b/moo.ion
new file mode 100644
index 0000000000000000000000000000000000000000..bb41aa681c7cb728b70bac3002524d88e7046975
GIT binary patch
literal 50
rcmZSJV_;z524Y4aW&&bnAZ7t#Rv=~rVs;?r0AfxC#<uwk?Tah`5t{<e

literal 0
HcmV?d00001

diff --git a/src/mightypork/gamecore/render/textures/FilteredTexture.java b/src/mightypork/gamecore/render/textures/FilteredTexture.java
index f9cad9d..a686255 100644
--- a/src/mightypork/gamecore/render/textures/FilteredTexture.java
+++ b/src/mightypork/gamecore/render/textures/FilteredTexture.java
@@ -11,7 +11,6 @@ import org.newdawn.slick.opengl.Texture;
  */
 public interface FilteredTexture extends Texture {
 	
-	
 	/**
 	 * Set filter for scaling
 	 * 
diff --git a/src/mightypork/rogue/App.java b/src/mightypork/rogue/App.java
index c1f4df8..0428f9c 100644
--- a/src/mightypork/rogue/App.java
+++ b/src/mightypork/rogue/App.java
@@ -22,6 +22,7 @@ import mightypork.rogue.screens.main_menu.ScreenMainMenu;
 import mightypork.rogue.screens.test_bouncyboxes.ScreenTestBouncy;
 import mightypork.rogue.screens.test_cat_sound.ScreenTestCat;
 import mightypork.rogue.screens.test_render.ScreenTestRender;
+import mightypork.rogue.world.WorldMap;
 import mightypork.rogue.world.item.Item;
 import mightypork.rogue.world.tile.Tile;
 import mightypork.util.control.eventbus.EventBus;
@@ -107,8 +108,10 @@ public final class App extends BaseApp {
 	{
 		Ion.registerIonizable(Tile.ION_MARK, Tile.class);
 		Ion.registerIonizable(Item.ION_MARK, Item.class);
+		Ion.registerIonizable(WorldMap.ION_MARK, WorldMap.class);
 	}
 	
+	
 	@Override
 	protected File getLockFile()
 	{
diff --git a/src/mightypork/rogue/screens/CrossfadeOverlay.java b/src/mightypork/rogue/screens/CrossfadeOverlay.java
index 09137d8..caf3457 100644
--- a/src/mightypork/rogue/screens/CrossfadeOverlay.java
+++ b/src/mightypork/rogue/screens/CrossfadeOverlay.java
@@ -26,7 +26,7 @@ public class CrossfadeOverlay extends Overlay implements CrossfadeRequest.Listen
 		@Override
 		public void run()
 		{
-			if(requestedScreenName == null) shutdown();
+			if (requestedScreenName == null) shutdown();
 			getEventBus().send(new ScreenRequestEvent(requestedScreenName));
 		}
 	};
@@ -45,7 +45,7 @@ public class CrossfadeOverlay extends Overlay implements CrossfadeRequest.Listen
 	public CrossfadeOverlay(AppAccess app) {
 		super(app);
 		
-		QuadPainter qp = new QuadPainter(color);
+		final QuadPainter qp = new QuadPainter(color);
 		qp.setRect(root);
 		root.add(qp);
 		
diff --git a/src/mightypork/rogue/screens/CrossfadeRequest.java b/src/mightypork/rogue/screens/CrossfadeRequest.java
index 9e13f36..c4742d1 100644
--- a/src/mightypork/rogue/screens/CrossfadeRequest.java
+++ b/src/mightypork/rogue/screens/CrossfadeRequest.java
@@ -9,7 +9,7 @@ import mightypork.util.control.eventbus.events.Event;
  */
 public class CrossfadeRequest implements Event<CrossfadeRequest.Listener> {
 	
-	private String screen;
+	private final String screen;
 	
 	
 	/**
diff --git a/src/mightypork/rogue/screens/ingame/GameGui.java b/src/mightypork/rogue/screens/ingame/GameGui.java
index 0ee95d3..77681b3 100644
--- a/src/mightypork/rogue/screens/ingame/GameGui.java
+++ b/src/mightypork/rogue/screens/ingame/GameGui.java
@@ -19,35 +19,35 @@ public class GameGui extends ScreenLayer {
 	public GameGui(Screen screen) {
 		super(screen);
 		
-		Num h = root.height();
-		Num w = root.width();
-		Num minWH = w.min(h).max(700); // avoid too small shrinking
+		final Num h = root.height();
+		final Num w = root.width();
+		final Num minWH = w.min(h).max(700); // avoid too small shrinking
 		
-		Component qp = new QuadPainter(PAL16.VOID);
+		final Component qp = new QuadPainter(PAL16.VOID);
 		qp.setRect(root);
 		root.add(qp);
 		
-		ImagePainter nav = new ImagePainter(Res.getTxQuad("panel"));
+		final ImagePainter nav = new ImagePainter(Res.getTxQuad("panel"));
 		nav.setRect(root.bottomEdge().growUp(minWH.perc(7)));
 		root.add(nav);
 		
-		HorizontalFixedFlowLayout itemSlots = new HorizontalFixedFlowLayout(root, nav.height().mul(1.8), AlignX.LEFT);
+		final HorizontalFixedFlowLayout itemSlots = new HorizontalFixedFlowLayout(root, nav.height().mul(1.8), AlignX.LEFT);
 		itemSlots.setRect(nav.growUp(nav.height()).move(nav.height().mul(0.2), nav.height().mul(-0.2)));
 		root.add(itemSlots);
 		
 		itemSlots.add(new NavItemSlot(Res.getTxQuad("meat")));
 		itemSlots.add(new NavItemSlot(Res.getTxQuad("sword")));
 		
-		Rect shrunk = root.shrink(minWH.perc(3));
-		Num displays_height = minWH.perc(6);
+		final Rect shrunk = root.shrink(minWH.perc(3));
+		final Num displays_height = minWH.perc(6);
 		
-		HeartBar hearts = new HeartBar(6, 3, Res.getTxQuad("heart_on"), Res.getTxQuad("heart_off"), AlignX.LEFT);
-		Rect hearts_box = shrunk.topLeft().startRect().growDown(displays_height);
+		final HeartBar hearts = new HeartBar(6, 3, Res.getTxQuad("heart_on"), Res.getTxQuad("heart_off"), AlignX.LEFT);
+		final Rect hearts_box = shrunk.topLeft().startRect().growDown(displays_height);
 		hearts.setRect(hearts_box);
 		root.add(hearts);
 		
-		HeartBar experience = new HeartBar(6, 2, Res.getTxQuad("xp_on"), Res.getTxQuad("xp_off"), AlignX.RIGHT);
-		Rect xp_box = shrunk.topRight().startRect().growDown(displays_height);
+		final HeartBar experience = new HeartBar(6, 2, Res.getTxQuad("xp_on"), Res.getTxQuad("xp_off"), AlignX.RIGHT);
+		final Rect xp_box = shrunk.topRight().startRect().growDown(displays_height);
 		experience.setRect(xp_box);
 		root.add(experience);
 	}
diff --git a/src/mightypork/rogue/screens/ingame/HeartBar.java b/src/mightypork/rogue/screens/ingame/HeartBar.java
index bd94b96..f37da5d 100644
--- a/src/mightypork/rogue/screens/ingame/HeartBar.java
+++ b/src/mightypork/rogue/screens/ingame/HeartBar.java
@@ -12,10 +12,10 @@ import mightypork.util.constraints.rect.Rect;
 
 public class HeartBar extends VisualComponent {
 	
-	private TxQuad img_on;
-	private TxQuad img_off;
-	private int total;
-	private int active;
+	private final TxQuad img_on;
+	private final TxQuad img_off;
+	private final int total;
+	private final int active;
 	
 	NumVar index = new NumVar(0);
 	Rect heart;
@@ -26,7 +26,7 @@ public class HeartBar extends VisualComponent {
 	 * @param active
 	 * @param img_on
 	 * @param img_off
-	 * @param align 
+	 * @param align
 	 */
 	public HeartBar(int total, int active, TxQuad img_on, TxQuad img_off, AlignX align) {
 		super();
@@ -35,18 +35,18 @@ public class HeartBar extends VisualComponent {
 		this.img_on = img_on;
 		this.img_off = img_off;
 		
-		Num h = height();
-		Num w = width();
+		final Num h = height();
+		final Num w = width();
 		
 		switch (align) {
 			case LEFT:
 				heart = leftEdge().growRight(h).moveX(index.mul(h));
 				break;
 			case RIGHT:
-				heart = rightEdge().growLeft(h).moveX(h.mul(-total+1).add(index.mul(h)));
+				heart = rightEdge().growLeft(h).moveX(h.mul(-total + 1).add(index.mul(h)));
 				break;
 			case CENTER:
-				heart = leftEdge().moveX(w.half().add(h.mul(-total/2D))).growRight(h).moveX(index.mul(h));
+				heart = leftEdge().moveX(w.half().add(h.mul(-total / 2D))).growRight(h).moveX(index.mul(h));
 				break;
 		}
 		
diff --git a/src/mightypork/rogue/screens/ingame/NavItemSlot.java b/src/mightypork/rogue/screens/ingame/NavItemSlot.java
index bbddf25..bf34d48 100644
--- a/src/mightypork/rogue/screens/ingame/NavItemSlot.java
+++ b/src/mightypork/rogue/screens/ingame/NavItemSlot.java
@@ -1,8 +1,8 @@
 package mightypork.rogue.screens.ingame;
 
 
+import mightypork.gamecore.control.events.MouseMotionEvent;
 import mightypork.gamecore.gui.components.ClickableComponent;
-import mightypork.gamecore.gui.components.InputComponent;
 import mightypork.gamecore.render.Render;
 import mightypork.gamecore.render.textures.TxQuad;
 import mightypork.rogue.Res;
@@ -13,15 +13,14 @@ import mightypork.util.constraints.rect.caching.RectCache;
 import mightypork.util.constraints.vect.Vect;
 import mightypork.util.control.timing.Updateable;
 import mightypork.util.math.Easing;
-import mightypork.gamecore.control.events.MouseMotionEvent;
 
 
 public class NavItemSlot extends ClickableComponent implements MouseMotionEvent.Listener, Updateable {
 	
-	private TxQuad image;
-	private TxQuad frame;
-	private RectCache paintBox;
-	private NumAnimated yOffset;
+	private final TxQuad image;
+	private final TxQuad frame;
+	private final RectCache paintBox;
+	private final NumAnimated yOffset;
 	private boolean wasInside = false;
 	
 	
@@ -29,11 +28,11 @@ public class NavItemSlot extends ClickableComponent implements MouseMotionEvent.
 		this.image = image;
 		this.frame = Res.getTxQuad("item_frame");
 		
-		Rect ref = shrink(height().perc(8));
+		final Rect ref = shrink(height().perc(8));
 		yOffset = new NumAnimated(0, Easing.LINEAR);
 		yOffset.setDefaultDuration(0.05);
 		
-		Num h = ref.width().min(ref.height());
+		final Num h = ref.width().min(ref.height());
 		this.paintBox = ref.bottomLeft().startRect().grow(Num.ZERO, h, h, Num.ZERO).moveY(yOffset.mul(h.perc(-5))).cached();
 	}
 	
@@ -61,7 +60,7 @@ public class NavItemSlot extends ClickableComponent implements MouseMotionEvent.
 	
 	@Override
 	public void receive(MouseMotionEvent event)
-	{		
+	{
 		if (event.getPos().isInside(this) != wasInside) {
 			if (wasInside) {
 				// left
diff --git a/src/mightypork/rogue/screens/ingame/ScreenGame.java b/src/mightypork/rogue/screens/ingame/ScreenGame.java
index 3acb8f1..d995bc4 100644
--- a/src/mightypork/rogue/screens/ingame/ScreenGame.java
+++ b/src/mightypork/rogue/screens/ingame/ScreenGame.java
@@ -1,17 +1,19 @@
 package mightypork.rogue.screens.ingame;
 
+
 import mightypork.gamecore.control.AppAccess;
 import mightypork.gamecore.gui.screens.LayeredScreen;
 
 
 public class ScreenGame extends LayeredScreen {
-
+	
 	public ScreenGame(AppAccess app) {
 		super(app);
 		
 		addLayer(new GameGui(this));
 	}
-
+	
+	
 	@Override
 	public String getName()
 	{
diff --git a/src/mightypork/rogue/screens/main_menu/MenuLayer.java b/src/mightypork/rogue/screens/main_menu/MenuLayer.java
index f813825..c69d4c0 100644
--- a/src/mightypork/rogue/screens/main_menu/MenuLayer.java
+++ b/src/mightypork/rogue/screens/main_menu/MenuLayer.java
@@ -1,7 +1,6 @@
 package mightypork.rogue.screens.main_menu;
 
 
-import mightypork.gamecore.control.events.ScreenRequestEvent;
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.layout.GridLayout;
 import mightypork.gamecore.gui.components.painters.QuadPainter;
@@ -9,8 +8,6 @@ import mightypork.gamecore.gui.components.painters.TextPainter;
 import mightypork.gamecore.gui.screens.BaseScreen;
 import mightypork.gamecore.gui.screens.ScreenLayer;
 import mightypork.rogue.Res;
-import mightypork.rogue.events.ActionRequest;
-import mightypork.rogue.events.ActionRequest.RequestType;
 import mightypork.rogue.screens.CrossfadeRequest;
 import mightypork.util.constraints.num.Num;
 import mightypork.util.constraints.rect.Rect;
@@ -49,13 +46,18 @@ class MenuLayer extends ScreenLayer {
 		b3 = new MenuButton("Flying Cat", PAL16.PIGMEAT);
 		b4 = new MenuButton("Bye!", PAL16.BLOODRED);
 		
-		int r=0;
+		int r = 0;
 		
-		layout.put(tp, r, 0, 4, 1); r += 5;
-		layout.put(b0, r, 0, 2, 1); r += 3;
-		layout.put(b1, r, 0, 2, 1); r += 2;
-		layout.put(b2, r, 0, 2, 1); r += 2;
-		layout.put(b3, r, 0, 2, 1); r += 3;
+		layout.put(tp, r, 0, 4, 1);
+		r += 5;
+		layout.put(b0, r, 0, 2, 1);
+		r += 3;
+		layout.put(b1, r, 0, 2, 1);
+		r += 2;
+		layout.put(b2, r, 0, 2, 1);
+		r += 2;
+		layout.put(b3, r, 0, 2, 1);
+		r += 3;
 		layout.put(b4, r, 0, 2, 1);
 		
 		root.add(layout);
diff --git a/src/mightypork/rogue/world/Entity.java b/src/mightypork/rogue/world/Entity.java
index 6e6ac55..3d8bdf5 100644
--- a/src/mightypork/rogue/world/Entity.java
+++ b/src/mightypork/rogue/world/Entity.java
@@ -57,6 +57,15 @@ public abstract class Entity<D, M extends EntityModel<D, R>, R extends RectBound
 	}
 	
 	
+	/**
+	 * @return data
+	 */
+	public final D getData()
+	{
+		return data;
+	}
+	
+	
 	/**
 	 * @return entity model
 	 */
diff --git a/src/mightypork/rogue/world/EntityModel.java b/src/mightypork/rogue/world/EntityModel.java
index b7ac5f9..a4597c8 100644
--- a/src/mightypork/rogue/world/EntityModel.java
+++ b/src/mightypork/rogue/world/EntityModel.java
@@ -1,6 +1,7 @@
 package mightypork.rogue.world;
 
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
@@ -57,8 +58,9 @@ public abstract class EntityModel<D, R extends RectBound> {
 	 * 
 	 * @param data data to load
 	 * @param in input stream
+	 * @throws IOException
 	 */
-	public abstract void load(D data, InputStream in);
+	public abstract void load(D data, InputStream in) throws IOException;
 	
 	
 	/**
@@ -66,9 +68,10 @@ public abstract class EntityModel<D, R extends RectBound> {
 	 * 
 	 * @param data data to save
 	 * @param out output stream
+	 * @throws IOException
 	 */
 	@DefaultImpl
-	public abstract void save(D data, OutputStream out);
+	public abstract void save(D data, OutputStream out) throws IOException;
 	
 	
 	/**
diff --git a/src/mightypork/rogue/world/WorldMap.java b/src/mightypork/rogue/world/WorldMap.java
index 93b4fc3..48289c8 100644
--- a/src/mightypork/rogue/world/WorldMap.java
+++ b/src/mightypork/rogue/world/WorldMap.java
@@ -13,12 +13,19 @@ import mightypork.util.files.ion.Ionizable;
 
 public class WorldMap implements TileHolder, Ionizable {
 	
+	public static final int ION_MARK = 702;
+	
 	private int width, height;
 	
 	/** Array of tiles [y][x] */
 	private Tile[][] tiles;
 	
 	
+	public WorldMap() {
+		// constructor for ION
+	}
+	
+	
 	public WorldMap(int width, int height) {
 		this.width = width;
 		this.height = height;
@@ -33,27 +40,33 @@ public class WorldMap implements TileHolder, Ionizable {
 	
 	
 	@Override
-	public Tile getTile(int x, int y)
+	public final Tile getTile(int x, int y)
 	{
 		return tiles[y][x];
 	}
 	
 	
-	public void setTile(Tile tile, int x, int y)
+	public final void setTile(int tileId, int x, int y)
+	{
+		setTile(new Tile(tileId), x, y);
+	}
+	
+	
+	public final void setTile(Tile tile, int x, int y)
 	{
 		tiles[y][x] = tile;
 	}
 	
 	
 	@Override
-	public int getWidth()
+	public final int getWidth()
 	{
 		return width;
 	}
 	
 	
 	@Override
-	public int getHeight()
+	public final int getHeight()
 	{
 		return height;
 	}
@@ -67,23 +80,52 @@ public class WorldMap implements TileHolder, Ionizable {
 		
 		buildArray();
 		
-		short mark;
-		
-		mark = Ion.readMark(in);
-		if(mark == Ion.START);
+		while (true) {
+			final short mark = Ion.readMark(in);
+			if (mark == Ion.END) {
+				break;
+			} else if (mark == Ion.ENTRY) {
+				
+				final int x = Ion.readInt(in);
+				final int y = Ion.readInt(in);
+				
+				final Tile tile = (Tile) Ion.readObject(in);
+				
+				setTile(tile, x, y);
+				
+			} else {
+				throw new IOException("Invalid mark encountered while reading tile map.");
+			}
+		}
 	}
 	
 	
 	@Override
 	public void saveTo(OutputStream out) throws IOException
 	{
+		Ion.writeInt(out, width);
+		Ion.writeInt(out, height);
+		
+		for (int x = 0; x < width; x++) {
+			for (int y = 0; y < height; y++) {
+				final Tile t = getTile(x, y);
+				if (t != null) {
+					Ion.writeMark(out, Ion.ENTRY);
+					Ion.writeInt(out, x);
+					Ion.writeInt(out, y);
+					Ion.writeObject(out, t);
+				}
+			}
+		}
+		
+		Ion.writeMark(out, Ion.END);
 	}
 	
 	
 	@Override
 	public short getIonMark()
 	{
-		return 0;
+		return ION_MARK;
 	}
 	
 }
diff --git a/src/mightypork/rogue/world/item/ItemData.java b/src/mightypork/rogue/world/item/ItemData.java
index 1e6e835..dc65a38 100644
--- a/src/mightypork/rogue/world/item/ItemData.java
+++ b/src/mightypork/rogue/world/item/ItemData.java
@@ -2,7 +2,7 @@ package mightypork.rogue.world.item;
 
 
 /**
- * Item data object. Can be extended for particular models' needs.
+ * Item data object.
  * 
  * @author MightyPork
  */
diff --git a/src/mightypork/rogue/world/item/Items.java b/src/mightypork/rogue/world/item/Items.java
index 8e7fb89..23960ba 100644
--- a/src/mightypork/rogue/world/item/Items.java
+++ b/src/mightypork/rogue/world/item/Items.java
@@ -10,7 +10,7 @@ public final class Items {
 	private static final Map<Integer, ItemModel> registered = new HashMap<>();
 	
 	
-	public static void register(int id, ItemModel model)
+	static void register(int id, ItemModel model)
 	{
 		if (registered.containsKey(id)) throw new IllegalArgumentException("Item ID " + id + " already in use.");
 		registered.put(id, model);
diff --git a/src/mightypork/rogue/world/tile/Tile.java b/src/mightypork/rogue/world/tile/Tile.java
index 50526cb..477e45f 100644
--- a/src/mightypork/rogue/world/tile/Tile.java
+++ b/src/mightypork/rogue/world/tile/Tile.java
@@ -1,8 +1,6 @@
 package mightypork.rogue.world.tile;
 
 
-import java.util.Stack;
-
 import mightypork.rogue.world.Entity;
 import mightypork.rogue.world.item.Item;
 
@@ -16,12 +14,6 @@ public final class Tile extends Entity<TileData, TileModel, TileRenderContext> {
 	
 	public static final short ION_MARK = 700;
 	
-	/** Items dropped onto this tile */
-	public final Stack<Item> items = new Stack<>();
-	
-	/** Whether the tile is occupied by an entity */
-	public boolean occupied;
-	
 	
 	public Tile() {
 		super();
@@ -58,8 +50,8 @@ public final class Tile extends Entity<TileData, TileModel, TileRenderContext> {
 		super.render(context);
 		
 		// render laying-on-top item
-		if (!items.isEmpty()) {
-			Item item = items.peek();
+		if (!data.items.isEmpty()) {
+			final Item item = data.items.peek();
 			
 			item.render(context.getRect());
 		}
@@ -72,8 +64,8 @@ public final class Tile extends Entity<TileData, TileModel, TileRenderContext> {
 		super.update(delta);
 		
 		// update laying-on-top item
-		if (!items.isEmpty()) {
-			Item item = items.peek();
+		if (!data.items.isEmpty()) {
+			final Item item = data.items.peek();
 			item.update(delta);
 		}
 	}
diff --git a/src/mightypork/rogue/world/tile/TileData.java b/src/mightypork/rogue/world/tile/TileData.java
index e883a97..0f57d03 100644
--- a/src/mightypork/rogue/world/tile/TileData.java
+++ b/src/mightypork/rogue/world/tile/TileData.java
@@ -5,8 +5,9 @@ import java.util.Stack;
 
 import mightypork.rogue.world.item.Item;
 
+
 /**
- * Tile data object. Can be extended for particular models' needs.
+ * Tile data object.
  * 
  * @author MightyPork
  */
@@ -15,4 +16,7 @@ public abstract class TileData {
 	/** Items dropped onto this tile */
 	public final Stack<Item> items = new Stack<>();
 	
+	/** Whether the tile is occupied by an entity */
+	public boolean occupied;
+	
 }
diff --git a/src/mightypork/rogue/world/tile/Tiles.java b/src/mightypork/rogue/world/tile/Tiles.java
index 4a3b30a..2888e4a 100644
--- a/src/mightypork/rogue/world/tile/Tiles.java
+++ b/src/mightypork/rogue/world/tile/Tiles.java
@@ -10,7 +10,7 @@ public final class Tiles {
 	private static final Map<Integer, TileModel> registered = new HashMap<>();
 	
 	
-	public static void register(int id, TileModel model)
+	static void register(int id, TileModel model)
 	{
 		if (registered.containsKey(id)) throw new IllegalArgumentException("Tile ID " + id + " already in use.");
 		registered.put(id, model);
diff --git a/src/mightypork/test/FakeTile.java b/src/mightypork/test/FakeTile.java
new file mode 100644
index 0000000..8f94d8d
--- /dev/null
+++ b/src/mightypork/test/FakeTile.java
@@ -0,0 +1,84 @@
+package mightypork.test;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import mightypork.rogue.world.tile.TileData;
+import mightypork.rogue.world.tile.TileModel;
+import mightypork.rogue.world.tile.TileRenderContext;
+import mightypork.util.files.ion.Ion;
+
+
+class FakeTileData extends TileData {
+	
+	int number;
+	String name;
+}
+
+
+public class FakeTile extends TileModel {
+	
+	public FakeTile(int id) {
+		super(id);
+	}
+	
+	
+	@Override
+	public boolean isPotentiallyWalkable()
+	{
+		return true;
+	}
+	
+	
+	@Override
+	public boolean isWalkable(TileData data)
+	{
+		return true;
+	}
+	
+	
+	@Override
+	public TileData createData()
+	{
+		return new FakeTileData() {
+			
+			{
+				number = 255;
+				name = "ABC";
+			}
+		};
+	}
+	
+	
+	@Override
+	public void load(TileData data, InputStream in) throws IOException
+	{
+		((FakeTileData) data).name = Ion.readString(in);
+		((FakeTileData) data).number = Ion.readInt(in);
+	}
+	
+	
+	@Override
+	public void save(TileData data, OutputStream out) throws IOException
+	{
+		Ion.writeString(out, ((FakeTileData) data).name);
+		Ion.writeInt(out, ((FakeTileData) data).number);
+	}
+	
+	
+	@Override
+	public void render(TileData data, TileRenderContext context)
+	{
+		//
+	}
+	
+	
+	@Override
+	public void update(TileData item, double delta)
+	{
+		//
+	}
+	
+}
diff --git a/src/mightypork/test/TestIonArray.java b/src/mightypork/test/TestIonArray.java
index 21988c4..629dd92 100644
--- a/src/mightypork/test/TestIonArray.java
+++ b/src/mightypork/test/TestIonArray.java
@@ -12,9 +12,9 @@ public class TestIonArray {
 	
 	public static void main(String[] args) throws IOException
 	{
-		byte[] array = new byte[1024 * 8];
+		final byte[] array = new byte[1024 * 8];
 		
-		Random rand = new Random();
+		final Random rand = new Random();
 		
 		for (int i = 0; i < array.length; i++) {
 			array[i] = (byte) rand.nextInt();
diff --git a/src/mightypork/test/TestIonArray2.java b/src/mightypork/test/TestIonArray2.java
index 0e5bbd4..65ff2e2 100644
--- a/src/mightypork/test/TestIonArray2.java
+++ b/src/mightypork/test/TestIonArray2.java
@@ -1,7 +1,12 @@
 package mightypork.test;
 
 
-import java.io.*;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
 import mightypork.util.files.ion.Ion;
 
 
@@ -9,31 +14,30 @@ public class TestIonArray2 {
 	
 	public static void main(String[] args) throws IOException
 	{
-		int[] array = { 1, 2, 3, 4, 5, 6, 7, 8, 9,99999,8888888 };
+		final int[] array = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 99999, 8888888 };
 		
-		OutputStream out = new FileOutputStream("fuck.ion");
+		final OutputStream out = new FileOutputStream("fuck.ion");
 		
 		Ion.writeIntArray(out, array);
 		Ion.writeString(out, "HELLO DUDE WHATSUP");
 		Ion.writeCharArray(out, "HERE'S ONE COOL ARRAY!!!".toCharArray());
-
+		
 		// ---
 		
-		InputStream in = new FileInputStream("fuck.ion");
+		final InputStream in = new FileInputStream("fuck.ion");
 		
-		int[] a = Ion.readIntArray(in);
+		final int[] a = Ion.readIntArray(in);
 		
-		for (int i : a)
+		for (final int i : a)
 			System.out.println(i);
-
-		String s = Ion.readString(in);
+		
+		final String s = Ion.readString(in);
 		System.out.println(s);
 		
-
-		char[] v = Ion.readCharArray(in);
+		final char[] v = Ion.readCharArray(in);
 		
-		for (int i : v)
-			System.out.print((char)i);
+		for (final int i : v)
+			System.out.print((char) i);
 		
 	}
 }
diff --git a/src/mightypork/test/TestPerlin.java b/src/mightypork/test/TestPerlin.java
index 38274e6..732932d 100644
--- a/src/mightypork/test/TestPerlin.java
+++ b/src/mightypork/test/TestPerlin.java
@@ -6,22 +6,22 @@ import java.util.Locale;
 import mightypork.util.math.noise.NoiseGen;
 
 
-public class TestPerlin {	
+public class TestPerlin {
 	
 	public static void main(String[] args)
 	{
 		Locale.setDefault(Locale.ENGLISH);
 		
-		int w = 50, h = 50;
+		final int w = 50, h = 50;
 		
-		NoiseGen ng = new NoiseGen(0.12, 0, 2.5, 5, (long) (Math.random()*100));
+		final NoiseGen ng = new NoiseGen(0.12, 0, 2.5, 5, (long) (Math.random() * 100));
 		
-		double[][] map = ng.buildMap(w, h);
+		final double[][] map = ng.buildMap(w, h);
 		
-		char[] colors = {' ', '░','▒','▓','█'};
+		final char[] colors = { ' ', '░', '▒', '▓', '█' };
 		
 		for (int y = 0; y < h; y++) {
-			for (int x = 0; x < w; x++) {	
+			for (int x = 0; x < w; x++) {
 				// "pixels" two-thick
 				System.out.print(colors[(int) Math.floor(map[y][x])]);
 				System.out.print(colors[(int) Math.floor(map[y][x])]);
diff --git a/src/mightypork/test/TestTileMap.java b/src/mightypork/test/TestTileMap.java
new file mode 100644
index 0000000..3caf54a
--- /dev/null
+++ b/src/mightypork/test/TestTileMap.java
@@ -0,0 +1,46 @@
+package mightypork.test;
+
+
+import java.io.IOException;
+
+import mightypork.rogue.world.WorldMap;
+import mightypork.rogue.world.item.Item;
+import mightypork.rogue.world.tile.Tile;
+import mightypork.rogue.world.tile.TileModel;
+import mightypork.util.files.ion.Ion;
+
+
+public class TestTileMap {
+	
+	public static void main(String[] args) throws IOException
+	{
+		
+		Ion.registerIonizable(WorldMap.ION_MARK, WorldMap.class);
+		Ion.registerIonizable(Tile.ION_MARK, Tile.class);
+		Ion.registerIonizable(Item.ION_MARK, Item.class);
+		
+		// register tile
+		final TileModel tm = new FakeTile(1);
+		
+//		
+//		WorldMap map = new WorldMap(10, 10);
+//		
+//		Random r = new Random();
+//		
+//		for(int i=0; i<10; i++) {
+//			map.setTile(1, r.nextInt(10),r.nextInt(10));
+//		}
+//		
+//		Ion.toFile("maptest.ion", map);
+		
+		final WorldMap map = (WorldMap) Ion.fromFile("maptest.ion");
+		for (int y = 0; y < map.getHeight(); y++) {
+			for (int x = 0; x < map.getWidth(); x++) {
+				final Tile t = map.getTile(x, y);
+				System.out.print(" " + (t == null ? "   " : ((FakeTileData) t.getData()).number));
+			}
+			
+			System.out.println();
+		}
+	}
+}
diff --git a/src/mightypork/util/constraints/num/mutable/NumAnimated.java b/src/mightypork/util/constraints/num/mutable/NumAnimated.java
index 2ac3a56..47e3e03 100644
--- a/src/mightypork/util/constraints/num/mutable/NumAnimated.java
+++ b/src/mightypork/util/constraints/num/mutable/NumAnimated.java
@@ -60,7 +60,7 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 		this(value);
 		setEasing(easing);
 	}
-
+	
 	
 	/**
 	 * Create animator with easing
@@ -74,6 +74,7 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 		setEasing(easingIn, easingOut);
 	}
 	
+	
 	/**
 	 * Create as copy of another
 	 * 
diff --git a/src/mightypork/util/control/timing/TimedTask.java b/src/mightypork/util/control/timing/TimedTask.java
index 5229699..c05b044 100644
--- a/src/mightypork/util/control/timing/TimedTask.java
+++ b/src/mightypork/util/control/timing/TimedTask.java
@@ -1,32 +1,38 @@
 package mightypork.util.control.timing;
 
+
 import mightypork.util.constraints.num.mutable.NumAnimated;
 
 
 public abstract class TimedTask implements Runnable, Updateable {
-
-	private NumAnimated timer = new NumAnimated(0);
+	
+	private final NumAnimated timer = new NumAnimated(0);
 	private boolean running = false;
 	
+	
 	@Override
 	public void update(double delta)
 	{
-		if(running) {
+		if (running) {
 			timer.update(delta);
-			if(timer.isFinished()) {
+			if (timer.isFinished()) {
 				running = false;
 				run();
 			}
 		}
 	}
 	
-	public void start(double seconds) {
+	
+	public void start(double seconds)
+	{
 		timer.reset();
 		timer.animate(1, seconds);
 		running = true;
 	}
 	
-	public void stop() {
+	
+	public void stop()
+	{
 		running = false;
 		timer.reset();
 	}
diff --git a/src/mightypork/util/files/ion/Ion.java b/src/mightypork/util/files/ion/Ion.java
index 7939b12..4cd9a58 100644
--- a/src/mightypork/util/files/ion/Ion.java
+++ b/src/mightypork/util/files/ion/Ion.java
@@ -70,16 +70,10 @@ public class Ion {
 	 */
 	public static final short ENTRY = 60;
 	
-	/**
-	 * Start mark - general purpose, marks start of a sequence of stored
-	 * objects.
-	 */
-	public static final short START = 61;
-	
 	/**
 	 * End mark - general purpose, marks end of sequence of stored objects.
 	 */
-	public static final short END = 62;
+	public static final short END = 61;
 	
 	// built in 80..99
 	/** Map mark (built-in data structure) */
@@ -135,7 +129,7 @@ public class Ion {
 		if (mark > Short.MAX_VALUE) throw new IllegalArgumentException("Mark too high (max " + Short.MAX_VALUE + ").");
 		if (mark < Short.MIN_VALUE) throw new IllegalArgumentException("Mark too low (min " + Short.MIN_VALUE + ").");
 		
-		short m = (short) mark;
+		final short m = (short) mark;
 		
 		if (markRangeChecking && m >= 0 && m < 100) {
 			throw new IllegalArgumentException("Marks 0..99 are reserved.");
@@ -304,7 +298,7 @@ public class Ion {
 					
 				case BOOLEAN_ARRAY:
 					length = readInt(in);
-					boolean[] bools = new boolean[length];
+					final boolean[] bools = new boolean[length];
 					for (int i = 0; i < length; i++) {
 						bools[i] = readBoolean(in);
 					}
@@ -312,7 +306,7 @@ public class Ion {
 					
 				case BYTE_ARRAY:
 					length = readInt(in);
-					byte[] bytes = new byte[length];
+					final byte[] bytes = new byte[length];
 					for (int i = 0; i < length; i++) {
 						bytes[i] = readByte(in);
 					}
@@ -320,7 +314,7 @@ public class Ion {
 					
 				case CHAR_ARRAY:
 					length = readInt(in);
-					char[] chars = new char[length];
+					final char[] chars = new char[length];
 					for (int i = 0; i < length; i++) {
 						chars[i] = readChar(in);
 					}
@@ -328,7 +322,7 @@ public class Ion {
 					
 				case SHORT_ARRAY:
 					length = readInt(in);
-					short[] shorts = new short[length];
+					final short[] shorts = new short[length];
 					for (int i = 0; i < length; i++) {
 						shorts[i] = readShort(in);
 					}
@@ -336,7 +330,7 @@ public class Ion {
 					
 				case INT_ARRAY:
 					length = readInt(in);
-					int[] ints = new int[length];
+					final int[] ints = new int[length];
 					for (int i = 0; i < length; i++) {
 						ints[i] = readInt(in);
 					}
@@ -344,7 +338,7 @@ public class Ion {
 					
 				case LONG_ARRAY:
 					length = readInt(in);
-					long[] longs = new long[length];
+					final long[] longs = new long[length];
 					for (int i = 0; i < length; i++) {
 						longs[i] = readLong(in);
 					}
@@ -352,7 +346,7 @@ public class Ion {
 					
 				case FLOAT_ARRAY:
 					length = readInt(in);
-					float[] floats = new float[length];
+					final float[] floats = new float[length];
 					for (int i = 0; i < length; i++) {
 						floats[i] = readFloat(in);
 					}
@@ -360,7 +354,7 @@ public class Ion {
 					
 				case DOUBLE_ARRAY:
 					length = readInt(in);
-					double[] doubles = new double[length];
+					final double[] doubles = new double[length];
 					for (int i = 0; i < length; i++) {
 						doubles[i] = readDouble(in);
 					}
@@ -368,7 +362,7 @@ public class Ion {
 					
 				case STRING_ARRAY:
 					length = readInt(in);
-					String[] Strings = new String[length];
+					final String[] Strings = new String[length];
 					for (int i = 0; i < length; i++) {
 						Strings[i] = readString(in);
 					}
@@ -732,7 +726,7 @@ public class Ion {
 	public static void writeBooleanArray(OutputStream out, boolean[] arr) throws IOException
 	{
 		writeInt(out, arr.length);
-		for (boolean a : arr) {
+		for (final boolean a : arr) {
 			writeBoolean(out, a);
 		}
 	}
@@ -748,7 +742,7 @@ public class Ion {
 	public static void writeByteArray(OutputStream out, byte[] arr) throws IOException
 	{
 		writeInt(out, arr.length);
-		for (byte a : arr) {
+		for (final byte a : arr) {
 			writeByte(out, a);
 		}
 	}
@@ -764,7 +758,7 @@ public class Ion {
 	public static void writeCharArray(OutputStream out, char[] arr) throws IOException
 	{
 		writeInt(out, arr.length);
-		for (char a : arr) {
+		for (final char a : arr) {
 			writeChar(out, a);
 		}
 	}
@@ -780,7 +774,7 @@ public class Ion {
 	public static void writeShortArray(OutputStream out, short[] arr) throws IOException
 	{
 		writeInt(out, arr.length);
-		for (short a : arr) {
+		for (final short a : arr) {
 			writeShort(out, a);
 		}
 	}
@@ -796,7 +790,7 @@ public class Ion {
 	public static void writeIntArray(OutputStream out, int[] arr) throws IOException
 	{
 		writeInt(out, arr.length);
-		for (int a : arr) {
+		for (final int a : arr) {
 			writeInt(out, a);
 		}
 	}
@@ -812,7 +806,7 @@ public class Ion {
 	public static void writeLongArray(OutputStream out, long[] arr) throws IOException
 	{
 		writeInt(out, arr.length);
-		for (long a : arr) {
+		for (final long a : arr) {
 			writeLong(out, a);
 		}
 	}
@@ -828,7 +822,7 @@ public class Ion {
 	public static void writeFloatArray(OutputStream out, float[] arr) throws IOException
 	{
 		writeInt(out, arr.length);
-		for (float a : arr) {
+		for (final float a : arr) {
 			writeFloat(out, a);
 		}
 	}
@@ -844,7 +838,7 @@ public class Ion {
 	public static void writeDoubleArray(OutputStream out, double[] arr) throws IOException
 	{
 		writeInt(out, arr.length);
-		for (double a : arr) {
+		for (final double a : arr) {
 			writeDouble(out, a);
 		}
 	}
@@ -860,7 +854,7 @@ public class Ion {
 	public static void writeStringArray(OutputStream out, String[] arr) throws IOException
 	{
 		writeInt(out, arr.length);
-		for (String a : arr) {
+		for (final String a : arr) {
 			writeString(out, a);
 		}
 	}
@@ -888,7 +882,7 @@ public class Ion {
 	 */
 	public static byte readByte(InputStream in) throws IOException
 	{
-		int b = in.read();
+		final int b = in.read();
 		if (-1 == b) throw new IOException("End of stream.");
 		return (byte) b;
 	}
@@ -1018,8 +1012,8 @@ public class Ion {
 	 */
 	public static boolean[] readBooleanArray(InputStream in) throws IOException
 	{
-		int length = readInt(in);
-		boolean[] booleans = new boolean[length];
+		final int length = readInt(in);
+		final boolean[] booleans = new boolean[length];
 		for (int i = 0; i < length; i++) {
 			booleans[i] = readBoolean(in);
 		}
@@ -1036,8 +1030,8 @@ public class Ion {
 	 */
 	public static byte[] readByteArray(InputStream in) throws IOException
 	{
-		int length = readInt(in);
-		byte[] bytes = new byte[length];
+		final int length = readInt(in);
+		final byte[] bytes = new byte[length];
 		for (int i = 0; i < length; i++) {
 			bytes[i] = readByte(in);
 		}
@@ -1054,8 +1048,8 @@ public class Ion {
 	 */
 	public static char[] readCharArray(InputStream in) throws IOException
 	{
-		int length = readInt(in);
-		char[] chars = new char[length];
+		final int length = readInt(in);
+		final char[] chars = new char[length];
 		for (int i = 0; i < length; i++) {
 			chars[i] = readChar(in);
 		}
@@ -1072,8 +1066,8 @@ public class Ion {
 	 */
 	public static short[] readShortArray(InputStream in) throws IOException
 	{
-		int length = readInt(in);
-		short[] shorts = new short[length];
+		final int length = readInt(in);
+		final short[] shorts = new short[length];
 		for (int i = 0; i < length; i++) {
 			shorts[i] = readShort(in);
 		}
@@ -1090,8 +1084,8 @@ public class Ion {
 	 */
 	public static int[] readIntArray(InputStream in) throws IOException
 	{
-		int length = readInt(in);
-		int[] ints = new int[length];
+		final int length = readInt(in);
+		final int[] ints = new int[length];
 		for (int i = 0; i < length; i++) {
 			ints[i] = readInt(in);
 		}
@@ -1108,8 +1102,8 @@ public class Ion {
 	 */
 	public static long[] readLongArray(InputStream in) throws IOException
 	{
-		int length = readInt(in);
-		long[] longs = new long[length];
+		final int length = readInt(in);
+		final long[] longs = new long[length];
 		for (int i = 0; i < length; i++) {
 			longs[i] = readLong(in);
 		}
@@ -1126,8 +1120,8 @@ public class Ion {
 	 */
 	public static float[] readFloatArray(InputStream in) throws IOException
 	{
-		int length = readInt(in);
-		float[] floats = new float[length];
+		final int length = readInt(in);
+		final float[] floats = new float[length];
 		for (int i = 0; i < length; i++) {
 			floats[i] = readFloat(in);
 		}
@@ -1144,8 +1138,8 @@ public class Ion {
 	 */
 	public static double[] readDoubleArray(InputStream in) throws IOException
 	{
-		int length = readInt(in);
-		double[] doubles = new double[length];
+		final int length = readInt(in);
+		final double[] doubles = new double[length];
 		for (int i = 0; i < length; i++) {
 			doubles[i] = readDouble(in);
 		}
@@ -1162,8 +1156,8 @@ public class Ion {
 	 */
 	public static String[] readStringArray(InputStream in) throws IOException
 	{
-		int length = readInt(in);
-		String[] Strings = new String[length];
+		final int length = readInt(in);
+		final String[] Strings = new String[length];
 		for (int i = 0; i < length; i++) {
 			Strings[i] = readString(in);
 		}
diff --git a/src/mightypork/util/files/ion/IonDataBundle.java b/src/mightypork/util/files/ion/IonDataBundle.java
index 3864cc2..53f43c9 100644
--- a/src/mightypork/util/files/ion/IonDataBundle.java
+++ b/src/mightypork/util/files/ion/IonDataBundle.java
@@ -1,7 +1,6 @@
 package mightypork.util.files.ion;
 
 
-
 /**
  * Ionizable HashMap<String, Object> with getters and setters for individual
  * supported types.
@@ -116,7 +115,6 @@ public class IonDataBundle extends IonMap<String, Object> {
 	{
 		super.put(key, num);
 	}
-
 	
 	
 	public Object getOfType(String key, Class<?> type)
diff --git a/src/mightypork/util/math/noise/NoiseGen.java b/src/mightypork/util/math/noise/NoiseGen.java
index 66f946d..f01688c 100644
--- a/src/mightypork/util/math/noise/NoiseGen.java
+++ b/src/mightypork/util/math/noise/NoiseGen.java
@@ -81,7 +81,7 @@ public class NoiseGen {
 	 */
 	public double[][] buildMap(int width, int height)
 	{
-		double[][] map = new double[height][width];
+		final double[][] map = new double[height][width];
 		
 		for (int y = 0; y < height; y++) {
 			for (int x = 0; x < width; x++) {
diff --git a/src/mightypork/util/math/noise/PerlinNoiseGenerator.java b/src/mightypork/util/math/noise/PerlinNoiseGenerator.java
index ebfd535..da95165 100644
--- a/src/mightypork/util/math/noise/PerlinNoiseGenerator.java
+++ b/src/mightypork/util/math/noise/PerlinNoiseGenerator.java
@@ -48,7 +48,7 @@ public class PerlinNoiseGenerator {
 	private final Random rand = new Random(DEFAULT_SEED);
 	
 	/** Permutation array for the improved noise function */
-	private int[] p_imp;
+	private final int[] p_imp;
 	
 	/** P array for perline 1 noise */
 	private int[] p;
@@ -103,39 +103,39 @@ public class PerlinNoiseGenerator {
 	public double improvedNoise(double x, double y, double z)
 	{
 		// Constraint the point to a unit cube
-		int uc_x = (int) Math.floor(x) & 255;
-		int uc_y = (int) Math.floor(y) & 255;
-		int uc_z = (int) Math.floor(z) & 255;
+		final int uc_x = (int) Math.floor(x) & 255;
+		final int uc_y = (int) Math.floor(y) & 255;
+		final int uc_z = (int) Math.floor(z) & 255;
 		
 		// Relative location of the point in the unit cube
-		double xo = x - Math.floor(x);
-		double yo = y - Math.floor(y);
-		double zo = z - Math.floor(z);
+		final double xo = x - Math.floor(x);
+		final double yo = y - Math.floor(y);
+		final double zo = z - Math.floor(z);
 		
 		// Fade curves for x, y and z
-		double u = fade(xo);
-		double v = fade(yo);
-		double w = fade(zo);
+		final double u = fade(xo);
+		final double v = fade(yo);
+		final double w = fade(zo);
 		
 		// Generate a hash for each coordinate to find out where in the cube
 		// it lies.
-		int a = p_imp[uc_x] + uc_y;
-		int aa = p_imp[a] + uc_z;
-		int ab = p_imp[a + 1] + uc_z;
+		final int a = p_imp[uc_x] + uc_y;
+		final int aa = p_imp[a] + uc_z;
+		final int ab = p_imp[a + 1] + uc_z;
 		
-		int b = p_imp[uc_x + 1] + uc_y;
-		int ba = p_imp[b] + uc_z;
-		int bb = p_imp[b + 1] + uc_z;
+		final int b = p_imp[uc_x + 1] + uc_y;
+		final int ba = p_imp[b] + uc_z;
+		final int bb = p_imp[b + 1] + uc_z;
 		
 		// blend results from the 8 corners based on the noise function
-		double c1 = grad(p_imp[aa], xo, yo, zo);
-		double c2 = grad(p_imp[ba], xo - 1, yo, zo);
-		double c3 = grad(p_imp[ab], xo, yo - 1, zo);
-		double c4 = grad(p_imp[bb], xo - 1, yo - 1, zo);
-		double c5 = grad(p_imp[aa + 1], xo, yo, zo - 1);
-		double c6 = grad(p_imp[ba + 1], xo - 1, yo, zo - 1);
-		double c7 = grad(p_imp[ab + 1], xo, yo - 1, zo - 1);
-		double c8 = grad(p_imp[bb + 1], xo - 1, yo - 1, zo - 1);
+		final double c1 = grad(p_imp[aa], xo, yo, zo);
+		final double c2 = grad(p_imp[ba], xo - 1, yo, zo);
+		final double c3 = grad(p_imp[ab], xo, yo - 1, zo);
+		final double c4 = grad(p_imp[bb], xo - 1, yo - 1, zo);
+		final double c5 = grad(p_imp[aa + 1], xo, yo, zo - 1);
+		final double c6 = grad(p_imp[ba + 1], xo - 1, yo, zo - 1);
+		final double c7 = grad(p_imp[ab + 1], xo, yo - 1, zo - 1);
+		final double c8 = grad(p_imp[bb + 1], xo - 1, yo - 1, zo - 1);
 		
 		return lerp(w, lerp(v, lerp(u, c1, c2), lerp(u, c3, c4)), lerp(v, lerp(u, c5, c6), lerp(u, c7, c8)));
 	}
@@ -149,16 +149,16 @@ public class PerlinNoiseGenerator {
 	 */
 	public double noise1(double x)
 	{
-		double t = x + N;
-		int bx0 = ((int) t) & BM;
-		int bx1 = (bx0 + 1) & BM;
-		double rx0 = t - (int) t;
-		double rx1 = rx0 - 1;
+		final double t = x + N;
+		final int bx0 = ((int) t) & BM;
+		final int bx1 = (bx0 + 1) & BM;
+		final double rx0 = t - (int) t;
+		final double rx1 = rx0 - 1;
 		
-		double sx = sCurve(rx0);
+		final double sx = sCurve(rx0);
 		
-		double u = rx0 * g1[p[bx0]];
-		double v = rx1 * g1[p[bx1]];
+		final double u = rx0 * g1[p[bx0]];
+		final double v = rx1 * g1[p[bx1]];
 		
 		return lerp(sx, u, v);
 	}
@@ -174,39 +174,39 @@ public class PerlinNoiseGenerator {
 	public double noise2(double x, double y)
 	{
 		double t = x + N;
-		int bx0 = ((int) t) & BM;
-		int bx1 = (bx0 + 1) & BM;
-		double rx0 = t - (int) t;
-		double rx1 = rx0 - 1;
+		final int bx0 = ((int) t) & BM;
+		final int bx1 = (bx0 + 1) & BM;
+		final double rx0 = t - (int) t;
+		final double rx1 = rx0 - 1;
 		
 		t = y + N;
-		int by0 = ((int) t) & BM;
-		int by1 = (by0 + 1) & BM;
-		double ry0 = t - (int) t;
-		double ry1 = ry0 - 1;
+		final int by0 = ((int) t) & BM;
+		final int by1 = (by0 + 1) & BM;
+		final double ry0 = t - (int) t;
+		final double ry1 = ry0 - 1;
 		
-		int i = p[bx0];
-		int j = p[bx1];
+		final int i = p[bx0];
+		final int j = p[bx1];
 		
-		int b00 = p[i + by0];
-		int b10 = p[j + by0];
-		int b01 = p[i + by1];
-		int b11 = p[j + by1];
+		final int b00 = p[i + by0];
+		final int b10 = p[j + by0];
+		final int b01 = p[i + by1];
+		final int b11 = p[j + by1];
 		
-		double sx = sCurve(rx0);
-		double sy = sCurve(ry0);
+		final double sx = sCurve(rx0);
+		final double sy = sCurve(ry0);
 		
 		double[] q = g2[b00];
 		double u = rx0 * q[0] + ry0 * q[1];
 		q = g2[b10];
 		double v = rx1 * q[0] + ry0 * q[1];
-		double a = lerp(sx, u, v);
+		final double a = lerp(sx, u, v);
 		
 		q = g2[b01];
 		u = rx0 * q[0] + ry1 * q[1];
 		q = g2[b11];
 		v = rx1 * q[0] + ry1 * q[1];
-		double b = lerp(sx, u, v);
+		final double b = lerp(sx, u, v);
 		
 		return lerp(sy, a, b);
 	}
@@ -223,34 +223,34 @@ public class PerlinNoiseGenerator {
 	public double noise3(double x, double y, double z)
 	{
 		double t = x + N;
-		int bx0 = ((int) t) & BM;
-		int bx1 = (bx0 + 1) & BM;
-		double rx0 = t - (int) t;
-		double rx1 = rx0 - 1;
+		final int bx0 = ((int) t) & BM;
+		final int bx1 = (bx0 + 1) & BM;
+		final double rx0 = t - (int) t;
+		final double rx1 = rx0 - 1;
 		
 		t = y + N;
-		int by0 = ((int) t) & BM;
-		int by1 = (by0 + 1) & BM;
-		double ry0 = t - (int) t;
-		double ry1 = ry0 - 1;
+		final int by0 = ((int) t) & BM;
+		final int by1 = (by0 + 1) & BM;
+		final double ry0 = t - (int) t;
+		final double ry1 = ry0 - 1;
 		
 		t = z + N;
-		int bz0 = ((int) t) & BM;
-		int bz1 = (bz0 + 1) & BM;
-		double rz0 = t - (int) t;
-		double rz1 = rz0 - 1;
+		final int bz0 = ((int) t) & BM;
+		final int bz1 = (bz0 + 1) & BM;
+		final double rz0 = t - (int) t;
+		final double rz1 = rz0 - 1;
 		
-		int i = p[bx0];
-		int j = p[bx1];
+		final int i = p[bx0];
+		final int j = p[bx1];
 		
-		int b00 = p[i + by0];
-		int b10 = p[j + by0];
-		int b01 = p[i + by1];
-		int b11 = p[j + by1];
+		final int b00 = p[i + by0];
+		final int b10 = p[j + by0];
+		final int b01 = p[i + by1];
+		final int b11 = p[j + by1];
 		
 		t = sCurve(rx0);
-		double sy = sCurve(ry0);
-		double sz = sCurve(rz0);
+		final double sy = sCurve(ry0);
+		final double sz = sCurve(rz0);
 		
 		double[] q = g3[b00 + bz0];
 		double u = (rx0 * q[0] + ry0 * q[1] + rz0 * q[2]);
@@ -264,7 +264,7 @@ public class PerlinNoiseGenerator {
 		v = (rx1 * q[0] + ry1 * q[1] + rz0 * q[2]);
 		double b = lerp(t, u, v);
 		
-		double c = lerp(sy, a, b);
+		final double c = lerp(sy, a, b);
 		
 		q = g3[b00 + bz1];
 		u = (rx0 * q[0] + ry0 * q[1] + rz1 * q[2]);
@@ -278,7 +278,7 @@ public class PerlinNoiseGenerator {
 		v = (rx1 * q[0] + ry1 * q[1] + rz1 * q[2]);
 		b = lerp(t, u, v);
 		
-		double d = lerp(sy, a, b);
+		final double d = lerp(sy, a, b);
 		
 		return lerp(sz, c, d);
 	}
@@ -491,9 +491,9 @@ public class PerlinNoiseGenerator {
 	private double grad(int hash, double x, double y, double z)
 	{
 		// Convert low 4 bits of hash code into 12 gradient directions.
-		int h = hash & 15;
-		double u = (h < 8 || h == 12 || h == 13) ? x : y;
-		double v = (h < 4 || h == 12 || h == 13) ? y : z;
+		final int h = hash & 15;
+		final double u = (h < 8 || h == 12 || h == 13) ? x : y;
+		final double v = (h < 4 || h == 12 || h == 13) ? y : z;
 		
 		return ((h & 1) == 0 ? u : -u) + ((h & 2) == 0 ? v : -v);
 	}
@@ -513,7 +513,7 @@ public class PerlinNoiseGenerator {
 	 */
 	private void normalize2(double[] v)
 	{
-		double s = 1 / Math.sqrt(v[0] * v[0] + v[1] * v[1]);
+		final double s = 1 / Math.sqrt(v[0] * v[0] + v[1] * v[1]);
 		v[0] *= s;
 		v[1] *= s;
 	}
@@ -524,7 +524,7 @@ public class PerlinNoiseGenerator {
 	 */
 	private void normalize3(double[] v)
 	{
-		double s = 1 / Math.sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
+		final double s = 1 / Math.sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
 		v[0] *= s;
 		v[1] *= s;
 		v[2] *= s;