proper api isolation for fplib

- Replaced "EBS" with "subchunk"
- Replaced "section" with "subchunk"
- Removed the Chunk* prefix from most classes
- Data manager names much more descriptive and less verbose

Yes, this contradicts the backwards compatibility requirements set forth in the FalsePatternLib StableAPI interface, however, we're still in beta, and only our mods use this library as far as I'm aware, so it's fine to make changes like this for now.

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+patreon: falsepattern
+ko_fi: falsepattern

LICENSE

@@ -1,63 +0,0 @@
-#-------------------------------------------------------------------------------
-# @author FalsePattern
-#
-# Copyright 2023
-#
-# All rights reserved.
-# Distribution of the software in any form is only allowed with
-# explicit, prior permission from the owner.
-#-------------------------------------------------------------------------------
-@author FalsePattern
-
-
-This code is the property of and owned and copyrighted by FalsePattern.
-This code is provided under a modified visible-source license
-that is as follows:
-
-
-API Code:
-==============================
-API code is identifiable as being in an "API" package in the respective
-repository or mod, and is intended to allow some level of inter-mod
-interactions without creating hard dependencies on the mod proper. This code
-is exempt from the below restrictions for "Mod Code", as it by nature will
-require some level of copying and redistribution.
-
-The only restrictions imposed on API code are that it remain clearly marked
-with its original authorship and source, that it be used for the purpose
-described previously, and that it not be modified from the original without
-first contacting FalsePattern.
-
-
-Mod Code:
-==============================
-Any and all users are permitted to use the source for educational purposes,
-or to create derivative works for private use only. GitHub forks and direct
-downloads are considered derivative works.
-
-Unless given explicit written permission - verifiable electronic writing is
-acceptable - no user may redistribute this source code nor any derivative
-works. These pre-approved works must prominently contain this copyright notice.
-
-Derivative mods using any or all of the source code or assets are
-EXPRESSLY FORBIDDEN.
-
-Additionally, no attempt may be made to achieve monetary gain from this code
-by anyone except the original author. In the case of pre-approved derivative
-works, any monetary gains made will be shared between the original author and
-the other developer(s), proportional to the ratio of derived to original code.
-
-Finally, any and all displays, duplicates or derivatives of this code must be
-prominently marked as such, and must contain attribution to the original
-author, including a link to the original source. Any attempts to claim credit
-for this code will be treated as intentional theft.
-
-Due to the Mojang and Minecraft Mod Terms of Service and Licensing
-Restrictions, compiled versions of this code must be provided for free.
-However, with the exception of pre-approved derivative works, only the original
-author's modpacks may distribute compiled binary versions of this code.
-
-==============================
-
-Failure to comply with these restrictions is a violation of copyright law and
-will be dealt with accordingly.

LICENSE.MD

