From 0755e8f618c18486a4ab42b673f5a5a6946b4ecd Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Sun, 6 Dec 2020 06:09:33 -0500
Subject: [PATCH] Regen inf

---
 .../engine/EngineCompositeGenerator.java      | 19 ++++++++-----------
 .../engine/EngineParallaxManager.java         |  6 +-----
 .../iris/scaffold/engine/EnginePlayer.java    | 16 ++++++++++++----
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
index 56188d372..249efab0a 100644
--- a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
+++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
@@ -498,11 +498,6 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
 
     @Override
     public void clearRegeneratedLists(int x, int z) {
-        if (true)
-        {
-            return;
-        }
-
         for(int i = 0; i < getComposite().getSize(); i++)
         {
             getComposite().getEngine(i).getParallax().delete(x, z);
@@ -511,6 +506,9 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
 
     @Override
     public void regenerate(int x, int z) {
+        clearRegeneratedLists(x, z);
+        int xx = x*16;
+        int zz = z*16;
         generateChunkRawData(getComposite().getWorld(), x, z, new TerrainChunk() {
             @Override
             public void setRaw(ChunkData data) {
@@ -544,12 +542,15 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
 
             @Override
             public void setBlock(int x, int y, int z, BlockData blockData) {
-                Iris.edit.set(compound.getWorld(), x, y, z, blockData);
+                if(!getBlockData(x,y,z).matches(blockData))
+                {
+                    Iris.edit.set(compound.getWorld(), x+xx, y, z+zz, blockData);
+                }
             }
 
             @Override
             public BlockData getBlockData(int x, int y, int z) {
-                return Iris.edit.get(compound.getWorld(), x, y, z);
+                return Iris.edit.get(compound.getWorld(), x+xx, y, z+zz);
             }
 
             @Override
@@ -607,10 +608,6 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
 
         Iris.edit.flushNow();
 
-        for (BlockPopulator i : populators) {
-            Chunk chunk = getComposite().getWorld().getChunkAt(x, z);
-            i.populate(compound.getWorld(), new RNG(Cache.key(x, z)), chunk);
-        }
     }
 
 
diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java
index b4ed9a754..59cede8a4 100644
--- a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java
+++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java
@@ -409,13 +409,9 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer
             }
         }
 
+        x = Math.max(z, x);
         x = (Math.max(x, 16) + 16) >> 4;
-        z = (Math.max(z, 16) + 16) >> 4;
         x = x % 2 == 0 ? x + 1 : x;
-        z = z % 2 == 0 ? z + 1 : z;
-        x = Math.max(x, z);
-        z = x;
-        Iris.verbose(getEngine().getDimension().getName() + " Parallax Size: " + x + ", " + z);
         return x;
     }
 
diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EnginePlayer.java b/src/main/java/com/volmit/iris/scaffold/engine/EnginePlayer.java
index 52a5761a2..bc97422ee 100644
--- a/src/main/java/com/volmit/iris/scaffold/engine/EnginePlayer.java
+++ b/src/main/java/com/volmit/iris/scaffold/engine/EnginePlayer.java
@@ -56,11 +56,19 @@ public class EnginePlayer {
     }
 
     public void sample() {
-        if(ticksSinceLastSample() > 55 && player.getLocation().distanceSquared(lastLocation) > 9 * 9)
+        try
         {
-            lastLocation = player.getLocation().clone();
-            lastSample = M.ms();
-            sampleBiomeRegion();
+            if(ticksSinceLastSample() > 55 && player.getLocation().distanceSquared(lastLocation) > 9 * 9)
+            {
+                lastLocation = player.getLocation().clone();
+                lastSample = M.ms();
+                sampleBiomeRegion();
+            }
+        }
+
+        catch(Throwable ew)
+        {
+
         }
     }