Merge remote-tracking branch 'origin/ver/6.0.0' into ver/6.0.0

# Conflicts:
#	README.md
#	platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeAdapter.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeUtil.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/ForgeBlock.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/ForgeBlockData.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeAnaloguePowerable.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeDirectional.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeEnumAdapter.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeMultipleFacing.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeOrientable.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeRotatable.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeSlab.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeStairs.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeWaterlogged.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/config/PostLoadCompatibilityOptions.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/config/PreLoadCompatibilityOptions.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/generation/ForgeChunkGeneratorWrapper.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/generation/PopulatorFeature.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/generation/TerraBiomeSource.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/generation/TerraGeneratorType.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/handle/ForgeItemHandle.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/handle/ForgeWorldHandle.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/listener/ForgeListener.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/listener/RegistryListener.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/DimensionGeneratorSettingsMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/ServerWorldMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/access/AbstractSpawnerAccessor.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/access/BiomeGeneratorTypeScreensAccessor.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/BiomeMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/ChunkGeneratorMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/ConfiguredFeatureMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/BlockMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/TileEntityMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/LockableLootTileEntityMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/MobSpawnerTileEntityMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/SignTileEntityMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/ChunkMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/WorldGenRegionMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/data/ChunkPrimerMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/entity/CommandSourceMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/entity/EntityMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/entity/EntityTypeMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/entity/PlayerEntityMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/LockableTileEntityMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/item/ItemMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/item/ItemStackMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/meta/EnchantmentMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/meta/ItemStackDamageableMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/meta/ItemStackMetaMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/package-info.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/world/ServerWorldMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/world/WorldGenRegionMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/init/MinecraftClientMixin.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/init/MinecraftServerMixin.java
#	platforms/forge/src/main/resources/terra.mixins.json
This commit is contained in:
dfsek
2021-09-03 10:46:48 -07:00
699 changed files with 10048 additions and 8288 deletions

View File

@@ -1,18 +1,20 @@
# Terra
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.
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)
* 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` (`gradlew.bat build` on Windows). This will build all platforms, and produce JARs
in `platforms/<platform>/build/libs`
To build, simply run `./gradlew build` (`gradlew.bat build` on Windows). This
will build all platforms, and produce JARs in `platforms/<platform>/build/libs`
### Production JARs:
@@ -30,10 +32,14 @@ JARs are produced in `platforms/<platform>/build/libs`.
To run Minecraft with Terra in the IDE (for testing) use the following tasks:
* Bukkit
* `installPaper` - Install a [Paper](https://github.com/PaperMC/Paper) test server. (Only needs to be run once).
* `installPurpur` - Install a [Purpur](https://github.com/pl3xgaming/Purpur) test server. (Only needs to be run once).
* `runPaper` - Run the Paper test server with Terra (`installPaper` must have been run previously).
* `runPurpur` - Run the Purpur test server with Terra (`installPurpur` must have been run previously).
* `installPaper` - Install a [Paper](https://github.com/PaperMC/Paper) test
server. (Only needs to be run once).
* `installPurpur` - Install a [Purpur](https://github.com/pl3xgaming/Purpur)
test server. (Only needs to be run once).
* `runPaper` - Run the Paper test server with Terra (`installPaper` must
have been run previously).
* `runPurpur` - Run the Purpur test server with Terra (`installPurpur` must
have been run previously).
* Fabric
* `runClient` - Run a Minecraft Fabric client with Terra installed.
* `runServer` - Run a Minecraft Fabric server with Terra installed.
@@ -41,9 +47,12 @@ To run Minecraft with Terra in the IDE (for testing) use the following tasks:
## Contributing
Contributions are welcome! If you want to see a feature in Terra, please, open an issue, or implement it yourself and submit a PR!
Join the discord [here](https://discord.gg/PXUEbbF) if you would like to talk more about the project!
Contributions are welcome! If you want to see a feature in Terra, please, open
an issue, or implement it yourself and submit a PR!
Join the discord [here](https://discord.gg/PXUEbbF) if you would like to talk
more about the project!
## Beta
Terra is still in beta! While it is stable, it is not feature-complete. There is a lot to be added!
Terra is still in beta! While it is stable, it is not feature-complete. There is
a lot to be added!