@@ -0,0 +1,157 @@
+# Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International
+
+Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
+
+**Using Creative Commons Public Licenses**
+
+Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
+
+* __Considerations for licensors:__ Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. [More considerations for licensors](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors).
+
+* __Considerations for the public:__ By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. [More considerations for the public](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees).
+
+## Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
+
+### Section 1 – Definitions.
+
+a. __Adapted Material__ means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
+
+b. __Copyright and Similar Rights__ means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
+
+e. __Effective Technological Measures__ means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
+
+f. __Exceptions and Limitations__ means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
+
+h. __Licensed Material__ means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
+
+i. __Licensed Rights__ means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
+
+h. __Licensor__ means the individual(s) or entity(ies) granting rights under this Public License.
+
+i. __NonCommercial__ means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.
+
+j. __Share__ means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
+
+k. __Sui Generis Database Rights__ means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
+
+l. __You__ means the individual or entity exercising the Licensed Rights under this Public License. __Your__ has a corresponding meaning.
+
+### Section 2 – Scope.
+
+a. ___License grant.___
+
+   1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+
+        A. reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and
+
+        B. produce and reproduce, but not Share, Adapted Material for NonCommercial purposes only.
+
+   2. __Exceptions and Limitations.__ For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
+
+   3. __Term.__ The term of this Public License is specified in Section 6(a).
+
+   4. __Media and formats; technical modifications allowed.__ The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
+
+   5. __Downstream recipients.__
+
+        A. __Offer from the Licensor – Licensed Material.__ Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
+
+        B. __No downstream restrictions.__ You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
+
+   6. __No endorsement.__ Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
+
+b. ___Other rights.___
+
+   1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
+
+   2. Patent and trademark rights are not licensed under this Public License.
+
+   3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.
+
+### Section 3 – License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the following conditions.
+
+a. ___Attribution.___
+
+   1. If You Share the Licensed Material, You must:
+
+      A. retain the following if it is supplied by the Licensor with the Licensed Material:
+
+         i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
+
+         ii. a copyright notice;
+
+         iii. a notice that refers to this Public License;
+
+         iv. a notice that refers to the disclaimer of warranties;
+
+         v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+
+      B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
+
+      C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
+ 
+        For the avoidance of doubt, You do not have permission under this Public License to Share Adapted Material.
+
+   2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
+
+   3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
+
+### Section 4 – Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
+
+a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only and provided You do not Share Adapted Material;
+
+b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and
+
+c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+
+### Section 5 – Disclaimer of Warranties and Limitation of Liability.
+
+a. __Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.__
+
+b. __To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.__
+
+c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
+
+### Section 6 – Term and Termination.
+
+a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
+
+b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
+
+   1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
+
+   2. upon express reinstatement by the Licensor.
+
+   For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
+
+c. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
+
+d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+
+### Section 7 – Other Terms and Conditions.
+
+a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
+
+b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
+
+### Section 8 – Interpretation.
+
+a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
+
+b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
+
+c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
+
+d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
+
+> Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at [creativecommons.org/policies](http://creativecommons.org/policies), Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
+>
+> Creative Commons may be contacted at [creativecommons.org](http://creativecommons.org).

build.gradle

@@ -1,4 +1,4 @@
-//version: 1656003793falsepattern63
+//version: 1656003793falsepattern74
 /*
 DO NOT CHANGE THIS FILE!
 
@@ -132,6 +132,8 @@ propertyDefaultIfUnset("mixinConfigs", "")
 propertyDefaultIfUnset("mixinPluginPreInit", "")
 propertyDefaultIfUnset("mixinPluginMinimumVersion", "0.8.5")
 propertyDefaultIfUnset("remapStubs", false)
+propertyDefaultIfUnset("apiPackages", null)
+propertyDefaultIfUnset("apiPackagesNoRecurse", null)
 
 propertyDefaultIfUnset("modrinthProjectId", "")
 propertyDefaultIfUnset("modrinthDependencies", "")
@@ -147,20 +149,31 @@ String javaSourceDir = "src/main/java/"
 String scalaSourceDir = "src/main/scala/"
 String kotlinSourceDir = "src/main/kotlin/"
 
-String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
-String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
-String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/")
-if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
-    throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
+def verifyPackage(thePackage, propName) {
+    String javaSourceDir = "src/main/java/"
+    String scalaSourceDir = "src/main/scala/"
+    String kotlinSourceDir = "src/main/kotlin/"
+    String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + thePackage.toString().replaceAll("\\.", "/")
+    String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + thePackage.toString().replaceAll("\\.", "/")
+    String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + thePackage.toString().replaceAll("\\.", "/")
+    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+        throw new GradleException("Could not resolve \"${propName}\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
+    }
 }
 
+verifyPackage("", "modGroup")
+
 if(apiPackage) {
-    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
-        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
-    }
+    verifyPackage(apiPackage, "apiPackage")
+}
+
+
+if (apiPackages) {
+    apiPackages.tokenize(';').forEach { it -> verifyPackage(it, "apiPackages")}
+}
+
+if (apiPackagesNoRecurse) {
+    apiPackagesNoRecurse.tokenize(';').forEach { it -> verifyPackage(it, "apiPackagesNoRecurse")}
 }
 
 if(accessTransformersFile) {
@@ -175,9 +188,9 @@ if(usesMixins.toBoolean()) {
         throw new GradleException("\"usesMixins\" requires \"mixinsPackage\" to be set!")
     }
 
-    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
     if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
         throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala  + " or " + targetPackageKotlin)
     }
@@ -281,6 +294,10 @@ if(file("addon.gradle").exists()) {
 
 apply from: 'repositories.gradle'
 
+if(file('repositories_override.gradle').exists()) {
+    apply from: 'repositories_override.gradle'
+}
+
 configurations {
     for (config in [shadowImplementation, shadowCompile, shadeCompile]) {
         implementation.extendsFrom(shadeCompile)
@@ -305,36 +322,52 @@ repositories {
             name = "sponge2"
             url = "https://mvn.falsepattern.com/sponge"
         }
+        maven {
+            name = "jitpack"
+            url = "https://mvn.falsepattern.com/jitpack/"
+        }
     }
 }
 
+def unimixinsVersion = "0.1.15"
+
 dependencies {
     if(usesMixins.toBoolean()) {
         annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3")
         annotationProcessor("com.google.guava:guava:24.1.1-jre")
         annotationProcessor("com.google.code.gson:gson:2.8.6")
-        annotationProcessor("com.llamalad7:MixinExtras:0.1.1-gasstation")
-        annotationProcessor("org.spongepowered:mixin:0.8.5-gasstation_7")
-        compile("org.spongepowered:mixin:0.8.5-gasstation_7")
-        compile("com.llamalad7:MixinExtras:0.1.1-gasstation")
-        compile("com.falsepattern:00gasstation-mc1.7.10:0.5.1:dev")
-        runtimeClasspath('org.jetbrains:intellij-fernflower:1.2.1.16')
-        testRuntimeClasspath('org.jetbrains:intellij-fernflower:1.2.1.16')
+        annotationProcessor("com.github.LegacyModdingMC.UniMixins:unimixins-all-1.7.10:$unimixinsVersion:dev")
+        implementation("com.github.LegacyModdingMC.UniMixins:unimixins-all-1.7.10:$unimixinsVersion:dev")
+        runtimeOnly('org.jetbrains:intellij-fernflower:1.2.1.16')
     } else if(hasMixinDeps.toBoolean()) {
-        runtime("com.llamalad7:MixinExtras:0.1.1-gasstation")
-        runtime("org.spongepowered:mixin:0.8.5-gasstation_7")
-        runtime("com.falsepattern:00gasstation-mc1.7.10:0.5.1:dev")
+        runtimeOnly("com.github.LegacyModdingMC.UniMixins:unimixins-all-1.7.10:$unimixinsVersion:dev")
     }
     // Latest LWJGL
-    compile "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209"
-    compile "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209"
+    implementation "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209"
+    implementation "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209"
     minecraftNatives "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209"
     minecraftDeps "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209"
     minecraftDeps "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209"
 }
 
+
+if(usesMixins.toBoolean()) {
+    configurations.implementation.dependencies.each {
+        if (it instanceof ExternalModuleDependency) {
+            it.exclude module: "SpongeMixins"
+            it.exclude module: "SpongePoweredMixin"
+            it.exclude module: "00gasstation-mc1.7.10"
+            it.exclude module: "gtnhmixins"
+        }
+    }
+}
+
 apply from: 'dependencies.gradle'
 
+if(file('dependencies_override.gradle').exists()) {
+    apply from: 'dependencies_override.gradle'
+}
+
 def mixinDir = new File(project.buildDir, 'mixins')
 if (!mixinDir.exists()) {
     mixinDir.mkdirs()
@@ -425,12 +458,6 @@ runClient {
     def arguments = []
     def jvmArguments = []
 
-    if (usesMixins.toBoolean()) {
-        arguments += [
-                "--mods=" + Paths.get("$projectDir").resolve(minecraft.runDir).normalize().relativize(Paths.get("$projectDir/build/libs/$archivesBaseName-${version}.jar"))
-        ]
-    }
-
     if(usesMixins.toBoolean() || hasMixinDeps.toBoolean()) {
         arguments += [
                 "--tweakClass", "org.spongepowered.asm.launch.MixinTweaker"
@@ -455,12 +482,6 @@ runServer {
     def arguments = []
     def jvmArguments = []
 
-    if (usesMixins.toBoolean()) {
-        arguments += [
-                "--mods=" + Paths.get("$projectDir").resolve(minecraft.runDir).normalize().relativize(Paths.get("$projectDir/build/libs/$archivesBaseName-${version}.jar"))
-        ]
-    }
-
     if (usesMixins.toBoolean() || hasMixinDeps.toBoolean()) {
         arguments += [
                 "--tweakClass", "org.spongepowered.asm.launch.MixinTweaker"
@@ -602,11 +623,29 @@ task devJar(type: Jar) {
 
 task apiJar(type: Jar) {
     from (sourceSets.main.allSource) {
-        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+        if (apiPackage)
+            include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+        if (apiPackages)
+            apiPackages.tokenize(';').forEach { pkg ->
+                include modGroup.toString().replaceAll("\\.", "/") + "/" + pkg.toString().replaceAll("\\.", "/") + '/**'
+            }
+        if (apiPackagesNoRecurse)
+            apiPackagesNoRecurse.tokenize(';').forEach { pkg ->
+                include modGroup.toString().replaceAll("\\.", "/") + "/" + pkg.toString().replaceAll("\\.", "/") + '/*'
+            }
     }
 
     from (sourceSets.main.output) {
-        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+        if (apiPackage)
+            include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+        if (apiPackages)
+            apiPackages.tokenize(';').forEach { pkg ->
+                include modGroup.toString().replaceAll("\\.", "/") + "/" + pkg.toString().replaceAll("\\.", "/") + '/**'
+            }
+        if (apiPackagesNoRecurse)
+            apiPackagesNoRecurse.tokenize(';').forEach { pkg ->
+                include modGroup.toString().replaceAll("\\.", "/") + "/" + pkg.toString().replaceAll("\\.", "/") + '/*'
+            }
     }
 
     from (sourceSets.main.resources.srcDirs) {
@@ -627,7 +666,7 @@ compileJava.dependsOn(copySrgs)
 artifacts {
     archives sourcesJar
     archives devJar
-    if(apiPackage) {
+    if(apiPackage || apiPackages || apiPackagesNoRecurse) {
         archives apiJar
     }
 }
@@ -670,6 +709,8 @@ def getCredentials = {
 }
 
 //Publishing
+tasks.publish.dependsOn(build)
+
 publishing {
     publications {
         maven(MavenPublication) {
@@ -681,7 +722,7 @@ publishing {
                 artifact source: sourcesJar, classifier: "sources"
             }
             artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
-            if (apiPackage) {
+            if (apiPackage || apiPackages || apiPackagesNoRecurse) {
                 artifact source: apiJar, classifier: "api"
             }
 
@@ -753,7 +794,7 @@ if (curseForgeProjectId != "" && System.getenv("CURSEFORGE_TOKEN") != null) {
             addGameVersion project.minecraft.version
             addGameVersion "Forge"
             mainArtifact(jar) {
-                displayName = "$modName version: $modVersion"
+                displayName = "$modName $modVersion"
             }
         }
         options {
@@ -775,7 +816,7 @@ if (curseForgeProjectId != "" && System.getenv("CURSEFORGE_TOKEN") != null) {
     }
 
     if (usesMixins.toBoolean()) {
-        addCurseForgeRelation("requiredDependency", "gasstation")
+        addCurseForgeRelation("requiredDependency", "unimixins")
     }
     tasks.curseforge.dependsOn(build)
     tasks.publish.dependsOn(tasks.curseforge)
@@ -808,7 +849,7 @@ if (modrinthProjectId != "" && System.getenv("MODRINTH_TOKEN") != null) {
         }
     }
     if (usesMixins.toBoolean()) {
-        addModrinthDep("required", "project", "cdeAhgfp")
+        addModrinthDep("required", "project", "ghjoiQAl")
     }
     tasks.modrinth.dependsOn(build)
     tasks.publish.dependsOn(tasks.modrinth)
@@ -1067,7 +1108,7 @@ def deobf(String sourceURL, String rawFileName) {
     }
 
     download.run {
-        src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar"
+        src "https://github.com/FalsePattern/ExampleMod1.7.10/raw/main/blobs/BON2-2.5.1.jar"
         dest bon2File
         quiet true
         overwrite false

dependencies.gradle

@@ -1,11 +1,12 @@
 dependencies {
-    compileOnly("org.projectlombok:lombok:[1.18.24,1.19)") {
+    compileOnly("org.projectlombok:lombok:1.18.28") {
         transitive = false
     }
-    annotationProcessor("org.projectlombok:lombok:[1.18.24,1.19)")
+    annotationProcessor("org.projectlombok:lombok:1.18.28")
 
-    implementation("com.falsepattern:falsepatternlib-mc1.7.10:[0.10.15,0.11):dev")
+    compileOnlyApi("com.falsepattern:falsepatternlib-mc1.7.10:1.0.0:api")
+    runtimeOnly("com.falsepattern:falsepatternlib-mc1.7.10:1.0.0:dev")
 
-    compileOnly("org.jetbrains:annotations:[24,25)")
+    compileOnly("org.jetbrains:annotations:24.0.1")
 
 }

gradle.properties

@@ -64,7 +64,7 @@ mavenArtifactId = chunkapi
 
 # The project's ID on Modrinth. Can be either the slug or the ID.
 # Leave this empty if you don't want to publish on Modrinth.
-modrinthProjectId =
+modrinthProjectId = y0vBUOla
 
 # The project's dependencies on Modrinth. You can use this to refer to other projects on Modrinth.
 # Syntax: scope1-type1:name1;scope2-type2:name2;...
@@ -73,7 +73,7 @@ modrinthProjectId =
 #       and the name is the Modrinth project or version slug/id of the other mod.
 # Example: required-project:fplib;incompatible-project:gregtech
 # Note: GasStation is automatically set as a required dependency if usesMixins = true
-modrinthDependencies =
+modrinthDependencies = required-project:fplib
 
 #endregion modrinth
 
@@ -84,7 +84,7 @@ modrinthDependencies =
 
 # The project's numeric ID on CurseForge. You can find this in the About Project box.
 # Leave this empty if you don't want to publish on CurseForge.
-curseForgeProjectId =
+curseForgeProjectId = 844484
 
 # The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
 # Syntax: type1:name1;type2:name2;...
@@ -92,7 +92,7 @@ curseForgeProjectId =
 #       and the name is the CurseForge project id of the other mod.
 # Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft
 # Note: GasStation is automatically set as a required dependency if usesMixins = true
-curseForgeRelations =
+curseForgeRelations = requiredDependency:fplib
 
 #endregion curseforge
 
@@ -104,7 +104,7 @@ curseForgeRelations =
 # If neither this property, nor the file, nor the environment variable (or the file it points to) exist, the changelog
 # will be set to "No changelog was provided.".
 # Example: https://github.com/myname/mymod/releases/tag/{version}
-changelog =
+changelog = https://github.com/FalsePattern/ChunkAPI/releases/tag/{version}
 
 # endregion publishing
 
@@ -166,12 +166,12 @@ mixinConfigs =
 
 # Specify the configuration file for Forge's access transformers here. I must be placed into /src/main/resources/META-INF/
 # Example value: mymodid_at.cfg
-accessTransformersFile =
+accessTransformersFile = chunkapi_at.cfg
 
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
 # This parameter is for legacy compatibility only
 # Example value: coreModClass = asm.FMLPlugin + modGroup = com.falsepattern.chunk -> com.falsepattern.chunk.asm.FMLPlugin
-coreModClass =
+coreModClass = internal.core.CoreLoadingPlugin
 
 #endregion core
 

readme.md

@@ -1,8 +1,7 @@
 # ChunkAPI
 
 ## Author: FalsePattern
-## License: No derivatives visible-source with API exception. See the LICENSE file for more details.
-
+## License: CC-BY-NC-ND 4.0 <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-nd/4.0/88x31.png" /></a>
 
 Summary
 -------
@@ -33,7 +32,7 @@ Modifying chunk packet data involved incompatibly modifying network packets, the
 which is a lot of work for a simple feature. This mod provides a way to add custom data to chunks without having
 to modify any of the vanilla classes yourself.
 
-Description
+API and spec
 -----------
 
 The API exposes a way to add custom data to chunks, and a way to register custom serializers for the data.
@@ -61,27 +60,54 @@ This is where you actually register your manager. You need to do all registratio
 You can also disable specific manager IDs by calling `disableDataManager`, but this is not recommended, and should
 only be used if you know what you are doing. You need to do all the disabling inside the `postInit` phase.
 
-Alternatives
-------------
+### Packet specification
 
-Mods can also implement their own chunk-independent data storage, or even use hidden entities to store data, but
-this is not a good solution and prone to breaking.
+ChunkAPI modifies the S21PacketChunkData and S26PacketMapChunkBulk vanilla packets, and overwrites their default
+formats.
 
-Testing
--------
+All sizes in the tables below are specified in bytes.
 
-This mod will be tested by using it in my own mods, primarily EndlessIDs.
+S21PacketChunkData new format:
 
-Risks and Assumptions
----------------------
+| Size (bytes) | Datatype | Name                       |
+|--------------|----------|----------------------------|
+| 4            | int      | X position                 |
+| 4            | int      | Z position                 |
+| 1            | bool     | Force Update               |
+| 2            | short    | ExtendedBlockStorage mask  |
+| 4            | int      | Uncompressed data length   |
+| 4            | int      | (n) Compressed data length |
+| n            | byte[n]  | Compressed data            |
+
+S26PacketMapChunkBulk new format:
+
+| Size (bytes) | Datatype             | Name                            |
+|--------------|----------------------|---------------------------------|
+| 2            | short                | (n) Chunk count in packet       |
+| n * 4        | int[n]               | Uncompressed chunk data lengths |
+| 4            | int                  | (m) Compressed data length      |
+| 1            | 1                    | Contains skylight data          |
+| m            | byte[m]              | Compressed data                 |
+| n * 10       | (int, int, short)[n] | Chunk Headers (x, z, ebs mask)  |
+
+In both cases, the compressed data is populated through the ChunkDataRegistryImpl.writeToBuffer method.
+The layout of this data is as follows:
+
+| Size (bytes) | Datatype | Name              |
+|--------------|----------|-------------------|
+| 4            | int      | (n) Manager count |
+| n * varying  | MGRData  | Manager data      |
+
+Manager data:
+
+| Size (bytes) | Datatype  | Name                    |
+|--------------|-----------|-------------------------|
+| 4            | int       | (n) Manager name length |
+| n            | UTF-8 str | Manager name            |
+| 4            | int       | (m) Manager data length |
+| m            | byte[m]   | Manager data            |
 
-This might slow down chunk loading/saving, and the networking, if the implementation turns out to be bad.
-Ideally, mods should declare their custom data as new fields in the chunk class using mixins instead of the
-ModdedChunk storage, but this is not a requirement.
 
-Ideally, this project must not have any derivatives or forks, as that will counter the primary purpose of this project,
-which is a single, unified codebase for chunk data exchange. For that goal, the project is explicitly licensed such as
-no derivatives are permitted.
 
 Dependencies
 ------------

src/main/java/com/falsepattern/chunk/api/ArrayUtil.java

@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+ */
+
+package com.falsepattern.chunk.api;
+
+import com.falsepattern.lib.StableAPI;
+import org.jetbrains.annotations.Contract;
+
+import net.minecraft.world.chunk.NibbleArray;
+
+import java.util.Arrays;
+
+/**
+ * Miscellaneous utilities for in-place array transfer (where possible).
+ */
+@StableAPI(since = "0.5.0")
+public class ArrayUtil {
+
+    @StableAPI.Expose
+    @Contract(value = "null, _ -> null;" +
+                      "!null, null -> new;",
+              mutates = "param2")
+    public static boolean[] copyArray(boolean[] src, boolean[] dst) {
+        if (src == null)
+            return null;
+        if (dst == null || src.length != dst.length)
+            return Arrays.copyOf(src, src.length);
+        System.arraycopy(src, 0, dst, 0, src.length);
+        return dst;
+    }
+
+    @StableAPI.Expose
+    @Contract(value = "null, _ -> null;" +
+                      "!null, null -> new;",
+              mutates = "param2")
+    public static byte[] copyArray(byte[] src, byte[] dst) {
+        if (src == null)
+            return null;
+        if (dst == null || src.length != dst.length)
+            return Arrays.copyOf(src, src.length);
+        System.arraycopy(src, 0, dst, 0, src.length);
+        return dst;
+    }
+
+    @StableAPI.Expose
+    @Contract(value = "null, _ -> null;" +
+                      "!null, null -> new;",
+              mutates = "param2")
+    public static char[] copyArray(char[] src, char[] dst) {
+        if (src == null)
+            return null;
+        if (dst == null || src.length != dst.length)
+            return Arrays.copyOf(src, src.length);
+        System.arraycopy(src, 0, dst, 0, src.length);
+        return dst;
+    }
+
+    @StableAPI.Expose
+    @Contract(value = "null, _ -> null;" +
+                      "!null, null -> new;",
+              mutates = "param2")
+    public static short[] copyArray(short[] src, short[] dst) {
+        if (src == null)
+            return null;
+        if (dst == null || src.length != dst.length)
+            return Arrays.copyOf(src, src.length);
+        System.arraycopy(src, 0, dst, 0, src.length);
+        return dst;
+    }
+
+    @StableAPI.Expose
+    @Contract(value = "null, _ -> null;" +
+                      "!null, null -> new;",
+              mutates = "param2")
+    public static int[] copyArray(int[] src, int[] dst) {
+        if (src == null)
+            return null;
+        if (dst == null || src.length != dst.length)
+            return Arrays.copyOf(src, src.length);
+        System.arraycopy(src, 0, dst, 0, src.length);
+        return dst;
+    }
+
+    @StableAPI.Expose
+    @Contract(value = "null, _ -> null;" +
+                      "!null, null -> new;",
+              mutates = "param2")
+    public static long[] copyArray(long[] src, long[] dst) {
+        if (src == null)
+            return null;
+        if (dst == null || src.length != dst.length)
+            return Arrays.copyOf(src, src.length);
+        System.arraycopy(src, 0, dst, 0, src.length);
+        return dst;
+    }
+
+    @StableAPI.Expose
+    @Contract(value = "null, _ -> null;" +
+                      "!null, null -> new;",
+              mutates = "param2")
+    public static float[] copyArray(float[] src, float[] dst) {
+        if (src == null)
+            return null;
+        if (dst == null || src.length != dst.length)
+            return Arrays.copyOf(src, src.length);
+        System.arraycopy(src, 0, dst, 0, src.length);
+        return dst;
+    }
+
+    @StableAPI.Expose
+    @Contract(value = "null, _ -> null;" +
+                      "!null, null -> new;",
+              mutates = "param2")
+    public static double[] copyArray(double[] src, double[] dst) {
+        if (src == null)
+            return null;
+        if (dst == null || src.length != dst.length)
+            return Arrays.copyOf(src, src.length);
+        System.arraycopy(src, 0, dst, 0, src.length);
+        return dst;
+    }
+
+    @StableAPI.Expose
+    @Contract(value = "null, _ -> null;" +
+                      "!null, null -> new;",
+              mutates = "param2")
+    public static <T> T[] copyArray(T[] src, T[] dst) {
+        if (src == null)
+            return null;
+        if (dst == null || src.length != dst.length)
+            return Arrays.copyOf(src, src.length);
+        System.arraycopy(src, 0, dst, 0, src.length);
+        return dst;
+    }
+
+    @StableAPI.Expose
+    @Contract(value = "null, _ -> null;" +
+                      "!null, null -> new;",
+              mutates = "param2")
+    public static NibbleArray copyArray(NibbleArray srcArray, NibbleArray dstArray) {
+        if (srcArray == null) {
+            return null;
+        }
+        if (dstArray == null) {
+            return new NibbleArray(Arrays.copyOf(srcArray.data, srcArray.data.length), srcArray.depthBits);
+        }
+        dstArray.depthBits = srcArray.depthBits;
+        dstArray.depthBitsPlusFour = srcArray.depthBitsPlusFour;
+        dstArray.data = copyArray(srcArray.data, dstArray.data);
+        return dstArray;
+    }
+}

src/main/java/com/falsepattern/chunk/api/ChunkDataRegistry.java

@@ -1,64 +0,0 @@
-/*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
- */
-
-package com.falsepattern.chunk.api;
-
-import com.falsepattern.chunk.internal.ChunkDataRegistryImpl;
-import com.falsepattern.lib.StableAPI;
-
-import java.util.Set;
-
-/**
- * This class is used to register ChunkDataManagers.
- *
- * @since 0.1.0
- * @see ChunkDataManager
- * @author FalsePattern
- * @version 0.1.0
- */
-@StableAPI(since = "0.1.0")
-public class ChunkDataRegistry {
-    /**
-     * Registers a ChunkDataManager. Only do this during the preInit phase.
-     *
-     * @param manager The manager to register.
-     *
-     * @throws IllegalStateException    If the registration stage is over.
-     * @throws IllegalArgumentException If the manager has a duplicate id.
-     */
-    @StableAPI.Expose
-    public static void registerDataManager(ChunkDataManager manager)
-            throws IllegalStateException, IllegalArgumentException {
-        ChunkDataRegistryImpl.registerDataManager(manager);
-    }
-
-    /**
-     * Disables a ChunkDataManager. Only do this during the preInit phase.
-     *
-     * @param id The id of the manager to disable.
-     *
-     * @throws IllegalStateException If the disable stage is over.
-     */
-    @StableAPI.Expose
-    public static void disableDataManager(String domain, String id) throws IllegalStateException {
-        ChunkDataRegistryImpl.disableDataManager(domain, id);
-    }
-
-    /**
-     * Returns an unmodifiable set of all registered ChunkDataManagers.
-     * The id of a manager is its domain and id separated by a colon. (domain:id)
-     */
-    @StableAPI.Expose
-    public static Set<String> getRegisteredManagers() {
-        return ChunkDataRegistryImpl.getRegisteredManagers();
-    }
-}

src/main/java/com/falsepattern/chunk/api/DataManager.java

@@ -1,19 +1,16 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 package com.falsepattern.chunk.api;
 
 import com.falsepattern.lib.StableAPI;
 import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.chunk.Chunk;
@@ -26,16 +23,16 @@ import java.nio.ByteBuffer;
  * managers. For the actual networking and data storage, see the internal interfaces of this interface.
  * Note: This interface does nothing by itself, you also need to implement one or more of the internal interfaces.
  *
- * @since 0.1.0
- * @see ChunkDataManager.PacketDataManager
- * @see ChunkDataManager.ChunkNBTDataManager
- * @see ChunkDataManager.SectionNBTDataManager
- * @see ChunkDataRegistry
+ * @since 0.5.0
+ * @see PacketDataManager
+ * @see ChunkDataManager
+ * @see SubChunkDataManager
+ * @see DataRegistry
  * @author FalsePattern
- * @version 0.1.0
+ * @version 0.5.0
  */
-@StableAPI(since = "0.1.0")
-public interface ChunkDataManager {
+@StableAPI(since = "0.5.0")
+public interface DataManager {
 
     /**
      * @return The domain of this manager. Usually the modid of the mod that owns this manager.
@@ -54,16 +51,17 @@ public interface ChunkDataManager {
     /**
      * Implement this interface if you want to synchronize your data with the client.
      *
-     * @since 0.1.0
+     * @since 0.5.0
      * @author FalsePattern
-     * @version 0.1.0
+     * @version 0.5.0
      */
-    @StableAPI(since = "0.1.0")
-    interface PacketDataManager extends ChunkDataManager {
+    @StableAPI(since = "0.5.0")
+    interface PacketDataManager extends DataManager {
         /**
          * @return The maximum amount of bytes your data can take up in a packet.
          *
-         * @implNote This is used to determine the size of the packet compression/decompression buffer.
+         * @implSpec This is used to determine the size of the packet compression/decompression buffer.
+         * Only called ONCE, during registration!
          */
         @StableAPI.Expose
         @Contract(pure = true)
@@ -74,8 +72,9 @@ public interface ChunkDataManager {
          *
          * @param chunk The chunk to serialize.
          */
+        @Contract(mutates = "param4")
         @StableAPI.Expose
-        void writeToBuffer(Chunk chunk, int ebsMask, boolean forceUpdate, ByteBuffer data);
+        void writeToBuffer(Chunk chunk, int subChunkMask, boolean forceUpdate, ByteBuffer data);
 
         /**
          * Deserializes your data from a packet.
@@ -84,19 +83,66 @@ public interface ChunkDataManager {
          * @param chunk  The chunk to deserialize.
          * @param buffer The packet buffer to read from.
          */
+        @Contract(mutates = "param1,param4")
         @StableAPI.Expose
-        void readFromBuffer(Chunk chunk, int ebsMask, boolean forceUpdate, ByteBuffer buffer);
+        void readFromBuffer(Chunk chunk, int subChunkMask, boolean forceUpdate, ByteBuffer buffer);
     }
 
     /**
-     * Implement this interface if you want to save your data to disk. This is called once per chunk.
-     *
-     * @since 0.1.0
+     * The common superinterface for RootDataManager and SubChunkDataManager.
+     * Contains version information and messages for users attempting to upgrade/remove versions.
+     * @since 0.5.0
      * @author FalsePattern
-     * @version 0.1.0
+     * @version 0.5.0
      */
-    @StableAPI(since = "0.1.0")
-    interface ChunkNBTDataManager extends ChunkDataManager {
+    @StableAPI(since = "0.5.0")
+    interface StorageDataManager extends DataManager {
+        /**
+         * @return The current version of the data manager
+         */
+        @StableAPI.Expose
+        @Contract(pure = true)
+        @NotNull
+        String version();
+
+        /**
+         * @return The message to show to users when a world is opened with this mod for the first time.
+         *         Return null to show no message, and treat the manager as fully compatible with vanilla.
+         */
+        @StableAPI.Expose
+        @Contract(pure = true)
+        @Nullable
+        String newInstallDescription();
+
+        /**
+         * @return The message to show to users when this manager is removed, AND they try to load the world (stored in the
+         * world's NBT during previous saves)
+         */
+        @StableAPI.Expose
+        @Contract(pure = true)
+        @NotNull
+        String uninstallMessage();
+
+        /**
+         * @param priorVersion The version of the manager this world was saved with.
+         * @return A warning message to show to the user when upgrading.\
+         *         If null, the manager is treated as fully compatible with the old version, and no warning is shown.
+         */
+        @StableAPI.Expose
+        @Contract(pure = true)
+        @Nullable
+        String versionChangeMessage(String priorVersion);
+    }
+
+    /**
+     * Implement this interface if you want to save your data to disk. This is called once per chunk, hence "root"
+     *
+     * @since 0.5.0
+     * @author FalsePattern
+     * @version 0.5.0
+     */
+    @StableAPI(since = "0.5.0")
+    interface ChunkDataManager extends StorageDataManager {
         /**
          * If false, the given nbt compound will be a freshly created object that gets inserted into the actual
          * level NBT tag under the `domain:id` name.
@@ -114,6 +160,7 @@ public interface ChunkDataManager {
         /**
          * Serializes your data into an NBT tag. This is used when saving the chunk to disk.
          */
+        @Contract(mutates = "param2")
         @StableAPI.Expose
         void writeChunkToNBT(Chunk chunk, NBTTagCompound nbt);
 
@@ -124,20 +171,30 @@ public interface ChunkDataManager {
          * (e.g., loading save before the mod was added), and the manager is not {@link #chunkPrivilegedAccess() privileged}.
          * In this case, you should initialize the data to a sane default.
          */
+        @Contract(mutates = "param1")
         @StableAPI.Expose
         void readChunkFromNBT(Chunk chunk, NBTTagCompound nbt);
+
+        /**
+         * Directly copies data from one chunk to another chunk.
+         * @param from The chunk to copy data from.
+         * @param to The chunk to copy data to.
+         */
+        @Contract(mutates = "param2")
+        @StableAPI.Expose
+        void cloneChunk(Chunk from, Chunk to);
     }
 
     /**
-     * Implement this interface if you want to save your ExtendedBlockStorage data to disk. This is called once per
+     * Implement this interface if you want to save your subChunk data to disk. This is called once per
      * ExtendedBlockStorage per chunk. (16 times per chunk)
      *
-     * @since 0.1.0
+     * @since 0.5.0
      * @author FalsePattern
-     * @version 0.1.0
+     * @version 0.5.0
      */
-    @StableAPI(since = "0.1.0")
-    interface SectionNBTDataManager extends ChunkDataManager {
+    @StableAPI(since = "0.5.0")
+    interface SubChunkDataManager extends StorageDataManager {
         /**
          * If false, the given nbt compound will be a freshly created object that gets inserted into the actual
          * segment NBT tag under the `domain:id` name.
@@ -148,23 +205,35 @@ public interface ChunkDataManager {
          */
         @StableAPI.Expose
         @Contract(pure = true)
-        default boolean sectionPrivilegedAccess() {
+        default boolean subChunkPrivilegedAccess() {
             return false;
         }
 
         /**
          * Serializes your data into an NBT tag. This is used when saving the chunk to disk.
          */
+        @Contract(mutates = "param3")
         @StableAPI.Expose
-        void writeSectionToNBT(Chunk chunk, ExtendedBlockStorage ebs, NBTTagCompound section);
+        void writeSubChunkToNBT(Chunk chunk, ExtendedBlockStorage subChunk, NBTTagCompound nbt);
 
         /**
          * Deserializes your data from an NBT tag. This is used when loading the chunk from disk.
          * The NBT *may* be null if the chunk was saved before this manager was registered
-         * (e.g., loading save before the mod was added), and the manager is not {@link #sectionPrivilegedAccess() privileged}.
+         * (e.g., loading save before the mod was added), and the manager is not {@link #subChunkPrivilegedAccess() privileged}.
          * In this case, you should initialize the data to a sane default.
          */
+        @Contract(mutates = "param2")
         @StableAPI.Expose
-        void readSectionFromNBT(Chunk chunk, ExtendedBlockStorage ebs, NBTTagCompound section);
+        void readSubChunkFromNBT(Chunk chunk, ExtendedBlockStorage subChunk, NBTTagCompound nbt);
+
+        /**
+         * Directly copies data from one subChunk to another.
+         * @param fromChunk The owner of the subChunk to copy data from.
+         * @param from The subChunk to copy data from.
+         * @param to The subChunk to copy data to.
+         */
+        @Contract(mutates = "param3")
+        @StableAPI.Expose
+        void cloneSubChunk(Chunk fromChunk, ExtendedBlockStorage from, ExtendedBlockStorage to);
     }
 }

src/main/java/com/falsepattern/chunk/api/DataRegistry.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+ */
+
+package com.falsepattern.chunk.api;
+
+import com.falsepattern.chunk.internal.DataRegistryImpl;
+import com.falsepattern.lib.StableAPI;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Unmodifiable;
+
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
+
+import java.util.Set;
+
+/**
+ * This class is used to register ChunkDataManagers, as well as dispatch clone requests.
+ *
+ * @since 0.5.0
+ * @see DataManager
+ * @author FalsePattern
+ * @version 0.5.0
+ */
+@StableAPI(since = "0.5.0")
+public class DataRegistry {
+    /**
+     * Registers a ChunkDataManager. Only do this during the init phase.
+     *
+     * @param manager The manager to register.
+     *
+     * @throws IllegalStateException    If the registration stage is over.
+     * @throws IllegalArgumentException If the manager has a duplicate id.
+     */
+    @StableAPI.Expose
+    public static void registerDataManager(DataManager manager)
+            throws IllegalStateException, IllegalArgumentException {
+        DataRegistryImpl.registerDataManager(manager);
+    }
+
+    /**
+     * Disables a ChunkDataManager. Only do this during the postInit phase.
+     *
+     * @param id The id of the manager to disable.
+     *
+     * @throws IllegalStateException If the disable stage is over.
+     */
+    @StableAPI.Expose
+    public static void disableDataManager(String domain, String id) throws IllegalStateException {
+        DataRegistryImpl.disableDataManager(domain, id);
+    }
+
+    /**
+     * Returns an unmodifiable set of all registered ChunkDataManagers.
+     * The id of a manager is its domain and id separated by a colon. (domain:id)
+     */
+    @Contract(pure = true)
+    @StableAPI.Expose
+    public static @Unmodifiable Set<String> getRegisteredManagers() {
+        return DataRegistryImpl.getRegisteredManagers();
+    }
+
+    /**
+     * Copies chunk-level data from a source chunk to a target chunk.
+     * DOES NOT copy data contained inside its ExtendedBlockStorage instances!!
+     * @param from The chunk to read the data from
+     * @param to The chunk to write the data to
+     */
+    @Contract(mutates = "param2")
+    @StableAPI.Expose(since = "0.5.0")
+    public static void cloneChunk(Chunk from, Chunk to) {
+        DataRegistryImpl.cloneChunk(from, to);
+    }
+
+    /**
+     * Copies data from a source subChunk to a target subChunk.
+     * @param fromChunk The chunk that owns the *from* subChunk. Used by data managers for getting metadata about the world (skylight presence, etc.)
+     * @param from The subChunk to read the data from
+     * @param to The subChunk to write the data to
+     */
+    @Contract(mutates = "param3")
+    @StableAPI.Expose(since = "0.5.0")
+    public static void cloneSubChunk(Chunk fromChunk, ExtendedBlockStorage from, ExtendedBlockStorage to) {
+        DataRegistryImpl.cloneSubChunk(fromChunk, from, to);
+    }
+}

src/main/java/com/falsepattern/chunk/api/package-info.java

@@ -1,20 +1,15 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 /**
  * This package contains the classes that you will use to interact with the ChunkAPI library.
  *
- * @since 0.1.0
+ * @since 0.5.0
  * @author FalsePattern
- * @version 0.1.0
+ * @version 0.5.0
  */
 package com.falsepattern.chunk.api;

src/main/java/com/falsepattern/chunk/internal/ChunkAPI.java

@@ -1,21 +1,17 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 package com.falsepattern.chunk.internal;
 
-import com.falsepattern.chunk.api.ChunkDataRegistry;
+import com.falsepattern.chunk.api.DataRegistry;
 import com.falsepattern.chunk.internal.vanilla.BiomeManager;
 import com.falsepattern.chunk.internal.vanilla.BlockIDManager;
 import com.falsepattern.chunk.internal.vanilla.BlocklightManager;
+import com.falsepattern.chunk.internal.vanilla.LightingManager;
 import com.falsepattern.chunk.internal.vanilla.MetadataManager;
 import com.falsepattern.chunk.internal.vanilla.SkylightManager;
 
@@ -26,15 +22,16 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
      version = Tags.VERSION,
      name = Tags.MODNAME,
      acceptedMinecraftVersions = "[1.7.10]",
-     dependencies = "required-after:falsepatternlib@[0.10.15,);")
+     dependencies = "required-after:falsepatternlib@[1.0.0,);")
 public class ChunkAPI {
 
     @Mod.EventHandler
     public void init(FMLInitializationEvent event) {
-        ChunkDataRegistry.registerDataManager(new BlockIDManager());
-        ChunkDataRegistry.registerDataManager(new MetadataManager());
-        ChunkDataRegistry.registerDataManager(new BlocklightManager());
-        ChunkDataRegistry.registerDataManager(new SkylightManager());
-        ChunkDataRegistry.registerDataManager(new BiomeManager());
+        DataRegistry.registerDataManager(new BlockIDManager());
+        DataRegistry.registerDataManager(new MetadataManager());
+        DataRegistry.registerDataManager(new LightingManager());
+        DataRegistry.registerDataManager(new BlocklightManager());
+        DataRegistry.registerDataManager(new SkylightManager());
+        DataRegistry.registerDataManager(new BiomeManager());
     }
 }

src/main/java/com/falsepattern/chunk/internal/ChunkDataRegistryImpl.java

@@ -1,224 +0,0 @@
-/*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
- */
-
-package com.falsepattern.chunk.internal;
-
-import com.falsepattern.chunk.api.ChunkDataManager;
-import lombok.val;
-import lombok.var;
-
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.chunk.Chunk;
-import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.LoaderState;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-public class ChunkDataRegistryImpl {
-    private static final Set<String> managers = new HashSet<>();
-    private static final Map<String, ChunkDataManager.PacketDataManager> packetManagers = new HashMap<>();
-    private static final Map<String, ChunkDataManager.ChunkNBTDataManager> chunkNBTManagers = new HashMap<>();
-    private static final Map<String, ChunkDataManager.SectionNBTDataManager> sectionNBTManagers = new HashMap<>();
-    private static final Set<String> disabledManagers = new HashSet<>();
-    private static int maxPacketSize = 4;
-
-    public static void registerDataManager(ChunkDataManager manager)
-            throws IllegalStateException, IllegalArgumentException {
-        if (Loader.instance().getLoaderState() != LoaderState.INITIALIZATION) {
-            throw new IllegalStateException("ChunkDataManager registration is not allowed at this time! " +
-                                            "Please register your ChunkDataManager in the init phase.");
-        }
-        var id = manager.domain() + ":" + manager.id();
-        if (managers.contains(id)) {
-            throw new IllegalArgumentException("ChunkDataManager " + manager + " has a duplicate id!");
-        }
-
-        // If the manager was disabled, do not add it to the list of managers.
-        if (disabledManagers.contains(id)) {
-            return;
-        }
-
-        managers.add(id);
-        if (manager instanceof ChunkDataManager.PacketDataManager) {
-            val packetManager = (ChunkDataManager.PacketDataManager) manager;
-            maxPacketSize += 4 + id.getBytes(StandardCharsets.UTF_8).length;
-            maxPacketSize += packetManager.maxPacketSize();
-            packetManagers.put(id, packetManager);
-        }
-        if (manager instanceof ChunkDataManager.ChunkNBTDataManager) {
-            chunkNBTManagers.put(id, (ChunkDataManager.ChunkNBTDataManager) manager);
-        }
-        if (manager instanceof ChunkDataManager.SectionNBTDataManager) {
-            sectionNBTManagers.put(id, (ChunkDataManager.SectionNBTDataManager) manager);
-        }
-    }
-
-    public static void disableDataManager(String domain, String id) {
-        if (Loader.instance().getLoaderState() != LoaderState.POSTINITIALIZATION) {
-            throw new IllegalStateException("ChunkDataManager disabling is not allowed at this time! " +
-                                            "Please disable any ChunkDataManagers in the postInit phase.");
-        }
-        Common.LOG.warn("Disabling ChunkDataManager " + id + " in domain " + domain +
-                        ". See the stacktrace for the source of this event.", new Throwable());
-        val manager = domain + ":" + id;
-        //Remove the manager from the list of managers, if it exists
-        if (managers.remove(manager)) {
-            //Clear the maps
-            if (packetManagers.containsKey(manager)) {
-                val removed = packetManagers.remove(manager);
-                maxPacketSize -= 4 + manager.getBytes(StandardCharsets.UTF_8).length;
-                maxPacketSize -= removed.maxPacketSize();
-            }
-            chunkNBTManagers.remove(manager);
-            sectionNBTManagers.remove(manager);
-        }
-
-        //Add the manager to the list of disabled managers, in case it gets registered after this disable call.
-        disabledManagers.add(manager);
-    }
-
-    public static int maxPacketSize() {
-        return maxPacketSize;
-    }
-
-    private static void writeString(ByteBuffer buffer, String string) {
-        val bytes = string.getBytes();
-        buffer.putInt(bytes.length);
-        buffer.put(bytes);
-    }
-
-    private static String readString(ByteBuffer buffer) {
-        val length = buffer.getInt();
-        val bytes = new byte[length];
-        buffer.get(bytes);
-        return new String(bytes);
-    }
-
-    public static void readFromBuffer(Chunk chunk, int ebsMask, boolean forceUpdate, byte[] data) {
-        val buf = ByteBuffer.wrap(data);
-        buf.order(ByteOrder.LITTLE_ENDIAN);
-        int count = buf.getInt();
-        for (int i = 0; i < count; i++) {
-            val id = readString(buf);
-            val length = buf.getInt();
-            val manager = packetManagers.get(id);
-            if (manager == null) {
-                Common.LOG.error("Received data for unknown PacketDataManager " + id + ". Skipping.");
-                buf.position(buf.position() + length);
-                continue;
-            }
-            int start = buf.position();
-            val slice = createSlice(buf, start, length);
-            manager.readFromBuffer(chunk, ebsMask, forceUpdate, slice);
-            buf.position(start + length);
-        }
-    }
-
-    public static int writeToBuffer(Chunk chunk, int ebsMask, boolean forceUpdate, byte[] data) {
-        val buf = ByteBuffer.wrap(data);
-        buf.order(ByteOrder.LITTLE_ENDIAN);
-        buf.putInt(packetManagers.size());
-        for (val pair : packetManagers.entrySet()) {
-            val id = pair.getKey();
-            val manager = pair.getValue();
-            writeString(buf, id);
-            int start = buf.position() + 4;
-            val slice = createSlice(buf, start, manager.maxPacketSize());
-            manager.writeToBuffer(chunk, ebsMask, forceUpdate, slice);
-            int length = slice.position();
-            buf.putInt(length);
-            buf.position(start + length);
-        }
-        return buf.position();
-    }
-
-    private static ByteBuffer createSlice(ByteBuffer buffer, int start, int length) {
-        int oldLimit = buffer.limit();
-        int oldPosition = buffer.position();
-        buffer.position(start);
-        buffer.limit(start + length);
-        ByteBuffer slice = buffer.slice();
-        buffer.limit(oldLimit);
-        buffer.position(oldPosition);
-        return slice;
-    }
-
-    private static NBTTagCompound createManagerNBT(boolean privileged, NBTTagCompound root, ChunkDataManager manager) {
-        if (privileged) {
-            return root;
-        }
-        val domain = manager.domain();
-        NBTTagCompound domainNBT;
-        if (root.hasKey(domain)) {
-            domainNBT = new NBTTagCompound();
-            root.setTag(domain, domainNBT);
-        } else {
-            domainNBT = root.getCompoundTag(domain);
-        }
-        val subNBT = new NBTTagCompound();
-        domainNBT.setTag(manager.id(), subNBT);
-        return subNBT;
-    }
-
-    private static NBTTagCompound getManagerNBT(boolean privileged, NBTTagCompound root, ChunkDataManager manager) {
-        if (privileged) {
-            return root;
-        }
-        val domain = manager.domain();
-        if (!root.hasKey(domain)) {
-            return null;
-        }
-        val domainNBT = root.getCompoundTag(domain);
-        if (!domainNBT.hasKey(manager.id())) {
-            return null;
-        }
-        return domainNBT.getCompoundTag(manager.id());
-    }
-
-    public static void writeSectionToNBT(Chunk chunk, ExtendedBlockStorage ebs, NBTTagCompound sectionNBT) {
-        for (val manager : sectionNBTManagers.values()) {
-            manager.writeSectionToNBT(chunk, ebs,
-                                      createManagerNBT(manager.sectionPrivilegedAccess(), sectionNBT, manager));
-        }
-    }
-
-    public static void readSectionFromNBT(Chunk chunk, ExtendedBlockStorage ebs, NBTTagCompound sectionNBT) {
-        for (val manager : sectionNBTManagers.values()) {
-            manager.readSectionFromNBT(chunk, ebs,
-                                       getManagerNBT(manager.sectionPrivilegedAccess(), sectionNBT, manager));
-        }
-    }
-
-    public static void writeChunkToNBT(Chunk chunk, NBTTagCompound chunkNBT) {
-        for (val manager : chunkNBTManagers.values()) {
-            manager.writeChunkToNBT(chunk, createManagerNBT(manager.chunkPrivilegedAccess(), chunkNBT, manager));
-        }
-    }
-
-    public static void readChunkFromNBT(Chunk chunk, NBTTagCompound chunkNBT) {
-        for (val manager : chunkNBTManagers.values()) {
-            manager.readChunkFromNBT(chunk, getManagerNBT(manager.chunkPrivilegedAccess(), chunkNBT, manager));
-        }
-    }
-
-    public static Set<String> getRegisteredManagers() {
-        return Collections.unmodifiableSet(managers);
-    }
-}

src/main/java/com/falsepattern/chunk/internal/Common.java

@@ -1,13 +1,8 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 package com.falsepattern.chunk.internal;
@@ -21,6 +16,6 @@ import org.apache.logging.log4j.Logger;
 public class Common {
     public static final Logger LOG = LogManager.getLogger(Tags.MODID);
 
-    public static final int EBS_PER_CHUNK = 16;
-    public static final int BLOCKS_PER_EBS = 16 * 16 * 16;
+    public static final int SUBCHUNKS_PER_CHUNK = 16;
+    public static final int BLOCKS_PER_SUBCHUNK = 16 * 16 * 16;
 }

src/main/java/com/falsepattern/chunk/internal/DataRegistryImpl.java

@@ -0,0 +1,421 @@
+/*
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+ */
+
+package com.falsepattern.chunk.internal;
+
+import com.falsepattern.chunk.api.DataManager;
+import lombok.Data;
+import lombok.val;
+import lombok.var;
+import org.jetbrains.annotations.Nullable;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
+import net.minecraftforge.common.util.Constants;
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.LoaderState;
+import cpw.mods.fml.common.StartupQuery;
+import cpw.mods.fml.common.ZipperUtil;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class DataRegistryImpl {
+    private static final Set<String> managers = new HashSet<>();
+    private static final Map<String, PacketManagerInfo> packetManagers = new HashMap<>();
+    private static final Map<String, DataManager.StorageDataManager> NBTManagers = new HashMap<>();
+    private static final Map<String, DataManager.ChunkDataManager> chunkNBTManagers = new HashMap<>();
+    private static final Map<String, DataManager.SubChunkDataManager> subChunkNBTManagers = new HashMap<>();
+    private static final Set<String> disabledManagers = new HashSet<>();
+    private static int maxPacketSize = 4;
+
+    @Data
+    private static class PacketManagerInfo {
+        public final int maxPacketSize;
+        public final DataManager.PacketDataManager manager;
+    }
+
+    public static void registerDataManager(DataManager manager)
+            throws IllegalStateException, IllegalArgumentException {
+        if (Loader.instance().getLoaderState() != LoaderState.INITIALIZATION) {
+            throw new IllegalStateException("ChunkDataManager registration is not allowed at this time! " +
+                                            "Please register your ChunkDataManager in the init phase.");
+        }
+        var id = manager.domain() + ":" + manager.id();
+        if (managers.contains(id)) {
+            throw new IllegalArgumentException("ChunkDataManager " + manager + " has a duplicate id!");
+        }
+
+        // If the manager was disabled, do not add it to the list of managers.
+        if (disabledManagers.contains(id)) {
+            return;
+        }
+
+        managers.add(id);
+        if (manager instanceof DataManager.PacketDataManager) {
+            val packetManager = (DataManager.PacketDataManager) manager;
+            val maxSize = packetManager.maxPacketSize();
+            maxPacketSize += 4 + id.getBytes(StandardCharsets.UTF_8).length + 4 + maxSize;
+            packetManagers.put(id, new PacketManagerInfo(maxSize, packetManager));
+        }
+        if (manager instanceof DataManager.StorageDataManager) {
+            NBTManagers.put(id, (DataManager.StorageDataManager) manager);
+            if (manager instanceof DataManager.ChunkDataManager) {
+                chunkNBTManagers.put(id, (DataManager.ChunkDataManager) manager);
+            }
+            if (manager instanceof DataManager.SubChunkDataManager) {
+                subChunkNBTManagers.put(id, (DataManager.SubChunkDataManager) manager);
+            }
+        }
+    }
+
+    public static void disableDataManager(String domain, String id) {
+        if (Loader.instance().getLoaderState() != LoaderState.POSTINITIALIZATION) {
+            throw new IllegalStateException("ChunkDataManager disabling is not allowed at this time! " +
+                                            "Please disable any ChunkDataManagers in the postInit phase.");
+        }
+        Common.LOG.debug("Disabling ChunkDataManager " + id + " in domain " + domain +
+                        ". See the stacktrace for the source of this event.\nThis is NOT an error.", new Throwable());
+        val manager = domain + ":" + id;
+        //Remove the manager from the list of managers, if it exists
+        if (managers.remove(manager)) {
+            //Clear the maps
+            if (packetManagers.containsKey(manager)) {
+                val removed = packetManagers.remove(manager);
+                maxPacketSize -= 4 + id.getBytes(StandardCharsets.UTF_8).length + 4 + removed.maxPacketSize;
+            }
+            chunkNBTManagers.remove(manager);
+            subChunkNBTManagers.remove(manager);
+            NBTManagers.remove(manager);
+        }
+
+        //Add the manager to the list of disabled managers, in case it gets registered after this disable call.
+        disabledManagers.add(manager);
+    }
+
+    public static int maxPacketSize() {
+        return maxPacketSize;
+    }
+
+    private static void writeString(ByteBuffer buffer, String string) {
+        val bytes = string.getBytes();
+        buffer.putInt(bytes.length);
+        buffer.put(bytes);
+    }
+
+    private static String readString(ByteBuffer buffer) {
+        val length = buffer.getInt();
+        val bytes = new byte[length];
+        buffer.get(bytes);
+        return new String(bytes);
+    }
+
+    public static void readFromBuffer(Chunk chunk, int subChunkMask, boolean forceUpdate, byte[] data) {
+        val buf = ByteBuffer.wrap(data);
+        buf.order(ByteOrder.LITTLE_ENDIAN);
+        int count = buf.getInt();
+        for (int i = 0; i < count; i++) {
+            val id = readString(buf);
+            val length = buf.getInt();
+            val managerInfo = packetManagers.get(id);
+            if (managerInfo == null) {
+                Common.LOG.error("Received data for unknown PacketDataManager " + id + ". Skipping.");
+                buf.position(buf.position() + length);
+                continue;
+            }
+            if (length > managerInfo.maxPacketSize) {
+                Common.LOG.error("Received packet larger than max size for PacketDataManager " + id + "! Continuing anyways, things might break!");
+            }
+            int start = buf.position();
+            val slice = createSlice(buf, start, length);
+            managerInfo.manager.readFromBuffer(chunk, subChunkMask, forceUpdate, slice);
+            buf.position(start + length);
+        }
+    }
+
+    public static int writeToBuffer(Chunk chunk, int subChunkMask, boolean forceUpdate, byte[] data) {
+        val buf = ByteBuffer.wrap(data);
+        buf.order(ByteOrder.LITTLE_ENDIAN);
+        buf.putInt(packetManagers.size());
+        for (val pair : packetManagers.entrySet()) {
+            val id = pair.getKey();
+            val managerInfo = pair.getValue();
+            writeString(buf, id);
+            int start = buf.position() + 4;
+            val slice = createSlice(buf, start, managerInfo.maxPacketSize);
+            managerInfo.manager.writeToBuffer(chunk, subChunkMask, forceUpdate, slice);
+            int length = slice.position();
+            buf.putInt(length);
+            buf.position(start + length);
+        }
+        return buf.position();
+    }
+
+    private static ByteBuffer createSlice(ByteBuffer buffer, int start, int length) {
+        int oldLimit = buffer.limit();
+        int oldPosition = buffer.position();
+        buffer.position(start);
+        buffer.limit(start + length);
+        ByteBuffer slice = buffer.slice();
+        buffer.limit(oldLimit);
+        buffer.position(oldPosition);
+        return slice;
+    }
+
+    private static NBTTagCompound createManagerNBT(boolean privileged, NBTTagCompound root, DataManager manager) {
+        if (privileged) {
+            return root;
+        }
+        val domain = manager.domain();
+        val id = manager.id();
+        NBTTagCompound domainNBT;
+        if (root.hasKey(domain)) {
+            domainNBT = root.getCompoundTag(domain);
+        } else {
+            domainNBT = new NBTTagCompound();
+            root.setTag(domain, domainNBT);
+        }
+        if (domainNBT.hasKey(id)) {
+            return domainNBT.getCompoundTag(id);
+        } else {
+            val subNBT = new NBTTagCompound();
+            domainNBT.setTag(id, subNBT);
+            return subNBT;
+        }
+    }
+
+    private static NBTTagCompound getManagerNBT(boolean privileged, NBTTagCompound root, DataManager manager) {
+        if (privileged) {
+            return root;
+        }
+        val domain = manager.domain();
+        if (!root.hasKey(domain)) {
+            return new NBTTagCompound();
+        }
+        val domainNBT = root.getCompoundTag(domain);
+        if (!domainNBT.hasKey(manager.id())) {
+            return new NBTTagCompound();
+        }
+        return domainNBT.getCompoundTag(manager.id());
+    }
+
+    public static void writeSubChunkToNBT(Chunk chunk, ExtendedBlockStorage subChunk, NBTTagCompound nbt) {
+        for (val manager : subChunkNBTManagers.values()) {
+            manager.writeSubChunkToNBT(chunk, subChunk,
+                                       createManagerNBT(manager.subChunkPrivilegedAccess(), nbt, manager));
+        }
+    }
+
+    public static void readSubChunkFromNBT(Chunk chunk, ExtendedBlockStorage subChunk, NBTTagCompound nbt) {
+        for (val manager : subChunkNBTManagers.values()) {
+            manager.readSubChunkFromNBT(chunk, subChunk,
+                                        getManagerNBT(manager.subChunkPrivilegedAccess(), nbt, manager));
+        }
+    }
+
+    public static void writeChunkToNBT(Chunk chunk, NBTTagCompound chunkNBT) {
+        for (val manager : chunkNBTManagers.values()) {
+            manager.writeChunkToNBT(chunk, createManagerNBT(manager.chunkPrivilegedAccess(), chunkNBT, manager));
+        }
+    }
+
+    public static void readChunkFromNBT(Chunk chunk, NBTTagCompound chunkNBT) {
+        for (val manager : chunkNBTManagers.values()) {
+            manager.readChunkFromNBT(chunk, getManagerNBT(manager.chunkPrivilegedAccess(), chunkNBT, manager));
+        }
+    }
+
+    public static void cloneChunk(Chunk from, Chunk to) {
+        for (val manager: chunkNBTManagers.values()) {
+            manager.cloneChunk(from, to);
+        }
+    }
+
+    public static void cloneSubChunk(Chunk fromChunk, ExtendedBlockStorage from, ExtendedBlockStorage to) {
+        for (val manager: subChunkNBTManagers.values()) {
+            manager.cloneSubChunk(fromChunk, from, to);
+        }
+    }
+
+    public static Set<String> getRegisteredManagers() {
+        return Collections.unmodifiableSet(managers);
+    }
+
+    public static void readLevelDat(NBTTagCompound tag) {
+        boolean triggerScreen = false;
+        boolean newlyInstalled = false;
+        val builder = new StringBuilder();
+        if (!tag.hasKey("version")) {
+            newlyInstalled = true;
+            builder.append("The world you are trying to load is a vanilla world, or a world that was created with a very old version of ChunkAPI.\n");
+        } // Compat code will be added here if needed.
+        val managerCompat = verifyManagerCompatibility(tag);
+        if (managerCompat != null) {
+            //Avoid duplicate messages
+            if (!newlyInstalled) {
+                builder.append("The world you are trying to load was created with a different version of ChunkAPI data managers.\n" +
+                               "Data managers are used by other mods to save extra data in chunks, and changes to these data managers can cause worlds to become corrupted.\n");
+            }
+            triggerScreen = true;
+        }
+        if (triggerScreen)
+            builder.append("ChunkAPI will attempt to load the world, but it is possible that chunks might get corrupted.\n" +
+                           "Read the following text carefully, and make sure you understand the risks before continuing.\n\n");
+        if (managerCompat != null)
+            builder.append(managerCompat);
+
+        if (triggerScreen) {
+            builder.append("\nA world backup will be automatically created in your saves directory.\n\n");
+            boolean confirmed = StartupQuery.confirm(builder.toString());
+            if (!confirmed) StartupQuery.abort();
+
+            try {
+                ZipperUtil.backupWorld();
+            } catch (IOException e) {
+                StartupQuery.notify("The world backup couldn't be created.\n\n"+e);
+                StartupQuery.abort();
+            }
+        }
+    }
+
+    private static String verifyManagerCompatibility(NBTTagCompound tag) {
+        boolean compatWarning = false;
+        StringBuilder builder = new StringBuilder();
+        val saveManagers = readManagers(tag);
+        val removedManagers = new HashSet<>(saveManagers.keySet());
+        removedManagers.removeAll(NBTManagers.keySet());
+        if (!removedManagers.isEmpty()) {
+            compatWarning = true;
+            builder.append("\nThe following data managers are no longer present:\n");
+            for (val manager : removedManagers) {
+                val saveManager = saveManagers.get(manager);
+                builder.append(manager);
+                if (saveManager.version != null)
+                    builder.append(' ').append(saveManager.version);
+                builder.append("\nUninstall information: ");
+                if (saveManager.uninstallMessage != null)
+                    builder.append(saveManager.getUninstallMessage());
+                else
+                    builder.append("No uninstall information available.");
+                builder.append('\n');
+            }
+        }
+        val addedManagers = NBTManagers.keySet()
+                                       .stream()
+                                       .filter(manager -> !manager.startsWith("minecraft:"))
+                                       .filter(manager -> !saveManagers.containsKey(manager))
+                                       .collect(Collectors.toSet());
+        if (!addedManagers.isEmpty()) {
+            compatWarning = true;
+            builder.append("\nThe following data managers have been newly added:\n");
+            for (val manager: addedManagers) {
+                val addedManager = NBTManagers.get(manager);
+                if (addedManager == null)
+                    continue;
+                builder.append(manager)
+                              .append(' ').append(addedManager.version()).append('\n');
+                val installMessage = addedManager.newInstallDescription();
+                if (installMessage != null)
+                    builder.append("Install information: ").append(addedManager.newInstallDescription()).append('\n');
+            }
+        }
+        boolean changePrompt = false;
+        for (val savedManager: saveManagers.entrySet()) {
+            val managerName = savedManager.getKey();
+            if (NBTManagers.containsKey(managerName)) {
+                val manager = savedManager.getValue();
+                val currentManager = NBTManagers.get(managerName);
+                val extraMessage = currentManager.versionChangeMessage(manager.version);
+                if (extraMessage != null) {
+                    compatWarning = true;
+                    if (!changePrompt) {
+                        builder.append("\nThe following data managers have changed versions in an incompatible way:\n");
+                        changePrompt = true;
+                    }
+                    builder.append(managerName)
+                                  .append(" has changed versions from ")
+                                  .append(manager.version)
+                                  .append(" to ")
+                                  .append(currentManager.version())
+                                  .append(".\n");
+                    builder.append("Upgrade information: ").append(extraMessage).append('\n');
+                }
+            }
+        }
+        if (!compatWarning)
+            return null;
+        return "The following managers have changed:\n" +
+               builder;
+    }
+
+    public static void writeLevelDat(NBTTagCompound tag) {
+        val managers = new NBTTagCompound();
+        tag.setTag("managers", managers);
+        tag.setString("version", Tags.VERSION);
+        for (val manager: NBTManagers.entrySet()) {
+            val name = manager.getKey();
+            if (name.startsWith("minecraft:"))
+                continue;
+            val value = manager.getValue();
+            managers.setTag(name, SaveManagerInfo.fromManager(value).toNBT());
+        }
+    }
+
+    private static Map<String, SaveManagerInfo> readManagers(NBTTagCompound tag) {
+        val managers = new HashMap<String, SaveManagerInfo>();
+        if (!tag.hasKey("managers")) return managers;
+        if (tag.func_150299_b("managers") != Constants.NBT.TAG_COMPOUND ) return managers;
+        val managerTag = tag.getCompoundTag("managers");
+        //noinspection unchecked
+        for (val key : (Set<String>)managerTag.func_150296_c()) {
+            managers.put(key, SaveManagerInfo.fromNBT(managerTag.getCompoundTag(key)));
+        }
+        return managers;
+    }
+
+    @Data
+    private static class SaveManagerInfo {
+        @Nullable
+        public final String version;
+        @Nullable
+        public final String uninstallMessage;
+
+        public NBTTagCompound toNBT() {
+            val tag = new NBTTagCompound();
+            if (version != null)
+                tag.setString("version", version);
+            if (uninstallMessage != null)
+                tag.setString("uninstallMessage", uninstallMessage);
+            return tag;
+        }
+
+        public static SaveManagerInfo fromNBT(NBTTagCompound tag) {
+            return new SaveManagerInfo(getNBTStringNullable(tag, "version"), getNBTStringNullable(tag, "uninstallMessage"));
+        }
+
+        private static String getNBTStringNullable(NBTTagCompound tag, String key) {
+            if (tag.hasKey(key) && tag.func_150299_b(key) == Constants.NBT.TAG_STRING) {
+                return tag.getString(key);
+            } else {
+                return null;
+            }
+        }
+
+        public static SaveManagerInfo fromManager(DataManager.StorageDataManager manager) {
+            return new SaveManagerInfo(manager.version(), manager.uninstallMessage());
+        }
+    }
+}

src/main/java/com/falsepattern/chunk/internal/Tags.java

@@ -1,13 +1,8 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 package com.falsepattern.chunk.internal;

src/main/java/com/falsepattern/chunk/internal/core/ChunkAPICoreModContainer.java

@@ -0,0 +1,51 @@
+package com.falsepattern.chunk.internal.core;
+
+import com.falsepattern.chunk.internal.DataRegistryImpl;
+import com.falsepattern.chunk.internal.Tags;
+import com.google.common.eventbus.EventBus;
+import lombok.val;
+
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.storage.SaveHandler;
+import net.minecraft.world.storage.WorldInfo;
+import cpw.mods.fml.common.DummyModContainer;
+import cpw.mods.fml.common.LoadController;
+import cpw.mods.fml.common.ModMetadata;
+import cpw.mods.fml.common.WorldAccessContainer;
+import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
+
+import java.util.Map;
+
+public class ChunkAPICoreModContainer extends DummyModContainer implements WorldAccessContainer {
+    public ChunkAPICoreModContainer() {
+        super(createMetadata());
+    }
+
+    private static ModMetadata createMetadata() {
+        val meta = new ModMetadata();
+        meta.modId = Tags.MODID + "core";
+        meta.name = Tags.MODNAME + " Core";
+        meta.version = Tags.VERSION;
+        meta.dependencies.add(new DefaultArtifactVersion(Tags.MODID, Tags.VERSION));
+        meta.parent = Tags.MODID;
+        return meta;
+    }
+
+    @Override
+    public boolean registerBus(EventBus bus, LoadController controller) {
+        return true;
+    }
+
+    @Override
+    public NBTTagCompound getDataForWriting(SaveHandler handler, WorldInfo info) {
+        val tag = new NBTTagCompound();
+        DataRegistryImpl.writeLevelDat(tag);
+        return tag;
+    }
+
+    @Override
+    public void readData(SaveHandler handler, WorldInfo info, Map<String, NBTBase> propertyMap, NBTTagCompound tag) {
+        DataRegistryImpl.readLevelDat(tag);
+    }
+}

src/main/java/com/falsepattern/chunk/internal/core/CoreLoadingPlugin.java

@@ -0,0 +1,35 @@
+package com.falsepattern.chunk.internal.core;
+
+import com.falsepattern.chunk.internal.Tags;
+
+import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
+
+import java.util.Map;
+
+@IFMLLoadingPlugin.TransformerExclusions(Tags.GROUPNAME + ".internal.core")
+public class CoreLoadingPlugin implements IFMLLoadingPlugin {
+    @Override
+    public String[] getASMTransformerClass() {
+        return new String[0];
+    }
+
+    @Override
+    public String getModContainerClass() {
+        return Tags.GROUPNAME + ".internal.core.ChunkAPICoreModContainer";
+    }
+
+    @Override
+    public String getSetupClass() {
+        return null;
+    }
+
+    @Override
+    public void injectData(Map<String, Object> data) {
+
+    }
+
+    @Override
+    public String getAccessTransformerClass() {
+        return null;
+    }
+}

src/main/java/com/falsepattern/chunk/internal/mixin/mixins/client/vanilla/ChunkMixin.java

@@ -1,18 +1,13 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 package com.falsepattern.chunk.internal.mixin.mixins.client.vanilla;
 
-import com.falsepattern.chunk.internal.ChunkDataRegistryImpl;
+import com.falsepattern.chunk.internal.DataRegistryImpl;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
@@ -22,7 +17,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -58,7 +52,7 @@ public abstract class ChunkMixin {
      */
     @SideOnly(Side.CLIENT)
     @Overwrite
-    public void fillChunk(byte[] data, int ebsMask, int ebsMSBMask, boolean forceUpdate) {
+    public void fillChunk(byte[] data, int subChunkMask, int subChunkMSBMask, boolean forceUpdate) {
         for (Object o : chunkTileEntityMap.values()) {
             TileEntity tileEntity = (TileEntity) o;
             tileEntity.updateContainingBlockInfo();
@@ -69,7 +63,7 @@ public abstract class ChunkMixin {
         boolean hasSky = !this.worldObj.provider.hasNoSky;
 
         for (int i = 0; i < storageArrays.length; i++) {
-            if ((ebsMask & (1 << i)) != 0) {
+            if ((subChunkMask & (1 << i)) != 0) {
                 if (storageArrays[i] == null) {
                     storageArrays[i] = new ExtendedBlockStorage(i << 4, hasSky);
                 }
@@ -78,10 +72,10 @@ public abstract class ChunkMixin {
             }
         }
 
-        ChunkDataRegistryImpl.readFromBuffer((Chunk) (Object) this, ebsMask, forceUpdate, data);
+        DataRegistryImpl.readFromBuffer((Chunk) (Object) this, subChunkMask, forceUpdate, data);
 
         for (int i = 0; i < storageArrays.length; ++i) {
-            if ((storageArrays[i] != null) && ((ebsMask & (1 << i)) != 0)) {
+            if ((storageArrays[i] != null) && ((subChunkMask & (1 << i)) != 0)) {
                 storageArrays[i].removeInvalidBlocks();
             }
         }

src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/AnvilChunkLoaderMixin.java

@@ -1,18 +1,13 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 package com.falsepattern.chunk.internal.mixin.mixins.common.vanilla;
 
-import com.falsepattern.chunk.internal.ChunkDataRegistryImpl;
+import com.falsepattern.chunk.internal.DataRegistryImpl;
 import lombok.val;
 import org.apache.logging.log4j.Level;
 import org.spongepowered.asm.mixin.Mixin;
@@ -46,13 +41,10 @@ public abstract class AnvilChunkLoaderMixin {
         nbt.setByte("V", (byte) 1);
         nbt.setInteger("xPos", chunk.xPosition);
         nbt.setInteger("zPos", chunk.zPosition);
-        System.out.println("Saving chunk " + chunk.xPosition + ", " + chunk.zPosition);
         nbt.setLong("LastUpdate", world.getTotalWorldTime());
-        nbt.setIntArray("HeightMap", chunk.heightMap);
         nbt.setBoolean("TerrainPopulated", chunk.isTerrainPopulated);
-        nbt.setBoolean("LightPopulated", chunk.isLightPopulated);
         nbt.setLong("InhabitedTime", chunk.inhabitedTime);
-        writeSections(chunk, nbt);
+        writeSubChunks(chunk, nbt);
         writeCustomData(chunk, nbt);
         writeEntities(chunk, world, nbt);
     }
@@ -68,13 +60,10 @@ public abstract class AnvilChunkLoaderMixin {
     private Chunk readChunkFromNBT(World world, NBTTagCompound nbt) {
         int x = nbt.getInteger("xPos");
         int z = nbt.getInteger("zPos");
-        System.out.println("Loading chunk " + x + ", " + z);
         Chunk chunk = new Chunk(world, x, z);
-        chunk.heightMap = nbt.getIntArray("HeightMap");
         chunk.isTerrainPopulated = nbt.getBoolean("TerrainPopulated");
-        chunk.isLightPopulated = nbt.getBoolean("LightPopulated");
         chunk.inhabitedTime = nbt.getLong("InhabitedTime");
-        readSections(chunk, nbt);
+        readSubChunks(chunk, nbt);
         readCustomData(chunk, nbt);
 
         // End this method here and split off entity loading to another method
@@ -82,46 +71,46 @@ public abstract class AnvilChunkLoaderMixin {
     }
 
     private void readCustomData(Chunk chunk, NBTTagCompound nbt) {
-        ChunkDataRegistryImpl.readChunkFromNBT(chunk, nbt);
+        DataRegistryImpl.readChunkFromNBT(chunk, nbt);
     }
 
-    private void readSections(Chunk chunk, NBTTagCompound nbt) {
-        NBTTagList sections = nbt.getTagList("Sections", 10);
+    private void readSubChunks(Chunk chunk, NBTTagCompound nbt) {
+        NBTTagList subChunksNBT = nbt.getTagList("Sections", 10);
         byte segments = 16;
-        ExtendedBlockStorage[] ebsList = new ExtendedBlockStorage[segments];
+        ExtendedBlockStorage[] subChunkList = new ExtendedBlockStorage[segments];
 
-        for (int k = 0; k < sections.tagCount(); ++k) {
-            NBTTagCompound section = sections.getCompoundTagAt(k);
-            byte yLevel = section.getByte("Y");
-            ExtendedBlockStorage ebs = new ExtendedBlockStorage(yLevel << 4, !chunk.worldObj.provider.hasNoSky);
-            ChunkDataRegistryImpl.readSectionFromNBT(chunk, ebs, section);
+        for (int k = 0; k < subChunksNBT.tagCount(); ++k) {
+            NBTTagCompound subChunkNBT = subChunksNBT.getCompoundTagAt(k);
+            byte yLevel = subChunkNBT.getByte("Y");
+            ExtendedBlockStorage subChunk = new ExtendedBlockStorage(yLevel << 4, !chunk.worldObj.provider.hasNoSky);
+            DataRegistryImpl.readSubChunkFromNBT(chunk, subChunk, subChunkNBT);
 
-            ebs.removeInvalidBlocks();
-            ebsList[yLevel] = ebs;
+            subChunk.removeInvalidBlocks();
+            subChunkList[yLevel] = subChunk;
         }
 
-        chunk.setStorageArrays(ebsList);
+        chunk.setStorageArrays(subChunkList);
     }
 
     private void writeCustomData(Chunk chunk, NBTTagCompound nbt) {
-        ChunkDataRegistryImpl.writeChunkToNBT(chunk, nbt);
+        DataRegistryImpl.writeChunkToNBT(chunk, nbt);
     }
 
-    private void writeSections(Chunk chunk, NBTTagCompound nbt) {
-        ExtendedBlockStorage[] ebsList = chunk.getBlockStorageArray();
-        NBTTagList sections = new NBTTagList();
-        NBTTagCompound section;
+    private void writeSubChunks(Chunk chunk, NBTTagCompound nbt) {
+        ExtendedBlockStorage[] subChunks = chunk.getBlockStorageArray();
+        NBTTagList subChunksNBT = new NBTTagList();
+        NBTTagCompound subChunkNBT;
 
-        for (ExtendedBlockStorage ebs : ebsList) {
-            if (ebs != null) {
-                section = new NBTTagCompound();
-                section.setByte("Y", (byte) (ebs.getYLocation() >> 4 & 255));
-                ChunkDataRegistryImpl.writeSectionToNBT(chunk, ebs, section);
-                sections.appendTag(section);
+        for (ExtendedBlockStorage subChunk : subChunks) {
+            if (subChunk != null) {
+                subChunkNBT = new NBTTagCompound();
+                subChunkNBT.setByte("Y", (byte) (subChunk.getYLocation() >> 4 & 255));
+                DataRegistryImpl.writeSubChunkToNBT(chunk, subChunk, subChunkNBT);
+                subChunksNBT.appendTag(subChunkNBT);
             }
         }
 
-        nbt.setTag("Sections", sections);
+        nbt.setTag("Sections", subChunksNBT);
     }
 
     private void writeEntities(Chunk chunk, World world, NBTTagCompound nbt) {

src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S21PacketChunkDataMixin.java

@@ -1,24 +1,17 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 package com.falsepattern.chunk.internal.mixin.mixins.common.vanilla;
 
-import com.falsepattern.chunk.internal.ChunkDataRegistryImpl;
+import com.falsepattern.chunk.internal.DataRegistryImpl;
 import lombok.val;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.Constant;
-import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.network.play.server.S21PacketChunkData;
@@ -42,7 +35,7 @@ public abstract class S21PacketChunkDataMixin {
     @Shadow(aliases = "field_149282_b")
     private int zPosition;
     @Shadow(aliases = "field_149283_c")
-    private int ebsMask;
+    private int subChunkMask;
     @Shadow(aliases = "field_149281_e")
     private byte[] deflatedData;
     @Shadow(aliases = "field_149278_f")
@@ -52,11 +45,14 @@ public abstract class S21PacketChunkDataMixin {
     @Shadow(aliases = "field_149285_h")
     private int deflatedSize;
 
-    @ModifyConstant(method = {"<clinit>", "func_149275_c"},
-                    constant = @Constant(intValue = 196864),
-                    require = 1)
-    private static int increasePacketSize(int constant) {
-        return ChunkDataRegistryImpl.maxPacketSize();
+
+    /**
+     * @author FalsePattern
+     * @reason Extend capacity
+     */
+    @Overwrite
+    public static int func_149275_c() {
+        return DataRegistryImpl.maxPacketSize();
     }
 
     /**
@@ -64,25 +60,25 @@ public abstract class S21PacketChunkDataMixin {
      * @reason Replace functionality
      */
     @Overwrite
-    public static S21PacketChunkData.Extracted func_149269_a(Chunk chunk, boolean forceUpdate, int ebsMask) {
-        ExtendedBlockStorage[] ebs = chunk.getBlockStorageArray();
+    public static S21PacketChunkData.Extracted func_149269_a(Chunk chunk, boolean forceUpdate, int subChunkMask) {
+        ExtendedBlockStorage[] subChunks = chunk.getBlockStorageArray();
         S21PacketChunkData.Extracted extracted = new S21PacketChunkData.Extracted();
 
-        if (buffer.length < ChunkDataRegistryImpl.maxPacketSize()) {
-            buffer = new byte[ChunkDataRegistryImpl.maxPacketSize()];
+        if (buffer.length < DataRegistryImpl.maxPacketSize()) {
+            buffer = new byte[DataRegistryImpl.maxPacketSize()];
         }
 
         if (forceUpdate) {
             chunk.sendUpdates = true;
         }
 
-        for (int i = 0; i < ebs.length; ++i) {
-            if (ebs[i] != null && (!forceUpdate || !ebs[i].isEmpty()) && (ebsMask & 1 << i) != 0) {
+        for (int i = 0; i < subChunks.length; ++i) {
+            if (subChunks[i] != null && (!forceUpdate || !subChunks[i].isEmpty()) && (subChunkMask & 1 << i) != 0) {
                 extracted.field_150280_b |= 1 << i;
             }
         }
 
-        int length = ChunkDataRegistryImpl.writeToBuffer(chunk, extracted.field_150280_b, forceUpdate, buffer);
+        int length = DataRegistryImpl.writeToBuffer(chunk, extracted.field_150280_b, forceUpdate, buffer);
 
         extracted.field_150282_a = new byte[length];
         System.arraycopy(buffer, 0, extracted.field_150282_a, 0, length);
@@ -110,9 +106,8 @@ public abstract class S21PacketChunkDataMixin {
         }
         data.writeInt(xPosition);
         data.writeInt(zPosition);
-        System.out.println("Writing chunk packet (" + xPosition + ", " + zPosition + ")");
         data.writeBoolean(forceUpdate);
-        data.writeShort((short) (ebsMask & 0xFFFF));
+        data.writeShort((short) (subChunkMask & 0xFFFF));
         data.writeInt(this.data.length);
         data.writeInt(deflatedSize);
         data.writeBytes(deflatedData, 0, deflatedSize);
@@ -126,9 +121,8 @@ public abstract class S21PacketChunkDataMixin {
     public void readPacketData(PacketBuffer data) throws IOException {
         xPosition = data.readInt();
         zPosition = data.readInt();
-        System.out.println("Reading chunk packet (" + xPosition + ", " + zPosition + ")");
         forceUpdate = data.readBoolean();
-        ebsMask = data.readShort() & 0xFFFF;
+        subChunkMask = data.readShort() & 0xFFFF;
         this.data = new byte[data.readInt()];
         deflatedSize = data.readInt();
         if (buffer.length < deflatedSize) {

src/main/java/com/falsepattern/chunk/internal/mixin/mixins/common/vanilla/S26PacketMapChunkBulkMixin.java

@@ -1,13 +1,8 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 package com.falsepattern.chunk.internal.mixin.mixins.common.vanilla;
@@ -39,7 +34,9 @@ public abstract class S26PacketMapChunkBulkMixin {
     @Shadow(aliases = "field_149264_b")
     private int[] zPositions;
     @Shadow(aliases = "field_149265_c")
-    private int[] ebsMasks;
+    private int[] subChunkMasks;
+    @Shadow(aliases = "field_149262_d")
+    private int[] subChunkMSBMasks;
     @Shadow(aliases = "field_149261_g")
     private int deflatedSize;
     @Shadow(aliases = "field_149267_h")
@@ -65,7 +62,8 @@ public abstract class S26PacketMapChunkBulkMixin {
         skylight = data.readBoolean();
         xPositions = new int[chunkCount];
         zPositions = new int[chunkCount];
-        ebsMasks = new int[chunkCount];
+        subChunkMasks = new int[chunkCount];
+        subChunkMSBMasks = new int[chunkCount];
         datas = new byte[chunkCount][];
 
         if (inflaterBuffer.length < deflatedSize) {
@@ -91,7 +89,7 @@ public abstract class S26PacketMapChunkBulkMixin {
             val size = sizes[i];
             xPositions[i] = data.readInt();
             zPositions[i] = data.readInt();
-            ebsMasks[i] = data.readUnsignedShort();
+            subChunkMasks[i] = data.readUnsignedShort();
 
             datas[i] = new byte[size];
             System.arraycopy(buf, pos, datas[i], 0, size);
@@ -124,7 +122,7 @@ public abstract class S26PacketMapChunkBulkMixin {
         for (int i = 0; i < xPositions.length; ++i) {
             data.writeInt(xPositions[i]);
             data.writeInt(zPositions[i]);
-            data.writeShort((short) (ebsMasks[i] & 65535));
+            data.writeShort((short) (subChunkMasks[i] & 65535));
         }
     }
 }

src/main/java/com/falsepattern/chunk/internal/mixin/plugin/Mixin.java

@@ -1,13 +1,8 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 package com.falsepattern.chunk.internal.mixin.plugin;

src/main/java/com/falsepattern/chunk/internal/mixin/plugin/MixinPlugin.java

@@ -1,13 +1,8 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 package com.falsepattern.chunk.internal.mixin.plugin;

src/main/java/com/falsepattern/chunk/internal/mixin/plugin/TargetedMod.java

@@ -1,13 +1,8 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 package com.falsepattern.chunk.internal.mixin.plugin;

src/main/java/com/falsepattern/chunk/internal/package-info.java

@@ -1,13 +1,8 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 /**

src/main/java/com/falsepattern/chunk/internal/vanilla/BiomeManager.java

@@ -1,18 +1,14 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 package com.falsepattern.chunk.internal.vanilla;
 
-import com.falsepattern.chunk.api.ChunkDataManager;
+import com.falsepattern.chunk.api.ArrayUtil;
+import com.falsepattern.chunk.api.DataManager;
 import org.jetbrains.annotations.NotNull;
 
 import net.minecraft.nbt.NBTTagCompound;
@@ -21,7 +17,7 @@ import net.minecraft.world.chunk.Chunk;
 import java.nio.ByteBuffer;
 
 public class BiomeManager extends VanillaManager
-        implements ChunkDataManager.PacketDataManager, ChunkDataManager.ChunkNBTDataManager {
+        implements DataManager.PacketDataManager, DataManager.ChunkDataManager {
     public static final int BYTES_PER_CHUNK = 256;
 
     @Override
@@ -35,14 +31,14 @@ public class BiomeManager extends VanillaManager
     }
 
     @Override
-    public void writeToBuffer(@NotNull Chunk chunk, int ebsMask, boolean forceUpdate, @NotNull ByteBuffer data) {
+    public void writeToBuffer(@NotNull Chunk chunk, int subChunkMask, boolean forceUpdate, @NotNull ByteBuffer data) {
         if (forceUpdate) {
             data.put(chunk.getBiomeArray());
         }
     }
 
     @Override
-    public void readFromBuffer(@NotNull Chunk chunk, int ebsMask, boolean forceUpdate, @NotNull ByteBuffer buffer) {
+    public void readFromBuffer(@NotNull Chunk chunk, int subChunkMask, boolean forceUpdate, @NotNull ByteBuffer buffer) {
         if (forceUpdate) {
             buffer.get(chunk.getBiomeArray());
         }
@@ -65,4 +61,9 @@ public class BiomeManager extends VanillaManager
             chunk.setBiomeArray(nbt.getByteArray("Biomes"));
         }
     }
+
+    @Override
+    public void cloneChunk(Chunk from, Chunk to) {
+        to.setBiomeArray(ArrayUtil.copyArray(from.getBiomeArray(), to.getBiomeArray()));
+    }
 }

src/main/java/com/falsepattern/chunk/internal/vanilla/BlockIDManager.java

@@ -1,18 +1,14 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 package com.falsepattern.chunk.internal.vanilla;
 
-import com.falsepattern.chunk.api.ChunkDataManager;
+import com.falsepattern.chunk.api.ArrayUtil;
+import com.falsepattern.chunk.api.DataManager;
 import lombok.val;
 
 import net.minecraft.nbt.NBTTagCompound;
@@ -22,13 +18,13 @@ import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
 
 import java.nio.ByteBuffer;
 
-import static com.falsepattern.chunk.internal.Common.BLOCKS_PER_EBS;
-import static com.falsepattern.chunk.internal.Common.EBS_PER_CHUNK;
+import static com.falsepattern.chunk.internal.Common.BLOCKS_PER_SUBCHUNK;
+import static com.falsepattern.chunk.internal.Common.SUBCHUNKS_PER_CHUNK;
 
 public class BlockIDManager extends VanillaManager
-        implements ChunkDataManager.PacketDataManager, ChunkDataManager.SectionNBTDataManager {
-    private static final int LSB_BYTES_PER_EBS = BLOCKS_PER_EBS;
-    private static final int MSB_BYTES_PER_EBS = BLOCKS_PER_EBS / 2;
+        implements DataManager.PacketDataManager, DataManager.SubChunkDataManager {
+    private static final int LSB_BYTES_PER_SUBCHUNK = BLOCKS_PER_SUBCHUNK;
+    private static final int MSB_BYTES_PER_SUBCHUNK = BLOCKS_PER_SUBCHUNK / 2;
     private static final int HEADER_SIZE = 2;
 
     @Override
@@ -38,20 +34,20 @@ public class BlockIDManager extends VanillaManager
 
     @Override
     public int maxPacketSize() {
-        return HEADER_SIZE + EBS_PER_CHUNK * (LSB_BYTES_PER_EBS + MSB_BYTES_PER_EBS);
+        return HEADER_SIZE + SUBCHUNKS_PER_CHUNK * (LSB_BYTES_PER_SUBCHUNK + MSB_BYTES_PER_SUBCHUNK);
     }
 
     @Override
-    public void writeToBuffer(Chunk chunk, int ebsMask, boolean forceUpdate, ByteBuffer data) {
-        val ebsArray = chunk.getBlockStorageArray();
+    public void writeToBuffer(Chunk chunk, int subChunkMask, boolean forceUpdate, ByteBuffer data) {
+        val subChunks = chunk.getBlockStorageArray();
         int currentPos = data.position();
         data.putShort((short) 0);
         int msbMask = 0;
-        for (int i = 0; i < ebsArray.length; i++) {
-            if ((ebsMask & (1 << i)) != 0) {
-                val ebs = ebsArray[i];
-                val lsb = ebs.getBlockLSBArray();
-                val msb = ebs.getBlockMSBArray();
+        for (int i = 0; i < subChunks.length; i++) {
+            if ((subChunkMask & (1 << i)) != 0) {
+                val subChunk = subChunks[i];
+                val lsb = subChunk.getBlockLSBArray();
+                val msb = subChunk.getBlockMSBArray();
                 data.put(lsb);
                 if (msb != null) {
                     msbMask |= 1 << i;
@@ -66,46 +62,52 @@ public class BlockIDManager extends VanillaManager
     }
 
     @Override
-    public void readFromBuffer(Chunk chunk, int ebsMask, boolean forceUpdate, ByteBuffer buffer) {
-        val ebsArray = chunk.getBlockStorageArray();
+    public void readFromBuffer(Chunk chunk, int subChunkMask, boolean forceUpdate, ByteBuffer buffer) {
+        val subChunks = chunk.getBlockStorageArray();
         val msbMask = buffer.getShort() & 0xFFFF;
-        for (int i = 0; i < ebsArray.length; i++) {
-            val ebs = ebsArray[i];
-            if ((ebsMask & (1 << i)) != 0 && ebs != null) {
-                buffer.get(ebs.getBlockLSBArray());
+        for (int i = 0; i < subChunks.length; i++) {
+            val subChunk = subChunks[i];
+            if ((subChunkMask & (1 << i)) != 0 && subChunk != null) {
+                buffer.get(subChunk.getBlockLSBArray());
                 if ((msbMask & (1 << i)) != 0) {
-                    val msb = ebs.getBlockMSBArray();
+                    val msb = subChunk.getBlockMSBArray();
                     if (msb == null) {
-                        ebs.createBlockMSBArray();
+                        subChunk.createBlockMSBArray();
                     }
-                    buffer.get(ebs.getBlockMSBArray().data);
+                    buffer.get(subChunk.getBlockMSBArray().data);
                 } else {
-                    ebs.setBlockMSBArray(null);
+                    subChunk.setBlockMSBArray(null);
                 }
             }
         }
     }
 
     @Override
-    public boolean sectionPrivilegedAccess() {
+    public boolean subChunkPrivilegedAccess() {
         return true;
     }
 
     @Override
-    public void writeSectionToNBT(Chunk chunk, ExtendedBlockStorage ebs, NBTTagCompound section) {
-        section.setByteArray("Blocks", ebs.getBlockLSBArray());
+    public void writeSubChunkToNBT(Chunk chunk, ExtendedBlockStorage subChunk, NBTTagCompound nbt) {
+        nbt.setByteArray("Blocks", subChunk.getBlockLSBArray());
 
-        if (ebs.getBlockMSBArray() != null) {
-            section.setByteArray("Add", ebs.getBlockMSBArray().data);
+        if (subChunk.getBlockMSBArray() != null) {
+            nbt.setByteArray("Add", subChunk.getBlockMSBArray().data);
         }
     }
 
     @Override
-    public void readSectionFromNBT(Chunk chunk, ExtendedBlockStorage ebs, NBTTagCompound section) {
-        ebs.setBlockLSBArray(section.getByteArray("Blocks"));
+    public void readSubChunkFromNBT(Chunk chunk, ExtendedBlockStorage subChunk, NBTTagCompound nbt) {
+        subChunk.setBlockLSBArray(nbt.getByteArray("Blocks"));
 
-        if (section.hasKey("Add", 7)) {
-            ebs.setBlockMSBArray(new NibbleArray(section.getByteArray("Add"), 4));
+        if (nbt.hasKey("Add", 7)) {
+            subChunk.setBlockMSBArray(new NibbleArray(nbt.getByteArray("Add"), 4));
         }
     }
+
+    @Override
+    public void cloneSubChunk(Chunk fromChunk, ExtendedBlockStorage from, ExtendedBlockStorage to) {
+        to.setBlockLSBArray(ArrayUtil.copyArray(from.getBlockLSBArray(), to.getBlockLSBArray()));
+        to.setBlockMSBArray(ArrayUtil.copyArray(from.getBlockMSBArray(), to.getBlockMSBArray()));
+    }
 }

src/main/java/com/falsepattern/chunk/internal/vanilla/BlocklightManager.java

@@ -1,28 +1,24 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 package com.falsepattern.chunk.internal.vanilla;
 
-import com.falsepattern.chunk.api.ChunkDataManager;
+import com.falsepattern.chunk.api.ArrayUtil;
+import com.falsepattern.chunk.api.DataManager;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.NibbleArray;
 import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
 
-public class BlocklightManager extends NibbleManager implements ChunkDataManager.SectionNBTDataManager {
+public class BlocklightManager extends NibbleManager implements DataManager.SubChunkDataManager {
     @Override
-    protected NibbleArray getNibbleArray(ExtendedBlockStorage ebs) {
-        return ebs.getBlocklightArray();
+    protected NibbleArray getNibbleArray(ExtendedBlockStorage subChunk) {
+        return subChunk.getBlocklightArray();
     }
 
     @Override
@@ -31,17 +27,22 @@ public class BlocklightManager extends NibbleManager implements ChunkDataManager
     }
 
     @Override
-    public boolean sectionPrivilegedAccess() {
+    public boolean subChunkPrivilegedAccess() {
         return true;
     }
 
     @Override
-    public void writeSectionToNBT(Chunk chunk, ExtendedBlockStorage ebs, NBTTagCompound section) {
-        section.setByteArray("BlockLight", ebs.getBlocklightArray().data);
+    public void writeSubChunkToNBT(Chunk chunk, ExtendedBlockStorage subChunk, NBTTagCompound nbt) {
+        nbt.setByteArray("BlockLight", subChunk.getBlocklightArray().data);
     }
 
     @Override
-    public void readSectionFromNBT(Chunk chunk, ExtendedBlockStorage ebs, NBTTagCompound section) {
-        ebs.setBlocklightArray(new NibbleArray(section.getByteArray("BlockLight"), 4));
+    public void readSubChunkFromNBT(Chunk chunk, ExtendedBlockStorage subChunk, NBTTagCompound nbt) {
+        subChunk.setBlocklightArray(new NibbleArray(nbt.getByteArray("BlockLight"), 4));
+    }
+
+    @Override
+    public void cloneSubChunk(Chunk fromChunk, ExtendedBlockStorage from, ExtendedBlockStorage to) {
+        from.setBlocklightArray(ArrayUtil.copyArray(from.getBlocklightArray(), to.getBlocklightArray()));
     }
 }

src/main/java/com/falsepattern/chunk/internal/vanilla/LightingManager.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+ */
+
+package com.falsepattern.chunk.internal.vanilla;
+
+import com.falsepattern.chunk.api.ArrayUtil;
+import com.falsepattern.chunk.api.DataManager;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.chunk.Chunk;
+
+public class LightingManager extends VanillaManager implements DataManager.ChunkDataManager {
+    @Override
+    public String id() {
+        return "lighting";
+    }
+
+    @Override
+    public void writeChunkToNBT(Chunk chunk, NBTTagCompound nbt) {
+        nbt.setIntArray("HeightMap", chunk.heightMap);
+        nbt.setBoolean("LightPopulated", chunk.isLightPopulated);
+    }
+
+    @Override
+    public void readChunkFromNBT(Chunk chunk, NBTTagCompound nbt) {
+        chunk.heightMap = nbt.getIntArray("HeightMap");
+        chunk.isLightPopulated = nbt.getBoolean("LightPopulated");
+    }
+
+    @Override
+    public boolean chunkPrivilegedAccess() {
+        return true;
+    }
+
+    @Override
+    public void cloneChunk(Chunk from, Chunk to) {
+        to.heightMap = ArrayUtil.copyArray(from.heightMap, to.heightMap);
+        to.isLightPopulated = from.isLightPopulated;
+    }
+}

src/main/java/com/falsepattern/chunk/internal/vanilla/MetadataManager.java

@@ -1,28 +1,24 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 package com.falsepattern.chunk.internal.vanilla;
 
-import com.falsepattern.chunk.api.ChunkDataManager;
+import com.falsepattern.chunk.api.ArrayUtil;
+import com.falsepattern.chunk.api.DataManager;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.NibbleArray;
 import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
 
-public class MetadataManager extends NibbleManager implements ChunkDataManager.SectionNBTDataManager {
+public class MetadataManager extends NibbleManager implements DataManager.SubChunkDataManager {
     @Override
-    protected NibbleArray getNibbleArray(ExtendedBlockStorage ebs) {
-        return ebs.getMetadataArray();
+    protected NibbleArray getNibbleArray(ExtendedBlockStorage subChunk) {
+        return subChunk.getMetadataArray();
     }
 
     @Override
@@ -31,17 +27,22 @@ public class MetadataManager extends NibbleManager implements ChunkDataManager.S
     }
 
     @Override
-    public boolean sectionPrivilegedAccess() {
+    public boolean subChunkPrivilegedAccess() {
         return true;
     }
 
     @Override
-    public void writeSectionToNBT(Chunk chunk, ExtendedBlockStorage ebs, NBTTagCompound section) {
-        section.setByteArray("Data", ebs.getMetadataArray().data);
+    public void writeSubChunkToNBT(Chunk chunk, ExtendedBlockStorage subChunk, NBTTagCompound nbt) {
+        nbt.setByteArray("Data", subChunk.getMetadataArray().data);
     }
 
     @Override
-    public void readSectionFromNBT(Chunk chunk, ExtendedBlockStorage ebs, NBTTagCompound section) {
-        ebs.setBlockMetadataArray(new NibbleArray(section.getByteArray("Data"), 4));
+    public void readSubChunkFromNBT(Chunk chunk, ExtendedBlockStorage subChunk, NBTTagCompound nbt) {
+        subChunk.setBlockMetadataArray(new NibbleArray(nbt.getByteArray("Data"), 4));
+    }
+
+    @Override
+    public void cloneSubChunk(Chunk fromChunk, ExtendedBlockStorage from, ExtendedBlockStorage to) {
+        to.setBlockMetadataArray(ArrayUtil.copyArray(from.getMetadataArray(), to.getMetadataArray()));
     }
 }

src/main/java/com/falsepattern/chunk/internal/vanilla/NibbleManager.java

@@ -1,18 +1,13 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 package com.falsepattern.chunk.internal.vanilla;
 
-import com.falsepattern.chunk.api.ChunkDataManager;
+import com.falsepattern.chunk.api.DataManager;
 import com.falsepattern.chunk.internal.Common;
 import lombok.val;
 
@@ -22,37 +17,37 @@ import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
 
 import java.nio.ByteBuffer;
 
-public abstract class NibbleManager extends VanillaManager implements ChunkDataManager.PacketDataManager {
-    public static final int BYTES_PER_EBS = Common.BLOCKS_PER_EBS / 2;
+public abstract class NibbleManager extends VanillaManager implements DataManager.PacketDataManager {
+    public static final int BYTES_PER_SUBCHUNK = Common.BLOCKS_PER_SUBCHUNK / 2;
 
-    protected abstract NibbleArray getNibbleArray(ExtendedBlockStorage ebs);
+    protected abstract NibbleArray getNibbleArray(ExtendedBlockStorage subChunk);
 
     @Override
     public int maxPacketSize() {
-        return Common.EBS_PER_CHUNK * BYTES_PER_EBS;
+        return Common.SUBCHUNKS_PER_CHUNK * BYTES_PER_SUBCHUNK;
     }
 
     @Override
-    public void writeToBuffer(Chunk chunk, int ebsMask, boolean forceUpdate, ByteBuffer data) {
-        val ebsArray = chunk.getBlockStorageArray();
-        for (int i = 0; i < ebsArray.length; i++) {
-            if ((ebsMask & (1 << i)) != 0) {
-                val ebs = ebsArray[i];
-                if (ebs != null) {
-                    data.put(getNibbleArray(ebs).data, 0, BYTES_PER_EBS);
+    public void writeToBuffer(Chunk chunk, int subChunkMask, boolean forceUpdate, ByteBuffer data) {
+        val subChunks = chunk.getBlockStorageArray();
+        for (int i = 0; i < subChunks.length; i++) {
+            if ((subChunkMask & (1 << i)) != 0) {
+                val subChunk = subChunks[i];
+                if (subChunk != null) {
+                    data.put(getNibbleArray(subChunk).data, 0, BYTES_PER_SUBCHUNK);
                 }
             }
         }
     }
 
     @Override
-    public void readFromBuffer(Chunk chunk, int ebsMask, boolean forceUpdate, ByteBuffer buffer) {
-        val ebsArray = chunk.getBlockStorageArray();
-        for (int i = 0; i < ebsArray.length; i++) {
-            if ((ebsMask & (1 << i)) != 0) {
-                val ebs = ebsArray[i];
-                if (ebs != null) {
-                    buffer.get(getNibbleArray(ebs).data, 0, BYTES_PER_EBS);
+    public void readFromBuffer(Chunk chunk, int subChunkMask, boolean forceUpdate, ByteBuffer buffer) {
+        val subChunks = chunk.getBlockStorageArray();
+        for (int i = 0; i < subChunks.length; i++) {
+            if ((subChunkMask & (1 << i)) != 0) {
+                val subChunk = subChunks[i];
+                if (subChunk != null) {
+                    buffer.get(getNibbleArray(subChunk).data, 0, BYTES_PER_SUBCHUNK);
                 }
             }
         }

src/main/java/com/falsepattern/chunk/internal/vanilla/SkylightManager.java

@@ -1,18 +1,14 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 package com.falsepattern.chunk.internal.vanilla;
 
-import com.falsepattern.chunk.api.ChunkDataManager;
+import com.falsepattern.chunk.api.ArrayUtil;
+import com.falsepattern.chunk.api.DataManager;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.chunk.Chunk;
@@ -21,49 +17,58 @@ import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
 
 import java.nio.ByteBuffer;
 
-public class SkylightManager extends NibbleManager implements ChunkDataManager.SectionNBTDataManager {
+public class SkylightManager extends NibbleManager implements DataManager.SubChunkDataManager {
     @Override
     public String id() {
         return "skylight";
     }
 
     @Override
-    protected NibbleArray getNibbleArray(ExtendedBlockStorage ebs) {
-        return ebs.getSkylightArray();
+    protected NibbleArray getNibbleArray(ExtendedBlockStorage subChunk) {
+        return subChunk.getSkylightArray();
     }
 
     @Override
-    public void writeToBuffer(Chunk chunk, int ebsMask, boolean forceUpdate, ByteBuffer data) {
+    public void writeToBuffer(Chunk chunk, int subChunkMask, boolean forceUpdate, ByteBuffer data) {
         if (!chunk.worldObj.provider.hasNoSky) {
-            super.writeToBuffer(chunk, ebsMask, forceUpdate, data);
+            super.writeToBuffer(chunk, subChunkMask, forceUpdate, data);
         }
     }
 
     @Override
-    public void readFromBuffer(Chunk chunk, int ebsMask, boolean forceUpdate, ByteBuffer buffer) {
+    public void readFromBuffer(Chunk chunk, int subChunkMask, boolean forceUpdate, ByteBuffer buffer) {
         if (!chunk.worldObj.provider.hasNoSky) {
-            super.readFromBuffer(chunk, ebsMask, forceUpdate, buffer);
+            super.readFromBuffer(chunk, subChunkMask, forceUpdate, buffer);
         }
     }
 
     @Override
-    public boolean sectionPrivilegedAccess() {
+    public boolean subChunkPrivilegedAccess() {
         return true;
     }
 
     @Override
-    public void writeSectionToNBT(Chunk chunk, ExtendedBlockStorage ebs, NBTTagCompound section) {
+    public void writeSubChunkToNBT(Chunk chunk, ExtendedBlockStorage subChunk, NBTTagCompound nbt) {
         if (!chunk.worldObj.provider.hasNoSky) {
-            section.setByteArray("SkyLight", ebs.getSkylightArray().data);
+            nbt.setByteArray("SkyLight", subChunk.getSkylightArray().data);
         } else {
-            section.setByteArray("SkyLight", new byte[ebs.getBlocklightArray().data.length]);
+            nbt.setByteArray("SkyLight", new byte[subChunk.getBlocklightArray().data.length]);
         }
     }
 
     @Override
-    public void readSectionFromNBT(Chunk chunk, ExtendedBlockStorage ebs, NBTTagCompound section) {
+    public void readSubChunkFromNBT(Chunk chunk, ExtendedBlockStorage subChunk, NBTTagCompound nbt) {
         if (!chunk.worldObj.provider.hasNoSky) {
-            ebs.setSkylightArray(new NibbleArray(section.getByteArray("SkyLight"), 4));
+            subChunk.setSkylightArray(new NibbleArray(nbt.getByteArray("SkyLight"), 4));
+        }
+    }
+
+    @Override
+    public void cloneSubChunk(Chunk fromChunk, ExtendedBlockStorage from, ExtendedBlockStorage to) {
+        if (!fromChunk.worldObj.provider.hasNoSky) {
+            to.setSkylightArray(ArrayUtil.copyArray(from.getSkylightArray(), to.getSkylightArray()));
+        } else {
+            to.setSkylightArray(null);
         }
     }
 }

src/main/java/com/falsepattern/chunk/internal/vanilla/VanillaManager.java

@@ -1,22 +1,35 @@
 /*
- * -------------------------------------------------------------------------------
- * @author FalsePattern
- *
- * Copyright 2023
- *
- * All rights reserved.
- * Distribution of the software in any form is only allowed with
- * explicit, prior permission from the owner.
- * -------------------------------------------------------------------------------
+ * Copyright (c) 2023 FalsePattern
+ * This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+ * or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
  */
 
 package com.falsepattern.chunk.internal.vanilla;
 
-import com.falsepattern.chunk.api.ChunkDataManager;
+import com.falsepattern.chunk.api.DataManager;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-public abstract class VanillaManager implements ChunkDataManager {
+public abstract class VanillaManager implements DataManager {
     @Override
     public String domain() {
         return "minecraft";
     }
+
+    public @NotNull String version() {
+        return "";
+    }
+
+    public @Nullable String newInstallDescription() {
+        return null;
+    }
+
+    public @NotNull String uninstallMessage() {
+        return "";
+    }
+
+    public @Nullable String versionChangeMessage(String priorVersion) {
+        return null;
+    }
 }

src/main/resources/LICENSE

@@ -1,63 +1,4 @@
-#-------------------------------------------------------------------------------
-# @author FalsePattern
-#
-# Copyright 2023
-#
-# All rights reserved.
-# Distribution of the software in any form is only allowed with
-# explicit, prior permission from the owner.
-#-------------------------------------------------------------------------------
-@author FalsePattern
-
-
-This code is the property of and owned and copyrighted by FalsePattern.
-This code is provided under a modified visible-source license
-that is as follows:
-
-
-API Code:
-==============================
-API code is identifiable as being in an "API" package in the respective
-repository or mod, and is intended to allow some level of inter-mod
-interactions without creating hard dependencies on the mod proper. This code
-is exempt from the below restrictions for "Mod Code", as it by nature will
-require some level of copying and redistribution.
-
-The only restrictions imposed on API code are that it remain clearly marked
-with its original authorship and source, that it be used for the purpose
-described previously, and that it not be modified from the original without
-first contacting FalsePattern.
-
-
-Mod Code:
-==============================
-Any and all users are permitted to use the source for educational purposes,
-or to create derivative works for private use only. GitHub forks and direct
-downloads are considered derivative works.
-
-Unless given explicit written permission - verifiable electronic writing is
-acceptable - no user may redistribute this source code nor any derivative
-works. These pre-approved works must prominently contain this copyright notice.
-
-Derivative mods using any or all of the source code or assets are
-EXPRESSLY FORBIDDEN.
-
-Additionally, no attempt may be made to achieve monetary gain from this code
-by anyone except the original author. In the case of pre-approved derivative
-works, any monetary gains made will be shared between the original author and
-the other developer(s), proportional to the ratio of derived to original code.
-
-Finally, any and all displays, duplicates or derivatives of this code must be
-prominently marked as such, and must contain attribution to the original
-author, including a link to the original source. Any attempts to claim credit
-for this code will be treated as intentional theft.
-
-Due to the Mojang and Minecraft Mod Terms of Service and Licensing
-Restrictions, compiled versions of this code must be provided for free.
-However, with the exception of pre-approved derivative works, only the original
-author's modpacks may distribute compiled binary versions of this code.
-
-==============================
-
-Failure to comply with these restrictions is a violation of copyright law and
-will be dealt with accordingly.
+Copyright (c) 2023 FalsePattern
+This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
+To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/
+or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.

src/main/resources/META-INF/chunkapi_at.cfg

@@ -0,0 +1,3 @@
+public-f net.minecraft.world.chunk.NibbleArray field_76585_a # data
+public-f net.minecraft.world.chunk.NibbleArray field_76583_b # depthBits
+public-f net.minecraft.world.chunk.NibbleArray field_76584_c # depthBitsPlusFour