Final renaming Coordinates to Point

amorphine · Dec 4, 2016 · d0c53ff · d0c53ff
1 parent 5c4b5dc
commit d0c53ff
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 10 deletions.
diff --git a/src/main/java/mregioneer/mcaliases/Chunk.java b/src/main/java/mregioneer/mcaliases/Chunk.java
@@ -5,7 +5,7 @@
 import com.mojang.nbt.CompoundTag;
 import com.mojang.nbt.IntTag;
 import com.mojang.nbt.ListTag;
-import mregioneer.utils.Coordinates2d;
+import mregioneer.utils.Point2d;
 import mregioneer.utils.Point3d;
 import mregioneer.utils.Formulae;
 
@@ -24,7 +24,7 @@ public class Chunk {
 
     private Section[] sections = new Section[16];
 
-    public Chunk(Coordinates2d local_cords, CompoundTag tag) {
+    public Chunk(Point2d local_cords, CompoundTag tag) {
         this.tag = tag;
 
         CompoundTag c_tag_level = (CompoundTag) tag.get("Level");

diff --git a/src/main/java/mregioneer/mcaliases/Region.java b/src/main/java/mregioneer/mcaliases/Region.java
@@ -5,7 +5,7 @@
 import com.mojang.nbt.NbtIo;
 import mregioneer.utils.Point3d;
 import net.minecraft.world.level.chunk.storage.RegionFile;
-import mregioneer.utils.Coordinates2d;
+import mregioneer.utils.Point2d;
 import mregioneer.utils.Formulae;
 
 import java.io.DataInputStream;
@@ -35,7 +35,7 @@ public Region(RegionFile region_file) {
                     tag = null;
                 }
 
-                Coordinates2d local_cords = new Coordinates2d(i, j);
+                Point2d local_cords = new Point2d(i, j);
 
                 Chunk chunk = null;
                 if (tag != null)
@@ -55,7 +55,7 @@ public Chunk[][] getChunks() {
      * @param cords XZ coordinates for chunk
      * @return
      */
-    public Chunk getChunk(Coordinates2d cords) {
+    public Chunk getChunk(Point2d cords) {
         return chunks[cords.getX()][cords.getZ()];
     }
 
@@ -82,7 +82,7 @@ public void saveChunk(Chunk chunk) throws IOException{
      * @param tag
      * @throws IOException
      */
-    public void saveTagAsChunk(Coordinates2d cords, CompoundTag tag) throws IOException{
+    public void saveTagAsChunk(Point2d cords, CompoundTag tag) throws IOException{
 
         int global_x = cords.getX();
         int global_z = cords.getZ();

diff --git a/src/main/java/mregioneer/mcaliases/Vector.java b/src/main/java/mregioneer/mcaliases/Vector.java
@@ -61,7 +61,7 @@ public List<Point3d> getCuboidPoints() {
         int width = getXend() - getXstart() + 1;
         int depth = getYend() - getYstart() + 1;
 
-        //Coordinates3d[] cords_arr = new Coordinates3d[depth * height * width];
+        //Point3d[] cords_arr = new Point3d[depth * height * width];
         ArrayList cords_arr_list = new ArrayList<Point3d>();
 
         for(int z = getZstart(); z <= getZend(); z++) {

diff --git a/src/main/java/mregioneer/mcaliases/World.java b/src/main/java/mregioneer/mcaliases/World.java
@@ -1,16 +1,19 @@
 package mregioneer.mcaliases;
 
 import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
+import com.googlecode.concurrentlinkedhashmap.EvictionListener;
 import mregioneer.utils.Point2d;
 import mregioneer.utils.Point3d;
 import net.minecraft.world.level.chunk.storage.RegionFile;
-import mregioneer.utils.Point2d;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import static mregioneer.utils.Formulae.regionFromBlock;
 
@@ -21,8 +24,25 @@ public class World {
 
     private Map<Point2d, RegionFile> region_files = new HashMap<Point2d, RegionFile>();
 
+    EvictionListener<Point2d, Region> listener;
+    {
+        listener = new EvictionListener<Point2d, Region>() {
+            final ExecutorService executor = Executors.newSingleThreadExecutor();
+
+            public void onEviction(Point2d region_point, final Region region) {
+                executor.submit(new Callable<Void>() {
+                    public Void call() throws IOException {
+                        region.save();
+                        return null;
+                    }
+                });
+            }
+        };
+    }
+
     private ConcurrentMap<Point2d, Region> regions = new ConcurrentLinkedHashMap.Builder<Point2d, Region>()
             .maximumWeightedCapacity(10)
+            .listener(listener)
             .build();
 
     public World(File world_dir) throws IOException {

diff --git a/src/test/java/TestReadWrite.java b/src/test/java/TestReadWrite.java
@@ -7,7 +7,7 @@
 import mregioneer.mcaliases.Chunk;
 import mregioneer.mcaliases.Region;
 import mregioneer.mcaliases.World;
-import mregioneer.utils.Coordinates2d;
+import mregioneer.utils.Point2d;
 
 import java.io.File;
 import java.io.IOException;
@@ -32,7 +32,7 @@ public void testAdd() {
             world = new World(new File (path_to_mca_folder));
             Region rg = world.getRegion(-1, 0);
 
-            Coordinates2d chunk_cords = new Coordinates2d(31, 0);
+            Point2d chunk_cords = new Point2d(31, 0);
 
             Chunk chunk = rg.getChunk(chunk_cords);
             chunk.changeBlockId(-3, 64,6, id_to_make);