From bd89d8a308e38d847a5d5271bec54998d5a9cbb9 Mon Sep 17 00:00:00 2001 From: Julian Krings <47589149+CrazyDev05@users.noreply.github.com> Date: Thu, 1 Aug 2024 00:20:30 +0200 Subject: [PATCH 1/4] change version to show 1.21 compat --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e81c2ecd9..204526821 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ plugins { id "de.undercouch.download" version "5.0.1" } -version '3.3.1-1.19.2-1.20.6' +version '3.3.1-1.19.2-1.21' // ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED // ======================== WINDOWS ============================= From cf4796bd121520fc301e11910200001ef340a672 Mon Sep 17 00:00:00 2001 From: Brian Neumann-Fopiano Date: Wed, 31 Jul 2024 18:45:13 -0400 Subject: [PATCH 2/4] V+ --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 204526821..23a86b14f 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ plugins { id "de.undercouch.download" version "5.0.1" } -version '3.3.1-1.19.2-1.21' +version '3.4.0-1.19.2-1.21' // ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED // ======================== WINDOWS ============================= @@ -46,7 +46,7 @@ registerCustomOutputTask('CrazyDev22', 'C://Users/Julian/Desktop/server/plugins' registerCustomOutputTask('Pixel', 'C://Users/repix/Iris Dimension Engine/1.20.4 - Development/plugins') // ========================== UNIX ============================== registerCustomOutputTaskUnix('CyberpwnLT', '/Users/danielmills/development/server/plugins') -registerCustomOutputTaskUnix('PsychoLT', '/Volumes/PRO-G40/Minecraft/MinecraftDevelopment/Server/plugins') +registerCustomOutputTaskUnix('PsychoLT', '/Users/brianfopiano/Developer/RemoteGit/Server/plugins') registerCustomOutputTaskUnix('CrazyDev22LT', '/home/julian/Desktop/server/plugins') // ============================================================== From 61bbfee6408a34d9bf4946194ba0dacdc8c2bff0 Mon Sep 17 00:00:00 2001 From: Julian Krings <47589149+CrazyDev05@users.noreply.github.com> Date: Fri, 2 Aug 2024 18:20:25 +0200 Subject: [PATCH 3/4] Update README.md --- README.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fadd56ffe..3d366c618 100644 --- a/README.md +++ b/README.md @@ -30,14 +30,11 @@ Consider supporting our development by buying Iris on spigot! We work hard to ma 3. Add `export JAVA_HOME=$(/usr/libexec/java_home)` as a new line 4. Use `CTRL + X`, then Press `Y`, Then `ENTER` 5. Quit & Reopen Terminal and verify with `echo $JAVA_HOME`. It should print a directory -3. If this is your first time building Iris for MC 1.18+ run `gradlew setup` inside the root Iris project folder. - Otherwise, skip this step. Grab a coffee, this may take up to 45 minutes depending on your cpu & internet connection. -4. Once the project has setup, run `gradlew iris` -5. The Iris jar will be placed in `Iris/build/Iris-XXX-XXX.jar` Enjoy! Consider supporting us by buying it on spigot! +3. Once the project has setup, run `gradlew iris` +4. The Iris jar will be placed in `Iris/build/Iris-XXX-XXX.jar` Enjoy! Consider supporting us by buying it on spigot! ### IDE Builds (for development) -* Run `gradlew setup` any time you get dependency issues with craftbukkit * Configure ITJ Gradle to use JDK 17 (in settings, search for gradle) * Add a build line in the build.gradle for your own build task to directly compile Iris into your plugins folder if you prefer. From 8e9f78e982631adf0c7d8c35b8a107220e9e292e Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Sat, 3 Aug 2024 13:03:50 +0200 Subject: [PATCH 4/4] fix region zoom --- core/src/main/java/com/volmit/iris/engine/IrisComplex.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/main/java/com/volmit/iris/engine/IrisComplex.java b/core/src/main/java/com/volmit/iris/engine/IrisComplex.java index cc3dc996e..a0da316aa 100644 --- a/core/src/main/java/com/volmit/iris/engine/IrisComplex.java +++ b/core/src/main/java/com/volmit/iris/engine/IrisComplex.java @@ -124,7 +124,6 @@ public class IrisComplex implements DataProvider { ProceduralStream.of((x, z) -> focusRegion, Interpolated.of(a -> 0D, a -> focusRegion)) : regionStyleStream - .zoom(engine.getDimension().getRegionZoom()) .selectRarity(data.getRegionLoader().loadAll(engine.getDimension().getRegions())) .cache2D("regionStream", engine, cacheSize).waste("Region Stream"); regionIDStream = regionIdentityStream.convertCached((i) -> new UUID(Double.doubleToLongBits(i),