diff --git a/build.gradle.kts b/build.gradle.kts index f178181b5..be590b5be 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,7 +33,7 @@ dependencies { compileOnly("org.spigotmc:spigot-api:1.16.2-R0.1-SNAPSHOT") compileOnly("org.jetbrains:annotations:20.1.0") // more recent. implementation("commons-io:commons-io:2.4") - compileOnly(name = "Gaea-1.14.1", group = "") + compileOnly(name = "Gaea-1.14.2", group = "") implementation("org.apache.commons:commons-imaging:1.0-alpha2") compileOnly("com.sk89q.worldedit:worldedit-bukkit:7.2.0-SNAPSHOT") implementation("org.bstats:bstats-bukkit:1.7") @@ -45,7 +45,7 @@ dependencies { testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.0") - testImplementation(name = "Gaea-1.14.1", group = "") + testImplementation(name = "Gaea-1.14.2", group = "") testImplementation("org.spigotmc:spigot-api:1.16.2-R0.1-SNAPSHOT") } diff --git a/lib/Gaea-1.14.1-javadoc.jar b/lib/Gaea-1.14.1-javadoc.jar deleted file mode 100644 index c90b5a24e..000000000 Binary files a/lib/Gaea-1.14.1-javadoc.jar and /dev/null differ diff --git a/lib/Gaea-1.14.1-sources.jar b/lib/Gaea-1.14.1-sources.jar deleted file mode 100644 index c3b48710b..000000000 Binary files a/lib/Gaea-1.14.1-sources.jar and /dev/null differ diff --git a/lib/Gaea-1.14.1.jar b/lib/Gaea-1.14.1.jar deleted file mode 100644 index 67d9df0d2..000000000 Binary files a/lib/Gaea-1.14.1.jar and /dev/null differ diff --git a/lib/Gaea-1.14.2.jar b/lib/Gaea-1.14.2.jar new file mode 100644 index 000000000..06a03fedc Binary files /dev/null and b/lib/Gaea-1.14.2.jar differ diff --git a/src/main/resources/default-config/abstract/biomes/basic_ores.yml b/src/main/resources/default-config/abstract/biomes/basic_ores.yml index a881a1d64..4da757e12 100644 --- a/src/main/resources/default-config/abstract/biomes/basic_ores.yml +++ b/src/main/resources/default-config/abstract/biomes/basic_ores.yml @@ -4,7 +4,7 @@ structures: - STRONGHOLD carving: - CAVE: 30 + CAVE: 40 RAVINE: 5 CAVERN: 5 ores: diff --git a/src/main/resources/default-config/abstract/biomes/deep_ocean_abstract.yml b/src/main/resources/default-config/abstract/biomes/deep_ocean_abstract.yml index 19178b724..d3494ef35 100644 --- a/src/main/resources/default-config/abstract/biomes/deep_ocean_abstract.yml +++ b/src/main/resources/default-config/abstract/biomes/deep_ocean_abstract.yml @@ -26,7 +26,7 @@ flora: max: 64 carving: - CAVE_OCEAN: 35 + CAVE_OCEAN: 45 structures: - STRONGHOLD diff --git a/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty.yml b/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty.yml index 7804b2f8b..11338dd17 100644 --- a/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty.yml +++ b/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty.yml @@ -2,7 +2,7 @@ noise-equation: "((-((y / 76)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + abs(noise2(x id: "MOUNTAINS_PRETTY" carving: - CAVE: 30 + CAVE: 40 RAVINE: 5 CAVERN: 5 diff --git a/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_0.yml b/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_0.yml index f1d67c27a..717fb53c1 100644 --- a/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_0.yml +++ b/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_0.yml @@ -2,7 +2,7 @@ noise-equation: "((-((y / 64)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + abs(noise2(x id: "MOUNTAINS_PRETTY_0" carving: - CAVE: 30 + CAVE: 40 RAVINE: 5 CAVERN: 5 diff --git a/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_1.yml b/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_1.yml index 0ad6d73ee..4cd7e192a 100644 --- a/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_1.yml +++ b/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_1.yml @@ -2,7 +2,7 @@ noise-equation: "((-((y / 70)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + abs(noise2(x id: "MOUNTAINS_PRETTY_1" carving: - CAVE: 30 + CAVE: 40 RAVINE: 5 CAVERN: 5 diff --git a/src/main/resources/default-config/abstract/biomes/ocean_abstract.yml b/src/main/resources/default-config/abstract/biomes/ocean_abstract.yml index 08c9951b9..40076c94d 100644 --- a/src/main/resources/default-config/abstract/biomes/ocean_abstract.yml +++ b/src/main/resources/default-config/abstract/biomes/ocean_abstract.yml @@ -26,7 +26,7 @@ flora: max: 64 carving: - CAVE_OCEAN: 35 + CAVE_OCEAN: 45 structures: - STRONGHOLD diff --git a/src/main/resources/default-config/abstract/biomes/plains_abstract.yml b/src/main/resources/default-config/abstract/biomes/plains_abstract.yml index 065fbd3d2..251cf0f2f 100644 --- a/src/main/resources/default-config/abstract/biomes/plains_abstract.yml +++ b/src/main/resources/default-config/abstract/biomes/plains_abstract.yml @@ -2,7 +2,7 @@ noise-equation: "((-((y / 63)^2)) + 1) + |(noise2(x, z) / 3) + 0.1|" id: "PLAINS_ABSTRACT" carving: - CAVE: 30 + CAVE: 40 RAVINE: 5 CAVERN: 5 diff --git a/src/main/resources/default-config/abstract/biomes/shelf_ocean_abstract.yml b/src/main/resources/default-config/abstract/biomes/shelf_ocean_abstract.yml index ccf221321..1ec3c36a4 100644 --- a/src/main/resources/default-config/abstract/biomes/shelf_ocean_abstract.yml +++ b/src/main/resources/default-config/abstract/biomes/shelf_ocean_abstract.yml @@ -28,7 +28,7 @@ flora: max: 64 carving: - CAVE_OCEAN: 35 + CAVE_OCEAN: 45 ores: DIRT: diff --git a/src/main/resources/default-config/carving/cave.yml b/src/main/resources/default-config/carving/cave.yml index c3e71fb4c..f8b5166e9 100644 --- a/src/main/resources/default-config/carving/cave.yml +++ b/src/main/resources/default-config/carving/cave.yml @@ -19,7 +19,7 @@ start: max: 72 cut: top: 0 - bottom: 2 + bottom: 1 mutate: x: 1 y: 3 diff --git a/src/main/resources/default-config/carving/cave_ocean.yml b/src/main/resources/default-config/carving/cave_ocean.yml index c94ae2688..9f46c88f2 100644 --- a/src/main/resources/default-config/carving/cave_ocean.yml +++ b/src/main/resources/default-config/carving/cave_ocean.yml @@ -1,4 +1,5 @@ id: "CAVE_OCEAN" +step: 2 length: min: 40 max: 80 @@ -11,14 +12,14 @@ start: x: 1 y: 1 z: 1 - min: 2 + min: 3 max: 4 height: min: 4 max: 72 cut: top: 0 - bottom: 0 + bottom: 1 mutate: x: 1 y: 3 diff --git a/src/main/resources/default-config/carving/cave_swamp.yml b/src/main/resources/default-config/carving/cave_swamp.yml index 00f5f8cbc..045fa0fab 100644 --- a/src/main/resources/default-config/carving/cave_swamp.yml +++ b/src/main/resources/default-config/carving/cave_swamp.yml @@ -1,4 +1,5 @@ id: "CAVE_SWAMP" +step: 2 length: min: 40 max: 80 @@ -11,14 +12,14 @@ start: x: 1 y: 1 z: 1 - min: 2 + min: 3 max: 4 height: min: 4 max: 72 cut: top: 0 - bottom: 0 + bottom: 1 mutate: x: 1 y: 3 diff --git a/src/main/resources/default-config/carving/cave_tundra.yml b/src/main/resources/default-config/carving/cave_tundra.yml index 22d2ed23d..30deefe74 100644 --- a/src/main/resources/default-config/carving/cave_tundra.yml +++ b/src/main/resources/default-config/carving/cave_tundra.yml @@ -1,4 +1,5 @@ id: "CAVE_TUNDRA" +step: 2 length: min: 40 max: 80 @@ -11,14 +12,14 @@ start: x: 1 y: 1 z: 1 - min: 2 + min: 3 max: 4 height: min: 4 max: 72 cut: top: 0 - bottom: 0 + bottom: 1 mutate: x: 1 y: 3