diff --git a/build.gradle.kts b/build.gradle.kts index 9b385dde5..1713be9bc 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.13.0", group = "") + compileOnly(name = "Gaea-1.13.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") diff --git a/lib/Gaea-1.13.0-javadoc.jar b/lib/Gaea-1.13.0-javadoc.jar deleted file mode 100644 index 766e62bab..000000000 Binary files a/lib/Gaea-1.13.0-javadoc.jar and /dev/null differ diff --git a/lib/Gaea-1.13.0-sources.jar b/lib/Gaea-1.13.0-sources.jar deleted file mode 100644 index c32f97230..000000000 Binary files a/lib/Gaea-1.13.0-sources.jar and /dev/null differ diff --git a/lib/Gaea-1.13.0.jar b/lib/Gaea-1.13.0.jar deleted file mode 100644 index 629e91b74..000000000 Binary files a/lib/Gaea-1.13.0.jar and /dev/null differ diff --git a/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java b/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java index 59bceea0a..f7d5aa48c 100644 --- a/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java +++ b/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java @@ -32,6 +32,7 @@ import org.polydev.gaea.generation.GenerationPopulator; import org.polydev.gaea.math.ChunkInterpolator; import org.polydev.gaea.math.FastNoiseLite; import org.polydev.gaea.population.PopulationManager; +import org.polydev.gaea.profiler.WorldProfiler; import org.polydev.gaea.world.palette.Palette; import java.io.FileNotFoundException; @@ -152,6 +153,12 @@ public class TerraChunkGenerator extends GaeaChunkGenerator { } } + @Override + public void attachProfiler(WorldProfiler p) { + super.attachProfiler(p); + popMan.attachProfiler(p); + } + public static synchronized void fixChunk(Chunk c) { if(! (c.getWorld().getGenerator() instanceof TerraChunkGenerator)) throw new IllegalArgumentException(); popMap.get(c.getWorld()).checkNeighbors(c.getX(), c.getZ(), c.getWorld()); diff --git a/src/main/resources/default-config/structures/single/mansion.yml b/src/main/resources/default-config/structures/single/mansion.yml index 27367277f..f7e5a9abe 100644 --- a/src/main/resources/default-config/structures/single/mansion.yml +++ b/src/main/resources/default-config/structures/single/mansion.yml @@ -8,8 +8,8 @@ spawn: bound: min: 48 max: 96 - width: 250 - padding: 500 + width: 125 + padding: 100 loot: 1: arrows features: @@ -18,8 +18,8 @@ features: attempts: 100 in-height: 1 amount: - min: 40 - max: 60 + min: 60 + max: 80 spawnable-on: - "minecraft:birch_planks" spawnable-in: diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index c2a3ced40..4cf39c40c 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: "Terra" depend: [ "Gaea" ] main: "com.dfsek.terra.Terra" -version: "1.0.5-BETA" +version: "1.1.1-BETA" load: "STARTUP" api-version: "1.16" softdepend: [ "WorldEdit" ]