From c0d26256af8c8fc8c450d24afdcff4d41905c93a Mon Sep 17 00:00:00 2001 From: dfsek Date: Wed, 3 Mar 2021 13:42:15 -0700 Subject: [PATCH 1/4] fix typo --- .../com/dfsek/terra/api/world/tree/fractal/trees/OakTree.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/OakTree.java b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/OakTree.java index ced1db454..c973d872a 100644 --- a/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/OakTree.java +++ b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/OakTree.java @@ -39,7 +39,7 @@ public class OakTree extends FractalTree { private void growBranch(Location l1, Vector3 diff, double d1, int recursions, Random r) { BlockData wood = getMain().getWorldHandle().createBlockData("minecraft:oak_wood"); - BlockData leaves = getMain().getWorldHandle().createBlockData("minecraft:oak_leave"); + BlockData leaves = getMain().getWorldHandle().createBlockData("minecraft:oak_leaves"); if(recursions > 1) { geo.generateSphere(l1, leaves, 1 + r.nextInt(2) + (3 - recursions), false, r); if(recursions > 2) return; From dc52dd635b3e8fe96a4c2eeafcc2b6d491d13c41 Mon Sep 17 00:00:00 2001 From: dfsek Date: Wed, 3 Mar 2021 15:59:26 -0700 Subject: [PATCH 2/4] update README.md --- README.md | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 42b12fcbc..759f27aaf 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,22 @@ # Terra -Terra is a data-driven world generator based on [Gaea](https://github.com/PolyhedralDev/Gaea). Find out more on our -[Spigot page](https://www.spigotmc.org/resources/85151/)! + +Terra is an incredibly powerful free & open-source data-driven, platform-agnostic world generator. It allows you to create a world exactly +to your specifications, with no knowledge of Java required. + +## Downloads: + +* Paper+ servers (Paper, Tuinity, Purpur, etc): [SpigotMC](https://www.spigotmc.org/resources/85151/) +* Fabric: [Modrinth](https://modrinth.com/mod/terra) / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/terra-world-generator) ## Building and running Terra -To build, simply run `./gradlew build` on Linux/MacOS, or `gradlew.bat build` on Windows. -This will produce a jar in `build/libs` called `Terra-[CURRENT VERSION].jar`. -You can put this right into your plugins dir, along with the correct Gaea version. + +To build, simply run `./gradlew build` (`gradlew.bat build` on Windows). This will produce a jar in `build/libs` +called `Terra-[CURRENT VERSION].jar`. You can put this right into your plugins dir, along with the correct Gaea version. If you would like to test it with a default server config, just run `./gradlew setupServer` or -`./gradlew.bat setupServer` to set up the server, then `./gradlew testWithPaper` or `gradlew.bat testWithPaper` to run -the server. If you want a clean installation of the server, re-run the `setupServer` task. -This will download a default server config from [here](https://github.com/PolyhedralDev/WorldGenTestServer) +`./gradlew.bat setupServer` to set up the server, then `./gradlew testWithPaper` or `gradlew.bat testWithPaper` to run the server. If you +want a clean installation of the server, re-run the `setupServer` task. This will download a default server config +from [here](https://github.com/PolyhedralDev/WorldGenTestServer) and install the server in the `target/server` directory, along with all the needed plugins. **Note: You will need to adjust the `NAME` variable `bukkit.yml` of the test server if you are not using the default From c8c3ab312b7008c03217be68cf9868823f899878 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sat, 6 Mar 2021 10:04:25 -0700 Subject: [PATCH 3/4] separate generator and GeneratorWrapper --- .../platform/world/generator/GeneratorWrapper.java | 9 +++++++++ .../com/dfsek/terra/config/dummy/DummyWorld.java | 5 +++-- .../main/java/com/dfsek/terra/world/TerraWorld.java | 10 +++++----- .../generator/BukkitChunkGeneratorWrapper.java | 3 ++- .../generator/FabricChunkGeneratorWrapper.java | 13 ++++++++----- 5 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 common/src/main/java/com/dfsek/terra/api/platform/world/generator/GeneratorWrapper.java diff --git a/common/src/main/java/com/dfsek/terra/api/platform/world/generator/GeneratorWrapper.java b/common/src/main/java/com/dfsek/terra/api/platform/world/generator/GeneratorWrapper.java new file mode 100644 index 000000000..127f9e5bf --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/generator/GeneratorWrapper.java @@ -0,0 +1,9 @@ +package com.dfsek.terra.api.platform.world.generator; + +import com.dfsek.terra.api.platform.Handle; +import com.dfsek.terra.api.world.generation.TerraChunkGenerator; + +public interface GeneratorWrapper extends Handle { + @Override + TerraChunkGenerator getHandle(); +} diff --git a/common/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java b/common/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java index d55d813ff..a71cb0867 100644 --- a/common/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java +++ b/common/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java @@ -7,6 +7,7 @@ import com.dfsek.terra.api.platform.entity.EntityType; import com.dfsek.terra.api.platform.world.Chunk; import com.dfsek.terra.api.platform.world.World; import com.dfsek.terra.api.platform.world.generator.ChunkGenerator; +import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper; import java.io.File; import java.util.UUID; @@ -24,12 +25,12 @@ public class DummyWorld implements World { @Override public int getMaxHeight() { - return 155; + return 255; } @Override public ChunkGenerator getGenerator() { - return () -> (ChunkGenerator) () -> null; + return () -> (GeneratorWrapper) () -> null; } @Override diff --git a/common/src/main/java/com/dfsek/terra/world/TerraWorld.java b/common/src/main/java/com/dfsek/terra/world/TerraWorld.java index cfec49efe..d173d12f2 100644 --- a/common/src/main/java/com/dfsek/terra/world/TerraWorld.java +++ b/common/src/main/java/com/dfsek/terra/world/TerraWorld.java @@ -6,7 +6,7 @@ import com.dfsek.terra.api.math.vector.Location; import com.dfsek.terra.api.math.vector.Vector3; import com.dfsek.terra.api.platform.block.BlockData; import com.dfsek.terra.api.platform.world.World; -import com.dfsek.terra.api.platform.world.generator.ChunkGenerator; +import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.provider.BiomeProvider; import com.dfsek.terra.api.world.generation.TerraChunkGenerator; @@ -37,16 +37,16 @@ public class TerraWorld { safe = true; } - public TerraChunkGenerator getGenerator() { - return (TerraChunkGenerator) ((ChunkGenerator) world.getGenerator().getHandle()).getHandle(); + public static boolean isTerraWorld(World w) { + return w.getGenerator().getHandle() instanceof GeneratorWrapper; } public World getWorld() { return world; } - public static boolean isTerraWorld(World w) { - return w.getGenerator().getHandle() instanceof ChunkGenerator; + public TerraChunkGenerator getGenerator() { + return ((GeneratorWrapper) world.getGenerator().getHandle()).getHandle(); } public BiomeProvider getBiomeProvider() { diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java index 278583560..092b486f2 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java @@ -2,6 +2,7 @@ package com.dfsek.terra.bukkit.generator; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper; import com.dfsek.terra.api.world.generation.TerraBlockPopulator; import com.dfsek.terra.api.world.generation.TerraChunkGenerator; import com.dfsek.terra.bukkit.population.PopulationManager; @@ -29,7 +30,7 @@ import java.util.Map; import java.util.Random; import java.util.stream.Collectors; -public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements com.dfsek.terra.api.platform.world.generator.ChunkGenerator { +public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements GeneratorWrapper { private static final Map popMap = new HashMap<>(); diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java index dad4cba8f..b1d769cef 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java @@ -1,6 +1,8 @@ package com.dfsek.terra.fabric.world.generator; +import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper; import com.dfsek.terra.api.util.FastRandom; +import com.dfsek.terra.api.world.generation.TerraChunkGenerator; import com.dfsek.terra.config.pack.ConfigPack; import com.dfsek.terra.fabric.TerraFabricPlugin; import com.dfsek.terra.fabric.world.TerraBiomeSource; @@ -30,7 +32,7 @@ import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.chunk.StructuresConfig; import net.minecraft.world.gen.chunk.VerticalBlockSample; -public class FabricChunkGeneratorWrapper extends ChunkGenerator implements com.dfsek.terra.api.platform.world.generator.ChunkGenerator { +public class FabricChunkGeneratorWrapper extends ChunkGenerator implements GeneratorWrapper { private final long seed; private final DefaultChunkGenerator3D delegate; private final TerraBiomeSource biomeSource; @@ -85,10 +87,6 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements com.d this.seed = seed; } - @Override - public DefaultChunkGenerator3D getHandle() { - return delegate; - } @Override protected Codec getCodec() { @@ -149,4 +147,9 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements com.d return new VerticalBlockSample(array); } + + @Override + public TerraChunkGenerator getHandle() { + return delegate; + } } From f989e4dc89310ce0fba126cb9d8f6b9f6525fe88 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sat, 6 Mar 2021 11:37:28 -0700 Subject: [PATCH 4/4] fix fabric mixin stuff --- platforms/fabric/build.gradle.kts | 6 +++--- platforms/fabric/gradle.properties | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 platforms/fabric/gradle.properties diff --git a/platforms/fabric/build.gradle.kts b/platforms/fabric/build.gradle.kts index 73dc69a3e..2aea53e83 100644 --- a/platforms/fabric/build.gradle.kts +++ b/platforms/fabric/build.gradle.kts @@ -39,7 +39,7 @@ configure { tasks.register("remapShadedJar") { dependsOn("shadowJar") setProperty("input", file("build/libs/Terra-fabric-${version}-shaded.jar")) - setProperty("addNestedDependencies", false) + setProperty("addNestedDependencies", true) setProperty("remapAccessWidener", true) } @@ -57,7 +57,7 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. "modImplementation"("net.fabricmc.fabric-api:fabric-api:0.31.0+1.16") - "compileOnly"("net.fabricmc:sponge-mixin:+") - "annotationProcessor"("net.fabricmc:sponge-mixin:+") + "compileOnly"("net.fabricmc:sponge-mixin:0.8.1") + "annotationProcessor"("net.fabricmc:sponge-mixin:0.8.1") "annotationProcessor"("net.fabricmc:fabric-loom:+") } \ No newline at end of file diff --git a/platforms/fabric/gradle.properties b/platforms/fabric/gradle.properties new file mode 100644 index 000000000..95b4763a8 --- /dev/null +++ b/platforms/fabric/gradle.properties @@ -0,0 +1 @@ +org.gradle.jvmargs=-Xmx4G