Some requested changes

This commit is contained in:
Zoë Gidiere committed 2023-11-08 21:58:57 -07:00
1 parent 0df940d688
commit 89d497d500
17 files changed
+29 -21

No files matched your search

@@ -1,4 +1,4 @@
version = version("1.0.0") version = version("1.0.1")
dependencies { dependencies {
compileOnlyApi(project(":common:addons:manifest-addon-loader")) compileOnlyApi(project(":common:addons:manifest-addon-loader"))
@@ -1,4 +1,4 @@
version = version("1.0.0") version = version("1.0.1")
dependencies { dependencies {
compileOnlyApi(project(":common:addons:manifest-addon-loader")) compileOnlyApi(project(":common:addons:manifest-addon-loader"))
@@ -1,4 +1,4 @@
version = version("1.0.0") version = version("1.0.1")
dependencies { dependencies {
compileOnlyApi(project(":common:addons:manifest-addon-loader")) compileOnlyApi(project(":common:addons:manifest-addon-loader"))
@@ -1,4 +1,4 @@
version = version("1.0.1") version = version("1.0.2")
dependencies { dependencies {
compileOnlyApi(project(":common:addons:manifest-addon-loader")) compileOnlyApi(project(":common:addons:manifest-addon-loader"))
@@ -1,4 +1,4 @@
version = version("1.2.0") version = version("1.2.1")
dependencies { dependencies {
compileOnlyApi(project(":common:addons:manifest-addon-loader")) compileOnlyApi(project(":common:addons:manifest-addon-loader"))
@@ -1,4 +1,4 @@
version = version("1.0.0") version = version("1.0.1")
dependencies { dependencies {
compileOnlyApi(project(":common:addons:manifest-addon-loader")) compileOnlyApi(project(":common:addons:manifest-addon-loader"))
+1 -1
View File
@@ -1,4 +1,4 @@
version = version("1.0.0") version = version("1.0.1")
dependencies { dependencies {
compileOnlyApi(project(":common:addons:manifest-addon-loader")) compileOnlyApi(project(":common:addons:manifest-addon-loader"))
@@ -1,4 +1,4 @@
version = version("1.1.0") version = version("1.1.1")
dependencies { dependencies {
compileOnlyApi(project(":common:addons:manifest-addon-loader")) compileOnlyApi(project(":common:addons:manifest-addon-loader"))
+1 -1
View File
@@ -1,4 +1,4 @@
version = version("1.0.0") version = version("1.1.0")
dependencies { dependencies {
compileOnlyApi(project(":common:addons:manifest-addon-loader")) compileOnlyApi(project(":common:addons:manifest-addon-loader"))
@@ -1,4 +1,4 @@
version = version("1.0.0") version = version("1.0.1")
dependencies { dependencies {
api("com.googlecode.json-simple:json-simple:1.1.1") api("com.googlecode.json-simple:json-simple:1.1.1")
+1 -1
View File
@@ -1,4 +1,4 @@
version = version("1.0.1") version = version("1.1.0")
dependencies { dependencies {
compileOnlyApi(project(":common:addons:manifest-addon-loader")) compileOnlyApi(project(":common:addons:manifest-addon-loader"))
@@ -127,10 +127,12 @@ public class DistanceTransform {
z[0] = Integer.MIN_VALUE; z[0] = Integer.MIN_VALUE;
z[1] = Integer.MAX_VALUE; z[1] = Integer.MAX_VALUE;
for(int q = 1; q <= f.length - 1; q++) { 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]) { while(s <= z[k]) {
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++; k++;
v[k] = q; v[k] = q;
@@ -1,6 +1,12 @@
version = version("1.1.0") import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
version = version("1.2.0")
dependencies { dependencies {
api("commons-io:commons-io:2.7") api("commons-io:commons-io:2.7")
compileOnlyApi(project(":common:addons:manifest-addon-loader")) compileOnlyApi(project(":common:addons:manifest-addon-loader"))
} }
tasks.named<ShadowJar>("shadowJar") {
relocate("org.apache.commons", "com.dfsek.terra.addons.terrascript.lib.commons")
}
@@ -1,4 +1,4 @@
version = version("1.0.0") version = version("1.0.1")
dependencies { dependencies {
compileOnlyApi(project(":common:addons:manifest-addon-loader")) compileOnlyApi(project(":common:addons:manifest-addon-loader"))
+4 -4
View File
@@ -7,12 +7,12 @@ val javaMainClass = "com.dfsek.terra.cli.TerraCLI"
dependencies { dependencies {
shadedApi(project(":common:implementation:base")) shadedApi(project(":common:implementation:base"))
shadedApi("commons-io:commons-io:${Versions.Libraries.Internal.apacheIO}") shadedApi("commons-io", "commons-io", Versions.Libraries.Internal.apacheIO)
shadedApi("com.github.Querz:NBT:${Versions.CLI.nbt}") 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")
} }
+1 -1
View File
@@ -1,4 +1,4 @@
# mixin-common # 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. well as glue code.
+1 -1
View File
@@ -1,3 +1,3 @@
# mixin-lifecycle # mixin-lifecycle
This project contains lifecycle mixins shared between Fabric and formerly Quilt. This project contains lifecycle mixins shared between Fabric, and formerly Quilt.