implement RegistryArgument

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -37,12 +37,9 @@ assignees: ""
 -->
 
 - [ ] I have checked that I am on the latest version of Terra.
-- [ ] I have searched the github issue tracker for similar issues, including
-  closed ones.
-- [ ] I have made sure that this is not a bug with another mod or plugin, and it
-  is Terra that is causing the issue.
-- [ ] I have checked that this is an issue with Terra and not an issue with the
-  pack I am using.
+- [ ] I have searched the github issue tracker for similar issues, including closed ones.
+- [ ] I have made sure that this is not a bug with another mod or plugin, and it is Terra that is causing the issue.
+- [ ] I have checked that this is an issue with Terra and not an issue with the pack I am using.
   <!-- If this is an issue with the default Terra pack, please open an issue on the pack repo: https://github.com/PolyhedralDev/TerraDefaultConfig/issues/new -->
 - [ ] I have attached a copy of the `latest.log` file
 - [ ] I have filled out and provided all the appropriate information.

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

@@ -31,11 +31,9 @@ assignees: ""
 -->
 
 - [ ] I have checked that I am on the latest version of Terra.
-- [ ] I have searched github for similar features requests, including closed
-  ones, and found none.
+- [ ] I have searched github for similar features requests, including closed ones, and found none.
 - [ ] I believe this is within the scope of Terra.
-- [ ] This feature request is for *all* of Terra, and isn't something that
-  should be implemented by a pack or addon.
+- [ ] This feature request is for *all* of Terra, and isn't something that should be implemented by a pack or addon.
 
 ## Feature Description
 

.github/ISSUE_TEMPLATE/OTHER_ISSUES.md

@@ -1,7 +1,6 @@
 ---
 name: "Other Issue"
-about: "Use this template if your issue doesn't accurately fit into any of the
-other categories."
+about: "Use this template if your issue doesn't accurately fit into any of the other categories."
 title: ""
 labels: "Type: Question, Status: Pending"
 assignees: ""

.github/PULL_REQUEST_TEMPLATE.md

@@ -33,11 +33,9 @@
 
 <!-- In order to be accepted, your changes must be under the GPLv3 license. Please check one of the following: -->
 
-- [ ] I am the original author of this code, and I am willing to release it
-  under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html).
-- [ ] I am not the original author of this code, but it is in public domain or
-  released under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html) or a
-  compatible license.
+- [ ] I am the original author of this code, and I am willing to release it under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html).
+- [ ] I am not the original author of this code, but it is in public domain or released
+  under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html) or a compatible license.
     <!--
       Please provide reliable evidence of this.
       NOTE: for compatible licenses, you must make sure to add the included license somewhere in the program, if so required.
@@ -72,24 +70,19 @@
 
 - [ ] Bug Fix <!-- Anything which fixes an issue in Terra. -->
 - [ ] Build system <!-- Anything which pretain to the build system. -->
-- [ ] 
-  Documentation <!-- Anything which adds or improves documentation for existing features. -->
+- [ ] Documentation <!-- Anything which adds or improves documentation for existing features. -->
 - [ ] New Feature <!-- Anything which adds new functionality to Terra. -->
 - [ ] Performance <!-- Anything which is imrpoves the performance of Terra. -->
-- [ ] 
-  Refactoring <!-- Anything which does not add any new code, only moves code around. -->
-- [ ] 
-  Repository <!-- Anything which affects the repository. Eg. changes to the `README.md` file. -->
+- [ ] Refactoring <!-- Anything which does not add any new code, only moves code around. -->
+- [ ] Repository <!-- Anything which affects the repository. Eg. changes to the `README.md` file. -->
 - [ ] Revert <!-- Anything which reverts previous commits. -->
 - [ ] Style <!-- Anything which updates style. -->
 - [ ] Tests <!-- Anything which adds or updates tests. -->
-- [ ] 
-  Translation <!-- Anything which is internationalizing the Terra program to other languages. -->
+- [ ] Translation <!-- Anything which is internationalizing the Terra program to other languages. -->
 
 #### Compatiblity
 
-- [ ] Breaking
-  change <!-- A fix, or a feature, that breaks some previous functionality to Terra. -->
+- [ ] Breaking change <!-- A fix, or a feature, that breaks some previous functionality to Terra. -->
 - [ ] Non-Breaking change.
     <!--
         A change which does not break *any* previous functionality of Terra.
@@ -101,9 +94,8 @@
 
 #### Contribution Guidelines.
 
