diff --git a/common/addons/biome-provider-image-v2/build.gradle.kts b/common/addons/biome-provider-image-v2/build.gradle.kts index 38f4801d2..989c8567c 100644 --- a/common/addons/biome-provider-image-v2/build.gradle.kts +++ b/common/addons/biome-provider-image-v2/build.gradle.kts @@ -1,4 +1,4 @@ -version = version("1.0.0") +version = version("1.0.1") dependencies { compileOnlyApi(project(":common:addons:manifest-addon-loader")) diff --git a/common/addons/biome-provider-image/build.gradle.kts b/common/addons/biome-provider-image/build.gradle.kts index f1755a0f0..e01ce95f8 100644 --- a/common/addons/biome-provider-image/build.gradle.kts +++ b/common/addons/biome-provider-image/build.gradle.kts @@ -1,4 +1,4 @@ -version = version("1.0.0") +version = version("1.0.1") dependencies { compileOnlyApi(project(":common:addons:manifest-addon-loader")) diff --git a/common/addons/biome-provider-pipeline-v2/build.gradle.kts b/common/addons/biome-provider-pipeline-v2/build.gradle.kts index d3eaff9fe..f0b8af23a 100644 --- a/common/addons/biome-provider-pipeline-v2/build.gradle.kts +++ b/common/addons/biome-provider-pipeline-v2/build.gradle.kts @@ -1,4 +1,4 @@ -version = version("1.0.0") +version = version("1.0.1") dependencies { compileOnlyApi(project(":common:addons:manifest-addon-loader")) diff --git a/common/addons/biome-provider-pipeline/build.gradle.kts b/common/addons/biome-provider-pipeline/build.gradle.kts index 35e4d7076..2e19b7c85 100644 --- a/common/addons/biome-provider-pipeline/build.gradle.kts +++ b/common/addons/biome-provider-pipeline/build.gradle.kts @@ -1,4 +1,4 @@ -version = version("1.0.1") +version = version("1.0.2") dependencies { compileOnlyApi(project(":common:addons:manifest-addon-loader")) diff --git a/common/addons/chunk-generator-noise-3d/build.gradle.kts b/common/addons/chunk-generator-noise-3d/build.gradle.kts index b4888dea4..3640ad054 100644 --- a/common/addons/chunk-generator-noise-3d/build.gradle.kts +++ b/common/addons/chunk-generator-noise-3d/build.gradle.kts @@ -1,4 +1,4 @@ -version = version("1.2.0") +version = version("1.2.1") dependencies { compileOnlyApi(project(":common:addons:manifest-addon-loader")) diff --git a/common/addons/config-distributors/build.gradle.kts b/common/addons/config-distributors/build.gradle.kts index 9d0aac37f..35e4d7076 100644 --- a/common/addons/config-distributors/build.gradle.kts +++ b/common/addons/config-distributors/build.gradle.kts @@ -1,4 +1,4 @@ -version = version("1.0.0") +version = version("1.0.1") dependencies { compileOnlyApi(project(":common:addons:manifest-addon-loader")) diff --git a/common/addons/config-flora/build.gradle.kts b/common/addons/config-flora/build.gradle.kts index 9d0aac37f..35e4d7076 100644 --- a/common/addons/config-flora/build.gradle.kts +++ b/common/addons/config-flora/build.gradle.kts @@ -1,4 +1,4 @@ -version = version("1.0.0") +version = version("1.0.1") dependencies { compileOnlyApi(project(":common:addons:manifest-addon-loader")) diff --git a/common/addons/config-locators/build.gradle.kts b/common/addons/config-locators/build.gradle.kts index 47ace7fcc..9360372c2 100644 --- a/common/addons/config-locators/build.gradle.kts +++ b/common/addons/config-locators/build.gradle.kts @@ -1,4 +1,4 @@ -version = version("1.1.0") +version = version("1.1.1") dependencies { compileOnlyApi(project(":common:addons:manifest-addon-loader")) diff --git a/common/addons/config-ore/build.gradle.kts b/common/addons/config-ore/build.gradle.kts index 8cbbf63e6..469635ee6 100644 --- a/common/addons/config-ore/build.gradle.kts +++ b/common/addons/config-ore/build.gradle.kts @@ -1,4 +1,4 @@ -version = version("1.0.0") +version = version("1.1.0") dependencies { compileOnlyApi(project(":common:addons:manifest-addon-loader")) diff --git a/common/addons/config-structure/build.gradle.kts b/common/addons/config-structure/build.gradle.kts index aab2399ea..a40803d2b 100644 --- a/common/addons/config-structure/build.gradle.kts +++ b/common/addons/config-structure/build.gradle.kts @@ -1,4 +1,4 @@ -version = version("1.0.0") +version = version("1.0.1") dependencies { api("com.googlecode.json-simple:json-simple:1.1.1") diff --git a/common/addons/library-image/build.gradle.kts b/common/addons/library-image/build.gradle.kts index e01ce95f8..b8682c80b 100644 --- a/common/addons/library-image/build.gradle.kts +++ b/common/addons/library-image/build.gradle.kts @@ -1,4 +1,4 @@ -version = version("1.0.1") +version = version("1.1.0") dependencies { compileOnlyApi(project(":common:addons:manifest-addon-loader")) diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/operator/DistanceTransform.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/operator/DistanceTransform.java index b5fa3458b..4f74ca592 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/operator/DistanceTransform.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/operator/DistanceTransform.java @@ -127,10 +127,12 @@ public class DistanceTransform { z[0] = Integer.MIN_VALUE; z[1] = Integer.MAX_VALUE; for(int q = 1; q <= f.length - 1; q++) { - double s = ((f[q] + Math.pow(q, 2)) - (f[v[k]] + Math.pow(v[k], 2))) / (2 * q - 2 * v[k]); + double fqPlusQ2 = (f[q] + Math.pow(q, 2)); + double twoQ = 2*q; + double s = (fqPlusQ2 - (f[v[k]] + Math.pow(v[k], 2))) / (twoQ - 2 * v[k]); while(s <= z[k]) { k--; - s = ((f[q] + Math.pow(q, 2)) - (f[v[k]] + Math.pow(v[k], 2))) / (2 * q - 2 * v[k]); + s = (fqPlusQ2 - (f[v[k]] + Math.pow(v[k], 2))) / (twoQ - 2 * v[k]); } k++; v[k] = q; diff --git a/common/addons/structure-terrascript-loader/build.gradle.kts b/common/addons/structure-terrascript-loader/build.gradle.kts index 93e35b659..a042ee13c 100644 --- a/common/addons/structure-terrascript-loader/build.gradle.kts +++ b/common/addons/structure-terrascript-loader/build.gradle.kts @@ -1,6 +1,12 @@ -version = version("1.1.0") +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + +version = version("1.2.0") dependencies { api("commons-io:commons-io:2.7") compileOnlyApi(project(":common:addons:manifest-addon-loader")) } + +tasks.named("shadowJar") { + relocate("org.apache.commons", "com.dfsek.terra.addons.terrascript.lib.commons") +} diff --git a/common/addons/terrascript-function-check-noise-3d/build.gradle.kts b/common/addons/terrascript-function-check-noise-3d/build.gradle.kts index bb694d2c6..75dbafba5 100644 --- a/common/addons/terrascript-function-check-noise-3d/build.gradle.kts +++ b/common/addons/terrascript-function-check-noise-3d/build.gradle.kts @@ -1,4 +1,4 @@ -version = version("1.0.0") +version = version("1.0.1") dependencies { compileOnlyApi(project(":common:addons:manifest-addon-loader")) diff --git a/platforms/cli/build.gradle.kts b/platforms/cli/build.gradle.kts index 9edd40c66..12c452419 100644 --- a/platforms/cli/build.gradle.kts +++ b/platforms/cli/build.gradle.kts @@ -7,12 +7,12 @@ val javaMainClass = "com.dfsek.terra.cli.TerraCLI" dependencies { shadedApi(project(":common:implementation:base")) - shadedApi("commons-io:commons-io:${Versions.Libraries.Internal.apacheIO}") - shadedApi("com.github.Querz:NBT:${Versions.CLI.nbt}") + shadedApi("commons-io", "commons-io", Versions.Libraries.Internal.apacheIO) + shadedApi("com.github.Querz", "NBT", "Versions.CLI.nbt") - shadedImplementation("com.google.guava:guava:${Versions.Libraries.Internal.guava}") + shadedImplementation("com.google.guava", "guava", "Versions.Libraries.Internal.guava") - shadedImplementation("ch.qos.logback:logback-classic:${Versions.CLI.logback}") + shadedImplementation("ch.qos.logback", "logback-classic", "Versions.CLI.logback") } diff --git a/platforms/mixin-common/README.md b/platforms/mixin-common/README.md index f252941a2..abc4b885e 100644 --- a/platforms/mixin-common/README.md +++ b/platforms/mixin-common/README.md @@ -1,4 +1,4 @@ # mixin-common -This project contains mixins shared between Forge, Fabric and formerly Quilt, as +This project contains mixins shared between Forge, Fabric, and formerly Quilt, as well as glue code. \ No newline at end of file diff --git a/platforms/mixin-lifecycle/README.md b/platforms/mixin-lifecycle/README.md index 95d7e8c1c..d0f9f2bc3 100644 --- a/platforms/mixin-lifecycle/README.md +++ b/platforms/mixin-lifecycle/README.md @@ -1,3 +1,3 @@ # mixin-lifecycle -This project contains lifecycle mixins shared between Fabric and formerly Quilt. \ No newline at end of file +This project contains lifecycle mixins shared between Fabric, and formerly Quilt. \ No newline at end of file