From 38ca7c030f6443c623f4b72ae45f54656e8493a9 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sat, 3 Jul 2021 01:21:50 -0400 Subject: [PATCH 1/5] Fix init compound update world --- .../volmit/iris/scaffold/engine/EngineCompositeGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ad9bd8faa..b72621d39 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java +++ b/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); From a942ea6ee2e2a64ec719c6f8d4c22e7a3db3715d Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sat, 3 Jul 2021 01:42:52 -0400 Subject: [PATCH 2/5] My god gradle is slow --- gradle.properties | 5 ++++- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 567bbb916..229aa2332 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,5 @@ org.gradle.daemon=true -org.gradle.parallel=true \ No newline at end of file +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 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69a971507..fe677279e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +zipStorePath=wrapper/dists \ No newline at end of file From 73e975cfa19c83688b922e89b08f41141ece6082 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sat, 3 Jul 2021 01:49:48 -0400 Subject: [PATCH 3/5] BP Hash --- src/main/java/com/volmit/iris/util/BlockPosition.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/volmit/iris/util/BlockPosition.java b/src/main/java/com/volmit/iris/util/BlockPosition.java index 4b3f1e5b3..47f319961 100644 --- a/src/main/java/com/volmit/iris/util/BlockPosition.java +++ b/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) From 9ddf09e18741ad8ac915377408c40693707491f2 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sat, 3 Jul 2021 01:49:55 -0400 Subject: [PATCH 4/5] JSON Tweaks --- src/main/java/com/volmit/iris/util/JSONArray.java | 12 ++++++------ src/main/java/com/volmit/iris/util/JSONObject.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/volmit/iris/util/JSONArray.java b/src/main/java/com/volmit/iris/util/JSONArray.java index ed935bcc3..8f7e6fdb4 100644 --- a/src/main/java/com/volmit/iris/util/JSONArray.java +++ b/src/main/java/com/volmit/iris/util/JSONArray.java @@ -843,7 +843,7 @@ public class JSONArray implements Iterable */ 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 */ public JSONArray put(int value) { - this.put(new Integer(value)); + this.put(value); return this; } @@ -871,7 +871,7 @@ public class JSONArray implements Iterable */ public JSONArray put(long value) { - this.put(new Long(value)); + this.put(value); return this; } @@ -956,7 +956,7 @@ public class JSONArray implements Iterable */ 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 */ 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 */ public JSONArray put(int index, long value) throws JSONException { - this.put(index, new Long(value)); + this.put(index, value); return this; } diff --git a/src/main/java/com/volmit/iris/util/JSONObject.java b/src/main/java/com/volmit/iris/util/JSONObject.java index 3ab4a6115..91a56aacb 100644 --- a/src/main/java/com/volmit/iris/util/JSONObject.java +++ b/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; } From e98209249f5d06abe0f67e2d937ba0006809ac32 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sat, 3 Jul 2021 01:57:32 -0400 Subject: [PATCH 5/5] V+ --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a80df46c1..2aab6c83d 100644 --- a/build.gradle +++ b/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'