Merge remote-tracking branch 'upstream/master' into 1.17

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'com.volmit.iris'
-version '1.4.4'
+version '1.4.6'
 def apiVersion = '1.17'
 def name = 'Iris'
 def main = 'com.volmit.iris.Iris'

gradle.properties

@@ -1,2 +1,5 @@
 org.gradle.daemon=true
 org.gradle.parallel=true
+org.gradle.jvmargs=-Xmx3072m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.caching=true
+org.gradle.configureondemand=true

src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java

@@ -287,7 +287,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
     }
 
     public synchronized void initialize(World world) {
-        if(!(world instanceof FakeWorld) && fake.get())
+        if(!(world instanceof FakeWorld) && fake.get() && this.compound != null)
         {
             fake.set(false);
             this.compound.updateWorld(world);

src/main/java/com/volmit/iris/util/BlockPosition.java

@@ -2,6 +2,8 @@ package com.volmit.iris.util;
 
 import lombok.Data;
 
+import java.util.Objects;
+
 @Data
 public class BlockPosition
 {
@@ -16,6 +18,11 @@ public class BlockPosition
 		this.z = z;
 	}
 
+	@Override
+	public int hashCode() {
+		return Objects.hash(x, y, z);
+	}
+
 	public boolean equals(Object o)
 	{
 		if(o == null)

src/main/java/com/volmit/iris/util/JSONArray.java

@@ -843,7 +843,7 @@ public class JSONArray implements Iterable<Object>
 	 */
 	public JSONArray put(double value) throws JSONException
 	{
-		Double d = new Double(value);
+		Double d = value;
 		JSONObject.testValidity(d);
 		this.put(d);
 		return this;
@@ -858,7 +858,7 @@ public class JSONArray implements Iterable<Object>
 	 */
 	public JSONArray put(int value)
 	{
-		this.put(new Integer(value));
+		this.put(value);
 		return this;
 	}
 
@@ -871,7 +871,7 @@ public class JSONArray implements Iterable<Object>
 	 */
 	public JSONArray put(long value)
 	{
-		this.put(new Long(value));
+		this.put(value);
 		return this;
 	}
 
@@ -956,7 +956,7 @@ public class JSONArray implements Iterable<Object>
 	 */
 	public JSONArray put(int index, double value) throws JSONException
 	{
-		this.put(index, new Double(value));
+		this.put(index, value);
 		return this;
 	}
 
@@ -975,7 +975,7 @@ public class JSONArray implements Iterable<Object>
 	 */
 	public JSONArray put(int index, int value) throws JSONException
 	{
-		this.put(index, new Integer(value));
+		this.put(index, value);
 		return this;
 	}
 
@@ -994,7 +994,7 @@ public class JSONArray implements Iterable<Object>
 	 */
 	public JSONArray put(int index, long value) throws JSONException
 	{
-		this.put(index, new Long(value));
+		this.put(index, value);
 		return this;
 	}
 

src/main/java/com/volmit/iris/util/JSONObject.java

@@ -1352,7 +1352,7 @@ public class JSONObject
 	 */
 	public JSONObject put(String key, double value) throws JSONException
 	{
-		this.put(key, new Double(value));
+		this.put(key, value);
 		return this;
 	}