-- [ ] I have read
-  the [`CONTRIBUTING.md`](https://github.com/PolyhedralDev/Terra/blob/master/CONTRIBUTING.md)
-  document in the root of the git repository.
+- [ ] I have read the [`CONTRIBUTING.md`](https://github.com/PolyhedralDev/Terra/blob/master/CONTRIBUTING.md) document in the root of the
+  git repository.
 - [ ] My code follows the code style for this
   project. <!-- There is an included `.editorconfig` file in the base of the repo. Please use a plugin for your IDE of choice that follows those settings. -->
 

.gitignore

@@ -65,8 +65,6 @@ hs_err_pid*
 .idea/**/dictionaries
 .idea/**/shelf
 
-.idea/
-
 # Generated files
 .idea/**/contentModel.xml
 
@@ -129,120 +127,17 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
 
-### Windows template
-# Windows thumbnail cache files
-Thumbs.db
-Thumbs.db:encryptable
-ehthumbs.db
-ehthumbs_vista.db
+# Ignore Gradle build output directory
+build
+/target/
 
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-### macOS template
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-### Linux template
-*~
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
-
-### Application
-# Archive love files
-*.log.gz
-
-# binary files
-*.bin
-
-# Database files
-*.db
-
-# Cache files
-*.meta
-*.data
-
-### JEnv template
-# JEnv local Java version configuration file
-.java-version
-
-# Used by previous versions of JEnv
-.jenv-version
-
-### VisualStudioCode template
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-*.code-workspace
-
-# Local History for Visual Studio Code
-.history/
-
-### NetBeans template
-**/nbproject/private/
-**/nbproject/Makefile-*.mk
-**/nbproject/Package-*.bash
-build/
-nbbuild/
-dist/
-nbdist/
-.nb-gradle/
-
-###
-**/target/
+.idea/sonarlint/**
+.idea/codeStyles/**
+.idea/**.xml
+.idea/modules/**.iml
 
+!lib/*.jar
 /run/
+idea/**
 
-**/testDir/
+testDir/

CODE_OF_CONDUCT.md

@@ -27,8 +27,8 @@ for everyone. We do not tolerate harassment of participants in any form.
 ## When and How to Use These Guidelines
 
 This code of conduct applies to all Terra community spaces, both online and off.
-This applies to the github discussion tab, the
-[Polyhedral Development community discord server](https://discord.gg/PXUEbbF),
+This applies to the github discussion tab, the 
+[Polyhedral Development community discord server](https://discord.gg/PXUEbbF), 
 and any other Terra community. In addition, we may choose to invoke them in
 instances of harassment outside the Terra communities, and we will punish the
 responsible individuals appropriately. We will not tolerate harassment in any
@@ -58,8 +58,8 @@ listen carefully, apologize sincerely, and correct the behavior going forward.
 Any member of the Terra community should always be open to new ideas and must
 always be open to the possibility of being wrong. Nobody can always be right,
 and we are only human; we are
-[fallible](https://www.merriam-webster.com/dictionary/fallible) by nature. It is
-okay to make mistakes, but we must be willing to admit when we make one.
+[fallible](https://www.merriam-webster.com/dictionary/fallible) by nature.
+It is okay to make mistakes, but we must be willing to admit when we make one.
 
 ### Be Direct but Professional
 

CONTRIBUTING.md

@@ -77,9 +77,9 @@ Unsure where to begin contributing to Terra? You can start by looking through "
 beginner" and "help wanted" issues:
 
 - [Beginner issues](https://github.com/PolyhedralDev/Terra/labels/Note%3A%20Good%20First%20Issue)
-    - issues which should be friendly to anyone new to terra.
+  - issues which should be friendly to anyone new to terra.
 - [Help wanted issues](https://github.com/PolyhedralDev/Terra/labels/Note%3A%20Help%20Wanted)
-    - issues which should be a bit more involved than "beginner" issues.
+  - issues which should be a bit more involved than "beginner" issues.
 
 New to github? Working on your first Pull Request? Check
 out [How to Contribute to an Open Source Project on GitHub](https://app.egghead.io/playlists/how-to-contribute-to-an-open-source-project-on-github)
@@ -114,9 +114,9 @@ please [include as many details as possible](#how-do-i-submit-a-good-bug-report)
 - Make sure that this is not a *specific* compatibility issue with another
   terrain generation mod. Do not request *specific* compatibility with mods or
   plugins (e.g. "Compatibility with TechCraft v7"). That should be implemented
-  in an addon, **not** in the platform project.
+  in an addon, **not** in the main project.
   *General* compatibility (e.g. "Ability to pull Vanilla/Modded features from
-  parent biomes") will be considered in the platform project.
+  parent biomes") will be considered in the main project.
 - Search for
   any [already existing issues](https://github.com/PolyhedralDev/Terra/issues?q=is%3Aissue+)
   open with your problem. If you open a duplicate, it will be closed as such.
@@ -200,7 +200,7 @@ please [include as many details as possible](#how-do-i-submit-a-good-enhancement
 
 Enhancement suggestions are tracked
 as [GitHub issues](https://guides.github.com/features/issues/). Create an issue
-on our platform repository and provide the following information:
+on our main repository and provide the following information:
 
 - **Use a clear and descriptive title** for the issue to identify the
   suggestion.
@@ -243,7 +243,7 @@ accepted.
 
 Pull Requests are tracked
 as [GitHub Pull Requests](https://guides.github.com/activities/forking/#making-a-pull-request)
-. Create a pr on our platform repository and provide the following information:
+. Create a pr on our main repository and provide the following information:
 
 - **Use a clear and descriptive title** to identify the pull request.
 - **State what this pull request adds/fixes**.
@@ -347,7 +347,7 @@ TODO
 #### General Compatibility
 
 General compatibility (example: injection of Vanilla structures/features/carvers
-into packs) is acceptable in the platform project.
+into packs) is acceptable in the main project.
 
 - General compatibility features should be *disabled by default*. Having things
   auto-injected causes unpredictable behaviour that is annoying to diagnose.
@@ -365,9 +365,8 @@ into packs) is acceptable in the platform project.
 
 #### Specific Compatibility
 
-Specific compatibility should *not* be put in the platform project. (Example:
-Adding the ability to generate TechCraft v7's doo-dads with a TerraScript
-function)
+Specific compatibility should *not* be put in the main project. (Example: Adding
+the ability to generate TechCraft v7's doo-dads with a TerraScript function)
 
 Having specific compatibilities leads to tons of extra dependencies to keep
 track of, as well as adding lots of additional stuff to maintain. It quickly

LICENSE

@@ -1,21 +1,674 @@
-MIT License
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-Copyright (c) 2020-2021 Polyhedral Development
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+                            Preamble
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,30 +1,15 @@
-<img align="left" width="64" height="64" src="https://raw.githubusercontent.com/wiki/PolyhedralDev/Terra/images/terra_logo.png" alt="Terra Logo">
-
 # Terra
 
-Terra is a modern world generation modding platform, primarily for Minecraft.
-Terra allows complete customization of world generation with an advanced API,
-tightly integrated with a powerful configuration system.
-
-Terra consists of several parts:
-
-* A voxel world generation API with emphasis on configuration and extensibility
-* Several platform implementations, the layer between the API and the platform
-  it's running on.
-* An addon loader, which allows addons to interface with the Terra API in a
-  platform-agnostic setting
-* Several "core addons," which implement the "default" configurations of Terra.
-  These addons can be thought of as the config "standard library"
-
-Terra currently officially supports the Fabric mod loader and the Bukkit API
-(Paper and friends). We welcome Pull Requests implementing additional platforms!
+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:
 
-* 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
 
@@ -59,6 +44,7 @@ To run Minecraft with Terra in the IDE (for testing) use the following tasks:
     * `runClient` - Run a Minecraft Fabric client with Terra installed.
     * `runServer` - Run a Minecraft Fabric server with Terra installed.
 
+
 ## Contributing
 
 Contributions are welcome! If you want to see a feature in Terra, please, open
@@ -66,43 +52,7 @@ 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!
 
-## Licensing
-
-Parts of Terra are licensed under either the MIT License or the GNU General
-Public License, version 3.0.
-
-* Our API is licensed under the [MIT License](LICENSE), to ensure that everyone
-  is able to freely use it however they want.
-* Our core addons are also licensed under the [MIT License](LICENSE), to ensure
-  that people can freely use code from them to learn and make their own addons,
-  without worrying about GPL infection.
-* Our platform-agnostic implementations and platform implementations are
-  licensed under
-  the [GNU General Public License, version 3.0](common/implementation/LICENSE),
-  to ensure that they remain free software wherever they are used.
-
-If you're not sure which license a particular file is under, check:
-
-* The file's header
-* The LICENSE file in the closest parent folder of the file in question
-
 ## Beta
 
 Terra is still in beta! While it is stable, it is not feature-complete. There is
 a lot to be added!
-
-## Special Thanks
-
-[![YourKit-Logo](https://www.yourkit.com/images/yklogo.png)](https://www.yourkit.com/)
-
-YourKit has granted Polyhedral Development an open-source license to their
-outstanding Java profiler, allowing us to make our software as performant as it
-can be!
-
-YourKit supports open source projects with innovative and intelligent tools for
-monitoring and profiling Java and .NET applications. YourKit is the creator of
-the
-[YourKit Java Profiler](https://www.yourkit.com/java/profiler/),
-[YourKit .NET Profiler](https://www.yourkit.com/.net/profiler/),
-and [YourKit YouMonitor](https://www.yourkit.com/youmonitor/).
-

build.gradle.kts

@@ -1,15 +1,17 @@
-preRelease(true)
-
-versionProjects(":common:api", version("6.0.0"))
-versionProjects(":common:implementation", version("6.0.0"))
-versionProjects(":platforms", version("6.0.0"))
+import com.dfsek.terra.configureCompilation
+import com.dfsek.terra.configureDependencies
+import com.dfsek.terra.configureDistribution
+import com.dfsek.terra.configurePublishing
+import com.dfsek.terra.getGitHash
 
+val versionObj = Version("6", "0", "0", true)
 
 allprojects {
+    version = versionObj
     group = "com.dfsek.terra"
     
-    configureCompilation()
     configureDependencies()
+    configureCompilation()
     configurePublishing()
     
     tasks.withType<JavaCompile>().configureEach {
@@ -28,30 +30,24 @@ allprojects {
         reports.html.required.set(false)
         reports.junitXml.required.set(false)
     }
-    
-    tasks.withType<Copy>().configureEach {
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    }
-    
-    tasks.withType<Jar>().configureEach {
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    }
 }
 
 afterEvaluate {
-    forImmediateSubProjects(":platforms") {
-        configureDistribution()
-    }
-    forSubProjects(":common:addons") {
-        apply(plugin = "com.github.johnrengelman.shadow")
-        
-        tasks.named("build") {
-            finalizedBy(tasks.named("shadowJar"))
-        }
-        
-        dependencies {
-            "compileOnly"(project(":common:api"))
-            "testImplementation"(project(":common:api"))
-        }
+    project(":platforms").subprojects.forEach { // Platform projects are where distribution happens
+        it.configureDistribution()
+    }
+}
+
+/**
+ * Version class that does version stuff.
+ */
+@Suppress("MemberVisibilityCanBePrivate")
+class Version(val major: String, val minor: String, val revision: String, val preRelease: Boolean = false) {
+    
+    override fun toString(): String {
+        return if (!preRelease)
+            "$major.$minor.$revision"
+        else //Only use git hash if it's a prerelease.
+            "$major.$minor.$revision-BETA+${getGitHash()}"
     }
 }

buildSrc/build.gradle.kts

@@ -6,13 +6,9 @@ plugins {
 repositories {
     mavenCentral()
     gradlePluginPortal()
-    maven { url = uri("https://repo.codemc.org/repository/maven-public") }
 }
 
 dependencies {
-    implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:+")
-    implementation("org.ow2.asm:asm:9.2")
-    implementation("org.ow2.asm:asm-tree:9.2")
-    implementation("com.dfsek.tectonic:common:4.2.0")
-    implementation("org.yaml:snakeyaml:1.27")
+    "implementation"("com.github.jengelman.gradle.plugins:shadow:+")
+    "implementation"("org.yaml:snakeyaml:1.27")
 }

buildSrc/src/main/kotlin/DependencyConfig.kt

@@ -1,47 +0,0 @@
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.creating
-import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.getValue
-import org.gradle.kotlin.dsl.getting
-import org.gradle.kotlin.dsl.maven
-import org.gradle.kotlin.dsl.repositories
-
-fun Project.configureDependencies() {
-    val testImplementation by configurations.getting
-    val compileOnly by configurations.getting
-    
-    val api by configurations.getting
-    val implementation by configurations.getting
-    
-    val shaded by configurations.creating
-    
-    @Suppress("UNUSED_VARIABLE")
-    val shadedApi by configurations.creating {
-        shaded.extendsFrom(this)
-        api.extendsFrom(this)
-    }
-    
-    @Suppress("UNUSED_VARIABLE")
-    val shadedImplementation by configurations.creating {
-        shaded.extendsFrom(this)
-        implementation.extendsFrom(this)
-    }
-    
-    repositories {
-        mavenCentral()
-        gradlePluginPortal()
-        maven("https://maven.fabricmc.net/")
-        maven("https://repo.codemc.org/repository/maven-public")
-        maven("https://repo.codemc.io/repository/nms/")
-        maven("https://papermc.io/repo/repository/maven-public/")
-    }
-    
-    dependencies {
-        testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
-        testImplementation("org.junit.jupiter:junit-jupiter-engine:5.7.0")
-        compileOnly("org.jetbrains:annotations:23.0.0")
-        
-        compileOnly("com.google.guava:guava:30.0-jre")
-        testImplementation("com.google.guava:guava:30.0-jre")
-    }
-}

buildSrc/src/main/kotlin/Utils.kt

@@ -1,56 +0,0 @@
-import java.io.ByteArrayOutputStream
-import org.gradle.api.Action
-import org.gradle.api.Project
-
-
-var isPrerelease = false
-
-
-fun Project.getGitHash(): String {
-    val stdout = ByteArrayOutputStream()
-    exec {
-        commandLine = mutableListOf("git", "rev-parse", "--short", "HEAD")
-        standardOutput = stdout
-    }
-    return stdout.toString().trim()
-}
-
-fun Project.gitClone(name: String) {
-    val stdout = ByteArrayOutputStream()
-    exec {
-        commandLine = mutableListOf("git", "clone", name)
-        standardOutput = stdout
-    }
-}
-
-fun Project.forSubProjects(project: String, action: Action<Project>) {
-    project(project).subprojects.forEach {
-        action.execute(it)
-    }
-}
-
-fun Project.forImmediateSubProjects(project: String, action: Action<Project>) {
-    project(project).childProjects.forEach {
-        action.execute(it.value)
-    }
-}
-
-fun preRelease(preRelease: Boolean) {
-    isPrerelease = preRelease
-}
-
-fun Project.versionProjects(project: String, version: String) {
-    forSubProjects(project) {
-        this.version = version
-        println("Setting version of $path to $version")
-    }
-    project(project).version = version
-    println("Setting version of $project to $version")
-}
-
-fun Project.version(version: String): String {
-    return if (!isPrerelease)
-        version
-    else //Only use git hash if it's a prerelease.
-        "$version-BETA+${getGitHash()}"
-}

buildSrc/src/main/kotlin/Versions.kt

@@ -1,38 +0,0 @@
-object Versions {
-    object Libraries {
-        const val tectonic = "4.2.0"
-        const val paralithic = "0.7.0"
-        const val strata = "1.1.1"
-        
-        const val cloud = "1.6.2"
-        
-        const val slf4j = "1.7.36"
-        const val log4j_slf4j_impl = "2.14.1"
-        
-        object Internal {
-            const val apacheText = "1.9"
-            const val jafama = "2.3.2"
-            const val apacheIO = "2.6"
-            const val fastutil = "8.5.6"
-        }
-    }
-    
-    object Fabric {
-        const val fabricLoader = "0.14.2"
-        const val fabricAPI = "0.53.4+1.18.2"
-        const val minecraft = "1.18.2"
-        const val yarn = "$minecraft+build.3"
-        const val permissionsAPI = "0.1-SNAPSHOT"
-    }
-    
-    object Bukkit {
-        const val paper = "1.18-R0.1-SNAPSHOT"
-        const val paperLib = "1.0.5"
-    }
-    
-    object Sponge {
-        const val sponge = "9.0.0-SNAPSHOT"
-        const val mixin = "0.8.2"
-        const val minecraft = "1.17.1"
-    }
-}

buildSrc/src/main/kotlin/com/dfsek/terra/AddonConfig.kt

@@ -1,10 +1,10 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+package com.dfsek.terra
+
 import java.io.File
 import java.util.function.Predicate
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.jvm.tasks.Jar
-import org.gradle.kotlin.dsl.extra
 import kotlin.streams.asStream
 
 
@@ -20,13 +20,12 @@ fun Project.addonDir(dir: File, task: Task) {
             println("Deleting old addon: " + it.absolutePath)
             it.delete()
         }
-        forSubProjects(":common:addons") {
-            val jar = tasks.named("shadowJar").get() as ShadowJar
+        project(":common:addons").subprojects.forEach { addonProject ->
+            val jar = (addonProject.tasks.named("jar").get() as Jar)
             
-            val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
-            val target = File(dir, boot + jar.archiveFileName.get())
+            val target = File(dir, jar.archiveFileName.get())
             
-            val base = "${jar.archiveBaseName.get()}-${version}"
+            val base = "${jar.archiveBaseName.get()}-${project.version}"
             
             println("Copying addon ${jar.archiveFileName.get()} to ${target.absolutePath}. Base name: $base")
             
@@ -37,6 +36,6 @@ fun Project.addonDir(dir: File, task: Task) {
 
 fun matchingAddons(dir: File, matcher: Predicate<File>): Set<File> {
     val matching = HashSet<File>()
-    dir.walk().asStream().filter(matcher).forEach(matching::add)
+    dir.walk().maxDepth(1).asStream().filter(matcher).forEach(matching::add)
     return matching
 }

buildSrc/src/main/kotlin/com/dfsek/terra/CommonConfig.kt

@@ -0,0 +1,21 @@
+package com.dfsek.terra
+
+import java.io.ByteArrayOutputStream
+import org.gradle.api.Project
+
+fun Project.getGitHash(): String {
+    val stdout = ByteArrayOutputStream()
+    exec {
+        commandLine = mutableListOf("git", "rev-parse", "--short", "HEAD")
+        standardOutput = stdout
+    }
+    return stdout.toString().trim()
+}
+
+fun Project.gitClone(name: String) {
+    val stdout = ByteArrayOutputStream()
+    exec {
+        commandLine = mutableListOf("git", "clone", name)
+        standardOutput = stdout
+    }
+}

buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt

@@ -1,5 +1,5 @@
-import com.dfsek.terra.tectonicdoc.TectonicDocPlugin
-import org.apache.tools.ant.filters.ReplaceTokens
+package com.dfsek.terra
+
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
@@ -19,11 +19,10 @@ fun Project.configureCompilation() {
     apply(plugin = "java")
     apply(plugin = "java-library")
     apply(plugin = "idea")
-    apply<TectonicDocPlugin>()
     
     configure<JavaPluginExtension> {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_16
+        targetCompatibility = JavaVersion.VERSION_16
     }
     
     tasks.withType<JavaCompile> {
@@ -35,26 +34,16 @@ fun Project.configureCompilation() {
     
     tasks.withType<ProcessResources> {
         include("**/*.*")
-        filter<ReplaceTokens>(
+        filter<org.apache.tools.ant.filters.ReplaceTokens>(
             "tokens" to mapOf(
-                "DESCRIPTION" to properties["terra.description"],
-                "WIKI" to properties["terra.wiki"],
-                "SOURCE" to properties["terra.source"],
-                "ISSUES" to properties["terra.issues"],
-                "LICENSE" to properties["terra.license"]
+                "VERSION" to project.version.toString(),
+                "DESCRIPTION" to project.properties["terra.description"],
+                "WIKI" to project.properties["terra.wiki"],
+                "SOURCE" to project.properties["terra.source"],
+                "ISSUES" to project.properties["terra.issues"],
+                "LICENSE" to project.properties["terra.license"]
                              )
-                             )
-    }
-    
-    afterEvaluate {
-        tasks.withType<ProcessResources> {
-            include("**/*.*")
-            filter<ReplaceTokens>(
-                "tokens" to mapOf(
-                    "VERSION" to version.toString()
-                                 )
-                                 )
-        }
+                                                          )
     }
     
     tasks.withType<Javadoc> {

buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt

@@ -0,0 +1,48 @@
+package com.dfsek.terra
+
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.invoke
+import org.gradle.kotlin.dsl.project
+import org.gradle.kotlin.dsl.repositories
+
+fun Project.configureDependencies() {
+    apply(plugin = "java")
+    apply(plugin = "java-library")
+    
+    configurations {
+        val shaded = create("shaded")
+        val shadedApi = create("shadedApi")
+        shaded.extendsFrom(shadedApi)
+        getByName("api").extendsFrom(shadedApi)
+        val shadedImplementation = create("shadedImplementation")
+        shaded.extendsFrom(shadedImplementation)
+        getByName("implementation").extendsFrom(shadedImplementation)
+    }
+    
+    repositories {
+        maven { url = uri("https://maven.enginehub.org/repo/") }
+        maven { url = uri("https://repo.codemc.org/repository/maven-public") }
+        maven { url = uri("https://papermc.io/repo/repository/maven-public/") }
+        maven { url = uri("https://maven.fabricmc.net/") }
+        gradlePluginPortal()
+        mavenCentral()
+    }
+    
+    dependencies {
+        "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.7.0")
+        "testImplementation"("org.junit.jupiter:junit-jupiter-engine:5.7.0")
+        "compileOnly"("org.jetbrains:annotations:20.1.0")
+        
+        "compileOnly"("com.google.guava:guava:30.0-jre")
+        "testImplementation"("com.google.guava:guava:30.0-jre")
+    }
+    
+    if (project(":common:addons").subprojects.contains(this)) { // If this is an addon project, depend on the API.
+        dependencies {
+            "compileOnly"(project(":common:api"))
+            "testImplementation"(project(":common:api"))
+        }
+    }
+}

buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt

@@ -1,17 +1,19 @@
+package com.dfsek.terra
+
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
 import java.io.FileWriter
 import java.net.URL
-import java.nio.file.FileSystems
-import java.nio.file.Files
-import java.nio.file.StandardCopyOption
+import java.util.zip.ZipEntry
+import java.util.zip.ZipOutputStream
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.plugins.BasePluginExtension
 import org.gradle.jvm.tasks.Jar
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.extra
 import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.named
 import org.yaml.snakeyaml.DumperOptions
@@ -24,47 +26,53 @@ fun Project.configureDistribution() {
         group = "terra"
         doFirst {
             file("${buildDir}/resources/main/packs/").deleteRecursively()
-            val defaultPackUrl = URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/latest/default.zip")
+            
+            val defaultPackUrl = URL("https://github.com/PolyhedralDev/TerraDefaultConfig/releases/download/latest/default.zip")
             downloadPack(defaultPackUrl, project)
+            val netherPackUrl = URL("https://github.com/PolyhedralDev/TerraDefaultConfig/releases/download/latest/nether.zip")
+            downloadPack(netherPackUrl, project)
         }
     }
     
     val installAddons = tasks.create("installAddons") {
         group = "terra"
-        forSubProjects(":common:addons") {
-            afterEvaluate {
-                dependsOn(getJarTask())
+        project(":common:addons").subprojects.forEach {
+            it.afterEvaluate {
+                dependsOn(it.tasks.getByName("build")) // Depend on addon JARs
             }
         }
         
-        doLast {
+        doFirst {
+            // The addons are copied into a JAR because of a ShadowJar bug
+            // which expands *all* JARs, even resource ones, into the fat JAR.
+            // To get around this, we copy all addon JARs into a *new* JAR,
+            // then, ShadowJar expands the newly created JAR, putting the original
+            // JARs where they should go.
+            //
             // https://github.com/johnrengelman/shadow/issues/111
-            val dest = tasks.named<ShadowJar>("shadowJar").get().archiveFile.get().asFile.toPath()
+            val dest = File(buildDir, "/resources/main/addons.jar")
+            dest.parentFile.mkdirs()
             
-            FileSystems.newFileSystem(dest, mapOf("create" to "false"), null).use { fs ->
-                forSubProjects(":common:addons") {
-                    val jar = getJarTask()
-        
-                    println("Packaging addon ${jar.archiveFileName.get()} to $dest. size: ${jar.archiveFile.get().asFile.length() / 1024}KB")
-        
-                    val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
-                    val addonPath = fs.getPath("/addons/$boot${jar.archiveFileName.get()}");
-        
-                    if(!Files.exists(addonPath)) {
-                        Files.createDirectories(addonPath.parent)
-                        Files.createFile(addonPath)
-                        Files.copy(jar.archiveFile.get().asFile.toPath(), addonPath, StandardCopyOption.REPLACE_EXISTING)
-                    }
-        
-                }
+            val zip = ZipOutputStream(FileOutputStream(dest))
+            
+            project(":common:addons").subprojects.forEach { addonProject ->
+                val jar = (addonProject.tasks.named("jar").get() as Jar)
+                println("Packaging addon ${jar.archiveFileName.get()} to ${dest.absolutePath}.")
+                
+                val entry = ZipEntry("addons/${jar.archiveFileName.get()}")
+                zip.putNextEntry(entry)
+                FileInputStream(jar.archiveFile.get().asFile).copyTo(zip)
+                zip.closeEntry()
             }
+            zip.close()
         }
     }
     
     val generateResourceManifest = tasks.create("generateResourceManifest") {
         group = "terra"
         dependsOn(downloadDefaultPacks)
-        doLast {
+        dependsOn(installAddons)
+        doFirst {
             val resources = HashMap<String, MutableList<String>>()
             val packsDir = File("${project.buildDir}/resources/main/packs/")
             
@@ -80,12 +88,9 @@ fun Project.configureDistribution() {
                 resources.computeIfAbsent("lang") { ArrayList() }.add(it.name)
             }
             
-            forSubProjects(":common:addons") {
-                val jar = getJarTask().archiveFileName.get()
-                resources.computeIfAbsent(
-                    if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "addons/bootstrap"
-                    else "addons"
-                                         ) { ArrayList() }.add(jar)
+            project(":common:addons").subprojects.forEach { addonProject ->
+                val jar = (addonProject.tasks.named("jar").get() as Jar).archiveFileName.get()
+                resources.computeIfAbsent("addons") { ArrayList() }.add(jar)
             }
             
             val options = DumperOptions()
@@ -108,20 +113,18 @@ fun Project.configureDistribution() {
     
     tasks["processResources"].dependsOn(generateResourceManifest)
     
-    
     tasks.named<ShadowJar>("shadowJar") {
         // Tell shadow to download the packs
         dependsOn(downloadDefaultPacks)
+        
         configurations = listOf(project.configurations["shaded"])
+        
         archiveClassifier.set("shaded")
         setVersion(project.version)
         relocate("org.apache.commons", "com.dfsek.terra.lib.commons")
         relocate("org.objectweb.asm", "com.dfsek.terra.lib.asm")
-        relocate("com.dfsek.paralithic", "com.dfsek.terra.lib.paralithic")
         relocate("org.json", "com.dfsek.terra.lib.json")
         relocate("org.yaml", "com.dfsek.terra.lib.yaml")
-    
-        finalizedBy(installAddons)
     }
     
     configure<BasePluginExtension> {
@@ -138,6 +141,4 @@ fun downloadPack(packUrl: URL, project: Project) {
     val file = File("${project.buildDir}/resources/main/packs/${fileName}")
     file.parentFile.mkdirs()
     file.outputStream().write(packUrl.readBytes())
-}
-
-fun Project.getJarTask() = tasks.named("shadowJar").get() as ShadowJar
+}

buildSrc/src/main/kotlin/com/dfsek/terra/PublishingConfig.kt

@@ -1,3 +1,5 @@
+package com.dfsek.terra
+
 import org.gradle.api.Project
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
@@ -11,7 +13,8 @@ fun Project.configurePublishing() {
     configure<PublishingExtension> {
         publications {
             create<MavenPublication>("mavenJava") {
-                from(components["java"])
+                artifact(tasks["sourcesJar"])
+                artifact(tasks["jar"])
             }
         }
         

buildSrc/src/main/kotlin/com/dfsek/terra/tectonicdoc/DocumentedTemplate.kt

@@ -1,20 +0,0 @@
-package com.dfsek.terra.tectonicdoc
-
-class DocumentedTemplate(private val name: String) {
-    private val template = HashMap<String, String>()
-    
-    fun add(name: String, content: String) {
-        template[name] = content
-    }
-    
-    fun format(): String {
-        val builder = StringBuilder("# ").append(name).append("\n\n")
-        template.forEach { name, content ->
-            builder
-                .append("### $name\n\n")
-                .append(content)
-                .append("\n\n")
-        }
-        return builder.toString()
-    }
-}

buildSrc/src/main/kotlin/com/dfsek/terra/tectonicdoc/GenerateDocsTask.kt

@@ -1,150 +0,0 @@
-package com.dfsek.terra.tectonicdoc
-
-import com.dfsek.tectonic.api.config.template.annotations.Description
-import com.dfsek.tectonic.api.config.template.annotations.Final
-import com.dfsek.tectonic.api.config.template.annotations.Value
-import java.io.File
-import java.io.FileInputStream
-import java.io.InputStream
-import org.gradle.api.DefaultTask
-import org.gradle.api.plugins.JavaPluginExtension
-import org.gradle.api.tasks.TaskAction
-import org.objectweb.asm.ClassReader
-import org.objectweb.asm.tree.ClassNode
-import org.objectweb.asm.tree.FieldNode
-
-
-abstract class GenerateDocsTask : DefaultTask() {
-    @TaskAction
-    fun generateDocs() {
-        project.extensions.getByType(JavaPluginExtension::class.java).sourceSets.forEach { sources ->
-            val classes = HashMap<String, ClassNode>()
-            sources.java.classesDirectory.get().asFileTree.forEach { file ->
-                if (file.name.endsWith(".class")) {
-                    val node = createClassNode(FileInputStream(file))
-                    if (node.fields.stream().anyMatch { field ->
-                            field.visibleAnnotations?.stream()?.anyMatch {
-                                it.desc.equals(descriptor(Value::class.java.canonicalName))
-                            } == true
-                        }) {
-                        var name = sources
-                            .java
-                            .classesDirectory
-                            .get()
-                            .asFile
-                            .toPath()
-                            .relativize(file.toPath())
-                            .toString()
-                            .substringBeforeLast('.')
-                        if (name.endsWith("Template")) {
-                            name = name.substringBeforeLast("Template")
-                        }
-                        classes[name] = node
-                    }
-                }
-            }
-            
-            val docsDir = File(project.buildDir, "tectonic")
-            docsDir.mkdirs()
-            
-            classes.forEach { (name, clazz) ->
-                val template = DocumentedTemplate(name.substringAfterLast('/'))
-                clazz.fields
-                    .stream()
-                    .filter { field ->
-                        field.visibleAnnotations?.stream()?.anyMatch {
-                            it.desc.equals(descriptor(Value::class.java.canonicalName))
-                        } == true
-                    }.forEach { field ->
-                        val annotations = field.visibleAnnotations
-                        
-                        val description = StringBuilder()
-                        
-                        annotations.stream().filter {
-                            it.desc.equals(descriptor(Description::class.java.canonicalName))
-                        }.forEach {
-                            description.append(it.values[1])
-                        }
-                        
-                        val keyName = StringBuilder()
-                        
-                        if (annotations.stream().anyMatch { it.desc.equals(descriptor(Final::class.java.canonicalName)) }) {
-                            keyName.append("final ")
-                        }
-                        
-                        keyName.append(getType(field))
-                            .append(" ")
-                        
-                        annotations.stream().filter {
-                            it.desc.equals(descriptor(Value::class.java.canonicalName))
-                        }.forEach {
-                            keyName.append(it.values[1])
-                        }
-                        
-                        template.add(keyName.toString(), description.toString().ifBlank {
-                            println("No description provided for field " + field.name + " in class " + name)
-                            "*No description provided.*"
-                        })
-                    }
-                
-                
-                val save = File(docsDir, "$name.md")
-                if (save.exists()) save.delete()
-                save.parentFile.mkdirs()
-                save.createNewFile()
-                save.writeText(template.format())
-            }
-        }
-    }
-    
-    private fun getType(node: FieldNode): String {
-        if (node.signature != null) {
-            return generic(node.signature)
-        }
-        return descriptorToHumanReadable(node.desc).substringAfterLast('.')
-    }
-    
-    private fun generic(type: String): String {
-        val clean = descriptorToHumanReadable(type)
-        
-        if (clean.contains('<')) {
-            val typeIndex = clean.indexOf('<')
-            return clean.substring(0, typeIndex + 1).substringAfterLast('.') + generic(clean.substring(typeIndex + 1)) + "\\>"
-        }
-        
-        return clean.substringAfterLast('.')
-    }
-    
-    private fun createClassNode(input: InputStream): ClassNode {
-        val reader = ClassReader(input)
-        val node = ClassNode()
-        try {
-            reader.accept(node, ClassReader.EXPAND_FRAMES)
-        } catch (e: Exception) {
-            reader.accept(node, ClassReader.SKIP_FRAMES or ClassReader.SKIP_DEBUG)
-        }
-        return node
-    }
-    
-    private fun descriptorToHumanReadable(descriptor: String): String {
-        if (descriptor.startsWith('L')) {
-            return descriptor.substring(1).substringBeforeLast(';').replace('/', '.')
-        }
-        if (descriptor.startsWith("[")) {
-            return "${descriptorToHumanReadable(descriptor.substring(1))}[]"
-        }
-        return when (descriptor) {
-            "B"  -> "byte"
-            "C"  -> "char"
-            "I"  -> "int"
-            "D"  -> "double"
-            "F"  -> "float"
-            "J"  -> "long"
-            "S"  -> "short"
-            "Z"  -> "boolean"
-            else -> descriptor
-        }
-    }
-    
-    private fun descriptor(name: String): String = "L${name.replace('.', '/')};"
-}

buildSrc/src/main/kotlin/com/dfsek/terra/tectonicdoc/TectonicDocPlugin.kt

@@ -1,10 +0,0 @@
-package com.dfsek.terra.tectonicdoc
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-
-class TectonicDocPlugin : Plugin<Project> {
-    override fun apply(project: Project) {
-        project.tasks.create("generateDocs", GenerateDocsTask::class.java)
-    }
-}

common/addons/api-addon-loader/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020-2021 Polyhedral Development
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

common/addons/api-addon-loader/README.md

@@ -1,3 +0,0 @@
-# api addon loader
-
-Loads dependencies as addons

common/addons/api-addon-loader/build.gradle.kts

@@ -1,12 +0,0 @@
-version = version("0.1.0")
-
-dependencies {
-}
-
-tasks.withType<Jar> {
-    manifest {
-        attributes("Terra-Bootstrap-Addon-Entry-Point" to "com.dfsek.terra.addon.loader.ApiAddonLoader")
-    }
-}
-
-project.extra.set("bootstrap", true)

common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddon.java

@@ -1,26 +0,0 @@
-package com.dfsek.terra.addon.loader;
-
-import ca.solostudios.strata.version.Version;
-
-import com.dfsek.terra.api.addon.BaseAddon;
-
-
-public class ApiAddon implements BaseAddon {
-    private final Version version;
-    private final String id;
-    
-    public ApiAddon(Version version, String id) {
-        this.version = version;
-        this.id = id;
-    }
-    
-    @Override
-    public Version getVersion() {
-        return version;
-    }
-    
-    @Override
-    public String getID() {
-        return id;
-    }
-}

common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonClassLoader.java

@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addon.loader;
-
-import java.net.URL;
-import java.net.URLClassLoader;
-
-
-public class ApiAddonClassLoader extends URLClassLoader {
-    static {
-        ClassLoader.registerAsParallelCapable();
-    }
-    
-    public ApiAddonClassLoader(URL[] urls, ClassLoader parent) {
-        super(urls, parent);
-    }
-}

common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonLoader.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addon.loader;
-
-import ca.solostudios.strata.Versions;
-import ca.solostudios.strata.version.Version;
-
-import java.nio.file.Path;
-import java.util.Collections;
-
-import com.dfsek.terra.api.addon.BaseAddon;
-import com.dfsek.terra.api.addon.bootstrap.BootstrapAddonClassLoader;
-import com.dfsek.terra.api.addon.bootstrap.BootstrapBaseAddon;
-
-
-public class ApiAddonLoader implements BootstrapBaseAddon<BaseAddon> {
-    private static final Version VERSION = Versions.getVersion(1, 0, 0);
-    
-    @Override
-    public Iterable<BaseAddon> loadAddons(Path addonsFolder, BootstrapAddonClassLoader parent) {
-        
-        return Collections.emptySet();
-    }
-    
-    @Override
-    public String getID() {
-        return "API";
-    }
-    
-    @Override
-    public Version getVersion() {
-        return VERSION;
-    }
-}

common/addons/api-features/README.md

@@ -0,0 +1,10 @@
+# api-features
+
+Contains the API for feature generation.
+
+This API implemented in:
+
+* `config-feature`
+* `generation-stage-feature`
+* `config-locators`
+* `config-distributors`

common/addons/api-features/build.gradle.kts

@@ -0,0 +1,2 @@
+dependencies {
+}

common/addons/biome-provider-image/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020-2021 Polyhedral Development
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

common/addons/biome-provider-image/build.gradle.kts

@@ -1,11 +1,2 @@
-version = version("1.0.0")
-
 dependencies {
-    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
 }
-
-tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
-    relocate("net.jafama", "com.dfsek.terra.addons.biome.image.lib.jafama")
-}

common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java

@@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.image;
 
 import net.jafama.FastMath;
@@ -15,17 +8,17 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
 public class ImageBiomeProvider implements BiomeProvider {
-    private final Map<Color, Biome> colorBiomeMap = new HashMap<>();
+    private final Map<Color, TerraBiome> colorBiomeMap = new HashMap<>();
     private final BufferedImage image;
     private final int resolution;
     private final Align align;
     
-    public ImageBiomeProvider(Set<Biome> registry, BufferedImage image, int resolution, Align align) {
+    public ImageBiomeProvider(Set<TerraBiome> registry, BufferedImage image, int resolution, Align align) {
         this.image = image;
         this.resolution = resolution;
         this.align = align;
@@ -37,7 +30,7 @@ public class ImageBiomeProvider implements BiomeProvider {
     }
     
     @Override
-    public Biome getBiome(int x, int y, int z, long seed) {
+    public TerraBiome getBiome(int x, int z, long seed) {
         x /= resolution;
         z /= resolution;
         Color color = align.getColor(image, x, z);
@@ -51,11 +44,6 @@ public class ImageBiomeProvider implements BiomeProvider {
                                                       }));
     }
     
-    @Override
-    public Iterable<Biome> getBiomes() {
-        return colorBiomeMap.values();
-    }
-    
     public enum Align {
         CENTER {
             @Override

common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java

@@ -1,49 +1,43 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.image;
 
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+import com.dfsek.tectonic.loading.object.ObjectTemplate;
 
 import java.util.function.Supplier;
 
-import com.dfsek.terra.addons.manifest.api.AddonInitializer;
-import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.addon.BaseAddon;
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.addon.TerraAddon;
+import com.dfsek.terra.api.addon.annotations.Addon;
+import com.dfsek.terra.api.addon.annotations.Author;
+import com.dfsek.terra.api.addon.annotations.Version;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.inject.annotations.Inject;
+import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.util.reflection.TypeKey;
-import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
-public class ImageBiomeProviderAddon implements AddonInitializer {
+@Addon("biome-provider-image")
+@Author("Terra")
+@Version("1.0.0")
+public class ImageBiomeProviderAddon extends TerraAddon {
     public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
     };
     
     @Inject
-    private Platform platform;
-    
-    @Inject
-    private BaseAddon addon;
+    private TerraPlugin main;
     
     @Override
     public void initialize() {
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
-                            PROVIDER_REGISTRY_KEY);
-                    providerRegistry.register(addon.key("IMAGE"),
-                                              () -> new ImageProviderTemplate(event.getPack().getRegistry(Biome.class)));
-                })
-                .failThrough();
+        main.getEventManager()
+            .getHandler(FunctionalEventHandler.class)
+            .register(this, ConfigPackPreLoadEvent.class)
+            .then(event -> {
+                CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
+                        PROVIDER_REGISTRY_KEY);
+                providerRegistry.register("IMAGE", () -> new ImageProviderTemplate(event.getPack().getRegistry(TerraBiome.class)));
+            })
+            .failThrough();
     }
 }

common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageProviderTemplate.java

@@ -1,40 +1,28 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.image;
 
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Description;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+import com.dfsek.tectonic.annotations.Default;
+import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.tectonic.loading.object.ObjectTemplate;
 
 import java.awt.image.BufferedImage;
 import java.util.HashSet;
 
 import com.dfsek.terra.api.registry.Registry;
-import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
-@SuppressWarnings("FieldMayBeFinal")
 public class ImageProviderTemplate implements ObjectTemplate<BiomeProvider> {
-    private final Registry<Biome> biomes;
+    private final Registry<TerraBiome> biomes;
     @Value("resolution")
     @Default
-    @Description("Sets the resolution at which to sample the image.")
-    private int resolution = 1;
+    private final int resolution = 1;
     @Value("image.name")
-    @Description("Sets the location of the image on the filesystem, relative to the pack root.")
     private BufferedImage image;
     @Value("image.align")
-    @Description("Sets the alignment style to use for the image.")
     private ImageBiomeProvider.Align align;
     
-    public ImageProviderTemplate(Registry<Biome> set) {
+    public ImageProviderTemplate(Registry<TerraBiome> set) {
         this.biomes = set;
     }
     

common/addons/biome-provider-image/src/main/resources/terra.addon.yml

@@ -1,12 +0,0 @@
-schema-version: 1
-contributors:
-  - Terra contributors
-id: biome-provider-image
-version: @VERSION@
-entrypoints:
-  - "com.dfsek.terra.addons.biome.image.ImageBiomeProviderAddon"
-website:
-  issues: https://github.com/PolyhedralDev/Terra/issues
-  source: https://github.com/PolyhedralDev/Terra
-  docs: https://terra.polydev.org
-license: MIT License

common/addons/biome-provider-pipeline/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020-2021 Polyhedral Development
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

common/addons/biome-provider-pipeline/build.gradle.kts

@@ -1,14 +1,2 @@
-version = version("1.0.0")
-
 dependencies {
-    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-    implementation("com.github.ben-manes.caffeine:caffeine:3.1.0")
-    
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
 }
-
-tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
-    relocate("com.github.benmanes.caffeine", "com.dfsek.terra.addons.biome.pipeline.lib.caffeine")
-    relocate("net.jafama", "com.dfsek.terra.addons.biome.pipeline.lib.jafama")
-}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomeHolderImpl.java

@@ -1,35 +1,28 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline;
 
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeExpander;
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeExpander;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
-import com.dfsek.terra.api.util.vector.Vector2;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 
 
 public class BiomeHolderImpl implements BiomeHolder {
-    private final Vector2.Mutable origin;
+    private final Vector2 origin;
     private final int width;
     private final int offset;
-    private BiomeDelegate[][] biomes;
+    private TerraBiome[][] biomes;
     
-    public BiomeHolderImpl(int width, Vector2.Mutable origin) {
+    public BiomeHolderImpl(int width, Vector2 origin) {
         width += 4;
         this.width = width;
-        biomes = new BiomeDelegate[width][width];
+        biomes = new TerraBiome[width][width];
         this.origin = origin;
         this.offset = 2;
     }
     
-    private BiomeHolderImpl(BiomeDelegate[][] biomes, Vector2.Mutable origin, int width, int offset) {
+    private BiomeHolderImpl(TerraBiome[][] biomes, Vector2 origin, int width, int offset) {
         this.biomes = biomes;
         this.origin = origin;
         this.width = width;
@@ -38,10 +31,10 @@ public class BiomeHolderImpl implements BiomeHolder {
     
     @Override
     public BiomeHolder expand(BiomeExpander expander, long seed) {
-        BiomeDelegate[][] old = biomes;
+        TerraBiome[][] old = biomes;
         int newWidth = width * 2 - 1;
         
-        biomes = new BiomeDelegate[newWidth][newWidth];
+        biomes = new TerraBiome[newWidth][newWidth];
         
         for(int x = 0; x < width; x++) {
             for(int z = 0; z < width; z++) {
@@ -80,14 +73,14 @@ public class BiomeHolderImpl implements BiomeHolder {
     }
     
     @Override
-    public BiomeDelegate getBiome(int x, int z) {
+    public TerraBiome getBiome(int x, int z) {
         x += offset;
         z += offset;
         return getBiomeRaw(x, z);
     }
     
     @Override
-    public BiomeDelegate getBiomeRaw(int x, int z) {
+    public TerraBiome getBiomeRaw(int x, int z) {
         if(x >= width || z >= width || x < 0 || z < 0) return null;
         return biomes[x][z];
     }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipeline.java

@@ -1,20 +1,12 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
-import com.dfsek.terra.api.util.vector.Vector2;
+import com.dfsek.terra.api.vector.Vector2;
 
 
 public class BiomePipeline {
@@ -39,27 +31,19 @@ public class BiomePipeline {
      * @return BiomeHolder containing biomes.
      */
     public BiomeHolder getBiomes(int x, int z, long seed) {
-        BiomeHolder holder = new BiomeHolderImpl(init, Vector2.of(x * (init - 1), z * (init - 1)).mutable());
+        BiomeHolder holder = new BiomeHolderImpl(init, new Vector2(x * (init - 1), z * (init - 1)));
         holder.fill(source, seed);
         for(Stage stage : stages) holder = stage.apply(holder, seed);
         return holder;
     }
     
-    public BiomeSource getSource() {
-        return source;
-    }
-    
-    public List<Stage> getStages() {
-        return Collections.unmodifiableList(stages);
-    }
-    
     public int getSize() {
         return size;
     }
     
     public static final class BiomePipelineBuilder {
         private final int init;
-        private final List<Stage> stages = new ArrayList<>();
+        List<Stage> stages = new ArrayList<>();
         private int expand;
         
         public BiomePipelineBuilder(int init) {

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java

@@ -1,21 +1,12 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline;
 
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+import com.dfsek.tectonic.loading.object.ObjectTemplate;
 
 import java.util.function.Supplier;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
-import com.dfsek.terra.addons.biome.pipeline.config.BiomeDelegateLoader;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.BiomePipelineTemplate;
-import com.dfsek.terra.addons.biome.pipeline.config.SamplerSourceTemplate;
+import com.dfsek.terra.addons.biome.pipeline.config.NoiseSourceTemplate;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.expander.ExpanderStageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderListMutatorTemplate;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderMutatorTemplate;
@@ -23,21 +14,23 @@ import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceListMut
 import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceMutatorTemplate;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.SmoothMutatorTemplate;
 import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
-import com.dfsek.terra.addons.manifest.api.AddonInitializer;
-import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.addon.BaseAddon;
-import com.dfsek.terra.api.event.events.config.pack.ConfigPackPostLoadEvent;
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.addon.TerraAddon;
+import com.dfsek.terra.api.addon.annotations.Addon;
+import com.dfsek.terra.api.addon.annotations.Author;
+import com.dfsek.terra.api.addon.annotations.Version;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.inject.annotations.Inject;
+import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.registry.CheckedRegistry;
-import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.util.reflection.TypeKey;
-import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
-public class BiomePipelineAddon implements AddonInitializer {
+@Addon("biome-provider-pipeline")
+@Author("Terra")
+@Version("1.0.0")
+public class BiomePipelineAddon extends TerraAddon {
     
     public static final TypeKey<Supplier<ObjectTemplate<BiomeSource>>> SOURCE_REGISTRY_KEY = new TypeKey<>() {
     };
@@ -47,43 +40,32 @@ public class BiomePipelineAddon implements AddonInitializer {
     public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
     };
     @Inject
-    private Platform platform;
-    
-    @Inject
-    private BaseAddon addon;
+    private TerraPlugin main;
     
     @Override
     public void initialize() {
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
-                            PROVIDER_REGISTRY_KEY);
-                    providerRegistry.register(addon.key("PIPELINE"), BiomePipelineTemplate::new);
-                })
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<BiomeSource>>> sourceRegistry = event.getPack().getOrCreateRegistry(
-                            SOURCE_REGISTRY_KEY);
-                    sourceRegistry.register(addon.key("SAMPLER"), SamplerSourceTemplate::new);
-                })
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<Stage>>> stageRegistry = event.getPack().getOrCreateRegistry(
-                            STAGE_REGISTRY_KEY);
-                    stageRegistry.register(addon.key("FRACTAL_EXPAND"), ExpanderStageTemplate::new);
-                    stageRegistry.register(addon.key("SMOOTH"), SmoothMutatorTemplate::new);
-                    stageRegistry.register(addon.key("REPLACE"), ReplaceMutatorTemplate::new);
-                    stageRegistry.register(addon.key("REPLACE_LIST"), ReplaceListMutatorTemplate::new);
-                    stageRegistry.register(addon.key("BORDER"), BorderMutatorTemplate::new);
-                    stageRegistry.register(addon.key("BORDER_LIST"), BorderListMutatorTemplate::new);
-                })
-                .failThrough();
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPostLoadEvent.class)
-                .then(event -> {
-                    Registry<Biome> biomeRegistry = event.getPack().getRegistry(Biome.class);
-                    event.getPack().applyLoader(BiomeDelegate.class, new BiomeDelegateLoader(biomeRegistry));
-                });
+        main.getEventManager()
+            .getHandler(FunctionalEventHandler.class)
+            .register(this, ConfigPackPreLoadEvent.class)
+            .then(event -> {
+                CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
+                        PROVIDER_REGISTRY_KEY);
+                providerRegistry.register("PIPELINE", () -> new BiomePipelineTemplate(main));
+            })
+            .then(event -> {
+                CheckedRegistry<Supplier<ObjectTemplate<BiomeSource>>> sourceRegistry = event.getPack().getOrCreateRegistry(
+                        SOURCE_REGISTRY_KEY);
+                sourceRegistry.register("NOISE", NoiseSourceTemplate::new);
+            })
+            .then(event -> {
+                CheckedRegistry<Supplier<ObjectTemplate<Stage>>> stageRegistry = event.getPack().getOrCreateRegistry(STAGE_REGISTRY_KEY);
+                stageRegistry.register("FRACTAL_EXPAND", ExpanderStageTemplate::new);
+                stageRegistry.register("SMOOTH", SmoothMutatorTemplate::new);
+                stageRegistry.register("REPLACE", ReplaceMutatorTemplate::new);
+                stageRegistry.register("REPLACE_LIST", ReplaceListMutatorTemplate::new);
+                stageRegistry.register("BORDER", BorderMutatorTemplate::new);
+                stageRegistry.register("BORDER_LIST", BorderListMutatorTemplate::new);
+            })
+            .failThrough();
     }
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java

@@ -1,27 +1,15 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline;
 
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.github.benmanes.caffeine.cache.LoadingCache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import net.jafama.FastMath;
-
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.StreamSupport;
+import org.jetbrains.annotations.NotNull;
 
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.registry.key.StringIdentifiable;
-import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
@@ -32,49 +20,27 @@ public class BiomePipelineProvider implements BiomeProvider {
     private final NoiseSampler mutator;
     private final double noiseAmp;
     
-    private final Set<Biome> biomes;
-    
-    public BiomePipelineProvider(BiomePipeline pipeline, int resolution, NoiseSampler mutator, double noiseAmp) {
+    public BiomePipelineProvider(BiomePipeline pipeline, TerraPlugin main, int resolution, NoiseSampler mutator, double noiseAmp) {
         this.resolution = resolution;
         this.mutator = mutator;
         this.noiseAmp = noiseAmp;
-        holderCache = Caffeine.newBuilder()
-                              .maximumSize(1024)
-                              .build(key -> pipeline.getBiomes(key.x, key.z, key.seed));
+        holderCache = CacheBuilder.newBuilder()
+                                  .maximumSize(main == null ? 32 : main.getTerraConfig().getProviderCache())
+                                  .build(
+                                          new CacheLoader<SeededVector, BiomeHolder>() {
+                                              @Override
+                                              public BiomeHolder load(@NotNull SeededVector key) {
+                                                  return pipeline.getBiomes(key.x, key.z, key.seed);
+                                              }
+                                          }
+                                        );
         this.pipeline = pipeline;
-        
-        Set<BiomeDelegate> biomeSet = new HashSet<>();
-        pipeline.getSource().getBiomes().forEach(biomeSet::add);
-        Iterable<BiomeDelegate> result = biomeSet;
-        for(Stage stage : pipeline.getStages()) {
-            result = stage.getBiomes(result); // pass through all stages
-        }
-        this.biomes = new HashSet<>();
-        Iterable<BiomeDelegate> finalResult = result;
-        result.forEach(biomeDelegate -> {
-            if(biomeDelegate.isEphemeral()) {
-                
-                StringBuilder biomeList = new StringBuilder("\n");
-                StreamSupport.stream(finalResult.spliterator(), false)
-                             .sorted(Comparator.comparing(StringIdentifiable::getID))
-                             .forEach(delegate -> biomeList
-                                     .append("    - ")
-                                     .append(delegate.getID())
-                                     .append(':')
-                                     .append(delegate.getClass().getCanonicalName())
-                                     .append('\n'));
-                throw new IllegalArgumentException("Biome Pipeline leaks ephemeral biome \"" + biomeDelegate.getID() +
-                                                   "\". Ensure there is a stage to guarantee replacement of the ephemeral biome. Biomes: " +
-                                                   biomeList);
-            }
-            this.biomes.add(biomeDelegate.getBiome());
-        });
     }
     
     @Override
-    public Biome getBiome(int x, int y, int z, long seed) {
-        x += mutator.noise(seed + 1, x, z) * noiseAmp;
-        z += mutator.noise(seed + 2, x, z) * noiseAmp;
+    public TerraBiome getBiome(int x, int z, long seed) {
+        x += mutator.getNoiseSeeded(seed + 1, x, z) * noiseAmp;
+        z += mutator.getNoiseSeeded(seed + 2, x, z) * noiseAmp;
         
         
         x = FastMath.floorToInt(FastMath.floorDiv(x, resolution));
@@ -83,15 +49,36 @@ public class BiomePipelineProvider implements BiomeProvider {
         
         int fdX = FastMath.floorDiv(x, pipeline.getSize());
         int fdZ = FastMath.floorDiv(z, pipeline.getSize());
-        return holderCache.get(new SeededVector(fdX, fdZ, seed)).getBiome(x - fdX * pipeline.getSize(),
-                                                                                   z - fdZ * pipeline.getSize()).getBiome();
+        return holderCache.getUnchecked(new SeededVector(fdX, fdZ, seed)).getBiome(x - fdX * pipeline.getSize(),
+                                                                                   z - fdZ * pipeline.getSize());
     }
     
-    @Override
-    public Iterable<Biome> getBiomes() {
-        return biomes;
-    }
-    
-    private record SeededVector(int x, int z, long seed) {
+    private static final class SeededVector {
+        private final int x;
+        private final int z;
+        private final long seed;
+        
+        private SeededVector(int x, int z, long seed) {
+            this.x = x;
+            this.z = z;
+            this.seed = seed;
+        }
+        
+        @Override
+        public int hashCode() {
+            int result = 0;
+            result = 31 * result + ((int) (seed ^ (seed >>> 32)));
+            result = 31 * result + x;
+            result = 31 * result + z;
+            return result;
+        }
+        
+        @Override
+        public boolean equals(Object obj) {
+            if(!(obj instanceof SeededVector)) return false;
+            SeededVector that = (SeededVector) obj;
+            
+            return this.seed == that.seed && this.x == that.x && this.z == that.z;
+        }
     }
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeExpander.java

@@ -0,0 +1,8 @@
+package com.dfsek.terra.addons.biome.pipeline.api;
+
+import com.dfsek.terra.api.world.biome.TerraBiome;
+
+
+public interface BiomeExpander {
+    TerraBiome getBetween(double x, double z, long seed, TerraBiome... others);
+}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeHolder.java

@@ -1,16 +1,7 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.api;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeExpander;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
 import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 
 
 public interface BiomeHolder {
@@ -20,7 +11,7 @@ public interface BiomeHolder {
     
     void fill(BiomeSource source, long seed);
     
-    BiomeDelegate getBiome(int x, int z);
+    TerraBiome getBiome(int x, int z);
     
-    BiomeDelegate getBiomeRaw(int x, int z);
+    TerraBiome getBiomeRaw(int x, int z);
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeMutator.java

@@ -0,0 +1,25 @@
+package com.dfsek.terra.addons.biome.pipeline.api;
+
+import com.dfsek.terra.api.world.biome.TerraBiome;
+
+
+public interface BiomeMutator {
+    TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed);
+    
+    class ViewPoint {
+        private final BiomeHolder biomes;
+        private final int offX;
+        private final int offZ;
+        
+        public ViewPoint(BiomeHolder biomes, int offX, int offZ) {
+            this.biomes = biomes;
+            this.offX = offX;
+            this.offZ = offZ;
+        }
+        
+        
+        public TerraBiome getBiome(int x, int z) {
+            return biomes.getBiomeRaw(x + offX, z + offZ);
+        }
+    }
+}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Stage.java

@@ -0,0 +1,8 @@
+package com.dfsek.terra.addons.biome.pipeline.api;
+
+public interface Stage {
+    BiomeHolder apply(BiomeHolder in, long seed);
+    
+    boolean isExpansion();
+    
+}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/BiomeDelegate.java

@@ -1,35 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.api.delegate;
-
-import java.util.Set;
-
-import com.dfsek.terra.api.registry.key.StringIdentifiable;
-import com.dfsek.terra.api.world.biome.Biome;
-
-
-public interface BiomeDelegate extends StringIdentifiable {
-    static BiomeDelegate ephemeral(String id) {
-        return new EphemeralBiomeDelegate(id);
-    }
-    
-    static BiomeDelegate from(Biome biome) {
-        return new DelegatedBiome(biome);
-    }
-    
-    static BiomeDelegate self() {
-        return SelfDelegate.INSTANCE;
-    }
-    
-    Biome getBiome();
-    
-    Set<String> getTags();
-    
-    default boolean isEphemeral() {
-        return false;
-    }
-    
-    default boolean isSelf() {
-        return false;
-    }
-    
-    
-}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/DelegatedBiome.java

@@ -1,40 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.api.delegate;
-
-import java.util.Set;
-
-import com.dfsek.terra.api.world.biome.Biome;
-
-
-final class DelegatedBiome implements BiomeDelegate {
-    private final Biome biome;
-    
-    public DelegatedBiome(Biome biome) {
-        this.biome = biome;
-    }
-    
-    @Override
-    public Biome getBiome() {
-        return biome;
-    }
-    
-    @Override
-    public int hashCode() {
-        return biome.hashCode();
-    }
-    
-    @Override
-    public boolean equals(Object obj) {
-        if(!(obj instanceof DelegatedBiome that)) return false;
-        return that.biome.equals(this.biome);
-    }
-    
-    @Override
-    public Set<String> getTags() {
-        return biome.getTags();
-    }
-    
-    @Override
-    public String getID() {
-        return biome.getID();
-    }
-}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/EphemeralBiomeDelegate.java

@@ -1,51 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.api.delegate;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import com.dfsek.terra.api.world.biome.Biome;
-
-
-final class EphemeralBiomeDelegate implements BiomeDelegate {
-    private final Set<String> tags;
-    private final String id;
-    
-    public EphemeralBiomeDelegate(String id) {
-        this.id = id;
-        tags = new HashSet<>();
-        tags.add(id);
-        tags.add("ALL");
-    }
-    
-    @Override
-    public Biome getBiome() {
-        throw new UnsupportedOperationException("Cannot get biome from ephemeral delegate");
-    }
-    
-    @Override
-    public Set<String> getTags() {
-        return tags;
-    }
-    
-    @Override
-    public String getID() {
-        return id;
-    }
-    
-    @Override
-    public boolean isEphemeral() {
-        return true;
-    }
-    
-    @Override
-    public int hashCode() {
-        return id.hashCode();
-    }
-    
-    @Override
-    public boolean equals(Object obj) {
-        if(!(obj instanceof EphemeralBiomeDelegate that)) return false;
-        
-        return this.id.equals(that.id);
-    }
-}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/SelfDelegate.java

@@ -1,40 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.api.delegate;
-
-import java.util.Collections;
-import java.util.Set;
-
-import com.dfsek.terra.api.world.biome.Biome;
-
-
-final class SelfDelegate implements BiomeDelegate {
-    public static final SelfDelegate INSTANCE = new SelfDelegate();
-    
-    private SelfDelegate() {
-
-    }
-    
-    @Override
-    public Biome getBiome() {
-        throw new UnsupportedOperationException("Cannot get biome from self delegate");
-    }
-    
-    @Override
-    public boolean isSelf() {
-        return true;
-    }
-    
-    @Override
-    public boolean isEphemeral() {
-        return true;
-    }
-    
-    @Override
-    public Set<String> getTags() {
-        return Collections.emptySet();
-    }
-    
-    @Override
-    public String getID() {
-        return "SELF";
-    }
-}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/Stage.java

@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.api.stage;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-
-
-public interface Stage {
-    BiomeHolder apply(BiomeHolder in, long seed);
-    
-    boolean isExpansion();
-    
-    Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes);
-}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/type/BiomeExpander.java

@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.api.stage.type;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-
-
-public interface BiomeExpander {
-    BiomeDelegate getBetween(double x, double z, long seed, BiomeDelegate... others);
-}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/type/BiomeMutator.java

@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.api.stage.type;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-
-
-public interface BiomeMutator {
-    BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed);
-    
-    default Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        return biomes;
-    }
-    
-    class ViewPoint {
-        private final BiomeHolder biomes;
-        private final int offX;
-        private final int offZ;
-        
-        public ViewPoint(BiomeHolder biomes, int offX, int offZ) {
-            this.biomes = biomes;
-            this.offX = offX;
-            this.offZ = offZ;
-        }
-        
-        
-        public BiomeDelegate getBiome(int x, int z) {
-            return biomes.getBiomeRaw(x + offX, z + offZ);
-        }
-    }
-}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomeDelegateLoader.java

@@ -1,32 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.config;
-
-import com.dfsek.tectonic.api.depth.DepthTracker;
-import com.dfsek.tectonic.api.exception.LoadException;
-import com.dfsek.tectonic.api.loader.ConfigLoader;
-import com.dfsek.tectonic.api.loader.type.TypeLoader;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.AnnotatedType;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.api.registry.Registry;
-import com.dfsek.terra.api.world.biome.Biome;
-
-
-public class BiomeDelegateLoader implements TypeLoader<BiomeDelegate> {
-    private final Registry<Biome> biomeRegistry;
-    
-    public BiomeDelegateLoader(Registry<Biome> biomeRegistry) {
-        this.biomeRegistry = biomeRegistry;
-    }
-    
-    @Override
-    public BiomeDelegate load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader, DepthTracker depthTracker)
-    throws LoadException {
-        if(c.equals("SELF")) return BiomeDelegate.self();
-        return biomeRegistry
-                .getByID((String) c)
-                .map(BiomeDelegate::from)
-                .orElseGet(() -> BiomeDelegate.ephemeral((String) c));
-    }
-}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java

@@ -1,54 +1,41 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.config;
 
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Description;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
+import com.dfsek.tectonic.annotations.Default;
+import com.dfsek.tectonic.annotations.Value;
 
 import java.util.List;
 
 import com.dfsek.terra.addons.biome.pipeline.BiomePipeline;
 import com.dfsek.terra.addons.biome.pipeline.BiomePipelineProvider;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
 @SuppressWarnings({ "FieldMayBeFinal", "unused" })
 public class BiomePipelineTemplate extends BiomeProviderTemplate {
+    private final TerraPlugin main;
     @Value("pipeline.initial-size")
     @Default
-    @Description("""
-                 The initial size of biome chunks. This value must be at least 2.
-                 <b>This is not the final size of biome chunks. Final chunks will be much larger</b>.
-                                  
-                 It is recommended to keep biome chunks' final size in the range of [50, 300]
-                 to prevent performance issues. To calculate the size of biome chunks, simply
-                 take initial-size and for each expand stage, multiply the running value by 2
-                 and subtract 1. (The size is also printed to the server console if you
-                 have debug mode enabled)""")
     private @Meta int initialSize = 2;
     
+    @Value("pipeline.stages")
+    private @Meta List<@Meta Stage> stages;
+    
     @Value("pipeline.source")
-    @Description("The Biome Source to use for initial population of biomes.")
     private @Meta BiomeSource source;
     
-    @Value("pipeline.stages")
-    @Description("A list of pipeline stages to apply to the result of #source")
-    private @Meta List<@Meta Stage> stages;
+    public BiomePipelineTemplate(TerraPlugin main) {
+        this.main = main;
+    }
     
     @Override
     public BiomeProvider get() {
         BiomePipeline.BiomePipelineBuilder biomePipelineBuilder = new BiomePipeline.BiomePipelineBuilder(initialSize);
         stages.forEach(biomePipelineBuilder::addStage);
         BiomePipeline pipeline = biomePipelineBuilder.build(source);
-        return new BiomePipelineProvider(pipeline, resolution, blend, blendAmp);
+        return new BiomePipelineProvider(pipeline, main, resolution, blend, blendAmp);
     }
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomeProviderLoader.java

@@ -0,0 +1,18 @@
+package com.dfsek.terra.addons.biome.pipeline.config;
+
+import com.dfsek.tectonic.exception.LoadException;
+import com.dfsek.tectonic.loading.ConfigLoader;
+import com.dfsek.tectonic.loading.TypeLoader;
+
+import java.lang.reflect.AnnotatedType;
+
+import com.dfsek.terra.addons.biome.pipeline.BiomePipelineProvider;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+
+
+public class BiomeProviderLoader implements TypeLoader<BiomeProvider> {
+    @Override
+    public BiomeProvider load(AnnotatedType t, Object c, ConfigLoader loader) throws LoadException {
+        return loader.loadType(BiomePipelineProvider.class, c); // TODO: actually implement this lol
+    }
+}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomeProviderTemplate.java

@@ -1,16 +1,8 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.config;
 
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Description;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+import com.dfsek.tectonic.annotations.Default;
+import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.tectonic.loading.object.ObjectTemplate;
 
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.noise.NoiseSampler;
@@ -20,18 +12,11 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 public abstract class BiomeProviderTemplate implements ObjectTemplate<BiomeProvider> {
     @Value("resolution")
     @Default
-    @Description("""
-                 The resolution at which to sample biomes.
-                 
-                 Larger values are quadratically faster, but produce lower quality results.
-                 For example, a value of 3 would sample every 3 blocks.""")
     protected @Meta int resolution = 1;
-    @Value("blend.sampler")
+    @Value("blend.noise")
     @Default
-    @Description("A sampler to use for blending the edges of biomes via domain warping.")
     protected @Meta NoiseSampler blend = NoiseSampler.zero();
     @Value("blend.amplitude")
     @Default
-    @Description("The amplitude at which to perform blending.")
     protected @Meta double blendAmp = 0d;
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/NoiseSourceTemplate.java

@@ -0,0 +1,24 @@
+package com.dfsek.terra.addons.biome.pipeline.config;
+
+import com.dfsek.tectonic.annotations.Value;
+
+import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
+import com.dfsek.terra.addons.biome.pipeline.source.NoiseSource;
+import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.world.biome.TerraBiome;
+
+
+public class NoiseSourceTemplate extends SourceTemplate {
+    @Value("noise")
+    private @Meta NoiseSampler noise;
+    
+    @Value("biomes")
+    private @Meta ProbabilityCollection<@Meta TerraBiome> biomes;
+    
+    @Override
+    public BiomeSource get() {
+        return new NoiseSource(biomes, noise);
+    }
+}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SamplerSourceTemplate.java

@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Description;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
-import com.dfsek.terra.addons.biome.pipeline.source.SamplerSource;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-
-
-public class SamplerSourceTemplate extends SourceTemplate {
-    @Value("sampler")
-    @Description("The sampler used to distribute biomes.")
-    private @Meta NoiseSampler noise;
-    
-    @Value("biomes")
-    @Description("The biomes to be distributed.")
-    private @Meta ProbabilityCollection<@Meta BiomeDelegate> biomes;
-    
-    @Override
-    public BiomeSource get() {
-        return new SamplerSource(biomes, noise);
-    }
-}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceTemplate.java

@@ -1,13 +1,6 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.config;
 
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+import com.dfsek.tectonic.loading.object.ObjectTemplate;
 
 import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
 

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java

@@ -1,23 +1,14 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.config.stage;
 
-import com.dfsek.tectonic.api.config.template.annotations.Description;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.tectonic.loading.object.ObjectTemplate;
 
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.noise.NoiseSampler;
 
 
 public abstract class StageTemplate implements ObjectTemplate<Stage> {
-    @Value("sampler")
-    @Description("Sampler to use for stage distribution.")
+    @Value("noise")
     protected @Meta NoiseSampler noise;
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/expander/ExpanderStageTemplate.java

@@ -1,13 +1,6 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.config.stage.expander;
 
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.expand.FractalExpander;
 import com.dfsek.terra.addons.biome.pipeline.stages.ExpanderStage;

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderListMutatorTemplate.java

@@ -1,23 +1,16 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
 
-import com.dfsek.tectonic.api.config.template.annotations.Value;
+import com.dfsek.tectonic.annotations.Value;
 
 import java.util.Map;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.mutator.BorderListMutator;
 import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 
 
 @SuppressWarnings("unused")
@@ -29,10 +22,10 @@ public class BorderListMutatorTemplate extends StageTemplate {
     private @Meta String defaultReplace;
     
     @Value("default-to")
-    private @Meta ProbabilityCollection<@Meta BiomeDelegate> defaultTo;
+    private @Meta ProbabilityCollection<@Meta TerraBiome> defaultTo;
     
     @Value("replace")
-    private @Meta Map<@Meta BiomeDelegate, @Meta ProbabilityCollection<@Meta BiomeDelegate>> replace;
+    private @Meta Map<@Meta TerraBiome, @Meta ProbabilityCollection<@Meta TerraBiome>> replace;
     
     
     @Override

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderMutatorTemplate.java

@@ -1,21 +1,14 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
 
-import com.dfsek.tectonic.api.config.template.annotations.Value;
+import com.dfsek.tectonic.annotations.Value;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.mutator.BorderMutator;
 import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 
 
 @SuppressWarnings("unused")
@@ -27,7 +20,7 @@ public class BorderMutatorTemplate extends StageTemplate {
     private @Meta String replace;
     
     @Value("to")
-    private @Meta ProbabilityCollection<@Meta BiomeDelegate> to;
+    private @Meta ProbabilityCollection<@Meta TerraBiome> to;
     
     @Override
     public Stage get() {

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListMutatorTemplate.java

@@ -1,23 +1,16 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
 
-import com.dfsek.tectonic.api.config.template.annotations.Value;
+import com.dfsek.tectonic.annotations.Value;
 
 import java.util.Map;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceListMutator;
 import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 
 
 @SuppressWarnings("unused")
@@ -26,10 +19,10 @@ public class ReplaceListMutatorTemplate extends StageTemplate {
     private @Meta String defaultFrom;
     
     @Value("default-to")
-    private @Meta ProbabilityCollection<@Meta BiomeDelegate> defaultTo;
+    private @Meta ProbabilityCollection<@Meta TerraBiome> defaultTo;
     
     @Value("to")
-    private @Meta Map<@Meta BiomeDelegate, @Meta ProbabilityCollection<@Meta BiomeDelegate>> replace;
+    private @Meta Map<@Meta TerraBiome, @Meta ProbabilityCollection<@Meta TerraBiome>> replace;
     
     @Override
     public Stage get() {

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceMutatorTemplate.java

@@ -1,21 +1,14 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
 
-import com.dfsek.tectonic.api.config.template.annotations.Value;
+import com.dfsek.tectonic.annotations.Value;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceMutator;
 import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 
 
 @SuppressWarnings("unused")
@@ -24,7 +17,7 @@ public class ReplaceMutatorTemplate extends StageTemplate {
     private @Meta String from;
     
     @Value("to")
-    private @Meta ProbabilityCollection<@Meta BiomeDelegate> to;
+    private @Meta ProbabilityCollection<@Meta TerraBiome> to;
     
     @Override
     public Stage get() {

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/SmoothMutatorTemplate.java

@@ -1,13 +1,6 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
 
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.mutator.SmoothMutator;
 import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/expand/FractalExpander.java

@@ -1,16 +1,9 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.expand;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeExpander;
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeExpander;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.MathUtil;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 
 
 public class FractalExpander implements BiomeExpander {
@@ -21,7 +14,7 @@ public class FractalExpander implements BiomeExpander {
     }
     
     @Override
-    public BiomeDelegate getBetween(double x, double z, long seed, BiomeDelegate... others) {
-        return others[MathUtil.normalizeIndex(sampler.noise(seed, x, z), others.length)];
+    public TerraBiome getBetween(double x, double z, long seed, TerraBiome... others) {
+        return others[MathUtil.normalizeIndex(sampler.getNoiseSeeded(seed, x, z), others.length)];
     }
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderListMutator.java

@@ -1,32 +1,22 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.mutator;
 
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
-import java.util.function.Predicate;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 
 
 public class BorderListMutator implements BiomeMutator {
     private final String border;
     private final NoiseSampler noiseSampler;
-    private final ProbabilityCollection<BiomeDelegate> replaceDefault;
+    private final ProbabilityCollection<TerraBiome> replaceDefault;
     private final String defaultReplace;
-    private final Map<BiomeDelegate, ProbabilityCollection<BiomeDelegate>> replace;
+    private final Map<TerraBiome, ProbabilityCollection<TerraBiome>> replace;
     
-    public BorderListMutator(Map<BiomeDelegate, ProbabilityCollection<BiomeDelegate>> replace, String border, String defaultReplace,
-                             NoiseSampler noiseSampler, ProbabilityCollection<BiomeDelegate> replaceDefault) {
+    public BorderListMutator(Map<TerraBiome, ProbabilityCollection<TerraBiome>> replace, String border, String defaultReplace,
+                             NoiseSampler noiseSampler, ProbabilityCollection<TerraBiome> replaceDefault) {
         this.border = border;
         this.noiseSampler = noiseSampler;
         this.replaceDefault = replaceDefault;
@@ -35,33 +25,25 @@ public class BorderListMutator implements BiomeMutator {
     }
     
     @Override
-    public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
-        BiomeDelegate origin = viewPoint.getBiome(0, 0);
+    public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) {
+        TerraBiome origin = viewPoint.getBiome(0, 0);
         if(origin.getTags().contains(defaultReplace)) {
             for(int xi = -1; xi <= 1; xi++) {
                 for(int zi = -1; zi <= 1; zi++) {
                     if(xi == 0 && zi == 0) continue;
-                    BiomeDelegate current = viewPoint.getBiome(xi, zi);
-                    if(current != null && current.getTags().contains(border)) {
+                    TerraBiome current = viewPoint.getBiome(xi, zi);
+                    if(current == null) continue;
+                    if(current.getTags().contains(border)) {
                         if(replace.containsKey(origin)) {
-                            BiomeDelegate biome = replace.get(origin).get(noiseSampler, x, z, seed);
-                            return biome.isSelf() ? origin : biome;
+                            TerraBiome biome = replace.get(origin).get(noiseSampler, x, z, seed);
+                            return biome == null ? origin : biome;
                         }
-                        BiomeDelegate biome = replaceDefault.get(noiseSampler, x, z, seed);
-                        return biome.isSelf() ? origin : biome;
+                        TerraBiome biome = replaceDefault.get(noiseSampler, x, z, seed);
+                        return biome == null ? origin : biome;
                     }
                 }
             }
         }
         return origin;
     }
-    
-    @Override
-    public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        Set<BiomeDelegate> biomeSet = new HashSet<>();
-        biomes.forEach(biomeSet::add);
-        biomeSet.addAll(replaceDefault.getContents().stream().filter(Predicate.not(BiomeDelegate::isSelf)).toList());
-        replace.forEach((biome, collection) -> biomeSet.addAll(collection.getContents()));
-        return biomeSet;
-    }
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderMutator.java

@@ -1,29 +1,18 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.mutator;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Predicate;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 
 
 public class BorderMutator implements BiomeMutator {
     private final String border;
     private final NoiseSampler noiseSampler;
-    private final ProbabilityCollection<BiomeDelegate> replace;
+    private final ProbabilityCollection<TerraBiome> replace;
     private final String replaceTag;
     
-    public BorderMutator(String border, String replaceTag, NoiseSampler noiseSampler, ProbabilityCollection<BiomeDelegate> replace) {
+    public BorderMutator(String border, String replaceTag, NoiseSampler noiseSampler, ProbabilityCollection<TerraBiome> replace) {
         this.border = border;
         this.noiseSampler = noiseSampler;
         this.replace = replace;
@@ -31,36 +20,21 @@ public class BorderMutator implements BiomeMutator {
     }
     
     @Override
-    public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
-        BiomeDelegate origin = viewPoint.getBiome(0, 0);
+    public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) {
+        TerraBiome origin = viewPoint.getBiome(0, 0);
         if(origin.getTags().contains(replaceTag)) {
             for(int xi = -1; xi <= 1; xi++) {
                 for(int zi = -1; zi <= 1; zi++) {
                     if(xi == 0 && zi == 0) continue;
-                    BiomeDelegate current = viewPoint.getBiome(xi, zi);
-                    if(current != null && current.getTags().contains(border)) {
-                        BiomeDelegate biome = replace.get(noiseSampler, x, z, seed);
-                        return biome.isSelf() ? origin : biome;
+                    TerraBiome current = viewPoint.getBiome(xi, zi);
+                    if(current == null) continue;
+                    if(current.getTags().contains(border)) {
+                        TerraBiome biome = replace.get(noiseSampler, x, z, seed);
+                        return biome == null ? origin : biome;
                     }
                 }
             }
         }
         return origin;
     }
-    
-    @Override
-    public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        Set<BiomeDelegate> biomeSet = new HashSet<>();
-        biomes.forEach(biomeSet::add);
-        biomeSet.addAll(
-                replace
-                        .getContents()
-                        .stream()
-                        .filter(
-                                Predicate.not(BiomeDelegate::isSelf)
-                               )
-                        .toList()
-                       );
-        return biomeSet;
-    }
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceListMutator.java

@@ -1,31 +1,21 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.mutator;
 
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
-import java.util.stream.Stream;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 
 
 public class ReplaceListMutator implements BiomeMutator {
-    private final Map<BiomeDelegate, ProbabilityCollection<BiomeDelegate>> replace;
+    private final Map<TerraBiome, ProbabilityCollection<TerraBiome>> replace;
     private final NoiseSampler sampler;
-    private final ProbabilityCollection<BiomeDelegate> replaceDefault;
+    private final ProbabilityCollection<TerraBiome> replaceDefault;
     private final String defaultTag;
     
-    public ReplaceListMutator(Map<BiomeDelegate, ProbabilityCollection<BiomeDelegate>> replace, String defaultTag,
-                              ProbabilityCollection<BiomeDelegate> replaceDefault, NoiseSampler sampler) {
+    public ReplaceListMutator(Map<TerraBiome, ProbabilityCollection<TerraBiome>> replace, String defaultTag,
+                              ProbabilityCollection<TerraBiome> replaceDefault, NoiseSampler sampler) {
         this.replace = replace;
         this.sampler = sampler;
         this.defaultTag = defaultTag;
@@ -33,40 +23,16 @@ public class ReplaceListMutator implements BiomeMutator {
     }
     
     @Override
-    public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
-        BiomeDelegate center = viewPoint.getBiome(0, 0);
+    public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) {
+        TerraBiome center = viewPoint.getBiome(0, 0);
         if(replace.containsKey(center)) {
-            BiomeDelegate biome = replace.get(center).get(sampler, x, z, seed);
-            return biome.isSelf() ? viewPoint.getBiome(0, 0) : biome;
+            TerraBiome biome = replace.get(center).get(sampler, x, z, seed);
+            return biome == null ? viewPoint.getBiome(0, 0) : biome;
         }
         if(viewPoint.getBiome(0, 0).getTags().contains(defaultTag)) {
-            BiomeDelegate biome = replaceDefault.get(sampler, x, z, seed);
-            return biome.isSelf() ? viewPoint.getBiome(0, 0) : biome;
+            TerraBiome biome = replaceDefault.get(sampler, x, z, seed);
+            return biome == null ? viewPoint.getBiome(0, 0) : biome;
         }
         return center;
     }
-    
-    @Override
-    public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        Set<BiomeDelegate> biomeSet = new HashSet<>();
-        
-        Set<BiomeDelegate> reject = new HashSet<>();
-        
-        biomes.forEach(biome -> {
-            if(!biome.getTags().contains(defaultTag) && !replace.containsKey(biome)) {
-                biomeSet.add(biome);
-            } else {
-                reject.add(biome);
-            }
-        });
-        biomeSet.addAll(replaceDefault.getContents().stream().flatMap(terraBiome -> {
-            if(terraBiome.isSelf()) return reject.stream();
-            return Stream.of(terraBiome);
-        }).toList());
-        replace.forEach((biome, collection) -> biomeSet.addAll(collection.getContents().stream().map(terraBiome -> {
-            if(terraBiome.isSelf()) return biome;
-            return terraBiome;
-        }).toList()));
-        return biomeSet;
-    }
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceMutator.java

@@ -1,57 +1,28 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.mutator;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Stream;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 
 
 public class ReplaceMutator implements BiomeMutator {
     private final String replaceableTag;
-    private final ProbabilityCollection<BiomeDelegate> replace;
+    private final ProbabilityCollection<TerraBiome> replace;
     private final NoiseSampler sampler;
     
-    public ReplaceMutator(String replaceable, ProbabilityCollection<BiomeDelegate> replace, NoiseSampler sampler) {
+    public ReplaceMutator(String replaceable, ProbabilityCollection<TerraBiome> replace, NoiseSampler sampler) {
         this.replaceableTag = replaceable;
         this.replace = replace;
         this.sampler = sampler;
     }
     
     @Override
-    public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
+    public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) {
         if(viewPoint.getBiome(0, 0).getTags().contains(replaceableTag)) {
-            BiomeDelegate biome = replace.get(sampler, x, z, seed);
-            return biome.isSelf() ? viewPoint.getBiome(0, 0) : biome;
+            TerraBiome biome = replace.get(sampler, x, z, seed);
+            return biome == null ? viewPoint.getBiome(0, 0) : biome;
         }
         return viewPoint.getBiome(0, 0);
     }
-    
-    @Override
-    public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        Set<BiomeDelegate> biomeSet = new HashSet<>();
-        Set<BiomeDelegate> reject = new HashSet<>();
-        biomes.forEach(biome -> {
-            if(!biome.getTags().contains(replaceableTag)) {
-                biomeSet.add(biome);
-            } else {
-                reject.add(biome);
-            }
-        });
-        biomeSet.addAll(replace.getContents().stream().flatMap(terraBiome -> {
-            if(terraBiome.isSelf()) return reject.stream();
-            return Stream.of(terraBiome);
-        }).toList());
-        return biomeSet;
-    }
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/SmoothMutator.java

@@ -1,18 +1,11 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.mutator;
 
 import java.util.Objects;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.MathUtil;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 
 
 public class SmoothMutator implements BiomeMutator {
@@ -24,18 +17,18 @@ public class SmoothMutator implements BiomeMutator {
     }
     
     @Override
-    public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
-        BiomeDelegate top = viewPoint.getBiome(1, 0);
-        BiomeDelegate bottom = viewPoint.getBiome(-1, 0);
-        BiomeDelegate left = viewPoint.getBiome(0, 1);
-        BiomeDelegate right = viewPoint.getBiome(0, -1);
+    public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) {
+        TerraBiome top = viewPoint.getBiome(1, 0);
+        TerraBiome bottom = viewPoint.getBiome(-1, 0);
+        TerraBiome left = viewPoint.getBiome(0, 1);
+        TerraBiome right = viewPoint.getBiome(0, -1);
         
         
         boolean vert = Objects.equals(top, bottom) && top != null;
         boolean horiz = Objects.equals(left, right) && left != null;
         
         if(vert && horiz) {
-            return MathUtil.normalizeIndex(sampler.noise(seed, x, z), 2) == 0 ? left : top;
+            return MathUtil.normalizeIndex(sampler.getNoiseSeeded(seed, x, z), 2) == 0 ? left : top;
         }
         
         if(vert) return top;

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/BiomeSource.java

@@ -1,17 +1,8 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.source;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 
 
 public interface BiomeSource {
-    BiomeDelegate getBiome(double x, double z, long seed);
-    
-    Iterable<BiomeDelegate> getBiomes();
+    TerraBiome getBiome(double x, double z, long seed);
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/NoiseSource.java

@@ -0,0 +1,21 @@
+package com.dfsek.terra.addons.biome.pipeline.source;
+
+import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.world.biome.TerraBiome;
+
+
+public class NoiseSource implements BiomeSource {
+    private final ProbabilityCollection<TerraBiome> biomes;
+    private final NoiseSampler sampler;
+    
+    public NoiseSource(ProbabilityCollection<TerraBiome> biomes, NoiseSampler sampler) {
+        this.biomes = biomes;
+        this.sampler = sampler;
+    }
+    
+    @Override
+    public TerraBiome getBiome(double x, double z, long seed) {
+        return biomes.get(sampler, x, z, seed);
+    }
+}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/SamplerSource.java

@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.biome.pipeline.source;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-
-
-public class SamplerSource implements BiomeSource {
-    private final ProbabilityCollection<BiomeDelegate> biomes;
-    private final NoiseSampler sampler;
-    
-    public SamplerSource(ProbabilityCollection<BiomeDelegate> biomes, NoiseSampler sampler) {
-        this.biomes = biomes;
-        this.sampler = sampler;
-    }
-    
-    @Override
-    public BiomeDelegate getBiome(double x, double z, long seed) {
-        return biomes.get(sampler, x, z, seed);
-    }
-    
-    @Override
-    public Iterable<BiomeDelegate> getBiomes() {
-        return biomes.getContents();
-    }
-}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/ExpanderStage.java

@@ -1,16 +1,8 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.stages;
 
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeExpander;
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeExpander;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 
 
 public class ExpanderStage implements Stage {
@@ -30,8 +22,7 @@ public class ExpanderStage implements Stage {
         return true;
     }
     
-    @Override
-    public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        return biomes;
+    public enum Type {
+        FRACTAL
     }
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/MutatorStage.java

@@ -1,16 +1,8 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.stages;
 
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 
 
 public class MutatorStage implements Stage {
@@ -31,11 +23,6 @@ public class MutatorStage implements Stage {
         return false;
     }
     
-    @Override
-    public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        return mutator.getBiomes(biomes);
-    }
-    
     public enum Type {
         REPLACE,
         REPLACE_LIST,

common/addons/biome-provider-pipeline/src/main/resources/terra.addon.yml

@@ -1,12 +0,0 @@
-schema-version: 1
-contributors:
-  - Terra contributors
-id: biome-provider-pipeline
-version: @VERSION@
-entrypoints:
-  - "com.dfsek.terra.addons.biome.pipeline.BiomePipelineAddon"
-website:
-  issues: https://github.com/PolyhedralDev/Terra/issues
-  source: https://github.com/PolyhedralDev/Terra
-  docs: https://terra.polydev.org
-license: MIT License

common/addons/biome-provider-single/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020-2021 Polyhedral Development
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

common/addons/biome-provider-single/build.gradle.kts

@@ -1,5 +1,2 @@
-version = version("1.0.0")
-
 dependencies {
-    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }

common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProvider.java

@@ -1,32 +1,18 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.single;
 
-import java.util.Collections;
-
-import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
 public class SingleBiomeProvider implements BiomeProvider {
-    private final Biome biome;
+    private final TerraBiome biome;
     
-    public SingleBiomeProvider(Biome biome) {
+    public SingleBiomeProvider(TerraBiome biome) {
         this.biome = biome;
     }
     
     @Override
-    public Biome getBiome(int x, int y, int z, long seed) {
+    public TerraBiome getBiome(int x, int z, long seed) {
         return biome;
     }
-    
-    @Override
-    public Iterable<Biome> getBiomes() {
-        return Collections.singleton(biome);
-    }
 }

common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java

@@ -1,47 +1,42 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.single;
 
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+import com.dfsek.tectonic.loading.object.ObjectTemplate;
 
 import java.util.function.Supplier;
 
-import com.dfsek.terra.addons.manifest.api.AddonInitializer;
-import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.addon.BaseAddon;
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.addon.TerraAddon;
+import com.dfsek.terra.api.addon.annotations.Addon;
+import com.dfsek.terra.api.addon.annotations.Author;
+import com.dfsek.terra.api.addon.annotations.Version;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.inject.annotations.Inject;
+import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
-public class SingleBiomeProviderAddon implements AddonInitializer {
+@Addon("biome-provider-single")
+@Author("Terra")
+@Version("1.0.0")
+public class SingleBiomeProviderAddon extends TerraAddon {
     public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
     };
     
     @Inject
-    private Platform platform;
-    
-    @Inject
-    private BaseAddon addon;
+    private TerraPlugin main;
     
     @Override
     public void initialize() {
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
-                            PROVIDER_REGISTRY_KEY);
-                    providerRegistry.register(addon.key("SINGLE"), SingleBiomeProviderTemplate::new);
-                })
-                .failThrough();
+        main.getEventManager()
+            .getHandler(FunctionalEventHandler.class)
+            .register(this, ConfigPackPreLoadEvent.class)
+            .then(event -> {
+                CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
+                        PROVIDER_REGISTRY_KEY);
+                providerRegistry.register("SINGLE", SingleBiomeProviderTemplate::new);
+            })
+            .failThrough();
     }
 }

common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderTemplate.java

@@ -1,23 +1,16 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.single;
 
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.tectonic.loading.object.ObjectTemplate;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
 public class SingleBiomeProviderTemplate implements ObjectTemplate<BiomeProvider> {
     @Value("biome")
-    private @Meta Biome biome;
+    private @Meta TerraBiome biome;
     
     @Override
     public BiomeProvider get() {

common/addons/biome-provider-single/src/main/resources/terra.addon.yml

@@ -1,12 +0,0 @@
-schema-version: 1
-contributors:
-  - Terra contributors
-id: biome-provider-single
-version: @VERSION@
-entrypoints:
-  - "com.dfsek.terra.addons.biome.single.SingleBiomeProviderAddon"
-website:
-  issues: https://github.com/PolyhedralDev/Terra/issues
-  source: https://github.com/PolyhedralDev/Terra
-  docs: https://terra.polydev.org
-license: MIT License

common/addons/chunk-generator-noise-3d/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020-2021 Polyhedral Development
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

common/addons/chunk-generator-noise-3d/build.gradle.kts

@@ -1,12 +1,2 @@
-version = version("1.0.0")
-
 dependencies {
-    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-    
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-}
-
-tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
-    relocate("net.jafama", "com.dfsek.terra.addons.chunkgenerator.lib.jafama")
 }

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/BiomePaletteTemplate.java

@@ -0,0 +1,30 @@
+package com.dfsek.terra.addons.chunkgenerator;
+
+import com.dfsek.tectonic.annotations.Default;
+import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.tectonic.loading.object.ObjectTemplate;
+
+import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
+import com.dfsek.terra.addons.chunkgenerator.palette.PaletteInfo;
+import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
+import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.world.generator.Palette;
+
+
+public class BiomePaletteTemplate implements ObjectTemplate<PaletteInfo> {
+    @Value("slant")
+    @Default
+    private final @Meta SlantHolder slant;
+    @Value("palette")
+    private @Meta PaletteHolder palette;
+    @Value("ocean.level")
+    private @Meta int seaLevel;
+    
+    @Value("ocean.palette")
+    private @Meta Palette oceanPalette;
+    
+    @Override
+    public PaletteInfo get() {
+        return new PaletteInfo(palette, slant, oceanPalette, seaLevel);
+    }
+}

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java

@@ -1,62 +1,52 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.chunkgenerator;
 
-import com.dfsek.terra.addons.chunkgenerator.config.NoiseChunkGeneratorPackConfigTemplate;
-import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseConfigTemplate;
-import com.dfsek.terra.addons.chunkgenerator.config.palette.BiomePaletteTemplate;
-import com.dfsek.terra.addons.chunkgenerator.config.palette.SlantLayer;
-import com.dfsek.terra.addons.chunkgenerator.generation.NoiseChunkGenerator3D;
-import com.dfsek.terra.addons.manifest.api.AddonInitializer;
-import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.addon.BaseAddon;
+import com.dfsek.terra.addons.chunkgenerator.generation.generators.NoiseChunkGenerator3D;
+import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
+import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolderLoader;
+import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
+import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolderLoader;
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.addon.TerraAddon;
+import com.dfsek.terra.api.addon.annotations.Addon;
+import com.dfsek.terra.api.addon.annotations.Author;
+import com.dfsek.terra.api.addon.annotations.Version;
 import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.inject.annotations.Inject;
-import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.api.world.chunk.generation.util.provider.ChunkGeneratorProvider;
+import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.world.biome.TerraBiome;
+import com.dfsek.terra.api.world.generator.ChunkGeneratorProvider;
 
 
-public class NoiseChunkGenerator3DAddon implements AddonInitializer {
+@Addon("chunk-generator-noise-3d")
+@Author("Terra")
+@Version("1.0.0")
+public class NoiseChunkGenerator3DAddon extends TerraAddon {
     @Inject
-    private Platform platform;
-    
-    @Inject
-    private BaseAddon addon;
+    private TerraPlugin main;
     
     @Override
     public void initialize() {
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    NoiseChunkGeneratorPackConfigTemplate config = event.loadTemplate(new NoiseChunkGeneratorPackConfigTemplate());
-            
-                    event.getPack()
-                         .getOrCreateRegistry(ChunkGeneratorProvider.class)
-                         .register(addon.key("NOISE_3D"),
-                                   pack -> new NoiseChunkGenerator3D(platform, config.getElevationBlend(), config.getHorizontalRes(),
-                                                                     config.getVerticalRes()));
-                    event.getPack()
-                         .applyLoader(SlantLayer.class, SlantLayer::new);
-                })
-                .failThrough();
+        main.getEventManager()
+            .getHandler(FunctionalEventHandler.class)
+            .register(this, ConfigPackPreLoadEvent.class)
+            .then(event -> {
+                event.getPack().getOrCreateRegistry(ChunkGeneratorProvider.class).register("NOISE_3D",
+                                                                                           pack -> new NoiseChunkGenerator3D(pack, main));
+                event.getPack()
+                     .applyLoader(SlantHolder.class, new SlantHolderLoader())
+                     .applyLoader(PaletteHolder.class, new PaletteHolderLoader());
+            })
+            .failThrough();
         
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigurationLoadEvent.class)
-                .then(event -> {
-                    if(event.is(Biome.class)) {
-                        event.getLoadedObject(Biome.class).getContext().put(event.load(new BiomePaletteTemplate(platform)).get());
-                        event.getLoadedObject(Biome.class).getContext().put(event.load(new BiomeNoiseConfigTemplate()).get());
-                    }
-                })
-                .failThrough();
+        main.getEventManager()
+            .getHandler(FunctionalEventHandler.class)
+            .register(this, ConfigurationLoadEvent.class)
+            .then(event -> {
+                if(event.is(TerraBiome.class)) {
+                    event.getLoadedObject(TerraBiome.class).getContext().put(event.load(new BiomePaletteTemplate()).get());
+                }
+            })
+            .failThrough();
     }
 }

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/PaletteUtil.java

@@ -0,0 +1,23 @@
+package com.dfsek.terra.addons.chunkgenerator;
+
+import com.dfsek.terra.addons.chunkgenerator.palette.PaletteInfo;
+import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
+import com.dfsek.terra.api.util.MathUtil;
+import com.dfsek.terra.api.world.biome.GenerationSettings;
+import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.generator.Sampler;
+
+
+public final class PaletteUtil {
+    public static Palette getPalette(int x, int y, int z, GenerationSettings c, Sampler sampler, PaletteInfo paletteInfo) {
+        SlantHolder slant = paletteInfo.getSlantHolder();
+        if(slant != null) {
+            double slope = MathUtil.derivative(sampler, x, y, z);
+            if(slope > slant.getMinSlope()) {
+                return slant.getPalette(slope).getPalette(y);
+            }
+        }
+        
+        return paletteInfo.getPaletteHolder().getPalette(y);
+    }
+}

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/NoiseChunkGeneratorPackConfigTemplate.java

@@ -1,34 +0,0 @@
-package com.dfsek.terra.addons.chunkgenerator.config;
-
-import com.dfsek.tectonic.api.config.template.ConfigTemplate;
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-
-import com.dfsek.terra.api.config.meta.Meta;
-
-
-public class NoiseChunkGeneratorPackConfigTemplate implements ConfigTemplate {
-    @Value("blend.terrain.elevation")
-    @Default
-    private @Meta int elevationBlend = 4;
-    
-    @Value("carving.resolution.horizontal")
-    @Default
-    private @Meta int horizontalRes = 4;
-    
-    @Value("carving.resolution.vertical")
-    @Default
-    private @Meta int verticalRes = 2;
-    
-    public int getElevationBlend() {
-        return elevationBlend;
-    }
-    
-    public int getHorizontalRes() {
-        return horizontalRes;
-    }
-    
-    public int getVerticalRes() {
-        return verticalRes;
-    }
-}

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/noise/BiomeNoiseConfigTemplate.java

@@ -1,44 +0,0 @@
-package com.dfsek.terra.addons.chunkgenerator.config.noise;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.noise.NoiseSampler;
-
-
-public class BiomeNoiseConfigTemplate implements ObjectTemplate<BiomeNoiseProperties> {
-    @Value("terrain.sampler")
-    private @Meta NoiseSampler baseSampler;
-    
-    @Value("terrain.sampler-2d")
-    @Default
-    private @Meta NoiseSampler elevationSampler = NoiseSampler.zero();
-    
-    @Value("carving.sampler")
-    @Default
-    private @Meta NoiseSampler carvingSampler = NoiseSampler.zero();
-    
-    @Value("terrain.blend.distance")
-    @Default
-    private @Meta int blendDistance = 3;
-    
-    @Value("terrain.blend.weight")
-    @Default
-    private @Meta double blendWeight = 1;
-    
-    @Value("terrain.blend.step")
-    @Default
-    private @Meta int blendStep = 4;
-    
-    @Value("terrain.blend.weight-2d")
-    @Default
-    private @Meta double elevationWeight = 1;
-    
-    @Override
-    public BiomeNoiseProperties get() {
-        return new BiomeNoiseProperties(baseSampler, elevationSampler, carvingSampler, blendDistance, blendStep, blendWeight,
-                                        elevationWeight);
-    }
-}

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/noise/BiomeNoiseProperties.java

@@ -1,15 +0,0 @@
-package com.dfsek.terra.addons.chunkgenerator.config.noise;
-
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.properties.Properties;
-
-
-public record BiomeNoiseProperties(NoiseSampler base,
-                                   NoiseSampler elevation,
-                                   NoiseSampler carving,
-                                   int blendDistance,
-                                   int blendStep,
-                                   double blendWeight,
-                                   double elevationWeight) implements Properties {
-    
-}

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/BiomePaletteTemplate.java

@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.chunkgenerator.config.palette;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Description;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolderBuilder;
-import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
-import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.world.chunk.generation.util.Palette;
-
-
-public class BiomePaletteTemplate implements ObjectTemplate<PaletteInfo> {
-    private final Platform platform;
-    
-    @Value("slant")
-    @Default
-    @Description("The slant palettes to use in this biome.")
-    private @Meta List<@Meta SlantLayer> slant = Collections.emptyList();
-    
-    @Value("slant-depth")
-    @Default
-    @Description("The maximum depth at which to apply a slant palette.")
-    private @Meta int slantDepth = Integer.MAX_VALUE;
-    
-    @Value("palette")
-    @Description("The palettes to use in this biome.")
-    private @Meta List<@Meta Map<@Meta Palette, @Meta Integer>> palettes;
-    
-    @Value("ocean.level")
-    @Description("Sea level in this biome. Defaults to zero")
-    @Default
-    private @Meta int seaLevel = 0;
-    
-    @Value("ocean.palette")
-    @Description("The palette to use for the ocean in this biome. Defaults to a blank palette.")
-    @Default
-    private @Meta Palette oceanPalette = new Palette() {
-        @Override
-        public BlockState get(int layer, double x, double y, double z, long seed) {
-            return platform.getWorldHandle().air();
-        }
-    };
-    
-    public BiomePaletteTemplate(Platform platform) { this.platform = platform; }
-    
-    @Override
-    public PaletteInfo get() {
-        PaletteHolderBuilder builder = new PaletteHolderBuilder();
-        for(Map<Palette, Integer> layer : palettes) {
-            for(Entry<Palette, Integer> entry : layer.entrySet()) {
-                builder.add(entry.getValue(), entry.getKey());
-            }
-        }
-        
-        TreeMap<Double, PaletteHolder> slantLayers = new TreeMap<>();
-        double minThreshold = Double.MAX_VALUE;
-        
-        for(SlantLayer layer : slant) {
-            double threshold = layer.getThreshold();
-            if(threshold < minThreshold) minThreshold = threshold;
-            slantLayers.put(threshold, layer.getPalette());
-        }
-        
-        return new PaletteInfo(builder.build(), SlantHolder.of(slantLayers, minThreshold), oceanPalette, seaLevel, slantDepth);
-    }
-}

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/PaletteInfo.java

@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.chunkgenerator.config.palette;
-
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
-import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
-import com.dfsek.terra.api.properties.Properties;
-import com.dfsek.terra.api.world.chunk.generation.util.Palette;
-
-
-public record PaletteInfo(PaletteHolder paletteHolder,
-                          SlantHolder slantHolder,
-                          Palette ocean,
-                          int seaLevel,
-                          int maxSlantDepth) implements Properties {
-}

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/SlantLayer.java

@@ -1,42 +0,0 @@
-package com.dfsek.terra.addons.chunkgenerator.config.palette;
-
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolderBuilder;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.world.chunk.generation.util.Palette;
-
-
-public class SlantLayer implements ObjectTemplate<SlantLayer> {
-    @Value("threshold")
-    private @Meta double threshold;
-    
-    @Value("palette")
-    private @Meta List<@Meta Map<@Meta Palette, @Meta Integer>> palettes;
-    
-    @Override
-    public SlantLayer get() {
-        return this;
-    }
-    
-    public double getThreshold() {
-        return threshold;
-    }
-    
-    public PaletteHolder getPalette() {
-        PaletteHolderBuilder builder = new PaletteHolderBuilder();
-        for(Map<Palette, Integer> layer : palettes) {
-            for(Entry<Palette, Integer> entry : layer.entrySet()) {
-                builder.add(entry.getValue(), entry.getKey());
-            }
-        }
-        
-        return builder.build();
-    }
-}

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java

@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.chunkgenerator.generation;
-
-
-import net.jafama.FastMath;
-import org.jetbrains.annotations.NotNull;
-
-import com.dfsek.terra.addons.chunkgenerator.config.palette.PaletteInfo;
-import com.dfsek.terra.addons.chunkgenerator.generation.math.PaletteUtil;
-import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.LazilyEvaluatedInterpolator;
-import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
-import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.SamplerProvider;
-import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
-import com.dfsek.terra.api.world.chunk.generation.ProtoChunk;
-import com.dfsek.terra.api.world.chunk.generation.util.Palette;
-import com.dfsek.terra.api.world.info.WorldProperties;
-
-
-public class NoiseChunkGenerator3D implements ChunkGenerator {
-    private final Platform platform;
-    
-    private final SamplerProvider samplerCache;
-    
-    private final BlockState air;
-    
-    private final int carverHorizontalResolution;
-    private final int carverVerticalResolution;
-    
-    public NoiseChunkGenerator3D(Platform platform, int elevationBlend, int carverHorizontalResolution,
-                                 int carverVerticalResolution) {
-        this.platform = platform;
-        this.air = platform.getWorldHandle().air();
-        this.carverHorizontalResolution = carverHorizontalResolution;
-        this.carverVerticalResolution = carverVerticalResolution;
-        this.samplerCache = new SamplerProvider(platform, elevationBlend);
-    }
-    
-    @Override
-    @SuppressWarnings("try")
-    public void generateChunkData(@NotNull ProtoChunk chunk, @NotNull WorldProperties world,
-                                  @NotNull BiomeProvider biomeProvider,
-                                  int chunkX, int chunkZ) {
-        platform.getProfiler().push("chunk_base_3d");
-        int xOrig = (chunkX << 4);
-        int zOrig = (chunkZ << 4);
-        
-        Sampler3D sampler = samplerCache.getChunk(chunkX, chunkZ, world, biomeProvider);
-        
-        long seed = world.getSeed();
-        
-        LazilyEvaluatedInterpolator carver = new LazilyEvaluatedInterpolator(biomeProvider,
-                                                                             chunkX,
-                                                                             chunkZ,
-                                                                             world.getMaxHeight(),
-                                                                             world.getMinHeight(),
-                                                                             carverHorizontalResolution,
-                                                                             carverVerticalResolution,
-                                                                             seed);
-        for(int x = 0; x < 16; x++) {
-            for(int z = 0; z < 16; z++) {
-                int paletteLevel = 0;
-                
-                int cx = xOrig + x;
-                int cz = zOrig + z;
-                
-                Biome biome = biomeProvider.getBiome(cx, 0, cz, seed);
-                
-                PaletteInfo paletteInfo = biome.getContext().get(PaletteInfo.class);
-                
-                int sea = paletteInfo.seaLevel();
-                Palette seaPalette = paletteInfo.ocean();
-                
-                BlockState data;
-                for(int y = world.getMaxHeight() - 1; y >= world.getMinHeight(); y--) {
-                    if(sampler.sample(x, y, z) > 0) {
-                        if(carver.sample(x, y, z) <= 0) {
-                            data = PaletteUtil.getPalette(x, y, z, sampler, paletteInfo, paletteLevel).get(paletteLevel, cx, y, cz,
-                                                                                                           seed);
-                            chunk.setBlock(x, y, z, data);
-                        }
-                        
-                        paletteLevel++;
-                    } else if(y <= sea) {
-                        chunk.setBlock(x, y, z, seaPalette.get(sea - y, x + xOrig, y, z + zOrig, seed));
-                        paletteLevel = 0;
-                    } else {
-                        paletteLevel = 0;
-                    }
-                }
-            }
-        }
-        platform.getProfiler().pop("chunk_base_3d");
-    }
-    
-    @Override
-    public BlockState getBlock(WorldProperties world, int x, int y, int z, BiomeProvider biomeProvider) {
-        Biome biome = biomeProvider.getBiome(x, y, z, world.getSeed());
-        Sampler3D sampler = samplerCache.get(x, z, world, biomeProvider);
-        
-        PaletteInfo paletteInfo = biome.getContext().get(PaletteInfo.class);
-        
-        int fdX = FastMath.floorMod(x, 16);
-        int fdZ = FastMath.floorMod(z, 16);
-        
-        Palette palette = PaletteUtil.getPalette(fdX, y, fdZ, sampler, paletteInfo, 0);
-        double noise = sampler.sample(fdX, y, fdZ);
-        if(noise > 0) {
-            int level = 0;
-            for(int yi = world.getMaxHeight() - 1; yi > y; yi--) {
-                if(sampler.sample(fdX, yi, fdZ) > 0) level++;
-                else level = 0;
-            }
-            return palette.get(level, x, y, z, world.getSeed());
-        } else if(y <= paletteInfo.seaLevel()) {
-            return paletteInfo.ocean().get(paletteInfo.seaLevel() - y, x, y, z, world.getSeed());
-        } else return air;
-    }
-    
-    @Override
-    public Palette getPalette(int x, int y, int z, WorldProperties world, BiomeProvider biomeProvider) {
-        return biomeProvider.getBiome(x, y, z, world.getSeed()).getContext().get(PaletteInfo.class).paletteHolder().getPalette(y);
-    }
-    
-    public SamplerProvider samplerProvider() {
-        return samplerCache;
-    }
-}

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java

@@ -0,0 +1,192 @@
+package com.dfsek.terra.addons.chunkgenerator.generation.generators;
+
+import net.jafama.FastMath;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import com.dfsek.terra.addons.chunkgenerator.PaletteUtil;
+import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
+import com.dfsek.terra.addons.chunkgenerator.palette.PaletteInfo;
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.block.state.properties.base.Properties;
+import com.dfsek.terra.api.block.state.properties.enums.Direction;
+import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.api.profiler.ProfileFrame;
+import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.world.BiomeGrid;
+import com.dfsek.terra.api.world.World;
+import com.dfsek.terra.api.world.biome.GenerationSettings;
+import com.dfsek.terra.api.world.biome.TerraBiome;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import com.dfsek.terra.api.world.generator.ChunkData;
+import com.dfsek.terra.api.world.generator.ChunkGenerator;
+import com.dfsek.terra.api.world.generator.GenerationStage;
+import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.generator.Sampler;
+
+
+public class NoiseChunkGenerator3D implements ChunkGenerator {
+    private final ConfigPack configPack;
+    private final TerraPlugin main;
+    private final List<GenerationStage> generationStages = new ArrayList<>();
+    
+    private final BlockState air;
+    
+    public NoiseChunkGenerator3D(ConfigPack c, TerraPlugin main) {
+        this.configPack = c;
+        this.main = main;
+        this.air = main.getWorldHandle().air();
+        c.getStages().forEach(stage -> generationStages.add(stage.newInstance(c)));
+    }
+    
+    @SuppressWarnings("try")
+    static void biomes(@NotNull World world, int chunkX, int chunkZ, @NotNull BiomeGrid biome, TerraPlugin main) {
+        try(ProfileFrame ignore = main.getProfiler().profile("biomes")) {
+            int xOrig = (chunkX << 4);
+            int zOrig = (chunkZ << 4);
+            long seed = world.getSeed();
+            BiomeProvider grid = world.getBiomeProvider();
+            for(int x = 0; x < 4; x++) {
+                for(int z = 0; z < 4; z++) {
+                    int cx = xOrig + (x << 2);
+                    int cz = zOrig + (z << 2);
+                    TerraBiome b = grid.getBiome(cx, cz, seed);
+                    
+                    biome.setBiome(cx, cz, b.getVanillaBiomes().get(b.getGenerator().getBiomeNoise(), cx, 0, cz, world.getSeed()));
+                }
+            }
+        }
+    }
+    
+    @Override
+    @SuppressWarnings("try")
+    public ChunkData generateChunkData(@NotNull World world, Random random, int chunkX, int chunkZ, ChunkData chunk) {
+        try(ProfileFrame ignore = main.getProfiler().profile("chunk_base_3d")) {
+            BiomeProvider grid = world.getBiomeProvider();
+            
+            int xOrig = (chunkX << 4);
+            int zOrig = (chunkZ << 4);
+            
+            Sampler sampler = world.getConfig().getSamplerCache().getChunk(chunkX, chunkZ);
+            
+            long seed = world.getSeed();
+            
+            for(int x = 0; x < 16; x++) {
+                for(int z = 0; z < 16; z++) {
+                    int paletteLevel = 0;
+                    
+                    int cx = xOrig + x;
+                    int cz = zOrig + z;
+                    
+                    TerraBiome biome = grid.getBiome(cx, cz, seed);
+                    
+                    PaletteInfo paletteInfo = biome.getContext().get(PaletteInfo.class);
+                    
+                    if(paletteInfo == null) {
+                        main.logger().info("null palette: " + biome.getID());
+                    }
+                    
+                    GenerationSettings generationSettings = biome.getGenerator();
+                    
+                    int sea = paletteInfo.getSeaLevel();
+                    Palette seaPalette = paletteInfo.getOcean();
+                    
+                    boolean justSet = false;
+                    BlockState data = null;
+                    for(int y = world.getMaxHeight() - 1; y >= world.getMinHeight(); y--) {
+                        if(sampler.sample(x, y, z) > 0) {
+                            justSet = true;
+                            
+                            data = PaletteUtil.getPalette(x, y, z, generationSettings, sampler, paletteInfo).get(paletteLevel, cx, y, cz,
+                                                                                                                 seed);
+                            chunk.setBlock(x, y, z, data);
+                            
+                            paletteLevel++;
+                        } else if(y <= sea) {
+                            chunk.setBlock(x, y, z, seaPalette.get(sea - y, x + xOrig, y, z + zOrig, seed));
+                            
+                            justSet = false;
+                            paletteLevel = 0;
+                        } else {
+                            
+                            justSet = false;
+                            paletteLevel = 0;
+                        }
+                    }
+                }
+            }
+            return chunk;
+        }
+    }
+    
+    @Override
+    public void generateBiomes(@NotNull World world, @NotNull Random random, int chunkX, int chunkZ, @NotNull BiomeGrid biome) {
+        biomes(world, chunkX, chunkZ, biome, main);
+    }
+    
+    @Override
+    public Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, World world, int elevationSmooth) {
+        return new Sampler3D(chunkX, chunkZ, provider, world, elevationSmooth);
+    }
+    
+    @Override
+    public ConfigPack getConfigPack() {
+        return configPack;
+    }
+    
+    @Override
+    public TerraPlugin getMain() {
+        return main;
+    }
+    
+    @Override
+    public List<GenerationStage> getGenerationStages() {
+        return generationStages;
+    }
+    
+    @Override
+    public BlockState getBlock(World world, int x, int y, int z) {
+        BiomeProvider provider = world.getBiomeProvider();
+        TerraBiome biome = provider.getBiome(x, z, world.getSeed());
+        Sampler sampler = world.getConfig().getSamplerCache().get(x, z);
+        
+        PaletteInfo paletteInfo = biome.getContext().get(PaletteInfo.class);
+        Palette palette = PaletteUtil.getPalette(x, y, z, biome.getGenerator(), sampler, paletteInfo);
+        int fdX = FastMath.floorMod(x, 16);
+        int fdZ = FastMath.floorMod(z, 16);
+        double noise = sampler.sample(fdX, y, fdZ);
+        if(noise > 0) {
+            int level = 0;
+            for(int yi = world.getMaxHeight() - 1; yi > y; yi--) {
+                if(sampler.sample(fdX, yi, fdZ) > 0) level++;
+                else level = 0;
+            }
+            return palette.get(level, x, y, z, world.getSeed());
+        } else if(y <= paletteInfo.getSeaLevel()) {
+            return paletteInfo.getOcean().get(paletteInfo.getSeaLevel() - y, x, y, z, world.getSeed());
+        } else return air;
+    }
+    
+    private boolean placeStair(BlockState orig, ChunkData chunk, Vector3 block, double thresh, Sampler sampler, BlockState stairNew) {
+        
+        if(sampler.sample(block.getBlockX() - 0.55, block.getY(), block.getZ()) > thresh) {
+            stairNew.set(Properties.DIRECTION, Direction.WEST);
+        } else if(sampler.sample(block.getBlockX(), block.getY(), block.getZ() - 0.55) > thresh) {
+            stairNew.set(Properties.DIRECTION, Direction.NORTH);
+        } else if(sampler.sample(block.getBlockX(), block.getY(), block.getZ() + 0.55) > thresh) {
+            stairNew.set(Properties.DIRECTION, Direction.SOUTH);
+        } else if(sampler.sample(block.getX() + 0.55, block.getY(), block.getZ()) > thresh) {
+            stairNew.set(Properties.DIRECTION, Direction.EAST);
+        } else stairNew = null;
+        if(stairNew != null) {
+            stairNew.setIfPresent(Properties.WATERLOGGED, orig.getBlockType().isWater());
+            chunk.setBlock(block.getBlockX(), block.getBlockY(), block.getBlockZ(), stairNew);
+            return true;
+        }
+        return false;
+    }
+}

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/PaletteUtil.java

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.chunkgenerator.generation.math;
-
-import com.dfsek.terra.addons.chunkgenerator.config.palette.PaletteInfo;
-import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
-import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
-import com.dfsek.terra.api.world.chunk.generation.util.Palette;
-
-
-public final class PaletteUtil {
-    /**
-     * Derivative constant.
-     */
-    private static final double DERIVATIVE_DIST = 0.55;
-    
-    public static Palette getPalette(int x, int y, int z, Sampler3D sampler, PaletteInfo paletteInfo, int depth) {
-        SlantHolder slant = paletteInfo.slantHolder();
-        if(!slant.isEmpty() && depth <= paletteInfo.maxSlantDepth()) {
-            double slope = derivative(sampler, x, y, z);
-            if(slope > slant.getMinSlope()) {
-                return slant.getPalette(slope).getPalette(y);
-            }
-        }
-        
-        return paletteInfo.paletteHolder().getPalette(y);
-    }
-    
-    public static double derivative(Sampler3D sampler, double x, double y, double z) {
-        double baseSample = sampler.sample(x, y, z);
-        
-        double xVal1 = (sampler.sample(x + DERIVATIVE_DIST, y, z) - baseSample) / DERIVATIVE_DIST;
-        double xVal2 = (sampler.sample(x - DERIVATIVE_DIST, y, z) - baseSample) / DERIVATIVE_DIST;
-        double zVal1 = (sampler.sample(x, y, z + DERIVATIVE_DIST) - baseSample) / DERIVATIVE_DIST;
-        double zVal2 = (sampler.sample(x, y, z - DERIVATIVE_DIST) - baseSample) / DERIVATIVE_DIST;
-        double yVal1 = (sampler.sample(x, y + DERIVATIVE_DIST, z) - baseSample) / DERIVATIVE_DIST;
-        double yVal2 = (sampler.sample(x, y - DERIVATIVE_DIST, z) - baseSample) / DERIVATIVE_DIST;
-        
-        return Math.sqrt(((xVal2 - xVal1) * (xVal2 - xVal1)) + ((zVal2 - zVal1) * (zVal2 - zVal1)) + ((yVal2 - yVal1) * (yVal2 - yVal1)));
-    }
-}