From dfed36748ce5264605c794b1b5e795865fce3537 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 14 Jul 2018 16:06:38 -0400
Subject: [PATCH] Fixed saves not loading / Increased biomatter compressor
 output

---
 .../anuke/mindustry/content/blocks/CraftingBlocks.java   | 2 +-
 core/src/io/anuke/mindustry/core/World.java              | 9 ++++++++-
 core/src/io/anuke/mindustry/io/versions/Save16.java      | 6 +++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
index 67ab558fdd..f75d363d81 100644
--- a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
@@ -212,7 +212,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
             itemCapacity = 50;
             craftTime = 25f;
             outputLiquid = Liquids.oil;
-            outputLiquidAmount = 0.14f;
+            outputLiquidAmount = 0.9f;
             size = 2;
             health = 320;
             hasLiquids = true;
diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java
index a691cef20f..7e34007d0e 100644
--- a/core/src/io/anuke/mindustry/core/World.java
+++ b/core/src/io/anuke/mindustry/core/World.java
@@ -15,6 +15,7 @@ import io.anuke.mindustry.maps.Map;
 import io.anuke.mindustry.io.MapIO;
 import io.anuke.mindustry.maps.MapMeta;
 import io.anuke.mindustry.maps.Maps;
+import io.anuke.mindustry.maps.Sectors;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.mapgen.WorldGenerator;
@@ -37,12 +38,14 @@ public class World extends Module{
     private Pathfinder pathfinder = new Pathfinder();
     private BlockIndexer indexer = new BlockIndexer();
     private Maps maps = new Maps();
+    private Sectors sectors = new Sectors();
 
     private Array<Tile> tempTiles = new ThreadArray<>();
     private boolean generating, invalidMap;
 
     public World(){
         maps.load();
+        sectors.load();
     }
 
     @Override
@@ -50,6 +53,10 @@ public class World extends Module{
         maps.dispose();
     }
 
+    public Sectors sectors(){
+        return sectors;
+    }
+
     public Maps maps(){
         return maps;
     }
@@ -208,7 +215,7 @@ public class World extends Module{
 
         beginMapLoad();
 
-        int width = 400, height = 400;
+        int width = 250, height = 250;
 
         Tile[][] tiles = createTiles(width, height);
 
diff --git a/core/src/io/anuke/mindustry/io/versions/Save16.java b/core/src/io/anuke/mindustry/io/versions/Save16.java
index fe9a57ddb2..b77fef58f6 100644
--- a/core/src/io/anuke/mindustry/io/versions/Save16.java
+++ b/core/src/io/anuke/mindustry/io/versions/Save16.java
@@ -36,8 +36,8 @@ public class Save16 extends SaveFileVersion{
 
     @Override
     public void read(DataInputStream stream) throws IOException{
-        /*long loadTime = */
-        stream.readLong();
+        stream.readLong(); //time
+        stream.readInt(); //build
 
         //general state
         byte mode = stream.readByte();
@@ -154,7 +154,7 @@ public class Save16 extends SaveFileVersion{
         //--META--
         stream.writeInt(version); //version id
         stream.writeLong(TimeUtils.millis()); //last saved
-        stream.writeInt(Version.build);
+        stream.writeInt(Version.build); //build
 
         //--GENERAL STATE--
         stream.writeByte(state.mode.ordinal()); //gamemode