Update core

1.16.5 core

See merge request jeseibel/minecraft-lod-mod!10

.gitignore

@@ -20,34 +20,8 @@ build
 # other
 eclipse
 run
+**/src/generated/
 
 # Files from Forge MDK
 logs
 forge*changelog.txt
-
-.architectury-transformer/
-build/
-*.ipr
-run/
-*.iws
-out/
-*.iml
-.gradle/
-output/
-bin/
-libs/
-
-.classpath
-.project
-.idea/
-classes/
-.metadata
-.vscode
-.settings
-*.launch
-
-**/src/generated/
-Merged/
-
-# file from notepad++
-*.bak

.gitlab-ci.yml

@@ -1,100 +0,0 @@
-# use Eclipse's JDK
-image: gradle:eclipse-temurin
-
-# all stages need to be defined here
-stages:
-  - build_18-1
-  - build_18-2
-#   - zip_artifacts
-
-variables:
-    # If we have correctness issues when compiling this can be set to false
-    GRADLE_OPTS: "-Dorg.gradle.daemon=true"
-    # Pull core when building
-    GIT_SUBMODULE_STRATEGY: recursive
-
-
-before_script:
-    - echo $CI_JOB_ID
-    # Writing GE_JOB_ID variable to environment file, will need the value in the next stage.
-    - echo GE_JOB_ID=$CI_JOB_ID >> generate_jars.env
-
-
-# 1.18.1 build
-build_18-1:
-    stage: build_18-1
-    script: ./gradlew build -PmcVer=1.18.1 --gradle-user-home cache/; ./gradlew merge --gradle-user-home cache/
-    # build using Java 17
-    image: eclipse-temurin:17
-    cache:
-        key: "$CI_COMMIT_REF_NAME_18-1"
-        policy: pull-push
-        paths:
-            - .gradle
-            - cache/
-
-
-# 1.18.2 build
-build_18-2:
-    stage: build_18-2
-    script: ./gradlew build -PmcVer=1.18.2 --gradle-user-home cache/; ./gradlew merge --gradle-user-home cache/
-    # build using Java 17
-    image: eclipse-temurin:17
-    cache:
-        key: "$CI_COMMIT_REF_NAME_18-2"
-        policy: pull-push
-        paths:
-            - .gradle
-            - cache/
-    
-    # TEMPORARY, there should be a way of either generating artifacts per build or in a separate stage
-    artifacts:
-        # This should only be done after the last build, otherwise there will be duplicate jars
-        name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
-        paths:
-            # relative to the root directory
-            - Merged
-        expire_in: 1 day
-
-
-# # put artifacts in a zip
-# # This should only be done after all the builds have been completed
-# zip_artifacts:
-#     stage: zip_artifacts
-#     # The complier complains if we don't do something with the script line 
-#     script: echo 'Building complete. Creating artifact Zip.'
-#     # build using Java 17
-#     image: eclipse-temurin:17
-#     artifacts:
-#         # This should only be done after the last build, otherwise there will be duplicate jars
-#         name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
-#         paths:
-#             # relative to the root directory
-#             - Merged
-#         expire_in: 1 day
-
-
-
-# unused deployment stage
-#deploy:
-#    stage: deploy
-#    image: registry.gitlab.com/gitlab-org/release-cli:latest
-#    script:
-#        - echo 'running release_job'
-#        - echo 'Previous Job ID is printed below'
-#        - echo $GE_JOB_ID
-#    # Specifying that this job requires artifacts from the previous job to succeed
-#    needs:
-#        - job: build
-#          artifacts: true
-#    release:
-#        name: 'Unstable Jars for Latest Commit' #: $CI_COMMIT_SHORT_SHA'
-#        description: 'Created automatically using the release-cli.'
-#        # tag_name is a mendatory field and can not be an empty string
-#        tag_name: 'Unstable-$CI_COMMIT_SHORT_SHA'
-#        assets:
-#            links:
-#                - name: 'Fabric Jars'
-#                  url: 'https://gitlab.com/jeseibel/minecraft-lod-mod/cw/-/jobs/${GE_JOB_ID}/artifacts/file/fabric/build/libs'
-#                - name: 'Forge Jars'
-#                  url: 'https://gitlab.com/jeseibel/minecraft-lod-mod/cw/-/jobs/${GE_JOB_ID}/artifacts/file/forge/build/libs' 

.gitmodules

@@ -1,4 +1,3 @@
 [submodule "core"]
 	path = core
 	url = https://gitlab.com/jeseibel/distant-horizons-core.git
-	branch = main

1.18.1.properties

@@ -1,37 +0,0 @@
-# 1.18.1 version based stuff
-
-minecraft_version=1.18.1
-java_version = 17
-
-# Fabric loader
-fabric_loader_version=0.13.3
-fabric_api_version=0.46.6+1.18
-    # Fabric mod versions
-    modmenu_version=3.0.1
-    starlight_version_fabric=3554912
-    lithium_version=mc1.18.1-0.7.7
-    sodium_version=3605309
-    iris_version=1.18.x-v1.1.4
-    bclib_version=1.2.5
-    immersive_portals_version = v1.0.4-1.18
-
-    # Fabric mod run
-    # 0 = Don't enable and don't run
-    # 1 = Can be referenced in code but doesn't run
-    # 2 = Can be referenced in code and runs in client
-    enable_starlight=0
-    enable_sodium=1
-    enable_lithium=0
-    enable_iris=0
-    enable_bclib=0
-
-# Forge loader
-forge_version=39.1.2
-    # Forge mod versions
-    starlight_version_forge=3559934
-
-    # Forge mod run
-    # 0 = Dont enable and don't run
-    # 1 = Can be referenced in code but doesn't run
-    # 2 = Can be referenced in code and runs in client
-    enable_starlight_forge=0

1.18.2.properties

@@ -1,38 +0,0 @@
-# 1.18.2 version based stuff
-# architectury_plugin_version = 3.4-SNAPSHOT
-# dev_architectury_loom_version = 0.10.0-SNAPSHOT
-minecraft_version=1.18.2
-java_version = 17
-
-# Fabric loader
-fabric_loader_version=0.13.3
-fabric_api_version=0.48.0+1.18.2
-    # Fabric mod versions
-    modmenu_version=3.1.0
-    starlight_version_fabric=3667443
-    lithium_version=mc1.18.2-0.7.9
-    sodium_version=3669187
-    iris_version=1.18.x-v1.2.2
-    immersive_portals_version = v1.0.4-1.18
-    bclib_version=0
-
-    # Fabric mod run
-    # 0 = Don't enable and don't run
-    # 1 = Can be referenced in code but doesn't run
-    # 2 = Can be referenced in code and runs in client
-    enable_starlight=0
-    enable_sodium=1
-    enable_lithium=0
-    enable_iris=0
-    enable_bclib=0
-
-# Forge loader
-forge_version=40.0.18
-    # Forge mod versions
-    starlight_version_forge=0
-
-    # Forge mod run
-    # 0 = Dont enable and don't run
-    # 1 = Can be referenced in code but doesn't run
-    # 2 = Can be referenced in code and runs in client
-    enable_starlight_forge=0

Readme.md

@@ -1,9 +1,4 @@
-# <img src="https://gitlab.com/jeseibel/distant-horizons-core/-/raw/main/_logo%20files/LOD%20logo%20flat%20-%20with%20boarder.png" width="32"> Distant Horizons
+# Distant Horizons
-
-> A mod that adds a Level of Detail System to Minecraft
-
-
-# What is Distant Horizons?
 
 This mod adds a Level Of Detail (LOD) system to Minecraft.\
 This implementation renders simplified chunks outside the normal render distance\
@@ -12,80 +7,42 @@ allowing for an increased view distance without harming performance.
 Or in other words: this mod lets you see farther without turning your game into a slide show.\
 If you want to see a quick demo, check out a video covering the mod here:
 
-<a href="https://www.youtube.com/watch?v=H2tnvEVbO1c" target="_blank">![Minecraft Level Of Detail (LOD) mod - Alpha 1.5](https://i.ytimg.com/vi_webp/H2tnvEVbO1c/mqdefault.webp)</a>
+<a href="https://www.youtube.com/watch?v=H2tnvEVbO1c" target="_blank">![Minecraft Level Of Detail (LOD) mod - Alpha 1.4](https://i.ytimg.com/vi_webp/H2tnvEVbO1c/mqdefault.webp)</a>
 
-### Versions
-
-Architectury version: 3.4-SNAPSHOT\
-Java Compiler plugin: Manifold Preprocessor
-
-#### 1.18.2 mods
-Forge version: 40.0.18\
-Fabric version: 0.13.3\
-Fabric API version: 0.48.0+1.18.2\
-Modmenu version: 3.1.0
-
-#### 1.18.1 mods
-Forge version: 39.1.2\
-Fabric version: 0.13.3\
-Fabric API version: 0.46.6+1.18\
-Modmenu version: 3.0.1
 
+Forge version: 1.16.5-36.1.0
 
 Notes:\
-This version has been confirmed to work in IDE and Retail Minecraft.\
+This version has been confirmed to work in Eclipse and Retail Minecraft.\
-(Retail running forge version 1.18.1-39.0.5 and fabric version 1.18-0.12.12 and 1.18.1-0.13.2)
+(Retail running forge version 1.16.5-36.1.0)
 
 
-## Source Code Installation
+## source code installation
 
-See the Fabric Documentation online for more detailed instructions:\
+See the Forge Documentation online for more detailed instructions:\
-https://fabricmc.net/wiki/tutorial:setup
+http://mcforge.readthedocs.io/en/latest/gettingstarted/
 
-### Prerequisites
+1. Create a system variable called "JAVA_MC_HOME" with the location of the JDK 1.8.0_251 (This is needed for gradle to work correctly)
+2. replace JAVA_HOME with JAVA_MC_HOME in gradle.bat
+3. open a command line in the project folder
 
-* A Java Development Kit (JDK) for Java 17 (recommended) or newer. Visit https://www.oracle.com/java/technologies/downloads/ for installers.
+**If using Ecplise:**
-* Git or someway to clone git projects. Visit https://git-scm.com/ for installers.
-* (Not required) Any Java IDE with plugins that support Manifold, for example Intellij IDEA.
-
-**If using IntelliJ:**
-0. Install Manifold plugin
-1. open IDEA and import the build.gradle
-2. refresh the Gradle project in IDEA if required
-
-**If using Ecplise: (Note that Eclispe currently doesn't support Manifold's preprocessor!)**
 1. run the command: `./gradlew geneclipseruns`
 2. run the command: `./gradlew eclipse`
-3. Make sure eclipse has the JDK 17 installed. (This is needed so that eclipse can run minecraft)
+3. Make sure eclipse has the JDK 1.8.0_251 installed. (This is needed so that eclipse can run minecraft)
 4. Import the project into eclipse
 
-## Switching Versions
+**If using IntelliJ:**
-This branch support 2 built versions:
+1. open IDEA and import the build.gradle
- - 1.18.2
+2. run the command: `./gradlew genIntellijRuns`
- - 1.18.1 (which also runs on 1.18)
+3. refresh the Gradle project in IDEA if required
 
-To switch between active versions, change `mcVer=1.18.?` in `gradle.properties` file.
 
-If running on IDE, to ensure IDE pickup the changed versions, you will need to run a gradle command again to allow gradle to update all the libs. (In IntellJ you will also need to do a gradle sync again if it didn't start it automatically.)
->Note: There may be a `java.nio.file.FileSystemException` thrown on running the command after switching versions. To fix it, either restart your IDE (as your IDE is locking up a file) or use tools like LockHunter to unlock the linked file. (Often a lib file under `common\build\lib` or `forge\build\lib` or `fabric\build\lib`). If anyone knows how to solve this issue please comment to this issue: https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues/233
- 
 ## Compiling
 
-**Using GUI**
+1. open a command line in the project folder
-1. Download the zip of the project and extract it
+2. run the command: `./gradlew build`
-2. Download the core from https://gitlab.com/jeseibel/distant-horizons-core and extract into a folder called `core`
+3. the compiled jar file will be in the folder `build\libs`
-3. Open a command line in the project folder
-4. Run the command: `./gradlew assemble`
-5. Then run command: `./gradlew mergeJars`
-6. The compiled jar file will be in the folder `Merged`
-
-**If in terminal:**
-1. `git clone -b preprocessor_test --recurse-submodules https://gitlab.com/jeseibel/minecraft-lod-mod.git`
-2. `cd minecraft-lod-mod`
-3. `./gradlew assemble`
-4. `./gradlew mergeJars`
-5. The compiled jar file will be in the folder `Merged`
->Note: You can add the arg: `-PmcVer=1.18.?` to tell gradle to build a selected MC version instead of having to manually modify the `gradle.properties` file.
 
 
 ## Other commands
@@ -101,17 +58,11 @@ The Minecraft source code is NOT added to your workspace in an editable way. Min
 
 Source code uses Mojang mappings.
 
-## Useful commands
+The source code can be 'created' with the `./eclipse` command and can be found in the following path:\
+`minecraft-lod-mod\build\fg_cache\mcp\ VERSION \joined\ RANDOM_STRING \patch\output.jar`
 
-Build only Fabric: `./gradlew fabric:assemble` or `./gradlew fabric:build`\
-Build only Forge: `./gradlew fabric:assemble` or `./gradlew forge:build`\
-Run the Fabric client (for debugging): `./gradlew fabric:runClient`\
-Run the Forge client (for debugging): `./gradlew forge:runClient`
 
 ## Open Source Acknowledgements
 
 XZ for Java (data compression)\
 https://tukaani.org/xz/java.html
-
-DHJarMerger (To merge multiple mod versions into one jar)\
-https://github.com/Ran-helo/DHJarMerger

build.gradle

@@ -1,199 +1,270 @@
-import io.github.ran.jarmerger.JarMergerPlugin
-
-
 buildscript {
-    dependencies{
+    repositories {
-        classpath files('plugins/DHJarMerger-1.0.jar')
+        maven { url = 'https://files.minecraftforge.net' }
+        mavenCentral()
+        // potential replacement in case of problems: https://dist.creeper.host/Sponge/maven
+		maven { url = 'https://repo.spongepowered.org/maven/' }
+		// used to download and compile dependencies from git repos
+		maven { url 'https://jitpack.io' }
+        gradlePluginPortal()
+    }
+    dependencies {
+    	// Note to self: Don't try to update ForgeGradle!
+    	// As of 11-27-2021 Mixins don't work on Gradle 7, 
+    	// which the newer versions of ForgeGradle use
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3+', changing: true
+		classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
     }
 }
 
 plugins {
-    id "architectury-plugin" version "3.4-SNAPSHOT"
+    id "com.github.johnrengelman.shadow" version "4.0.4"
-    id "dev.architectury.loom" version "0.10.0-SNAPSHOT" apply false
 }
 
-def writeBuildGradlePredefine() {
+apply plugin: 'net.minecraftforge.gradle'
-    def excapedMCVersion = rootProject.minecraft_version.replace(".", "_")
+apply plugin: 'org.spongepowered.mixin'
-    new File(projectDir, "build.properties").text = "MC_VERSION_${excapedMCVersion}=\n"
+// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
-}
+apply plugin: 'eclipse'
+apply plugin: 'maven-publish'
 
-def loadProperties() {
+version = 'a1.5.4'
-    def defaultMcVersion = '1.18.2'
+group = 'com.seibel.lod'
-    if (!project.hasProperty("mcVer")) {
+archivesBaseName = 'Distant-Horizons_1.16.5'
-        println "No mcVer set! Defaulting to ${defaultMcVersion}."
-        println "Tip: Use -PmcVer='${defaultMcVersion}' in cmd arg to set mcVer."
-    }
-	def mcVersion = project.hasProperty("mcVer") ? mcVer : defaultMcVersion
 
-	println "Loading properties file at " + mcVersion + ".properties"
+
-	def props = new Properties()
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
-	props.load(new FileInputStream("$rootProject.rootDir/"+"$mcVersion"+".properties"))
+
+println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
+minecraft {
+    // The mappings can be changed at any time, and must be in the following format.
+    // snapshot_YYYYMMDD   Snapshot are built nightly.
+    // stable_#            Stables are built at the discretion of the MCP team.
+    // Use non-default mappings at your own risk. they may not always work.
+    // Simply re-run your setup task after changing the mappings to update your workspace.
+	mappings channel: 'official', version: '1.16.5'
 	
-    props.each { prop ->
+    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
-      rootProject.ext.set(prop.key, prop.value)
+    
-	  // println "Added prop [key:" + prop.key + ", value:" + prop.value + "]"
+    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
-    }
-    writeBuildGradlePredefine()
-}
-loadProperties()
 
-apply plugin: JarMergerPlugin
+    // Default run configurations.
+    // These can be tweaked, removed, or duplicated as needed.
+    runs {
+        client {
+            workingDirectory project.file('run')
+			arg "-mixin.config=lod.mixins.json"
 
-architectury {
+            // Recommended logging data for a userdev environment
-    minecraft = rootProject.minecraft_version
+            // The markers can be changed as needed. 
-}
+            // "SCAN": For mods scan.
+            // "REGISTRIES": For firing of registry events.
+            // "REGISTRYDUMP": For getting the contents of all registries.
+            property 'forge.logging.markers', 'REGISTRIES'
 
-subprojects { p ->
+            // Recommended logging level for the console
-    apply plugin: "dev.architectury.loom"
+            // You can set various levels here.
+            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
+            property 'forge.logging.console.level', 'debug'
 
-    loom {
+            mods {
-        silentMojangMappingsLicense()
+                examplemod {
-    }
+                    source sourceSets.main
-
+                }
-    configurations {
-        common
-        shadowMe
-        implementation.extendsFrom shadowMe
-    }
-
-    dependencies {
-        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        // The following line declares the mojmap mappings
-        mappings loom.officialMojangMappings()
-		
-		//Manifold
-		annotationProcessor "systems.manifold:manifold-preprocessor:${rootProject.manifold_version}"
-
-        // Toml
-        implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
-
-        if (p != project(":forge")) {
-            // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
-            // Do NOT use other classes from fabric loader unless working with fabric
-            modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-        }
-
-        if (p != project(":core")) {
-            common(project(":core")) { transitive false }
-            shadowMe(project(":core")) { transitive false }
-        }
-    }
-
-    jar {
-        manifest {
-            attributes 'Implementation-Title': rootProject.archives_base_name,
-                    'Implementation-Version': rootProject.mod_version,
-                    'Main-Class': 'com.seibel.lod.core.JarMain'
-        }
-    }
-}
-
-allprojects { p ->
-    apply plugin: "java"
-    apply plugin: "architectury-plugin"
-    apply plugin: "maven-publish"
-
-    archivesBaseName = rootProject.archives_base_name
-    version = rootProject.mod_version
-    group = rootProject.maven_group
-
-    repositories {
-        mavenCentral()
-        // used to download and compile dependencies from git repos
-        maven { url 'https://jitpack.io' }
-		
-		// For Manifold Preprocessor
-		maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
-
-        // Required for importing Modrinth mods
-        maven {
-            name = "Modrinth"
-            url = "https://api.modrinth.com/maven"
-            content {
-                includeGroup "maven.modrinth"
             }
         }
 
-        // Required for importing CursedForge mods
+        server {
-        maven {
+            workingDirectory project.file('run')
-            url "https://www.cursemaven.com"
+			arg "-mixin.config=lod.mixins.json"
-            content {
+			
-                includeGroup "curse.maven"
+            // Recommended logging data for a userdev environment
+            // The markers can be changed as needed. 
+            // "SCAN": For mods scan.
+            // "REGISTRIES": For firing of registry events.
+            // "REGISTRYDUMP": For getting the contents of all registries.
+            property 'forge.logging.markers', 'REGISTRIES'
+
+            // Recommended logging level for the console
+            // You can set various levels here.
+            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
+            property 'forge.logging.console.level', 'debug'
+
+            mods {
+                examplemod {
+                    source sourceSets.main
+                }
             }
         }
 
-        // These 2 are for importing mods that arnt on CursedForge, Modrinth, GitHub, GitLab or anywhere opensource
+        data {
-        flatDir {
+            workingDirectory project.file('run')
-            dirs "${rootDir}/mods/fabric"
-            content {
-                includeGroup "fabric-mod"
-            }
-        }
-        flatDir {
-            dirs "${rootDir}/mods/forge"
-            content {
-                includeGroup "forge-mod"
-            }
-        }
-    }
 
+            // Recommended logging data for a userdev environment
+            // The markers can be changed as needed. 
+            // "SCAN": For mods scan.
+            // "REGISTRIES": For firing of registry events.
+            // "REGISTRYDUMP": For getting the contents of all registries.
+            property 'forge.logging.markers', 'REGISTRIES'
 
-    // Put stuff from gradle.properties into the mod info
+            // Recommended logging level for the console
-    processResources {
+            // You can set various levels here.
-        def resourceTargets = ["fabric.mod.json", "META-INF/mods.toml"] // Location of where to put
+            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
-        def intoTargets = ["$buildDir/resources/main/"] // Location of the built resources folder
+            property 'forge.logging.console.level', 'debug'
-        def replaceProperties = [
-                version: mod_version,
-                mod_name: mod_name,
-                authors: mod_authors,
-                description: mod_description,
-                homepage: mod_homepage,
-                source: mod_source,
-                issues: mod_issues,
-                minecraft_version: minecraft_version,
-                java_version: java_version
-        ]   // The left side is what gets replaced in the mod info and the right side is where to get it from in the gradle.properties
-        //TODO: Make Forge loader version also be relaced with non hardcoded value instead of "[36,41)"
 
-        inputs.properties replaceProperties
+            // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-        replaceProperties.put 'project', project
+            args '--mod', 'lod', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-        filesMatching(resourceTargets) {
-            expand replaceProperties
-        }
 
-        intoTargets.each { target ->
+            mods {
-            if (file(target).exists()) {
+                examplemod {
-                copy {
+                    source sourceSets.main
-                    from(sourceSets.main.resources) {
-                        include resourceTargets
-                        expand replaceProperties
-                    }
-                    into target
                 }
             }
         }
     }
+}
 
-
+sourceSets {
-    tasks.withType(JavaCompile) {
+    main {
-		// Add Manifold Preprocessor
+        java {
-//		def excapedMCVersion = rootProject.minecraft_version.replace(".", "_")
+        	// add Distant Horizon's Core source folders
-//		options.compilerArgs += ['-Xplugin:Manifold', "-AMC_VERSION_${excapedMCVersion}"]
+            srcDirs("core/src/main/java");
-//
+            srcDirs("core/src/main/resources")
-        options.compilerArgs += ['-Xplugin:Manifold']
+        }
-
+        resources {
-		// println options.compilerArgs
+        	// Include resources generated by data generators.
-        if (p != project(":core")) {
+        	srcDir("src/generated/resources")
-            options.release = rootProject.java_version as Integer
         }
     }
+}
 
-    java {
+// this is required so that we can use 
-        withSourcesJar()
+// jitpack in the dependencies section below 
-    }
+repositories {
+    mavenCentral()
+	// used to download and compile dependencies from git repos 
+	maven { url 'https://jitpack.io' }
+}
 
-    if (p == project(":core") || p == project(":common")) {
+configurations {
-        runClient.enabled = false
+    shadowMe
-        runServer.enabled = false
+    compileOnly.extendsFrom(embed)
+}
+
+dependencies {
+    // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
+    // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
+    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
+    minecraft 'net.minecraftforge:forge:1.16.5-36.1.0'
+	
+	// required to generate the mixin refmap
+	annotationProcessor 'org.spongepowered:mixin:0.8:processor'
+	
+    implementation 'org.tukaani:xz:1.9'
+    shadowMe 'org.tukaani:xz:1.9'
+    implementation 'org.apache.commons:commons-compress:1.21'
+    shadowMe 'org.apache.commons:commons-compress:1.21'
+
+    // these were added to hopefully allow for cloning
+    // configuredFeatures to allow for safe
+    // multi threaded feature generation. Sadly I couldn't find
+    // a way to duplicate lambda functions (which features use)
+    // so for now I'm not sure what to do.
+    //implementation 'io.github.kostaskougios:cloning:1.10.3'
+    //
+    //implementation ('com.esotericsoftware:kryo:5.1.1') {
+    //  exclude group: "org.objenesis"
+    //}
+    //implementation 'org.objenesis:objenesis:3.2'
+
+
+    // You may put jars on which you depend on in ./libs or you may define them like so..
+    // compile "some.group:artifact:version:classifier"
+    // compile "some.group:artifact:version"
+
+    // Real examples
+    // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
+    // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
+
+    // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
+    // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+
+    // These dependencies get remapped to your current MCP mappings
+    // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+
+    // For more info...
+    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
+    // http://www.gradle.org/docs/current/userguide/dependency_management.html
+}
+
+task copyCoreResources(type: Copy) {
+    from file("core/src/main/resources/shaders")
+    into file("src/generated/resources/shaders")
+}
+
+task copyCoreResourcesAtRuntime(type: Copy) {
+    from file("core/src/main/resources/shaders")
+    into file("build/resources/main/shaders")
+}
+
+compileJava.dependsOn(copyCoreResources).dependsOn(copyCoreResourcesAtRuntime)
+
+jar {
+    classifier 'withoutDependencies'
+}
+
+shadowJar {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    configurations = [project.configurations.getByName("shadowMe")]
+    relocate 'org.tukaani', 'shaded.tukaani'
+    relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress'
+    classifier ''
+}
+
+reobf {
+    shadowJar {
+        dependsOn tasks.createMcpToSrg
+        mappings = tasks.createMcpToSrg.outputs.files.singleFile
     }
 }
+
+artifacts {
+    archives tasks.shadowJar
+}
+
+// Example for how to get properties into the manifest for reading by the runtime..
+jar {
+    manifest {
+        attributes([
+            "Specification-Title": "LOD",
+            "Specification-Version": "1", // We are version 1 of ourselves
+            "Implementation-Title": project.name,
+            "Implementation-Version": "1",
+            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+			"MixinConfigs": "lod.mixins.json",
+        ])
+    }
+}
+// Example configuration to allow publishing using the maven-publish task
+// This is the preferred method to reobfuscate your jar file
+jar.finalizedBy('reobfJar')
+// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
+//publish.dependsOn('reobfJar')
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            artifact jar
+        }
+    }
+    repositories {
+        maven {
+            url "file:///${project.projectDir}/mcmodsrepo"
+        }
+    }
+}
+
+mixin {
+    add sourceSets.main, "lod.refmap.json"
+    config "lod.mixins.json"
+}
+

build.properties

@@ -1 +0,0 @@
-MC_VERSION_1_18_2=

common/build.gradle

@@ -1,29 +0,0 @@
-loom {
-    accessWidenerPath.set(file("src/main/resources/lod.accesswidener"))
-}
-
-architectury {
-    common()
-}
-
-afterEvaluate {
-    tasks {
-        remapJar {
-            remapAccessWidener.set(false)
-        }
-    }
-}
-
-publishing {
-    publications {
-        mavenCommon(MavenPublication) {
-            artifactId = rootProject.archives_base_name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}

common/src/main/java/com/seibel/lod/common/Config.java

@@ -1,402 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.common;
-
-import com.seibel.lod.core.config.*;
-import com.seibel.lod.core.enums.config.*;
-import com.seibel.lod.core.enums.rendering.*;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IAdvanced.*;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IGraphics.*;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IGraphics.IFogQuality.IAdvancedFog;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IGraphics.IFogQuality.IAdvancedFog.IHeightFog;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IMultiplayer;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IWorldGenerator;
-
-
-/**
- * This handles any configuration the user has access to.
- * @author coolGi2007
- * @version 12-12-2021
- */
-
-public class Config
-//public class Config extends TinyConfig
-{
-	// CONFIG STRUCTURE
-	// 	-> Client
-	//		|
-	//		|-> Graphics
-	//		|		|-> Quality
-	//		|		|-> FogQuality
-	//		|		|-> AdvancedGraphics
-	//		|
-	//		|-> World Generation
-	//		|
-	//		|-> Advanced
-	//				|-> Threads
-	//				|-> Buffers
-	//				|-> Debugging
-	
-	// Since the original config system uses forge stuff, that means we have to rewrite the whole config system
-	
-	@ConfigAnnotations.ScreenEntry
-	public static Client client;
-	
-	@ConfigAnnotations.FileComment
-	public static String _optionsButton = ILodConfigWrapperSingleton.IClient.OPTIONS_BUTTON_DESC;
-	// I know this option should be in Client
-	// This is a hacky method to not show the button in the options screen but show it in the mod menu
-	// Tough it is in client in the wrapper singleton
-	@ConfigAnnotations.Entry
-	public static boolean optionsButton = true;
-	
-	public static class Client
-	{
-		@ConfigAnnotations.ScreenEntry
-		public static Graphics graphics;
-		
-		@ConfigAnnotations.ScreenEntry
-		public static WorldGenerator worldGenerator;
-		
-		@ConfigAnnotations.ScreenEntry
-		public static Multiplayer multiplayer;
-		
-		@ConfigAnnotations.ScreenEntry
-		public static Advanced advanced;
-		
-		
-		public static class Graphics
-		{
-			@ConfigAnnotations.ScreenEntry
-			public static Quality quality;
-			
-			@ConfigAnnotations.ScreenEntry
-			public static FogQuality fogQuality;
-			
-			@ConfigAnnotations.ScreenEntry
-			public static AdvancedGraphics advancedGraphics;
-			
-			
-			public static class Quality
-			{
-				@ConfigAnnotations.FileComment
-				public static String _drawResolution = IQuality.DRAW_RESOLUTION_DESC;
-				@ConfigAnnotations.Entry
-				public static HorizontalResolution drawResolution = IQuality.DRAW_RESOLUTION_DEFAULT;
-				
-				@ConfigAnnotations.FileComment
-				public static String _lodChunkRenderDistance = IQuality.LOD_CHUNK_RENDER_DISTANCE_DESC;
-				@ConfigAnnotations.Entry(minValue = 16, maxValue = 2048)
-				public static int lodChunkRenderDistance = IQuality.LOD_CHUNK_RENDER_DISTANCE_MIN_DEFAULT_MAX.defaultValue;
-				
-				@ConfigAnnotations.FileComment
-				public static String _verticalQuality = IQuality.VERTICAL_QUALITY_DESC;
-				@ConfigAnnotations.Entry
-				public static VerticalQuality verticalQuality = IQuality.VERTICAL_QUALITY_DEFAULT;
-				
-				@ConfigAnnotations.FileComment
-				public static String _horizontalScale = IQuality.HORIZONTAL_SCALE_DESC;
-				@ConfigAnnotations.Entry(minValue = 2, maxValue = 32)
-				public static int horizontalScale = IQuality.HORIZONTAL_SCALE_MIN_DEFAULT_MAX.defaultValue;
-				
-				@ConfigAnnotations.FileComment
-				public static String _horizontalQuality = IQuality.HORIZONTAL_SCALE_DESC;
-				@ConfigAnnotations.Entry
-				public static HorizontalQuality horizontalQuality = IQuality.HORIZONTAL_QUALITY_DEFAULT;
-				
-				@ConfigAnnotations.FileComment
-				public static String _dropoffQuality = IQuality.DROPOFF_QUALITY_DESC;
-				@ConfigAnnotations.Entry
-				public static DropoffQuality dropoffQuality = IQuality.DROPOFF_QUALITY_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _lodBiomeBlending = IQuality.LOD_BIOME_BLENDING_DESC;
-				@ConfigAnnotations.Entry(minValue = 0, maxValue = 7)
-				public static int lodBiomeBlending = IQuality.LOD_BIOME_BLENDING_MIN_DEFAULT_MAX.defaultValue;
-			}
-			
-			
-			public static class FogQuality
-			{
-				@ConfigAnnotations.FileComment
-				public static String _fogDistance = IFogQuality.FOG_DISTANCE_DESC;
-				@ConfigAnnotations.Entry
-				public static FogDistance fogDistance = IFogQuality.FOG_DISTANCE_DEFAULT;
-				
-				@ConfigAnnotations.FileComment
-				public static String _fogDrawMode = IFogQuality.FOG_DRAW_MODE_DESC;
-				@ConfigAnnotations.Entry
-				public static FogDrawMode fogDrawMode = IFogQuality.FOG_DRAW_MODE_DEFAULT;
-				
-				@ConfigAnnotations.FileComment
-				public static String _fogColorMode = IFogQuality.FOG_COLOR_MODE_DESC;
-				@ConfigAnnotations.Entry
-				public static FogColorMode fogColorMode = IFogQuality.FOG_COLOR_MODE_DEFAULT;
-				
-				@ConfigAnnotations.FileComment
-				public static String _disableVanillaFog = IFogQuality.DISABLE_VANILLA_FOG_DESC;
-				@ConfigAnnotations.Entry
-				public static boolean disableVanillaFog = IFogQuality.DISABLE_VANILLA_FOG_DEFAULT;
-				
-				@ConfigAnnotations.ScreenEntry
-				public static AdvancedFog advancedFog;
-				
-				public static class AdvancedFog {
-					static final double SQRT2 = 1.4142135623730951;
-					
-					@ConfigAnnotations.FileComment
-					public static String _farFogStart = IAdvancedFog.FAR_FOG_START_DESC;
-					@ConfigAnnotations.Entry(minValue = 0.0, maxValue = SQRT2)
-					public static double farFogStart = IAdvancedFog.FAR_FOG_START_MIN_DEFAULT_MAX.defaultValue;
-					
-					@ConfigAnnotations.FileComment
-					public static String _farFogEnd = IAdvancedFog.FAR_FOG_END_DESC;
-					@ConfigAnnotations.Entry(minValue = 0.0, maxValue = SQRT2)
-					public static double farFogEnd = IAdvancedFog.FAR_FOG_END_MIN_DEFAULT_MAX.defaultValue;
-					
-					@ConfigAnnotations.FileComment
-					public static String _farFogMin = IAdvancedFog.FAR_FOG_MIN_DESC;
-					@ConfigAnnotations.Entry(minValue = -5.0, maxValue = SQRT2)
-					public static double farFogMin = IAdvancedFog.FAR_FOG_MIN_MIN_DEFAULT_MAX.defaultValue;
-					
-					@ConfigAnnotations.FileComment
-					public static String _farFogMax = IAdvancedFog.FAR_FOG_MAX_DESC;
-					@ConfigAnnotations.Entry(minValue = 0.0, maxValue = 5.0)
-					public static double farFogMax = IAdvancedFog.FAR_FOG_MAX_MIN_DEFAULT_MAX.defaultValue;
-					
-					@ConfigAnnotations.FileComment
-					public static String _farFogType = IAdvancedFog.FAR_FOG_TYPE_DESC;
-					@ConfigAnnotations.Entry
-					public static FogSetting.FogType farFogType = IAdvancedFog.FAR_FOG_TYPE_DEFAULT;
-					
-					@ConfigAnnotations.FileComment
-					public static String _farFogDensity = IAdvancedFog.FAR_FOG_DENSITY_DESC;
-					@ConfigAnnotations.Entry(minValue = 0.01, maxValue = 50.0)
-					public static double farFogDensity = IAdvancedFog.FAR_FOG_DENSITY_MIN_DEFAULT_MAX.defaultValue;
-					
-					@ConfigAnnotations.ScreenEntry
-					public static HeightFog heightFog;
-					
-					public static class HeightFog {
-						
-						@ConfigAnnotations.FileComment
-						public static String _heightFogMixMode = IHeightFog.HEIGHT_FOG_MIX_MODE_DESC;
-						@ConfigAnnotations.Entry
-						public static HeightFogMixMode heightFogMixMode = IHeightFog.HEIGHT_FOG_MIX_MODE_DEFAULT;
-						@ConfigAnnotations.FileComment
-						public static String _heightFogMode = IHeightFog.HEIGHT_FOG_MODE_DESC;
-						@ConfigAnnotations.Entry
-						public static HeightFogMode heightFogMode = IHeightFog.HEIGHT_FOG_MODE_DEFAULT;
-						
-						@ConfigAnnotations.FileComment
-						public static String _heightFogHeight = IHeightFog.HEIGHT_FOG_HEIGHT_DESC;
-						@ConfigAnnotations.Entry(minValue = -4096.0, maxValue = 4096.0)
-						public static double heightFogHeight = IHeightFog.HEIGHT_FOG_HEIGHT_MIN_DEFAULT_MAX.defaultValue;
-						
-						@ConfigAnnotations.FileComment
-						public static String _heightFogStart = IHeightFog.HEIGHT_FOG_START_DESC;
-						@ConfigAnnotations.Entry(minValue = 0.0, maxValue = SQRT2)
-						public static double heightFogStart = IHeightFog.HEIGHT_FOG_START_MIN_DEFAULT_MAX.defaultValue;
-						
-						@ConfigAnnotations.FileComment
-						public static String _heightFogEnd = IHeightFog.HEIGHT_FOG_END_DESC;
-						@ConfigAnnotations.Entry(minValue = 0.0, maxValue = SQRT2)
-						public static double heightFogEnd = IHeightFog.HEIGHT_FOG_END_MIN_DEFAULT_MAX.defaultValue;
-						
-						@ConfigAnnotations.FileComment
-						public static String _heightFogMin = IHeightFog.HEIGHT_FOG_MIN_DESC;
-						@ConfigAnnotations.Entry(minValue = -5.0, maxValue = SQRT2)
-						public static double heightFogMin = IHeightFog.HEIGHT_FOG_MIN_MIN_DEFAULT_MAX.defaultValue;
-						
-						@ConfigAnnotations.FileComment
-						public static String _heightFogMax = IHeightFog.HEIGHT_FOG_MAX_DESC;
-						@ConfigAnnotations.Entry(minValue = 0.0, maxValue = 5.0)
-						public static double heightFogMax = IHeightFog.HEIGHT_FOG_MAX_MIN_DEFAULT_MAX.defaultValue;
-						
-						@ConfigAnnotations.FileComment
-						public static String _heightFogType = IHeightFog.HEIGHT_FOG_TYPE_DESC;
-						@ConfigAnnotations.Entry
-						public static FogSetting.FogType heightFogType = IHeightFog.HEIGHT_FOG_TYPE_DEFAULT;
-						
-						@ConfigAnnotations.FileComment
-						public static String _heightFogDensity = IHeightFog.HEIGHT_FOG_DENSITY_DESC;
-						@ConfigAnnotations.Entry(minValue = 0.01, maxValue = 50.0)
-						public static double heightFogDensity = IHeightFog.HEIGHT_FOG_DENSITY_MIN_DEFAULT_MAX.defaultValue;
-						
-					}
-				}
-			}
-			
-			
-			public static class AdvancedGraphics
-			{
-				@ConfigAnnotations.FileComment
-				public static String _disableDirectionalCulling = IAdvancedGraphics.DISABLE_DIRECTIONAL_CULLING_DESC;
-				@ConfigAnnotations.Entry
-				public static boolean disableDirectionalCulling = IAdvancedGraphics.DISABLE_DIRECTIONAL_CULLING_DEFAULT;
-				
-				@ConfigAnnotations.FileComment
-				public static String _vanillaOverdraw = IAdvancedGraphics.VANILLA_OVERDRAW_DESC;
-				@ConfigAnnotations.Entry
-				public static VanillaOverdraw vanillaOverdraw = IAdvancedGraphics.VANILLA_OVERDRAW_DEFAULT;
-				
-				@ConfigAnnotations.FileComment
-				public static String _useExtendedNearClipPlane = IAdvancedGraphics.USE_EXTENDED_NEAR_CLIP_PLANE_DESC;
-				@ConfigAnnotations.Entry
-				public static boolean useExtendedNearClipPlane = IAdvancedGraphics.USE_EXTENDED_NEAR_CLIP_PLANE_DEFAULT;
-				
-				@ConfigAnnotations.FileComment
-				public static String _brightnessMultiplier = IAdvancedGraphics.BRIGHTNESS_MULTIPLIER_DESC;
-				@ConfigAnnotations.Entry
-				public static double brightnessMultiplier = IAdvancedGraphics.BRIGHTNESS_MULTIPLIER_DEFAULT;
-				
-				@ConfigAnnotations.FileComment
-				public static String _saturationMultiplier = IAdvancedGraphics.SATURATION_MULTIPLIER_DESC;
-				@ConfigAnnotations.Entry
-				public static double saturationMultiplier = IAdvancedGraphics.SATURATION_MULTIPLIER_DEFAULT;
-				
-				/*
-				@ConfigAnnotations.FileComment
-				public static String _backsideCullingRange = IAdvancedGraphics.VANILLA_CULLING_RANGE_DESC;
-				@ConfigAnnotations.Entry(minValue = 0, maxValue = 512)
-				public static int backsideCullingRange = IAdvancedGraphics.VANILLA_CULLING_RANGE_MIN_DEFAULT_MAX.defaultValue;
-				*/
-			}
-		}
-		
-		
-		public static class WorldGenerator
-		{
-			@ConfigAnnotations.FileComment
-			public static String _enableDistantGeneration = IWorldGenerator.ENABLE_DISTANT_GENERATION_DESC;
-			@ConfigAnnotations.Entry
-			public static boolean enableDistantGeneration = IWorldGenerator.ENABLE_DISTANT_GENERATION_DEFAULT;
-			
-			//			@ConfigAnnotations.FileComment
-//			public static String _distanceGenerationMode = IWorldGenerator.getDistanceGenerationModeDesc();
-			@ConfigAnnotations.Entry
-			public static DistanceGenerationMode distanceGenerationMode = IWorldGenerator.DISTANCE_GENERATION_MODE_DEFAULT;
-			
-			@ConfigAnnotations.FileComment
-			public static String _lightGenerationMode = IWorldGenerator.LIGHT_GENERATION_MODE_DESC;
-			@ConfigAnnotations.Entry
-			public static LightGenerationMode lightGenerationMode = IWorldGenerator.LIGHT_GENERATION_MODE_DEFAULT;
-			
-			@ConfigAnnotations.FileComment
-			public static String _generationPriority = IWorldGenerator.GENERATION_PRIORITY_DESC;
-			@ConfigAnnotations.Entry
-			public static GenerationPriority generationPriority = IWorldGenerator.GENERATION_PRIORITY_DEFAULT;
-
-			/*
-			@ConfigAnnotations.FileComment
-			public static String _allowUnstableFeatureGeneration = IWorldGenerator.ALLOW_UNSTABLE_FEATURE_GENERATION_DESC;
-			// FIXME: Temperary override. In 1.18, the newer Unstable gnerator is more usable
-			@ConfigAnnotations.Entry
-			public static boolean allowUnstableFeatureGeneration = true;//IWorldGenerator.ALLOW_UNSTABLE_FEATURE_GENERATION_DEFAULT;
-			*/
-			
-			@ConfigAnnotations.FileComment
-			public static String _blocksToAvoid = IWorldGenerator.BLOCKS_TO_AVOID_DESC;
-			@ConfigAnnotations.Entry
-			public static BlocksToAvoid blocksToAvoid = IWorldGenerator.BLOCKS_TO_AVOID_DEFAULT;
-		}
-		
-		
-		public static class Multiplayer
-		{
-			@ConfigAnnotations.FileComment
-			public static String _serverFolderNameMode = IMultiplayer.SERVER_FOLDER_NAME_MODE_DESC;
-			@ConfigAnnotations.Entry
-			public static ServerFolderNameMode serverFolderNameMode = IMultiplayer.SERVER_FOLDER_NAME_MODE_DEFAULT;
-			
-			@ConfigAnnotations.FileComment
-			public static String _multiDimensionRequiredSimilarity = IMultiplayer.MULTI_DIMENSION_REQUIRED_SIMILARITY_DESC;
-			@ConfigAnnotations.Entry
-			public static double multiDimensionRequiredSimilarity = IMultiplayer.MULTI_DIMENSION_REQUIRED_SIMILARITY_DEFAULT;
-			
-		}
-		
-		
-		public static class Advanced
-		{
-			@ConfigAnnotations.ScreenEntry
-			public static Threading threading;
-			
-			@ConfigAnnotations.ScreenEntry
-			public static Debugging debugging;
-			
-			@ConfigAnnotations.ScreenEntry
-			public static Buffers buffers;
-			
-			
-			public static class Threading
-			{
-				@ConfigAnnotations.FileComment
-				public static String _numberOfWorldGenerationThreads = IThreading.NUMBER_OF_WORLD_GENERATION_THREADS_DESC;
-				@ConfigAnnotations.Entry(minValue = 1, maxValue = 50)
-				public static int numberOfWorldGenerationThreads = IThreading.NUMBER_OF_WORLD_GENERATION_THREADS_DEFAULT.defaultValue;
-				
-				@ConfigAnnotations.FileComment
-				public static String _numberOfBufferBuilderThreads = IThreading.NUMBER_OF_BUFFER_BUILDER_THREADS_DESC;
-				@ConfigAnnotations.Entry(minValue = 1, maxValue = 50)
-				public static int numberOfBufferBuilderThreads = IThreading.NUMBER_OF_BUFFER_BUILDER_THREADS_MIN_DEFAULT_MAX.defaultValue;
-			}
-			
-			
-			public static class Debugging
-			{
-				@ConfigAnnotations.FileComment
-				public static String _drawLods = IDebugging.DRAW_LODS_DESC;
-				@ConfigAnnotations.Entry
-				public static boolean drawLods = IDebugging.DRAW_LODS_DEFAULT;
-				
-				@ConfigAnnotations.FileComment
-				public static String _debugMode = IDebugging.DEBUG_MODE_DESC;
-				@ConfigAnnotations.Entry
-				public static DebugMode debugMode = IDebugging.DEBUG_MODE_DEFAULT;
-				
-				@ConfigAnnotations.FileComment
-				public static String _enableDebugKeybindings = IDebugging.DEBUG_KEYBINDINGS_ENABLED_DESC;
-				@ConfigAnnotations.Entry
-				public static boolean enableDebugKeybindings = IDebugging.DEBUG_KEYBINDINGS_ENABLED_DEFAULT;
-			}
-			
-			
-			public static class Buffers
-			{
-				@ConfigAnnotations.FileComment
-				public static String _gpuUploadMethod = IBuffers.GPU_UPLOAD_METHOD_DESC;
-				@ConfigAnnotations.Entry
-				public static GpuUploadMethod gpuUploadMethod = IBuffers.GPU_UPLOAD_METHOD_DEFAULT;
-				
-				@ConfigAnnotations.FileComment
-				public static String _gpuUploadPerMegabyteInMilliseconds = IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DESC;
-				@ConfigAnnotations.Entry(minValue = 0, maxValue = 50)
-				public static int gpuUploadPerMegabyteInMilliseconds = IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DEFAULT.defaultValue;
-				
-				@ConfigAnnotations.FileComment
-				public static String _rebuildTimes = IBuffers.REBUILD_TIMES_DESC;
-				@ConfigAnnotations.Entry
-				public static BufferRebuildTimes rebuildTimes = IBuffers.REBUILD_TIMES_DEFAULT;
-			}
-		}
-	}
-}

common/src/main/java/com/seibel/lod/common/LodCommonMain.java

@@ -1,39 +0,0 @@
-package com.seibel.lod.common;
-
-import com.seibel.lod.common.forge.LodForgeMethodCaller;
-import com.seibel.lod.common.networking.NetworkInterface;
-import com.seibel.lod.common.wrappers.DependencySetup;
-import com.seibel.lod.common.wrappers.config.ConfigGui;
-
-/**
- * This is the common main class
- * @author Ran
- */
-public class LodCommonMain {
-    public static boolean forge = false;
-    public static boolean serverSided;
-    public static LodForgeMethodCaller forgeMethodCaller;
-    public static NetworkInterface networkInterface;
-
-    public static void startup(LodForgeMethodCaller caller, boolean serverSided, NetworkInterface networkInterface) {
-        LodCommonMain.serverSided = serverSided;
-        if (caller != null) {
-            LodCommonMain.forge = true;
-            forgeMethodCaller = caller;
-        }
-
-        DependencySetup.createInitialBindings();
-
-        LodCommonMain.networkInterface = networkInterface;
-        if (!serverSided) {
-            networkInterface.register_Client();
-        } else {
-            networkInterface.register_Server();
-        }
-    }
-
-
-    public static void initConfig() {
-        ConfigGui.init(Config.class);
-    }
-}

common/src/main/java/com/seibel/lod/common/forge/LodForgeMethodCaller.java

@@ -1,19 +0,0 @@
-package com.seibel.lod.common.forge;
-
-import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper;
-import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-
-import java.util.List;
-import java.util.Random;
-
-/**
- * used for calling methods that forge modified
- * (forge modifies vanilla methods for some reason)
- * @author Ran
- */
-public interface LodForgeMethodCaller {
-    List<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, Random random);
-}

common/src/main/java/com/seibel/lod/common/networking/NetworkHandler.java

@@ -1,30 +0,0 @@
-package com.seibel.lod.common.networking;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.network.ServerGamePacketListenerImpl;
-
-/**
- * This is packet handler for our mod
- * It basically handles the packets sent from the server & client
- *
- * @author Ran
- */
-public class NetworkHandler {
-    // If you need the response sender then tell me
-    // I'll add extra code to get the response sender
-    public static void receivePacketClient(Minecraft client, ClientPacketListener handler, FriendlyByteBuf buf) {
-        // TODO: Server sided stuff here
-        // You can make client execute something by using client.execute(Runnable)
-        // In the fabric docs it says that client.execute is ran on the render thread?
-    }
-
-    // If you need the response sender then tell me
-    // I'll add extra code to get the response sender
-    public static void receivePacketServer(MinecraftServer server, ServerPlayer client, ServerGamePacketListenerImpl handler, FriendlyByteBuf buf) {
-        // TODO: Server sided stuff here
-    }
-}

common/src/main/java/com/seibel/lod/common/networking/NetworkInterface.java

@@ -1,9 +0,0 @@
-package com.seibel.lod.common.networking;
-
-/**
- * @author Ran
- */
-public interface NetworkInterface {
-    void register_Client();
-    void register_Server();
-}

common/src/main/java/com/seibel/lod/common/networking/Networking.java

@@ -1,100 +0,0 @@
-package com.seibel.lod.common.networking;
-
-import com.seibel.lod.core.ModInfo;
-import io.netty.buffer.Unpooled;
-import net.minecraft.client.Minecraft;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket;
-import net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.level.ServerPlayer;
-
-import java.util.Objects;
-
-/**
- * This class holds most of the networking code for the mod.
- * @author Ran
- */
-public class Networking {
-    public static final ResourceLocation resourceLocation_meow = new ResourceLocation("lod", "meow");
-
-    public static FriendlyByteBuf createNew() {
-        // TODO: Probably replace the Unpooled.buffer()
-        FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.buffer());
-        buf.writeInt(ModInfo.PROTOCOL_VERSION);
-        return buf;
-    }
-
-    /*
-     * All code below is from the fabric api and might have been modified to work with Distant Horizons
-     * Which is licensed under the Apache License 2.0
-     */
-
-    /**
-     * Sends a packet to a player.
-     *
-     * @param player the player to send the packet to
-     * @param buf the payload of the packet.
-     */
-    public static void send(ServerPlayer player, FriendlyByteBuf buf) {
-        Objects.requireNonNull(player, "Server player entity cannot be null");
-        Objects.requireNonNull(resourceLocation_meow, "Channel name cannot be null");
-        Objects.requireNonNull(buf, "Packet byte buf cannot be null");
-
-        player.connection.send(createS2CPacket(resourceLocation_meow, buf));
-    }
-
-    /**
-     * Sends a packet to the connected server.
-     *
-     * @param buf the payload of the packet
-     * @throws IllegalStateException if the client is not connected to a server
-     */
-    public static void send(FriendlyByteBuf buf) throws IllegalStateException {
-        // You cant send without a client player, so this is fine
-        if (Minecraft.getInstance().getConnection() != null) {
-            Minecraft.getInstance().getConnection().send(createC2SPacket(resourceLocation_meow, buf));
-            return;
-        }
-
-        throw new IllegalStateException("Cannot send packets when not in game!");
-    }
-
-    /**
-     * Creates a packet which may be sent to the connected client.
-     *
-     * @param channelName the channel name
-     * @param buf the packet byte buf which represents the payload of the packet
-     * @return a new packet
-     */
-    public static Packet<?> createS2CPacket(ResourceLocation channelName, FriendlyByteBuf buf) {
-        Objects.requireNonNull(channelName, "Channel cannot be null");
-        Objects.requireNonNull(buf, "Buf cannot be null");
-
-        return createPlayS2CPacket(channelName, buf);
-    }
-
-    public static Packet<?> createPlayS2CPacket(ResourceLocation channel, FriendlyByteBuf buf) {
-        return new ClientboundCustomPayloadPacket(channel, buf);
-    }
-
-    /**
-     * Creates a packet which may be sent to a the connected server.
-     *
-     * @param channelName the channel name
-     * @param buf the packet byte buf which represents the payload of the packet
-     * @return a new packet
-     */
-    public static Packet<?> createC2SPacket(ResourceLocation channelName, FriendlyByteBuf buf) {
-        Objects.requireNonNull(channelName, "Channel name cannot be null");
-        Objects.requireNonNull(buf, "Buf cannot be null");
-
-        return createPlayC2SPacket(channelName, buf);
-    }
-
-    public static Packet<?> createPlayC2SPacket(ResourceLocation channelName, FriendlyByteBuf buf) {
-        return new ServerboundCustomPayloadPacket(channelName, buf);
-    }
-
-}

common/src/main/java/com/seibel/lod/common/wrappers/DependencySetup.java

@@ -1,38 +0,0 @@
-package com.seibel.lod.common.wrappers;
-
-import com.seibel.lod.common.LodCommonMain;
-import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper;
-import com.seibel.lod.common.wrappers.minecraft.MinecraftRenderWrapper;
-import com.seibel.lod.core.handlers.IReflectionHandler;
-import com.seibel.lod.core.handlers.ReflectionHandler;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.wrapperInterfaces.IVersionConstants;
-import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
-
-/**
- * Binds all necessary dependencies, so we
- * can access them in Core. <br>
- * This needs to be called before any Core classes
- * are loaded.
- *
- * @author James Seibel
- * @author Ran
- * @version 12-1-2021
- */
-public class DependencySetup {
-    public static void createInitialBindings()
-    {
-        SingletonHandler.bind(IVersionConstants.class, VersionConstants.INSTANCE);
-        if (!LodCommonMain.serverSided)
-        {
-            SingletonHandler.bind(IMinecraftClientWrapper.class, MinecraftClientWrapper.INSTANCE);
-            SingletonHandler.bind(IMinecraftRenderWrapper.class, MinecraftRenderWrapper.INSTANCE);
-            SingletonHandler.bind(IReflectionHandler.class, ReflectionHandler.createSingleton(MinecraftClientWrapper.INSTANCE.getOptions().getClass().getDeclaredFields(), MinecraftClientWrapper.INSTANCE.getOptions()));
-        }
-
-        SingletonHandler.bind(IWrapperFactory.class, WrapperFactory.INSTANCE);
-        DependencySetupDoneCheck.isDone = true;
-    }
-}

common/src/main/java/com/seibel/lod/common/wrappers/DependencySetupDoneCheck.java

@@ -1,10 +0,0 @@
-package com.seibel.lod.common.wrappers;
-
-import java.util.function.Supplier;
-
-public class DependencySetupDoneCheck
-{
-	public static boolean isDone = false;
-	public static Supplier<Boolean> getIsCurrentThreadDistantGeneratorThread = (() -> {return false;});
-	
-}

common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java

@@ -1,79 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.common.wrappers;
-
-import java.nio.FloatBuffer;
-
-import com.mojang.math.Matrix4f;
-import com.seibel.lod.common.wrappers.block.BlockPosWrapper;
-import com.seibel.lod.core.enums.LodDirection;
-import com.seibel.lod.core.objects.math.Mat4f;
-import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-
-/**
- * This class converts to and from Minecraft objects (Ex: Matrix4f)
- * and objects we created (Ex: Mat4f).
- *
- * @author James Seibel
- * @version 11-20-2021
- */
-public class McObjectConverter
-{
-    /** 4x4 float matrix converter */
-    public static Mat4f Convert(Matrix4f mcMatrix)
-    {
-        FloatBuffer buffer = FloatBuffer.allocate(16);
-        mcMatrix.store(buffer);
-        Mat4f matrix = new Mat4f(buffer);
-        matrix.transpose();
-        return matrix;
-    }
-
-
-    static final Direction[] directions;
-    static final LodDirection[] lodDirections;
-    static {
-    	LodDirection[] lodDirs = LodDirection.values();
-    	directions = new Direction[lodDirs.length];
-    	lodDirections = new LodDirection[lodDirs.length];
-    	for (LodDirection lodDir : lodDirs) {
-    		Direction dir = Direction.byName(lodDir.name());
-    		directions[lodDir.ordinal()] = dir;
-    		lodDirections[dir.ordinal()] = lodDir;
-    	}
-    }
-    
-    public static BlockPos Convert(AbstractBlockPosWrapper wrappedPos) {
-    	return new BlockPos(wrappedPos.getX(),wrappedPos.getY(), wrappedPos.getZ());
-    }
-    
-    
-    public static Direction Convert(LodDirection lodDirection)
-    {
-        return directions[lodDirection.ordinal()];
-    }
-    public static LodDirection Convert(Direction direction)
-    {
-        return lodDirections[direction.ordinal()];
-    }
-}

common/src/main/java/com/seibel/lod/common/wrappers/VersionConstants.java

@@ -1,39 +0,0 @@
-
-package com.seibel.lod.common.wrappers;
-
-import com.seibel.lod.core.enums.config.DistanceGenerationMode;
-import com.seibel.lod.core.wrapperInterfaces.IVersionConstants;
-
-/**
- * @author James Seibel
- * @version 12-11-2021
- */
-public class VersionConstants implements IVersionConstants
-{
-	public static final VersionConstants INSTANCE = new VersionConstants();
-	
-	
-	private VersionConstants()
-	{
-		
-	}
-	
-	
-	@Override
-	public int getMinimumWorldHeight()
-	{
-		return 0;
-	}
-
-	@Override
-	public int getWorldGenerationCountPerThread()
-	{
-		return 1;
-	}
-
-	@Override
-	public boolean isVanillaRenderedChunkSquare()
-	{
-		return false;
-	}
-}

common/src/main/java/com/seibel/lod/common/wrappers/block/BlockDetailMap.java

@@ -1,27 +0,0 @@
-package com.seibel.lod.common.wrappers.block;
-
-import java.util.concurrent.ConcurrentHashMap;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.block.state.BlockState;
-
-public class BlockDetailMap
-{
-	
-	private static ConcurrentHashMap<BlockState, BlockDetailWrapper> map = new ConcurrentHashMap<BlockState, BlockDetailWrapper>();
-	
-	private BlockDetailMap() {}
-	
-	public static BlockDetailWrapper getOrMakeBlockDetailCache(BlockState bs, BlockPos pos, LevelReader getter) {
-		BlockDetailWrapper cache = map.get(bs);
-		if (cache != null) return cache;
-		if (bs.getFluidState().isEmpty()) {
-			cache = BlockDetailWrapper.make(bs, pos, getter);
-		} else {
-			cache = BlockDetailWrapper.make(bs.getFluidState().createLegacyBlock(), pos, getter);
-		}
-		BlockDetailWrapper cacheCAS = map.putIfAbsent(bs, cache);
-		return cacheCAS==null ? cache : cacheCAS;
-	}
-}

common/src/main/java/com/seibel/lod/common/wrappers/block/BlockDetailWrapper.java

@@ -1,315 +0,0 @@
-package com.seibel.lod.common.wrappers.block;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.Random;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
-import com.seibel.lod.common.Config;
-import com.seibel.lod.common.wrappers.McObjectConverter;
-import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.lod.core.api.ApiShared;
-import com.seibel.lod.core.enums.LodDirection;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.util.ColorUtil;
-import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
-import com.seibel.lod.core.wrapperInterfaces.block.IBlockDetailWrapper;
-import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
-
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
-import net.minecraft.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.color.block.BlockTintCache;
-import net.minecraft.client.renderer.BiomeColors;
-import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Cursor3D;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.*;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.FlowerBlock;
-import net.minecraft.world.level.block.LeavesBlock;
-import net.minecraft.world.level.block.RenderShape;
-import net.minecraft.world.level.block.RotatedPillarBlock;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
-
-public class BlockDetailWrapper extends IBlockDetailWrapper
-{
-	private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
-
-	public static final int FLOWER_COLOR_SCALE = 5;
-
-	public static final Random random = new Random(0);
-
-	enum ColorMode {
-		Default,
-		Flower,
-		Leaves;
-		static ColorMode getColorMode(Block b) {
-			if (b instanceof LeavesBlock) return Leaves;
-			if (b instanceof FlowerBlock) return Flower;
-			return Default;
-		}
-	}
-	//TODO: Perhaps make this not just use the first frame?
-	private static int calculateColorFromTexture(TextureAtlasSprite texture, ColorMode colorMode) {
-		
-		int count = 0;
-		double alpha = 0;
-		double red = 0;
-		double green = 0;
-		double blue = 0;
-	    int tempColor;
-	    
-	    {
-	        // textures normally use u and v instead of x and y
-	        for (int u = 0; u < texture.getWidth(); u++)
-	        {
-	            for (int v = 0; v < texture.getHeight(); v++)
-	            {
-	            	//note: Minecraft color format is: 0xAA BB GG RR
-	            	//________ DH mod color format is: 0xAA RR GG BB
-	            	//OpenGL RGBA format native order: 0xRR GG BB AA
-	            	//_ OpenGL RGBA format Java Order: 0xAA BB GG RR
-	                tempColor = TextureAtlasSpriteWrapper.getPixelRGBA(texture, 0, u, v);
-	
-	                double r = ((tempColor & 0x000000FF)      )/255.;
-	                double g = ((tempColor & 0x0000FF00) >>> 8)/255.;
-	                double b = ((tempColor & 0x00FF0000) >>> 16)/255.;
-	                double a = ((tempColor & 0xFF000000) >>> 24)/255.;
-	                int scale = 1;
-	                
-	                if (colorMode == ColorMode.Leaves) {
-	                	r *= a;
-	                	g *= a;
-	                	b *= a;
-	                	a = 1.;
-	                } else if (a==0.) {
-	                	continue;
-	                } else if (colorMode == ColorMode.Flower && (g+0.1<b || g+0.1<r)) {
-	                	scale = FLOWER_COLOR_SCALE;
-	                }
-	                
-	                count += scale;
-	                alpha += a*a*scale;
-	                red += r*r*scale;
-	                green += g*g*scale;
-	                blue += b*b*scale;
-	            }
-	        }
-	    }
-	
-	    if (count == 0)
-	        // this block is entirely transparent
-	        tempColor = ColorUtil.rgbToInt(255,255,0,255);
-	    else
-	    {
-	        // determine the average color
-	        tempColor = ColorUtil.rgbToInt(
-	                (int) (Math.sqrt(alpha/count)*255.),
-	                (int) (Math.sqrt(red / count)*255.),
-	                (int) (Math.sqrt(green / count)*255.),
-	                (int) (Math.sqrt(blue / count)*255.));
-	    }
-	    // TODO: Remove this when transparency is added!
-	    double colorAlpha = ColorUtil.getAlpha(tempColor)/255.;
-	    tempColor = ColorUtil.rgbToInt(
-	    		ColorUtil.getAlpha(tempColor),
-	    		(int)(ColorUtil.getRed(tempColor) * colorAlpha),
-	    		(int)(ColorUtil.getGreen(tempColor) * colorAlpha),
-	    		(int)(ColorUtil.getBlue(tempColor) * colorAlpha)
-	    		);
-		return tempColor;
-	}
-
-
-	
-	
-	
-	private static final Block[] BLOCK_TO_AVOID = {Blocks.AIR, Blocks.CAVE_AIR, Blocks.BARRIER};
-
-	private static final Direction[] DIRECTION_ORDER = {Direction.UP, Direction.NORTH, Direction.EAST, Direction.WEST, Direction.SOUTH, Direction.DOWN};
-	
-	private static boolean isBlockToBeAvoid(Block b) {
-		for (Block bta : BLOCK_TO_AVOID)
-			if (bta==b) return true;
-		return false;
-	}
-	
-	final BlockState state;
-	final BlockPos samplePos;
-	final LevelReader sampleGetter;
-	
-	boolean isShapeResolved = false;
-	boolean[] dontOccludeFaces = null;
-	boolean noCollision = false;
-	boolean noFullFace = false;
-	
-	boolean isColorResolved = false;
-	int baseColor = 0; //TODO: Impl per-face color
-	boolean needShade = true;
-	boolean needPostTinting = false;
-	int tintIndex = 0;
-	
-	public static BlockDetailWrapper NULL_BLOCK_DETAIL = new BlockDetailWrapper();
-	
-	public BlockDetailWrapper(BlockState state, BlockPos pos, LevelReader getter) {
-		this.state = state;
-		this.samplePos = pos;
-		this.sampleGetter = getter;
-	}
-	
-	private BlockDetailWrapper() {
-		this.state = null;
-		this.samplePos = null;
-		this.sampleGetter = null;
-	}
-
-	static BlockDetailWrapper make(BlockState bs, BlockPos pos, LevelReader getter) {
-		if(!bs.getFluidState().isEmpty()) { // Is a fluidBlock
-			if (isBlockToBeAvoid(bs.getBlock())) return NULL_BLOCK_DETAIL;
-			if (bs.isAir()) return NULL_BLOCK_DETAIL;
-			return new BlockDetailWrapper(bs, pos, getter);
-		} else {
-			if (bs.getRenderShape() != RenderShape.MODEL) return NULL_BLOCK_DETAIL;
-			if (isBlockToBeAvoid(bs.getBlock())) return NULL_BLOCK_DETAIL;
-			return new BlockDetailWrapper(bs, pos, getter);
-		}
-	}
-	
-	private void resolveShapes() {
-		if (isShapeResolved) return;
-		if (state.getFluidState().isEmpty()) {
-			noCollision = state.getCollisionShape(sampleGetter, samplePos).isEmpty();
-			dontOccludeFaces = new boolean[6];
-			if (state.canOcclude()) {
-				/* FIXME: Figure out how or if needed to impl per-face culling?
-				for (Direction dir : Direction.values()) {
-					dontOccludeFaces[McObjectConverter.Convert(dir).ordinal()]
-							= state.getFaceOcclusionShape(sampleGetter, samplePos, dir).isEmpty();
-				}*/
-			} else {
-				Arrays.fill(dontOccludeFaces, true);
-			}
-			
-			VoxelShape voxelShape = state.getShape(sampleGetter, samplePos);
-            if (voxelShape.isEmpty()) {
-            	noFullFace = true;
-            } else {
-	            AABB bbox = voxelShape.bounds();
-	            double xWidth = (bbox.maxX - bbox.minX);
-	            double yWidth = (bbox.maxY - bbox.minY);
-	            double zWidth = (bbox.maxZ - bbox.minZ);
-	            noFullFace = xWidth < 1 && zWidth < 1 && yWidth < 1;
-            }
-		} else { // Liquid Block
-			dontOccludeFaces = new boolean[6];
-		}
-		isShapeResolved = true;
-	}
-	
-	private void resolveColors() {
-		if (isColorResolved) return;
-		if (state.getFluidState().isEmpty()) {
-			List<BakedQuad> quads = null;
-			for (Direction direction : DIRECTION_ORDER)
-	        {
-	        	quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
-	        			getBlockModel(state).getQuads(state, direction, random);
-	            if (!quads.isEmpty() &&
-	            	!(state.getBlock() instanceof RotatedPillarBlock && direction == Direction.UP))
-	                break;
-	        };
-	        if (quads != null && !quads.isEmpty()) {
-	        	needPostTinting = quads.get(0).isTinted();
-	        	needShade = quads.get(0).isShade();
-	        	tintIndex = quads.get(0).getTintIndex();
-	        	baseColor = calculateColorFromTexture(quads.get(0).getSprite(),
-	        		ColorMode.getColorMode(state.getBlock()));
-	        }
-		} else { // Liquid Block
-			
-			needPostTinting = true;
-			needShade = false;
-			tintIndex = 0;
-			baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(state),
-					ColorMode.getColorMode(state.getBlock()));
-			
-		}
-		isColorResolved = true;
-	}
-	
-	private BlockAndTintGetter wrapColorResolver(LevelReader level) {
-		int blendDistance = CONFIG.client().graphics().quality().getLodBiomeBlending();
-		if (blendDistance == 0) {
-			return new TintGetterOverrideFast(level);
-		} else {
-			return new TintGetterOverrideSmooth(level, blendDistance);
-		}
-	}
-	
-	@Override
-	public int getAndResolveFaceColor(LodDirection dir, IChunkWrapper chunk, AbstractBlockPosWrapper blockPos)
-	{
-		// FIXME: impl per-face colors
-		resolveColors();
-		if (!needPostTinting) return baseColor;
-		int tintColor = Minecraft.getInstance().getBlockColors()
-				.getColor(state, wrapColorResolver(((ChunkWrapper)chunk).getColorResolver()),
-					McObjectConverter.Convert(blockPos), tintIndex);
-		if (tintColor == -1) return baseColor;
-		return ColorUtil.multiplyARGBwithRGB(baseColor, tintColor);
-	}
-
-	@Override
-	public boolean hasFaceCullingFor(LodDirection dir)
-	{
-		resolveShapes();
-		return !dontOccludeFaces[dir.ordinal()];
-	}
-
-	@Override
-	public boolean hasNoCollision()
-	{
-		resolveShapes();
-		return noCollision;
-	}
-
-	@Override
-	public boolean noFaceIsFullFace()
-	{
-		resolveShapes();
-		return noFullFace;
-	}
-
-	@Override
-	public String serialize()
-	{
-		// FIXME: Impl this for the blockState Storage stuff
-		return null;
-	}
-
-	@Override
-	protected boolean isSame(IBlockDetailWrapper iBlockDetail)
-	{
-		return ((BlockDetailWrapper)iBlockDetail).state.getBlock().equals(state.getBlock());
-	}
-	
-}

common/src/main/java/com/seibel/lod/common/wrappers/block/BlockPosWrapper.java

@@ -1,84 +0,0 @@
-package com.seibel.lod.common.wrappers.block;
-
-import java.util.Objects;
-
-import com.seibel.lod.core.enums.LodDirection;
-import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
-
-import net.minecraft.core.BlockPos;
-
-
-/**
- * @author James Seibel
- * @version 11-21-2021
- */
-public class BlockPosWrapper extends AbstractBlockPosWrapper
-{
-    private final BlockPos.MutableBlockPos blockPos;
-
-
-    public BlockPosWrapper()
-    {
-        this.blockPos = new BlockPos.MutableBlockPos(0,0,0);
-    }
-
-    public BlockPosWrapper(int x, int y, int z)
-    {
-        this.blockPos = new BlockPos.MutableBlockPos(x, y, z);
-    }
-
-
-
-    @Override
-    public void set(int x, int y, int z)
-    {
-        blockPos.set(x, y, z);
-    }
-
-    @Override
-    public int getX()
-    {
-        return blockPos.getX();
-    }
-
-    @Override
-    public int getY()
-    {
-        return blockPos.getY();
-    }
-
-    @Override
-    public int getZ()
-    {
-        return blockPos.getZ();
-    }
-
-    @Override
-    public int get(LodDirection.Axis axis)
-    {
-        return axis.choose(getX(), getY(), getZ());
-    }
-
-    public BlockPos.MutableBlockPos getBlockPos()
-    {
-        return blockPos;
-    }
-
-    @Override public boolean equals(Object o)
-    {
-        return blockPos.equals(o);
-    }
-
-    @Override public int hashCode()
-    {
-        return Objects.hash(blockPos);
-    }
-
-    @Override
-    public BlockPosWrapper offset(int x, int y, int z)
-    {
-        blockPos.set(blockPos.getX() + x, blockPos.getY() + y, blockPos.getZ() + z);
-        return this;
-    }
-
-}

common/src/main/java/com/seibel/lod/common/wrappers/block/TextureAtlasSpriteWrapper.java

@@ -1,28 +0,0 @@
-package com.seibel.lod.common.wrappers.block;
-
-
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-
-/**
- * For wrapping/utilizing around TextureAtlasSprite
- * @author Ran
- */
-public class TextureAtlasSpriteWrapper {
-
-    /**
-     * This code is from Minecraft Forge
-     * Which is licensed under the terms of GNU Lesser General Public License
-     * as published by the Free Software Foundation version 2.1
-     * of the License.
-     *
-     * The code has been modified to use TextureAtlasSprite
-     */
-    public static int getPixelRGBA(TextureAtlasSprite sprite, int frameIndex, int x, int y) {
-        if (sprite.animatedTexture != null) {
-            x += sprite.animatedTexture.getFrameX(frameIndex) * sprite.width;
-            y += sprite.animatedTexture.getFrameY(frameIndex) * sprite.height;
-        }
-
-        return sprite.mainImage[0].getPixelRGBA(x, y);
-    }
-}

common/src/main/java/com/seibel/lod/common/wrappers/block/TintGetterOverrideFast.java

@@ -1,196 +0,0 @@
-package com.seibel.lod.common.wrappers.block;
-
-import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
-import net.minecraft.Util;
-import net.minecraft.client.color.block.BlockTintCache;
-import net.minecraft.client.renderer.BiomeColors;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Cursor3D;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.*;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
-public class TintGetterOverrideFast implements BlockAndTintGetter {
-    LevelReader parent;
-    private final Object2ObjectArrayMap<ColorResolver, ConcurrentHashMap<Biome, Integer>> tintCaches;
-
-    public TintGetterOverrideFast(LevelReader parent) {
-        this.parent = parent;
-        this.tintCaches = Util.make(new Object2ObjectArrayMap(3), object2ObjectArrayMap -> {
-            object2ObjectArrayMap.put(BiomeColors.GRASS_COLOR_RESOLVER, new ConcurrentHashMap<Biome, Integer>());
-            object2ObjectArrayMap.put(BiomeColors.FOLIAGE_COLOR_RESOLVER, new ConcurrentHashMap<Biome, Integer>());
-            object2ObjectArrayMap.put(BiomeColors.WATER_COLOR_RESOLVER, new ConcurrentHashMap<Biome, Integer>());
-        });
-    }
-
-    private Biome _getBiome(BlockPos pos) {
-		#if MC_VERSION_1_18_2
-        return parent.getBiome(pos).value();
-		#elif MC_VERSION_1_18_1
-		return parent.getBiome(pos);
-		#endif
-    }
-
-    @Override
-    public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) {
-        Biome b = _getBiome(blockPos);
-        return tintCaches.get(colorResolver).computeIfAbsent(b, (key) -> colorResolver.getColor(b, blockPos.getX(), blockPos.getZ()));
-    }
-
-    @Override
-    public float getShade(Direction direction, boolean bl) {
-        return parent.getShade(direction, bl);
-    }
-
-    @Override
-    public LevelLightEngine getLightEngine() {
-        return parent.getLightEngine();
-    }
-
-    @Override
-    public int getBrightness(LightLayer lightLayer, BlockPos blockPos) {
-        return parent.getBrightness(lightLayer, blockPos);
-    }
-
-    @Override
-    public int getRawBrightness(BlockPos blockPos, int i) {
-        return parent.getRawBrightness(blockPos, i);
-    }
-
-    @Override
-    public boolean canSeeSky(BlockPos blockPos) {
-        return parent.canSeeSky(blockPos);
-    }
-
-    @Override
-    @Nullable
-    public BlockEntity getBlockEntity(BlockPos blockPos) {
-        return parent.getBlockEntity(blockPos);
-    }
-
-    @Override
-    public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType) {
-        return parent.getBlockEntity(blockPos, blockEntityType);
-    }
-
-    @Override
-    public BlockState getBlockState(BlockPos blockPos) {
-        return parent.getBlockState(blockPos);
-    }
-
-    @Override
-    public FluidState getFluidState(BlockPos blockPos) {
-        return parent.getFluidState(blockPos);
-    }
-
-    @Override
-    public int getLightEmission(BlockPos blockPos) {
-        return parent.getLightEmission(blockPos);
-    }
-
-    @Override
-    public int getMaxLightLevel() {
-        return parent.getMaxLightLevel();
-    }
-
-    @Override
-    public Stream<BlockState> getBlockStates(AABB aABB) {
-        return parent.getBlockStates(aABB);
-    }
-
-    @Override
-    public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext) {
-        return parent.isBlockInLine(clipBlockStateContext);
-    }
-
-    @Override
-    public BlockHitResult clip(ClipContext clipContext) {
-        return parent.clip(clipContext);
-    }
-
-    @Override
-    @Nullable
-    public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState) {
-        return parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
-    }
-
-    @Override
-    public double getBlockFloorHeight(VoxelShape voxelShape, Supplier<VoxelShape> supplier) {
-        return parent.getBlockFloorHeight(voxelShape, supplier);
-    }
-
-    @Override
-    public double getBlockFloorHeight(BlockPos blockPos) {
-        return parent.getBlockFloorHeight(blockPos);
-    }
-
-    @Override
-    public int getHeight() {
-        return parent.getHeight();
-    }
-
-    @Override
-    public int getMinBuildHeight() {
-        return parent.getMinBuildHeight();
-    }
-
-    @Override
-    public int getMaxBuildHeight() {
-        return parent.getMaxBuildHeight();
-    }
-
-    @Override
-    public int getSectionsCount() {
-        return parent.getSectionsCount();
-    }
-
-    @Override
-    public int getMinSection() {
-        return parent.getMinSection();
-    }
-
-    @Override
-    public int getMaxSection() {
-        return parent.getMaxSection();
-    }
-
-    @Override
-    public boolean isOutsideBuildHeight(BlockPos blockPos) {
-        return parent.isOutsideBuildHeight(blockPos);
-    }
-
-    @Override
-    public boolean isOutsideBuildHeight(int i) {
-        return parent.isOutsideBuildHeight(i);
-    }
-
-    @Override
-    public int getSectionIndex(int i) {
-        return parent.getSectionIndex(i);
-    }
-
-    @Override
-    public int getSectionIndexFromSectionY(int i) {
-        return parent.getSectionIndexFromSectionY(i);
-    }
-
-    @Override
-    public int getSectionYFromSectionIndex(int i) {
-        return parent.getSectionYFromSectionIndex(i);
-    }
-}

common/src/main/java/com/seibel/lod/common/wrappers/block/TintGetterOverrideSmooth.java

@@ -1,219 +0,0 @@
-package com.seibel.lod.common.wrappers.block;
-
-import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
-import net.minecraft.Util;
-import net.minecraft.client.color.block.BlockTintCache;
-import net.minecraft.client.renderer.BiomeColors;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Cursor3D;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.*;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Optional;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
-public class TintGetterOverrideSmooth implements BlockAndTintGetter {
-    LevelReader parent;
-    private final Object2ObjectArrayMap<ColorResolver, BlockTintCache> tintCaches;
-    public int smoothingRange;
-
-    public TintGetterOverrideSmooth(LevelReader parent, int smoothingRange) {
-        this.parent = parent;
-        this.smoothingRange = smoothingRange;
-        this.tintCaches = Util.make(new Object2ObjectArrayMap(3), object2ObjectArrayMap -> {
-            object2ObjectArrayMap.put(BiomeColors.GRASS_COLOR_RESOLVER, new BlockTintCache((pos) -> calculateBlockTint(pos, BiomeColors.GRASS_COLOR_RESOLVER)));
-            object2ObjectArrayMap.put(BiomeColors.FOLIAGE_COLOR_RESOLVER, new BlockTintCache((pos) -> calculateBlockTint(pos, BiomeColors.FOLIAGE_COLOR_RESOLVER)));
-            object2ObjectArrayMap.put(BiomeColors.WATER_COLOR_RESOLVER, new BlockTintCache((pos) -> calculateBlockTint(pos, BiomeColors.WATER_COLOR_RESOLVER)));
-        });
-    }
-
-    private Biome _getBiome(BlockPos pos) {
-		#if MC_VERSION_1_18_2
-        return parent.getBiome(pos).value();
-		#elif MC_VERSION_1_18_1
-		return parent.getBiome(pos);
-		#endif
-    }
-
-    public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
-    {
-        int i = smoothingRange;
-        if (i == 0)
-            return colorResolver.getColor(_getBiome(blockPos), blockPos.getX(), blockPos.getZ());
-        int j = (i * 2 + 1) * (i * 2 + 1);
-        int k = 0;
-        int l = 0;
-        int m = 0;
-        Cursor3D cursor3D = new Cursor3D(blockPos.getX() - i, blockPos.getY(), blockPos.getZ() - i, blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + i);
-        BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
-        while (cursor3D.advance())
-        {
-            mutableBlockPos.set(cursor3D.nextX(), cursor3D.nextY(), cursor3D.nextZ());
-            int n = colorResolver.getColor(_getBiome(mutableBlockPos), mutableBlockPos.getX(), mutableBlockPos.getZ());
-            k += (n & 0xFF0000) >> 16;
-            l += (n & 0xFF00) >> 8;
-            m += n & 0xFF;
-        }
-        return (k / j & 0xFF) << 16 | (l / j & 0xFF) << 8 | m / j & 0xFF;
-    }
-
-    @Override
-    public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) {
-        BlockTintCache blockTintCache = this.tintCaches.get(colorResolver);
-        return blockTintCache.getColor(blockPos);
-    }
-
-    @Override
-    public float getShade(Direction direction, boolean bl) {
-        return parent.getShade(direction, bl);
-    }
-
-    @Override
-    public LevelLightEngine getLightEngine() {
-        return parent.getLightEngine();
-    }
-
-    @Override
-    public int getBrightness(LightLayer lightLayer, BlockPos blockPos) {
-        return parent.getBrightness(lightLayer, blockPos);
-    }
-
-    @Override
-    public int getRawBrightness(BlockPos blockPos, int i) {
-        return parent.getRawBrightness(blockPos, i);
-    }
-
-    @Override
-    public boolean canSeeSky(BlockPos blockPos) {
-        return parent.canSeeSky(blockPos);
-    }
-
-    @Override
-    @Nullable
-    public BlockEntity getBlockEntity(BlockPos blockPos) {
-        return parent.getBlockEntity(blockPos);
-    }
-
-    @Override
-    public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType) {
-        return parent.getBlockEntity(blockPos, blockEntityType);
-    }
-
-    @Override
-    public BlockState getBlockState(BlockPos blockPos) {
-        return parent.getBlockState(blockPos);
-    }
-
-    @Override
-    public FluidState getFluidState(BlockPos blockPos) {
-        return parent.getFluidState(blockPos);
-    }
-
-    @Override
-    public int getLightEmission(BlockPos blockPos) {
-        return parent.getLightEmission(blockPos);
-    }
-
-    @Override
-    public int getMaxLightLevel() {
-        return parent.getMaxLightLevel();
-    }
-
-    @Override
-    public Stream<BlockState> getBlockStates(AABB aABB) {
-        return parent.getBlockStates(aABB);
-    }
-
-    @Override
-    public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext) {
-        return parent.isBlockInLine(clipBlockStateContext);
-    }
-
-    @Override
-    public BlockHitResult clip(ClipContext clipContext) {
-        return parent.clip(clipContext);
-    }
-
-    @Override
-    @Nullable
-    public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState) {
-        return parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
-    }
-
-    @Override
-    public double getBlockFloorHeight(VoxelShape voxelShape, Supplier<VoxelShape> supplier) {
-        return parent.getBlockFloorHeight(voxelShape, supplier);
-    }
-
-    @Override
-    public double getBlockFloorHeight(BlockPos blockPos) {
-        return parent.getBlockFloorHeight(blockPos);
-    }
-
-    @Override
-    public int getHeight() {
-        return parent.getHeight();
-    }
-
-    @Override
-    public int getMinBuildHeight() {
-        return parent.getMinBuildHeight();
-    }
-
-    @Override
-    public int getMaxBuildHeight() {
-        return parent.getMaxBuildHeight();
-    }
-
-    @Override
-    public int getSectionsCount() {
-        return parent.getSectionsCount();
-    }
-
-    @Override
-    public int getMinSection() {
-        return parent.getMinSection();
-    }
-
-    @Override
-    public int getMaxSection() {
-        return parent.getMaxSection();
-    }
-
-    @Override
-    public boolean isOutsideBuildHeight(BlockPos blockPos) {
-        return parent.isOutsideBuildHeight(blockPos);
-    }
-
-    @Override
-    public boolean isOutsideBuildHeight(int i) {
-        return parent.isOutsideBuildHeight(i);
-    }
-
-    @Override
-    public int getSectionIndex(int i) {
-        return parent.getSectionIndex(i);
-    }
-
-    @Override
-    public int getSectionIndexFromSectionY(int i) {
-        return parent.getSectionIndexFromSectionY(i);
-    }
-
-    @Override
-    public int getSectionYFromSectionIndex(int i) {
-        return parent.getSectionYFromSectionIndex(i);
-    }
-}

common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkPosWrapper.java

@@ -1,136 +0,0 @@
-package com.seibel.lod.common.wrappers.chunk;
-
-import java.util.Objects;
-
-import com.seibel.lod.core.util.LevelPosUtil;
-import com.seibel.lod.core.util.LodUtil;
-import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
-import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
-import com.seibel.lod.common.wrappers.block.BlockPosWrapper;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.ChunkPos;
-
-
-/**
- * @author James Seibel
- * @version 11-21-2021
- */
-public class ChunkPosWrapper extends AbstractChunkPosWrapper
-{
-    private final net.minecraft.world.level.ChunkPos chunkPos;
-
-    public ChunkPosWrapper()
-    {
-        this.chunkPos = new ChunkPos(0, 0);
-    }
-
-    public ChunkPosWrapper(BlockPos blockPos)
-    {
-        this.chunkPos = new ChunkPos(blockPos);
-    }
-
-    public ChunkPosWrapper(AbstractChunkPosWrapper newChunkPos)
-    {
-        this.chunkPos = ((ChunkPosWrapper) newChunkPos).chunkPos;
-    }
-
-    public ChunkPosWrapper(AbstractBlockPosWrapper blockPos)
-    {
-        this.chunkPos = new ChunkPos(((BlockPosWrapper) blockPos).getBlockPos());
-    }
-
-    public ChunkPosWrapper(int chunkX, int chunkZ)
-    {
-        this.chunkPos = new ChunkPos(chunkX, chunkZ);
-    }
-    
-    public ChunkPosWrapper(long l) {
-    	this.chunkPos = new ChunkPos(l);
-    }
-
-
-    public ChunkPosWrapper(ChunkPos pos)
-    {
-        this.chunkPos = pos;
-    }
-
-
-
-
-    @Override
-    public int getX()
-    {
-        return chunkPos.x;
-    }
-
-    @Override
-    public int getZ()
-    {
-        return chunkPos.z;
-    }
-
-    @Override
-    public int getMinBlockX()
-    {
-        return chunkPos.getMinBlockX();
-    }
-
-    @Override
-    public int getMinBlockZ()
-    {
-        return chunkPos.getMinBlockZ();
-    }
-
-    @Override
-    public int getRegionX()
-    {
-    	return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunkPos.x, LodUtil.REGION_DETAIL_LEVEL);
-    }
-
-    @Override
-    public int getRegionZ()
-    {
-    	return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunkPos.z, LodUtil.REGION_DETAIL_LEVEL);
-    }
-    
-    @Override
-    public long getLong() {
-    	return chunkPos.toLong();
-    }
-
-    public ChunkPos getChunkPos()
-    {
-        return chunkPos;
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-		// If the object is compared with itself then return true 
-        if (o == this) {
-            return true;
-        }
-        // Check if o is an instance of RegionPos or not
-        if (!(o instanceof ChunkPosWrapper)) {
-            return false;
-        }
-        ChunkPosWrapper c = (ChunkPosWrapper) o;
-        return c.chunkPos.equals(chunkPos);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(chunkPos);
-    }
-
-    @Override
-    public AbstractBlockPosWrapper getWorldPosition()
-    {
-        // the parameter here is the y position
-        BlockPos blockPos = chunkPos.getMiddleBlockPosition(0);
-        return new BlockPosWrapper(blockPos.getX(), blockPos.getY(), blockPos.getZ());
-    }
-
-}

common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java

@@ -1,208 +0,0 @@
-package com.seibel.lod.common.wrappers.chunk;
-
-import com.seibel.lod.common.wrappers.block.BlockDetailWrapper;
-import com.seibel.lod.core.enums.LodDirection;
-import com.seibel.lod.core.util.LevelPosUtil;
-import com.seibel.lod.core.util.LodUtil;
-import com.seibel.lod.core.wrapperInterfaces.block.IBlockDetailWrapper;
-import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
-import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;
-
-import com.seibel.lod.common.wrappers.WrapperUtil;
-import com.seibel.lod.common.wrappers.block.BlockDetailMap;
-import com.seibel.lod.common.wrappers.world.BiomeWrapper;
-import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.LightedWorldGenRegion;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.QuartPos;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.LightLayer;
-import net.minecraft.world.level.block.LiquidBlockContainer;
-import net.minecraft.world.level.block.SimpleWaterloggedBlock;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.properties.BlockStateProperties;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.levelgen.Heightmap;
-
-/**
- *
- * @author James Seibel
- * @version 3-5-2022
- */
-public class ChunkWrapper implements IChunkWrapper
-{
-	private final ChunkAccess chunk;
-	private final LevelReader lightSource;
-	
-	
-	public ChunkWrapper(ChunkAccess chunk, LevelReader lightSource)
-	{
-		this.chunk = chunk;
-		this.lightSource = lightSource;
-	}
-	
-	@Override
-	public int getHeight(){
-		return chunk.getHeight();
-	}
-	
-	@Override
-	public int getMinBuildHeight()
-	{
-		return chunk.getMinBuildHeight();
-	}
-	@Override
-	public int getMaxBuildHeight()
-	{
-		return chunk.getMaxBuildHeight();
-	}
-	
-	@Override
-	public int getHeightMapValue(int xRel, int zRel)
-	{
-		return chunk.getOrCreateHeightmapUnprimed(WrapperUtil.DEFAULT_HEIGHTMAP).getFirstAvailable(xRel, zRel);
-	}
-	
-	@Override
-	public IBiomeWrapper getBiome(int x, int y, int z)
-	{
-        #if MC_VERSION_1_18_2
-		return BiomeWrapper.getBiomeWrapper(chunk.getNoiseBiome(
-				QuartPos.fromBlock(x), QuartPos.fromBlock(y), QuartPos.fromBlock(z)).value());
-        #elif MC_VERSION_1_18_1
-        return BiomeWrapper.getBiomeWrapper(chunk.getNoiseBiome(
-        		QuartPos.fromBlock(x), QuartPos.fromBlock(y), QuartPos.fromBlock(z)));
-        #endif
-	}
-	
-	@Override
-	public IBlockDetailWrapper getBlockDetail(int x, int y, int z) {
-		BlockPos pos = new BlockPos(x,y,z);
-		BlockState blockState = chunk.getBlockState(pos);
-		IBlockDetailWrapper blockDetail = BlockDetailMap.getOrMakeBlockDetailCache(blockState, pos, lightSource);
-		return blockDetail == BlockDetailWrapper.NULL_BLOCK_DETAIL ? null : blockDetail;
-	}
-
-    @Override
-    public IBlockDetailWrapper getBlockDetailAtFace(int x, int y, int z, LodDirection dir) {
-        int fy = y+dir.getNormal().y;
-        if (fy < getMinBuildHeight() || fy > getMaxBuildHeight()) return null;
-        BlockPos pos = new BlockPos(x+dir.getNormal().x,fy,z+dir.getNormal().z);
-        BlockState blockState;
-        if (blockPosInsideChunk(x,y,z))
-            blockState = chunk.getBlockState(pos);
-        else {
-            blockState = lightSource.getBlockState(pos);
-        }
-        if (blockState == null || blockState.isAir()) return null;
-		IBlockDetailWrapper blockDetail = BlockDetailMap.getOrMakeBlockDetailCache(blockState, pos, lightSource);
-        return blockDetail == BlockDetailWrapper.NULL_BLOCK_DETAIL ? null : blockDetail;
-    }
-	
-	public ChunkAccess getChunk() {
-		return chunk;
-	}
-	
-	@Override
-	public int getChunkPosX(){
-		return chunk.getPos().x;
-	}
-	
-	@Override
-	public int getChunkPosZ(){
-		return chunk.getPos().z;
-	}
-	
-	@Override
-	public int getRegionPosX(){
-		return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().x, LodUtil.REGION_DETAIL_LEVEL);
-	}
-	
-	@Override
-	public int getRegionPosZ(){
-		return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().z, LodUtil.REGION_DETAIL_LEVEL);
-	}
-	
-	@Override
-	public int getMaxY(int x, int z) {
-		return chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, Math.floorMod(x, 16), Math.floorMod(z, 16));
-	}
-	
-	@Override
-	public int getMaxX(){
-		return chunk.getPos().getMaxBlockX();
-	}
-	@Override
-	public int getMaxZ(){
-		return chunk.getPos().getMaxBlockZ();
-	}
-	@Override
-	public int getMinX(){
-		return chunk.getPos().getMinBlockX();
-	}
-	@Override
-	public int getMinZ() {
-		return chunk.getPos().getMinBlockZ();
-	}
-	
-	@Override
-	public long getLongChunkPos() {
-		return chunk.getPos().toLong();
-	}
-	
-	@Override
-	public boolean isLightCorrect(){
-		//return true;
-		if (chunk instanceof LevelChunk) {
-			return ((LevelChunk) chunk).isClientLightReady();
-		}
-		return chunk.isLightCorrect();
-	}
-	
-	public boolean isWaterLogged(int x, int y, int z)
-	{
-		BlockState blockState = chunk.getBlockState(new BlockPos(x,y,z));
-		
-		//This type of block is always in water
-		return (!(blockState.getBlock() instanceof LiquidBlockContainer) && (blockState.getBlock() instanceof SimpleWaterloggedBlock))
-				&& (blockState.hasProperty(BlockStateProperties.WATERLOGGED) && blockState.getValue(BlockStateProperties.WATERLOGGED));
-	}
-	
-	@Override
-	public int getEmittedBrightness(int x, int y, int z)
-	{
-		return chunk.getLightEmission(new BlockPos(x,y,z));
-	}
-	
-	@Override
-	public int getBlockLight(int x, int y, int z) {
-		if (lightSource == null) return -1;
-		return lightSource.getBrightness(LightLayer.BLOCK, new BlockPos(x,y,z));
-	}
-	
-	@Override
-	public int getSkyLight(int x, int y, int z) {
-		if (lightSource == null) return -1;
-		return lightSource.getBrightness(LightLayer.SKY, new BlockPos(x,y,z));
-	}
-	
-	@Override
-	public boolean doesNearbyChunksExist() {
-		if (lightSource instanceof LightedWorldGenRegion) return true;
-		for (int dx = -1; dx <= 1; dx++) {
-			for (int dz = -1; dz <= 1; dz++) {
-				if (dx==0 && dz==0) continue;
-				if (lightSource.getChunk(dx+getChunkPosX(), dz+getChunkPosZ(), ChunkStatus.BIOMES, false) == null) return false;
-			}
-		}
-		return true;
-	}
-	
-	public LevelReader getColorResolver()
-	{
-		return lightSource;
-	}
-	
-}

common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java

@@ -1,762 +0,0 @@
-package com.seibel.lod.common.wrappers.config;
-
-import java.lang.reflect.Field;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-// Logger (for debug stuff)
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-// Uses https://github.com/TheElectronWill/night-config for toml (only for Fabric since Forge already includes this)
-
-import com.electronwill.nightconfig.core.file.CommentedFileConfig;
-
-// Gets info from our own mod
-
-import com.seibel.lod.common.LodCommonMain;
-import com.seibel.lod.core.ModInfo;
-import com.seibel.lod.core.config.*;
-
-// Minecraft imports
-
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiComponent;
-import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.components.EditBox;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.CommonComponents;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.client.resources.language.I18n;	// translation
-import net.minecraft.client.gui.narration.NarratableEntry; // Remove in 1.16
-
-/**
- * Based upon TinyConfig
- * https://github.com/Minenash/TinyConfig
- *
- * This config should work for both Fabric and Forge as long as you use Mojang mappings
- *
- * Credits to Motschen
- *
- * @author coolGi2007
- * @version 1-14-2022
- */
-@SuppressWarnings("unchecked")
-public abstract class ConfigGui
-{
-	/*
-	        TODO list
-
-		Fix floats not working
-        Make a wiki
-        Make it so you can enable and disable buttons from showing
-        Make min and max not final
-        Move the ConfigScreenConfigs class to the config class that extends this
-     */
-	/*
-		List of hacky things that are done that should be done properly
-
-		The buttons that don't show are still loaded but just not rendered
-		The screen with is set to double so the scroll bar doesn't show
-	 */
-
-
-	private static final Pattern INTEGER_ONLY_REGEX = Pattern.compile("(-?[0-9]*)");
-	private static final Pattern DECIMAL_ONLY_REGEX = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)");
-
-	private static final List<EntryInfo> entries = new ArrayList<>();
-	public static final Map<String,EntryInfo> entryMap = new HashMap<>();
-
-	// Change these to your own mod
-	private static final String MOD_NAME = ModInfo.NAME;					// For file saving and identifying
-	private static final String MOD_NAME_READABLE = ModInfo.READABLE_NAME;	// For logs
-	//	private static final Logger LOGGER = ApiShared.LOGGER;						// For logs
-	private static final Logger LOGGER = LogManager.getLogger(ModInfo.NAME);		// For logs (this inits before ClientAPI so this is a temp fix)
-
-
-
-
-	//==============//
-	// Initializers //
-	//==============//
-
-	private static class ConfigScreenConfigs
-	{
-		// This contains all the configs for the configs
-		public static final int SpaceFromRightScreen = 10;
-		public static final int ButtonWidthSpacing = 5;
-		public static final int ResetButtonWidth = 40;
-	}
-
-	public static class EntryInfo<T>
-	{
-		Field field;
-		Object widget;
-		int width = 0;
-		int max;
-		Map.Entry<EditBox, Component> error;
-		Object defaultValue;
-		Object value;
-		String tempValue;
-		boolean inLimits = true;
-		TranslatableComponent name;
-		int index;
-		/** Hides the button */
-		boolean hideOption = false;
-		/** This asks if it is a button to goto a new screen */
-		boolean screenButton = false;
-		/** This is only called if button is true */
-		String gotoScreen = "";
-		String category;
-		Class<T> varClass;
-
-
-		@Deprecated
-		boolean fileComment = false;
-	}
-
-	private static Path configFilePath;
-
-
-
-	public static void init(Class<?> config)
-	{
-		Minecraft mc =  Minecraft.getInstance();
-		configFilePath = mc.gameDirectory.toPath().resolve("config").resolve(MOD_NAME + ".toml");
-
-		initNestedClass(config, "");
-
-		for (EntryInfo info : entries) {
-			if (info.field.isAnnotationPresent(ConfigAnnotations.Entry.class)) {
-				try {
-					info.value = info.field.get(null);
-					info.tempValue = info.value.toString();
-				} catch (IllegalAccessException ignored) {
-				}
-			}
-		}
-
-		loadFromFile();
-	}
-
-	private static void initNestedClass(Class<?> config, String category)
-	{
-		for (Field field : config.getFields())
-		{
-			EntryInfo info = new EntryInfo();
-			if (field.isAnnotationPresent(ConfigAnnotations.Entry.class) || field.isAnnotationPresent(ConfigAnnotations.Comment.class) || field.isAnnotationPresent(ConfigAnnotations.ScreenEntry.class))
-			{
-				// If putting in your own mod then put your own check for server sided
-				info.category = category;
-				if (!LodCommonMain.serverSided)
-					initClient(field, info, category);
-			}
-
-			if (field.isAnnotationPresent(ConfigAnnotations.Entry.class))
-			{
-				entryMap.put((!category.isEmpty() ? category + "." : "") + field.getName(), info);
-				info.varClass = field.getType();
-				try
-				{
-					info.defaultValue = field.get(null);
-				}
-				catch (IllegalAccessException ignored) {}
-			}
-
-			if (field.isAnnotationPresent(ConfigAnnotations.ScreenEntry.class))
-				initNestedClass(field.getType(), (!category.isEmpty() ? category + "." : "") + field.getName());
-
-			// File comment (WILL BE REMOVED SOON)
-			if (field.isAnnotationPresent(ConfigAnnotations.FileComment.class)) {
-				entryMap.put((!category.isEmpty() ? category + "." : "") + field.getName(), info);
-				info.fileComment = true;
-				try
-				{
-					info.value = info.defaultValue = field.get(null);
-				}
-				catch (IllegalAccessException ignored) {}
-			}
-
-			info.field = field;
-		}
-	}
-
-	/** This adds the buttons to the queue to be rendered */
-	private static void initClient(Field field, EntryInfo info, String category)
-	{
-		Class<?> fieldClass = field.getType();
-		ConfigAnnotations.Entry entry = field.getAnnotation(ConfigAnnotations.Entry.class);
-		ConfigAnnotations.ScreenEntry screenEntry = field.getAnnotation(ConfigAnnotations.ScreenEntry.class);
-
-		if (entry != null)
-			info.width = entry.width();
-		else if (screenEntry != null)
-			info.width = screenEntry.width();
-
-		if (entry != null)
-		{
-			if (!entry.name().equals(""))
-				info.name = new TranslatableComponent(entry.name());
-
-
-			if (fieldClass == int.class)
-			{
-				// For int
-				textField(info, Integer::parseInt, INTEGER_ONLY_REGEX, entry.minValue(), entry.maxValue(), true);
-			}
-			else if (fieldClass == double.class)
-			{
-				// For double
-				textField(info, Double::parseDouble, DECIMAL_ONLY_REGEX, entry.minValue(), entry.maxValue(), false);
-			}
-			else if (fieldClass == String.class || fieldClass == List.class)
-			{
-				// For string or list
-				info.max = entry.maxValue() == Double.MAX_VALUE ? Integer.MAX_VALUE : (int) entry.maxValue();
-				textField(info, String::length, null, Math.min(entry.minValue(), 0), Math.max(entry.maxValue(), 1), true);
-			}
-			else if (fieldClass == boolean.class)
-			{
-				// For boolean
-				Function<Object, Component> func = value -> new TextComponent((Boolean) value ? "True" : "False").withStyle((Boolean) value ? ChatFormatting.GREEN : ChatFormatting.RED);
-				info.widget = new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(button -> {
-					info.value = !(Boolean) info.value;
-					button.setMessage(func.apply(info.value));
-				}, func);
-			}
-			else if (fieldClass.isEnum())
-			{
-				// For enum
-				List<?> values = Arrays.asList(field.getType().getEnumConstants());
-				Function<Object, Component> func = value -> new TranslatableComponent(MOD_NAME + ".config." + "enum." + fieldClass.getSimpleName() + "." + info.value.toString());
-				info.widget = new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(button -> {
-					int index = values.indexOf(info.value) + 1;
-					info.value = values.get(index >= values.size() ? 0 : index);
-					button.setMessage(func.apply(info.value));
-				}, func);
-			}
-		}
-		else if (screenEntry != null)
-		{
-			if (!screenEntry.name().equals(""))
-				info.name = new TranslatableComponent(screenEntry.name());
-
-			info.screenButton = true;
-			info.gotoScreen = (!info.category.isEmpty() ? info.category + "." : "") + field.getName();
-		}
-		entries.add(info);
-	}
-
-
-
-
-	/** creates a text field */
-	private static void textField(EntryInfo info, Function<String, Number> func, Pattern pattern, double minValue, double maxValue, boolean cast)
-	{
-		boolean isNumber = pattern != null;
-		info.widget = (BiFunction<EditBox, Button, Predicate<String>>) (editBox, button) -> stringValue ->
-		{
-			stringValue = stringValue.trim();
-			if (!(stringValue.isEmpty() || !isNumber || pattern.matcher(stringValue).matches()))
-				return false;
-
-			Number value = 0;
-			boolean inLimits = false;
-			info.error = null;
-			if (isNumber && !stringValue.isEmpty() && !stringValue.equals("-") && !stringValue.equals("."))
-			{
-				value = func.apply(stringValue);
-				inLimits = value.doubleValue() >= minValue && value.doubleValue() <= maxValue;
-				info.error = inLimits ? null : new AbstractMap.SimpleEntry<>(editBox, new TextComponent(value.doubleValue() < minValue ?
-						"§cMinimum " + "length" + (cast ? " is " + (int) minValue : " is " + minValue) :
-						"§cMaximum " + "length" + (cast ? " is " + (int) maxValue : " is " + maxValue)));
-			}
-
-			info.tempValue = stringValue;
-			editBox.setTextColor(inLimits ? 0xFFFFFFFF : 0xFFFF7777);
-			info.inLimits = inLimits;
-			button.active = entries.stream().allMatch(e -> e.inLimits);
-
-
-			if (inLimits && info.field.getType() != List.class)
-			{
-				info.value = value;
-			}
-			else if (inLimits)
-			{
-				if (((List<String>) info.value).size() == info.index)
-					((List<String>) info.value).add("");
-				((List<String>) info.value).set(info.index, Arrays.stream(info.tempValue.replace("[", "").replace("]", "").split(", ")).collect(Collectors.toList()).get(0));
-			}
-
-			return true;
-		};
-	}
-
-
-
-
-	//===============//
-	// File Handling //
-	//===============//
-
-	/** Grabs what is in the config and puts it in modid.toml */
-	public static void saveToFile()
-	{
-		CommentedFileConfig config = CommentedFileConfig.builder(configFilePath.toFile()).build();
-
-		// First try to create a config file
-		try {
-			if (!Files.exists(configFilePath))
-				Files.createFile(configFilePath);
-		}
-		catch (Exception e) {
-			LOGGER.info("Failed creating config file for " + MOD_NAME_READABLE + " at the path [" + configFilePath.toString() + "].");
-			e.printStackTrace();
-		}
-
-		loadFileWithErrorCheck(config);
-
-
-		// Just put this here for the future
-		config.setComment("_Version", " DONT TOUCH THIS, IF YOU DO THEN CONFIG FILE WOULD BREAK");
-		config.set("_Versions", ModInfo.VERSION);
-
-
-		for (EntryInfo info : entries) {
-			if (info.field.isAnnotationPresent(ConfigAnnotations.Entry.class)) {
-				editSingleOption.saveOption(info, config);
-
-				if (editSingleOption.getEntry((info.category.isEmpty() ? "" : info.category + ".") + "_" + info.field.getName()) != null)
-					config.setComment((info.category.isEmpty() ? "" : info.category + ".") + info.field.getName(), String.valueOf(editSingleOption.getEntry((info.category.isEmpty() ? "" : info.category + ".") + "_" + info.field.getName()).defaultValue));
-			}
-		}
-
-		config.save();
-		config.close();
-	}
-
-	/**
-	 * Grabs what is in modid.toml and puts it into the config
-	 * If the file doesn't exist then it runs saveToFile
-	 */
-	public static void loadFromFile()
-	{
-		CommentedFileConfig config = CommentedFileConfig.builder(configFilePath.toFile()).autosave().build();
-
-		// First checks if the config file was already made
-		if (!Files.exists(configFilePath)) {
-			LOGGER.info("Config file not found for " + MOD_NAME_READABLE + ". Creating config...");
-			saveToFile();
-			return;
-		}
-
-		loadFileWithErrorCheck(config);
-
-
-		// Just put this here for the future
-		config.setComment("_Version", " DONT TOUCH THIS, IF YOU DO THEN CONFIG FILE WOULD BREAK");
-		config.set("_Versions", ModInfo.VERSION);
-
-
-		// Puts everything into its variable
-		for (EntryInfo info : entries) {
-			if (info.field.isAnnotationPresent(ConfigAnnotations.Entry.class)) {
-				editSingleOption.loadOption(info, config);
-
-				// File comments (WILL REMOVE SOON)
-				if (editSingleOption.getEntry((info.category.isEmpty() ? "" : info.category + ".") + "_" + info.field.getName()) != null)
-					config.setComment((info.category.isEmpty() ? "" : info.category + ".") + info.field.getName(), String.valueOf(editSingleOption.getEntry((info.category.isEmpty() ? "" : info.category + ".") + "_" + info.field.getName()).defaultValue));
-			}
-		}
-
-		config.close();
-	}
-
-	public static class editSingleOption {
-		/** Get the entry info of an item using its string name */
-		public static EntryInfo getEntry(String name)
-		{
-			return entryMap.get(name);
-		}
-
-		/** Save a single item using its string name */
-		public static void saveOption(String name)
-		{
-			saveOption(entryMap.get(name));
-		}
-
-		/** Saves a single item using entry info */
-		public static void saveOption(EntryInfo info)
-		{
-			CommentedFileConfig config = CommentedFileConfig.builder(configFilePath.toFile()).autosave().build();
-
-			loadFileWithErrorCheck(config);
-
-			saveOption(info, config);
-
-			config.close();
-		}
-
-		/** Saves a single item using its entry info and its config builder */
-		public static void saveOption(EntryInfo info, CommentedFileConfig config)
-		{
-			config.set((info.category.isEmpty() ? "" : info.category + ".") + info.field.getName(), info.value);
-		}
-
-		/** Load a single item using its string name */
-		public static void loadOption(String name)
-		{
-			loadOption(entryMap.get(name));
-		}
-
-		/** Load a single item using entry info */
-		public static void loadOption(EntryInfo info)
-		{
-			CommentedFileConfig config = CommentedFileConfig.builder(configFilePath.toFile()).autosave().build();
-
-			loadFileWithErrorCheck(config);
-
-			loadOption(info, config);
-
-			config.close();
-		}
-
-		/** Loads a single item using its entry info and its config builder */
-		public static void loadOption(EntryInfo info, CommentedFileConfig config)
-		{
-			String itemPath = (info.category.isEmpty() ? "" : info.category + ".") + info.field.getName();
-			if (config.contains(itemPath)) {
-				if (info.field.getType().isEnum())
-					info.value = config.getEnum(itemPath, info.varClass);
-				else
-					info.value = config.get(itemPath);
-			} else
-				config.set(itemPath, info.value);
-
-			try {
-				info.field.set(null, info.value);
-			} catch (IllegalAccessException ignored) {
-			}
-		}
-	}
-
-	/** Dose config.load(); but with error checking to avoid crashes */
-	public static void loadFileWithErrorCheck(CommentedFileConfig config) {
-		try {
-			config.load();
-		} catch (Exception e) {
-			LOGGER.info("Error loading config for " + MOD_NAME_READABLE + " at the path [" + configFilePath.toString() + "].");
-			LOGGER.info("Creating a new config...");
-			try {
-				Files.deleteIfExists(configFilePath);
-				saveToFile();
-			} catch (Exception f) {
-				LOGGER.info("Failed creating config file for " + MOD_NAME_READABLE + " at the path [" + configFilePath.toString() + "].");
-				f.printStackTrace();
-			}
-		}
-	}
-
-
-
-
-	//==============//
-	// GUI handling //
-	//==============//
-
-	public static Screen getScreen(Screen parent, String category)
-	{
-		return new ConfigScreen(parent, category);
-	}
-
-	private static class ConfigScreen extends Screen
-	{
-		protected ConfigScreen(Screen parent, String category)
-		{
-			super(new TranslatableComponent(
-					I18n.exists(MOD_NAME + ".config" + (category.isEmpty()? "." + category : "") + ".title") ?
-							MOD_NAME + ".config.title" :
-							MOD_NAME + ".config" + (category.isEmpty() ? "" : "." + category) + ".title")
-			);
-			this.parent = parent;
-			this.category = category;
-			this.translationPrefix = MOD_NAME + ".config.";
-		}
-
-		private final String translationPrefix;
-		private final Screen parent;
-		private final String category;
-		private ConfigListWidget list;
-		private boolean reload = false;
-
-		// Real Time config update //
-		@Override
-		public void tick()
-		{
-			super.tick();
-		}
-
-
-		/** When you close it, it goes to the previous screen and saves */
-		@Override
-		public void onClose()
-		{
-			saveToFile();
-			Objects.requireNonNull(minecraft).setScreen(this.parent);
-		}
-
-		@Override
-		protected void init()
-		{
-			super.init();
-			if (!reload)
-				loadFromFile();
-
-			// addRenderableWidget in 1.17 and over
-			// addButton in 1.16 and below
-			this.addRenderableWidget(new Button(this.width / 2 - 154, this.height - 28, 150, 20, CommonComponents.GUI_CANCEL, button -> {
-				loadFromFile();
-				Objects.requireNonNull(minecraft).setScreen(parent);
-			}));
-
-			Button done = this.addRenderableWidget(new Button(this.width / 2 + 4, this.height - 28, 150, 20, CommonComponents.GUI_DONE, (button) -> {
-				saveToFile();
-				Objects.requireNonNull(minecraft).setScreen(parent);
-			}));
-
-			this.list = new ConfigListWidget(this.minecraft, this.width * 2, this.height, 32, this.height - 32, 25);
-			if (this.minecraft != null && this.minecraft.level != null)
-				this.list.setRenderBackground(false);
-			this.addWidget(this.list);
-			for (EntryInfo info : entries)
-			{
-				if (info.category.matches(category) && !info.hideOption)
-				{
-					TranslatableComponent name = (info.name == null ? new TranslatableComponent(translationPrefix + (!info.category.isEmpty() ? info.category + "." : "") + info.field.getName()) : info.name);
-					Button resetButton = new Button(this.width - ConfigScreenConfigs.SpaceFromRightScreen - info.width - ConfigScreenConfigs.ButtonWidthSpacing - ConfigScreenConfigs.ResetButtonWidth, 0, ConfigScreenConfigs.ResetButtonWidth, 20, new TextComponent("Reset").withStyle(ChatFormatting.RED), (button -> {
-						info.value = info.defaultValue;
-						info.tempValue = info.defaultValue.toString();
-						info.index = 0;
-						this.reload = true;
-						Objects.requireNonNull(minecraft).setScreen(this);
-					}));
-
-					if (info.widget instanceof Map.Entry)
-					{
-						Map.Entry<Button.OnPress, Function<Object, Component>> widget = (Map.Entry<Button.OnPress, Function<Object, Component>>) info.widget;
-						if (info.field.getType().isEnum())
-							widget.setValue(value -> new TranslatableComponent(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString()));
-						this.list.addButton(new Button(this.width - info.width - ConfigScreenConfigs.SpaceFromRightScreen, 0, info.width, 20, widget.getValue().apply(info.value), widget.getKey()), resetButton, null, name);
-					}
-					else if (info.field.getType() == List.class)
-					{
-						if (!reload)
-							info.index = 0;
-						EditBox widget = new EditBox(font, this.width - info.width - ConfigScreenConfigs.SpaceFromRightScreen, 0, info.width, 20, null);
-						widget.setMaxLength(info.width);
-						if (info.index < ((List<String>) info.value).size())
-							widget.insertText((String.valueOf(((List<String>) info.value).get(info.index))));
-						else
-							widget.insertText("");
-						Predicate<String> processor = ((BiFunction<EditBox, Button, Predicate<String>>) info.widget).apply(widget, done);
-						widget.setFilter(processor);
-						resetButton.setWidth(20);
-						resetButton.setMessage(new TextComponent("R").withStyle(ChatFormatting.RED));
-						Button cycleButton = new Button(this.width - 185, 0, 20, 20, new TextComponent(String.valueOf(info.index)).withStyle(ChatFormatting.GOLD), (button -> {
-							((List<String>) info.value).remove("");
-							this.reload = true;
-							info.index = info.index + 1;
-							if (info.index > ((List<String>) info.value).size())
-								info.index = 0;
-							Objects.requireNonNull(minecraft).setScreen(this);
-						}));
-						this.list.addButton(widget, resetButton, cycleButton, name);
-					}
-					else if (info.widget != null)
-					{
-						EditBox widget = new EditBox(font, this.width - info.width - ConfigScreenConfigs.SpaceFromRightScreen + 2, 0, info.width - 4, 20, null);
-						widget.setMaxLength(info.width);
-						widget.insertText(String.valueOf(info.value));
-						Predicate<String> processor = ((BiFunction<EditBox, Button, Predicate<String>>) info.widget).apply(widget, done);
-						widget.setFilter(processor);
-						this.list.addButton(widget, resetButton, null, name);
-					}
-					else if (info.screenButton)
-					{
-						Button widget = new Button(this.width / 2 - info.width, this.height - 28, info.width * 2, 20, name, (button -> {
-							saveToFile();
-							Objects.requireNonNull(minecraft).setScreen(ConfigGui.getScreen(this, info.gotoScreen));
-						}));
-						this.list.addButton(widget, null, null, null);
-					}
-					else if (!info.fileComment)
-					{
-						this.list.addButton(null, null, null, name);
-					}
-				}
-			}
-
-		}
-
-		@Override
-		public void render(PoseStack matrices, int mouseX, int mouseY, float delta)
-		{
-			this.renderBackground(matrices); // Renders background
-			this.list.render(matrices, mouseX, mouseY, delta); // Render buttons
-			drawCenteredString(matrices, font, title, width / 2, 15, 0xFFFFFF); // Render title
-
-			// Render the tooltip only if it can find a tooltip in the language file
-			for (EntryInfo info : entries) {
-				if (info.category.matches(category) && !info.hideOption) {
-					if (list.getHoveredButton(mouseX,mouseY).isPresent()) {
-						AbstractWidget buttonWidget = list.getHoveredButton(mouseX,mouseY).get();
-						Component text = ButtonEntry.buttonsWithText.get(buttonWidget);
-						TranslatableComponent name = new TranslatableComponent(this.translationPrefix + (info.category.isEmpty() ? "" : info.category + ".") + info.field.getName());
-						String key = translationPrefix + (info.category.isEmpty() ? "" : info.category + ".") + info.field.getName() + ".@tooltip";
-
-						if (info.error != null && text.equals(name)) renderTooltip(matrices, (Component) info.error.getValue(), mouseX, mouseY);
-						else if (I18n.exists(key) && (text != null && text.equals(name))) {
-							List<Component> list = new ArrayList<>();
-							for (String str : I18n.get(key).split("\n"))
-								list.add(new TextComponent(str));
-							renderComponentTooltip(matrices, list, mouseX, mouseY);
-						}
-					}
-				}
-			}
-			super.render(matrices, mouseX, mouseY, delta);
-		}
-	}
-
-
-
-
-	public static class ConfigListWidget extends ContainerObjectSelectionList<ButtonEntry>
-	{
-		Font textRenderer;
-
-		public ConfigListWidget(Minecraft minecraftClient, int i, int j, int k, int l, int m)
-		{
-			super(minecraftClient, i, j, k, l, m);
-			this.centerListVertically = false;
-			textRenderer = minecraftClient.font;
-		}
-
-		public void addButton(AbstractWidget button, AbstractWidget resetButton, AbstractWidget indexButton, Component text)
-		{
-			this.addEntry(ButtonEntry.create(button, text, resetButton, indexButton));
-		}
-
-		@Override
-		public int getRowWidth()
-		{
-			return 10000;
-		}
-
-		public Optional<AbstractWidget> getHoveredButton(double mouseX, double mouseY)
-		{
-			for (ButtonEntry buttonEntry : this.children())
-			{
-				if (buttonEntry.button != null && buttonEntry.button.isMouseOver(mouseX, mouseY))
-				{
-					return Optional.of(buttonEntry.button);
-				}
-			}
-			return Optional.empty();
-		}
-	}
-
-
-
-
-
-	public static class ButtonEntry extends ContainerObjectSelectionList.Entry<ButtonEntry>
-	{
-		private static final Font textRenderer = Minecraft.getInstance().font;
-		public final AbstractWidget button;
-		private final AbstractWidget resetButton;
-		private final AbstractWidget indexButton;
-		private final Component text;
-		private final List<AbstractWidget> children = new ArrayList<>();
-		public static final Map<AbstractWidget, Component> buttonsWithText = new HashMap<>();
-
-		private ButtonEntry(AbstractWidget button, Component text, AbstractWidget resetButton, AbstractWidget indexButton)
-		{
-			buttonsWithText.put(button, text);
-			this.button = button;
-			this.resetButton = resetButton;
-			this.text = text;
-			this.indexButton = indexButton;
-			if (button != null)
-				children.add(button);
-			if (resetButton != null)
-				children.add(resetButton);
-			if (indexButton != null)
-				children.add(indexButton);
-		}
-
-		public static ButtonEntry create(AbstractWidget button, Component text, AbstractWidget resetButton, AbstractWidget indexButton)
-		{
-			return new ButtonEntry(button, text, resetButton, indexButton);
-		}
-
-		@Override
-		public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
-		{
-			if (button != null)
-			{
-				button.y = y;
-				button.render(matrices, mouseX, mouseY, tickDelta);
-			}
-			if (resetButton != null)
-			{
-				resetButton.y = y;
-				resetButton.render(matrices, mouseX, mouseY, tickDelta);
-			}
-			if (indexButton != null)
-			{
-				indexButton.y = y;
-				indexButton.render(matrices, mouseX, mouseY, tickDelta);
-			}
-			if (text != null && (!text.getString().contains("spacer") || button != null))
-				GuiComponent.drawString(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF);
-		}
-
-		@Override
-		public List<? extends GuiEventListener> children()
-		{
-			return children;
-		}
-
-		// Only for 1.17 and over
-		// Remove in 1.16 and below
-        @Override
-        public List<? extends NarratableEntry> narratables()
-        {
-            return children;
-        }
-	}
-}

common/src/main/java/com/seibel/lod/common/wrappers/config/LodConfigWrapperSingleton.java

@@ -1,786 +0,0 @@
-package com.seibel.lod.common.wrappers.config;
-
-import com.seibel.lod.core.enums.config.*;
-import com.seibel.lod.core.enums.rendering.*;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.common.Config;
-
-/**
- * This holds the config defaults and setters/getters
- * that should be hooked into the host mod loader (Fabric, Forge, etc.).
- *
- * @author James Seibel
- * @version 11-16-2021
- */
-public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
-{
-	public static final LodConfigWrapperSingleton INSTANCE = new LodConfigWrapperSingleton();
-	
-	
-	private static final Client client = new Client();
-	@Override
-	public IClient client()
-	{
-		return client;
-	}
-	
-	public static class Client implements IClient
-	{
-		public final IGraphics graphics;
-		public final IWorldGenerator worldGenerator;
-		public final IMultiplayer multiplayer;
-		public final IAdvanced advanced;
-		
-		
-		@Override
-		public IGraphics graphics()
-		{
-			return graphics;
-		}
-		
-		@Override
-		public IWorldGenerator worldGenerator()
-		{
-			return worldGenerator;
-		}
-		
-		@Override
-		public IMultiplayer multiplayer() {
-			return multiplayer;
-		}
-		
-		@Override
-		public IAdvanced advanced()
-		{
-			return advanced;
-		}
-		
-		
-		@Override
-		public boolean getOptionsButton()
-		{
-			return Config.optionsButton;
-		}
-		@Override
-		public void setOptionsButton(boolean newOptionsButton)
-		{
-			ConfigGui.editSingleOption.getEntry("optionsButton").value = newOptionsButton;
-			ConfigGui.editSingleOption.saveOption("optionsButton");
-		}
-		
-		
-		//================//
-		// Client Configs //
-		//================//
-		public Client()
-		{
-			graphics = new Graphics();
-			worldGenerator = new WorldGenerator();
-			multiplayer = new Multiplayer();
-			advanced = new Advanced();
-		}
-		
-		
-		//==================//
-		// Graphics Configs //
-		//==================//
-		public static class Graphics implements IGraphics
-		{
-			public final IQuality quality;
-			public final IFogQuality fogQuality;
-			public final IAdvancedGraphics advancedGraphics;
-			
-			
-			
-			@Override
-			public IQuality quality()
-			{
-				return quality;
-			}
-			
-			@Override
-			public IFogQuality fogQuality()
-			{
-				return fogQuality;
-			}
-			
-			@Override
-			public IAdvancedGraphics advancedGraphics()
-			{
-				return advancedGraphics;
-			}
-			
-			
-			Graphics()
-			{
-				quality = new Quality();
-				fogQuality = new FogQuality();
-				advancedGraphics = new AdvancedGraphics();
-			}
-			
-			
-			public static class Quality implements IQuality
-			{
-				@Override
-				public HorizontalResolution getDrawResolution()
-				{
-					return Config.Client.Graphics.Quality.drawResolution;
-				}
-				@Override
-				public void setDrawResolution(HorizontalResolution newHorizontalResolution)
-				{
-					ConfigGui.editSingleOption.getEntry("client.graphics.quality.drawResolution").value = newHorizontalResolution;
-					ConfigGui.editSingleOption.saveOption("client.graphics.quality.drawResolution");
-				}
-				
-				
-				@Override
-				public int getLodChunkRenderDistance()
-				{
-					return Config.Client.Graphics.Quality.lodChunkRenderDistance;
-				}
-				@Override
-				public void setLodChunkRenderDistance(int newLodChunkRenderDistance)
-				{
-					ConfigGui.editSingleOption.getEntry("client.graphics.quality.lodChunkRenderDistance").value = newLodChunkRenderDistance;
-					ConfigGui.editSingleOption.saveOption("client.graphics.quality.lodChunkRenderDistance");
-				}
-				
-				
-				@Override
-				public VerticalQuality getVerticalQuality()
-				{
-					return Config.Client.Graphics.Quality.verticalQuality;
-				}
-				@Override
-				public void setVerticalQuality(VerticalQuality newVerticalQuality)
-				{
-					ConfigGui.editSingleOption.getEntry("client.graphics.quality.verticalQuality").value = newVerticalQuality;
-					ConfigGui.editSingleOption.saveOption("client.graphics.quality.verticalQuality");
-				}
-				
-				
-				@Override
-				public int getHorizontalScale()
-				{
-					return Config.Client.Graphics.Quality.horizontalScale;
-				}
-				@Override
-				public void setHorizontalScale(int newHorizontalScale)
-				{
-					ConfigGui.editSingleOption.getEntry("client.graphics.quality.horizontalScale").value = newHorizontalScale;
-					ConfigGui.editSingleOption.saveOption("client.graphics.quality.horizontalScale");
-				}
-				
-				
-				@Override
-				public HorizontalQuality getHorizontalQuality()
-				{
-					return Config.Client.Graphics.Quality.horizontalQuality;
-				}
-				@Override
-				public void setHorizontalQuality(HorizontalQuality newHorizontalQuality)
-				{
-					ConfigGui.editSingleOption.getEntry("client.graphics.quality.horizontalQuality").value = newHorizontalQuality;
-					ConfigGui.editSingleOption.saveOption("client.graphics.quality.horizontalQuality");
-				}
-				
-				@Override
-				public DropoffQuality getDropoffQuality() {
-					return Config.Client.Graphics.Quality.dropoffQuality;
-				}
-				@Override
-				public void setDropoffQuality(DropoffQuality newDropoffQuality) {
-					ConfigGui.editSingleOption.getEntry("client.graphics.quality.dropoffQuality").value = newDropoffQuality;
-					ConfigGui.editSingleOption.saveOption("client.graphics.quality.dropoffQuality");
-				}
-
-				@Override
-				public int getLodBiomeBlending() {
-					return Config.Client.Graphics.Quality.lodBiomeBlending;
-				}
-
-				@Override
-				public void setLodBiomeBlending(int newLodBiomeBlending) {
-					ConfigGui.editSingleOption.getEntry("client.graphics.quality.lodBiomeBlending").value = newLodBiomeBlending;
-					ConfigGui.editSingleOption.saveOption("client.graphics.quality.lodBiomeBlending");
-				}
-			}
-			
-			
-			public static class FogQuality implements IFogQuality
-			{
-				public final IAdvancedFog advancedFog;
-
-				FogQuality()
-				{
-					advancedFog = new AdvancedFog();
-				}
-
-				@Override
-				public FogDistance getFogDistance()
-				{
-					return Config.Client.Graphics.FogQuality.fogDistance;
-				}
-				@Override
-				public void setFogDistance(FogDistance newFogDistance)
-				{
-					ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.fogDistance").value = newFogDistance;
-					ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.fogDistance");
-				}
-				
-				
-				@Override
-				public FogDrawMode getFogDrawMode()
-				{
-					return Config.Client.Graphics.FogQuality.fogDrawMode;
-				}
-				
-				@Override
-				public void setFogDrawMode(FogDrawMode setFogDrawMode)
-				{
-					ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.fogDrawMode").value = setFogDrawMode;
-					ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.fogDrawMode");
-				}
-				
-				
-				@Override
-				public FogColorMode getFogColorMode()
-				{
-					return Config.Client.Graphics.FogQuality.fogColorMode;
-				}
-				
-				@Override
-				public void setFogColorMode(FogColorMode newFogColorMode)
-				{
-					ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.fogColorMode").value = newFogColorMode;
-					ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.fogColorMode");
-				}
-				
-				
-				@Override
-				public boolean getDisableVanillaFog()
-				{
-					return Config.Client.Graphics.FogQuality.disableVanillaFog;
-				}
-				@Override
-				public void setDisableVanillaFog(boolean newDisableVanillaFog)
-				{
-					ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.disableVanillaFog").value = newDisableVanillaFog;
-					ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.disableVanillaFog");
-				}
-
-				@Override
-				public IAdvancedFog advancedFog() {
-					return advancedFog;
-				}
-
-				public static class AdvancedFog implements IAdvancedFog {
-					public final IHeightFog heightFog;
-
-					public AdvancedFog() {
-						heightFog = new HeightFog();
-					}
-
-					@Override
-					public double getFarFogStart() {
-						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogStart;
-					}
-					@Override
-					public double getFarFogEnd() {
-						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogEnd;
-					}
-					@Override
-					public double getFarFogMin() {
-						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogMin;
-					}
-					@Override
-					public double getFarFogMax() {
-						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogMax;
-					}
-					@Override
-					public FogSetting.FogType getFarFogType() {
-						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogType;
-					}
-					@Override
-					public double getFarFogDensity() {
-						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogDensity;
-					}
-
-					@Override
-					public void setFarFogStart(double newFarFogStart) {
-						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogStart").value = newFarFogStart;
-						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogStart");
-					}
-					@Override
-					public void setFarFogEnd(double newFarFogEnd) {
-						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogEnd").value = newFarFogEnd;
-						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogEnd");
-					}
-					@Override
-					public void setFarFogMin(double newFarFogMin) {
-						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogMin").value = newFarFogMin;
-						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogMin");
-					}
-					@Override
-					public void setFarFogMax(double newFarFogMax) {
-						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogMax").value = newFarFogMax;
-						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogMax");
-					}
-					@Override
-					public void setFarFogType(FogSetting.FogType newFarFogType) {
-						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogType").value = newFarFogType;
-						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogType");
-					}
-					@Override
-					public void setFarFogDensity(double newFarFogDensity) {
-						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogDensity").value = newFarFogDensity;
-						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogDensity");
-					}
-
-					@Override
-					public IHeightFog heightFog() {
-						return heightFog;
-					}
-					
-					public static class HeightFog implements IHeightFog {
-
-						@Override
-						public HeightFogMixMode getHeightFogMixMode() {
-							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMixMode;
-						}
-						@Override
-						public HeightFogMode getHeightFogMode() {
-							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMode;
-						}
-						@Override
-						public double getHeightFogHeight() {
-							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogHeight;
-						}
-						@Override
-						public double getHeightFogStart() {
-							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogStart;
-						}
-						@Override
-						public double getHeightFogEnd() {
-							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogEnd;
-						}
-						@Override
-						public double getHeightFogMin() {
-							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMin;
-						}
-						@Override
-						public double getHeightFogMax() {
-							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMax;
-						}
-						@Override
-						public FogSetting.FogType getHeightFogType() {
-							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogType;
-						}
-						@Override
-						public double getHeightFogDensity() {
-							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogDensity;
-						}
-
-						@Override
-						public void setHeightFogMixMode(HeightFogMixMode newHeightFogMixMode) {
-							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogMixMode").value = newHeightFogMixMode;
-							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMixMode");
-						}
-						@Override
-						public void setHeightFogMode(HeightFogMode newHeightFogMode) {
-							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogMode").value = newHeightFogMode;
-							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMode");
-						}
-						@Override
-						public void setHeightFogHeight(double newHeightFogHeight) {
-							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogHeight").value = newHeightFogHeight;
-							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogHeight");
-						}
-						@Override
-						public void setHeightFogStart(double newHeightFogStart) {
-							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogStart").value = newHeightFogStart;
-							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogStart");
-						}
-						@Override
-						public void setHeightFogEnd(double newHeightFogEnd) {
-							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogEnd").value = newHeightFogEnd;
-							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogEnd");
-						}
-						@Override
-						public void setHeightFogMin(double newHeightFogMin) {
-							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogMin").value = newHeightFogMin;
-							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMin");
-						}
-						@Override
-						public void setHeightFogMax(double newHeightFogMax) {
-							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogMax").value = newHeightFogMax;
-							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMax");
-						}
-						@Override
-						public void setHeightFogType(FogSetting.FogType newHeightFogType) {
-							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogType").value = newHeightFogType;
-							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogType");
-						}
-						@Override
-						public void setHeightFogDensity(double newHeightFogDensity) {
-							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogDensity").value = newHeightFogDensity;
-							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogDensity");
-						}
-					}
-				}
-
-			}
-			
-			
-			public static class AdvancedGraphics implements IAdvancedGraphics
-			{
-				@Override
-				public boolean getDisableDirectionalCulling()
-				{
-					return Config.Client.Graphics.AdvancedGraphics.disableDirectionalCulling;
-				}
-				@Override
-				public void setDisableDirectionalCulling(boolean newDisableDirectionalCulling)
-				{
-					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.disableDirectionalCulling").value = newDisableDirectionalCulling;
-					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.disableDirectionalCulling");
-				}
-				
-				
-				@Override
-				public VanillaOverdraw getVanillaOverdraw()
-				{
-					return Config.Client.Graphics.AdvancedGraphics.vanillaOverdraw;
-				}
-				@Override
-				public void setVanillaOverdraw(VanillaOverdraw newVanillaOverdraw)
-				{
-					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.vanillaOverdraw").value = newVanillaOverdraw;
-					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.vanillaOverdraw");
-				}
-				/*
-				@Override
-				public int getBacksideCullingRange()
-				{
-					return Config.Client.Graphics.AdvancedGraphics.backsideCullingRange;
-				}
-				@Override
-				public void setBacksideCullingRange(int newBacksideCullingRange)
-				{
-					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.backsideCullingRange").value = newBacksideCullingRange;
-					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.backsideCullingRange");
-				}*/
-				
-				@Override
-				public boolean getUseExtendedNearClipPlane()
-				{
-					return Config.Client.Graphics.AdvancedGraphics.useExtendedNearClipPlane;
-				}
-				@Override
-				public void setUseExtendedNearClipPlane(boolean newUseExtendedNearClipPlane)
-				{
-					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.useExtendedNearClipPlane").value = newUseExtendedNearClipPlane;
-					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.useExtendedNearClipPlane");
-				}
-				
-				@Override
-				public double getBrightnessMultiplier()
-				{
-					return Config.Client.Graphics.AdvancedGraphics.brightnessMultiplier;
-				}
-				@Override
-				public void setBrightnessMultiplier(double newBrightnessMultiplier)
-				{
-					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.brightnessMultiplier").value = newBrightnessMultiplier;
-					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.brightnessMultiplier");
-				}
-				
-				@Override
-				public double getSaturationMultiplier()
-				{
-					return Config.Client.Graphics.AdvancedGraphics.saturationMultiplier;
-				}
-				@Override
-				public void setSaturationMultiplier(double newSaturationMultiplier)
-				{
-					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.saturationMultiplier").value = newSaturationMultiplier;
-					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.saturationMultiplier");
-				}
-			}
-		}
-		
-		
-		
-		
-		//========================//
-		// WorldGenerator Configs //
-		//========================//
-		public static class WorldGenerator implements IWorldGenerator
-		{
-			@Override
-			public GenerationPriority getGenerationPriority()
-			{
-				return Config.Client.WorldGenerator.generationPriority;
-			}
-			@Override
-			public void setGenerationPriority(GenerationPriority newGenerationPriority)
-			{
-				ConfigGui.editSingleOption.getEntry("client.worldGenerator.generationPriority").value = newGenerationPriority;
-				ConfigGui.editSingleOption.saveOption("client.worldGenerator.generationPriority");
-			}
-			
-			
-			@Override
-			public DistanceGenerationMode getDistanceGenerationMode()
-			{
-				return Config.Client.WorldGenerator.distanceGenerationMode;
-			}
-			@Override
-			public void setDistanceGenerationMode(DistanceGenerationMode newDistanceGenerationMode)
-			{
-				ConfigGui.editSingleOption.getEntry("client.worldGenerator.distanceGenerationMode").value = newDistanceGenerationMode;
-				ConfigGui.editSingleOption.saveOption("client.worldGenerator.distanceGenerationMode");
-			}
-
-			/*
-			@Override
-			public boolean getAllowUnstableFeatureGeneration()
-			{
-				return Config.Client.WorldGenerator.allowUnstableFeatureGeneration;
-			}
-			@Override
-			public void setAllowUnstableFeatureGeneration(boolean newAllowUnstableFeatureGeneration)
-			{
-				ConfigGui.editSingleOption.getEntry("client.worldGenerator.allowUnstableFeatureGeneration").value = newAllowUnstableFeatureGeneration;
-				ConfigGui.editSingleOption.saveOption("client.worldGenerator.allowUnstableFeatureGeneration");
-			}*/
-			
-			
-			@Override
-			public BlocksToAvoid getBlocksToAvoid()
-			{
-				return Config.Client.WorldGenerator.blocksToAvoid;
-			}
-			@Override
-			public void setBlockToAvoid(BlocksToAvoid newBlockToAvoid)
-			{
-				ConfigGui.editSingleOption.getEntry("client.worldGenerator.blocksToAvoid").value = newBlockToAvoid;
-				ConfigGui.editSingleOption.saveOption("client.worldGenerator.blocksToAvoid");
-			}
-			@Override
-			public boolean getEnableDistantGeneration()
-			{
-				return (boolean) ConfigGui.editSingleOption.getEntry("client.worldGenerator.enableDistantGeneration").value;
-			}
-			@Override
-			public void setEnableDistantGeneration(boolean newEnableDistantGeneration)
-			{
-				ConfigGui.editSingleOption.getEntry("client.worldGenerator.enableDistantGeneration").value = newEnableDistantGeneration;
-				ConfigGui.editSingleOption.saveOption("client.worldGenerator.enableDistantGeneration");
-			}
-			@Override
-			public LightGenerationMode getLightGenerationMode()
-			{
-				return Config.Client.WorldGenerator.lightGenerationMode;
-			}
-			@Override
-			public void setLightGenerationMode(LightGenerationMode newLightGenerationMode)
-			{
-				ConfigGui.editSingleOption.getEntry("client.worldGenerator.lightGenerationMode").value = newLightGenerationMode;
-				ConfigGui.editSingleOption.saveOption("client.worldGenerator.lightGenerationMode");
-			}
-		}
-		
-		
-		
-		//=====================//
-		// Multiplayer Configs //
-		//=====================//
-		public static class Multiplayer implements IMultiplayer
-		{
-			@Override
-			public ServerFolderNameMode getServerFolderNameMode()
-			{
-				return Config.Client.Multiplayer.serverFolderNameMode;
-			}
-			@Override
-			public void setServerFolderNameMode(ServerFolderNameMode newServerFolderNameMode)
-			{
-				ConfigGui.editSingleOption.getEntry("client.multiplayer.serverFolderNameMode").value = newServerFolderNameMode;
-				ConfigGui.editSingleOption.saveOption("client.multiplayer.serverFolderNameMode");
-			}
-			
-			@Override
-			public double getMultiDimensionRequiredSimilarity()
-			{
-				return Config.Client.Multiplayer.multiDimensionRequiredSimilarity;
-			}
-			
-			@Override
-			public void setMultiDimensionRequiredSimilarity(double newMultiDimensionMinimumSimilarityPercent)
-			{
-				ConfigGui.editSingleOption.getEntry("client.multiplayer.multiDimensionMinimumSimilarityPercent").value = newMultiDimensionMinimumSimilarityPercent;
-				ConfigGui.editSingleOption.saveOption("client.multiplayer.multiDimensionMinimumSimilarityPercent");
-			}
-		}
-		
-		
-		
-		//============================//
-		// AdvancedModOptions Configs //
-		//============================//
-		public static class Advanced implements IAdvanced
-		{
-			public final IThreading threading;
-			public final IDebugging debugging;
-			public final IBuffers buffers;
-			
-			
-			@Override
-			public IThreading threading()
-			{
-				return threading;
-			}
-			
-			
-			@Override
-			public IDebugging debugging()
-			{
-				return debugging;
-			}
-			
-			
-			@Override
-			public IBuffers buffers()
-			{
-				return buffers;
-			}
-			
-			
-			public Advanced()
-			{
-				threading = new Threading();
-				debugging = new Debugging();
-				buffers = new Buffers();
-			}
-			
-			public static class Threading implements IThreading
-			{
-				@Override
-				public int getNumberOfWorldGenerationThreads()
-				{
-					return Config.Client.Advanced.Threading.numberOfWorldGenerationThreads;
-				}
-				@Override
-				public void setNumberOfWorldGenerationThreads(int newNumberOfWorldGenerationThreads)
-				{
-					ConfigGui.editSingleOption.getEntry("client.advanced.threading.numberOfWorldGenerationThreads").value = newNumberOfWorldGenerationThreads;
-					ConfigGui.editSingleOption.saveOption("client.advanced.threading.numberOfWorldGenerationThreads");
-				}
-				
-				
-				@Override
-				public int getNumberOfBufferBuilderThreads()
-				{
-					return Config.Client.Advanced.Threading.numberOfBufferBuilderThreads;
-				}
-				@Override
-				public void setNumberOfBufferBuilderThreads(int newNumberOfWorldBuilderThreads)
-				{
-					ConfigGui.editSingleOption.getEntry("client.advanced.threading.numberOfBufferBuilderThreads").value = newNumberOfWorldBuilderThreads;
-					ConfigGui.editSingleOption.saveOption("client.advanced.threading.numberOfBufferBuilderThreads");
-				}
-			}
-			
-			
-			
-			
-			//===============//
-			// Debug Options //
-			//===============//
-			public static class Debugging implements IDebugging
-			{
-				@Override
-				public boolean getDrawLods()
-				{
-					return (boolean) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.drawLods").value;
-				}
-				@Override
-				public void setDrawLods(boolean newDrawLods)
-				{
-					ConfigGui.editSingleOption.getEntry("client.advanced.debugging.drawLods").value = newDrawLods;
-					ConfigGui.editSingleOption.saveOption("client.advanced.debugging.drawLods");
-				}
-				
-				
-				@Override
-				public DebugMode getDebugMode()
-				{
-					return (DebugMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugMode").value;
-				}
-				@Override
-				public void setDebugMode(DebugMode newDebugMode)
-				{
-					ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugMode").value = newDebugMode;
-					ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugMode");
-				}
-				
-				
-				@Override
-				public boolean getDebugKeybindingsEnabled()
-				{
-					return (boolean) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.enableDebugKeybindings").value;
-				}
-				@Override
-				public void setDebugKeybindingsEnabled(boolean newEnableDebugKeybindings)
-				{
-					ConfigGui.editSingleOption.getEntry("client.advanced.debugging.enableDebugKeybindings").value = newEnableDebugKeybindings;
-					ConfigGui.editSingleOption.saveOption("client.advanced.debugging.enableDebugKeybindings");
-				}
-			}
-			
-			
-			public static class Buffers implements IBuffers
-			{
-				
-				@Override
-				public GpuUploadMethod getGpuUploadMethod()
-				{
-					return Config.Client.Advanced.Buffers.gpuUploadMethod;
-				}
-				@Override
-				public void setGpuUploadMethod(GpuUploadMethod newDisableVanillaFog)
-				{
-					ConfigGui.editSingleOption.getEntry("client.advanced.buffers.gpuUploadMethod").value = newDisableVanillaFog;
-					ConfigGui.editSingleOption.saveOption("client.advanced.buffers.gpuUploadMethod");
-				}
-				
-				
-				@Override
-				public int getGpuUploadPerMegabyteInMilliseconds()
-				{
-					return Config.Client.Advanced.Buffers.gpuUploadPerMegabyteInMilliseconds;
-				}
-				@Override
-				public void setGpuUploadPerMegabyteInMilliseconds(int newMilliseconds) {
-					ConfigGui.editSingleOption.getEntry("client.advanced.buffers.gpuUploadPerMegabyteInMilliseconds").value = newMilliseconds;
-					ConfigGui.editSingleOption.saveOption("client.advanced.buffers.gpuUploadPerMegabyteInMilliseconds");
-				}
-				
-				
-				@Override
-				public BufferRebuildTimes getRebuildTimes()
-				{
-					return Config.Client.Advanced.Buffers.rebuildTimes;
-				}
-				@Override
-				public void setRebuildTimes(BufferRebuildTimes newBufferRebuildTimes)
-				{
-					ConfigGui.editSingleOption.getEntry("client.advanced.buffers.newBufferRebuildTimes").value = newBufferRebuildTimes;
-					ConfigGui.editSingleOption.saveOption("client.advanced.buffers.newBufferRebuildTimes");
-				}
-			}
-		}
-	}
-}

common/src/main/java/com/seibel/lod/common/wrappers/config/TexturedButtonWidget.java

@@ -1,43 +0,0 @@
-package com.seibel.lod.common.wrappers.config;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.gui.components.ImageButton;
-import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
-
-/**
- * Creates a button with a texture on it
- */
-public class TexturedButtonWidget extends ImageButton {
-    public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, ResourceLocation texture, OnPress pressAction) {
-        super(x, y, width, height, u, v, texture, pressAction);
-    }
-    public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation texture, int textureWidth, int textureHeight, OnPress pressAction) {
-        super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction);
-    }
-
-    public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation texture, int textureWidth, int textureHeight, OnPress pressAction, Component text) {
-        super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, text);
-    }
-
-    public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation texture, int textureWidth, int textureHeight, OnPress pressAction, OnTooltip tooltipSupplier, Component text) {
-        super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, tooltipSupplier, text);
-    }
-
-    @Override
-    public void renderButton(PoseStack matrices, int mouseX, int mouseY, float delta) {
-        RenderSystem.setShader(GameRenderer::getPositionTexShader);
-        RenderSystem.setShaderTexture(0, WIDGETS_LOCATION);
-        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
-        int i = this.getYImage(this.isHovered);
-        RenderSystem.enableBlend();
-        RenderSystem.defaultBlendFunc();
-        RenderSystem.enableDepthTest();
-        this.blit(matrices, this.x, this.y, 0, 46 + i * 20, this.width / 2, this.height);
-        this.blit(matrices, this.x + this.width / 2, this.y, 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
-
-        super.renderButton(matrices, mouseX, mouseY, delta);
-    }
-}

common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java

@@ -1,430 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.common.wrappers.minecraft;
-
-import java.awt.Color;
-import java.io.File;
-import java.util.ArrayList;
-
-import com.mojang.blaze3d.platform.NativeImage;
-import com.mojang.blaze3d.platform.Window;
-import com.seibel.lod.core.ModInfo;
-import com.seibel.lod.core.api.ApiShared;
-import com.seibel.lod.core.enums.LodDirection;
-import com.seibel.lod.core.util.LodUtil;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper;
-import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper;
-import com.seibel.lod.core.wrapperInterfaces.world.IDimensionTypeWrapper;
-import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
-import com.seibel.lod.common.wrappers.McObjectConverter;
-import com.seibel.lod.common.wrappers.block.BlockPosWrapper;
-import com.seibel.lod.common.wrappers.chunk.ChunkPosWrapper;
-import com.seibel.lod.common.wrappers.misc.LightMapWrapper;
-import com.seibel.lod.common.wrappers.world.DimensionTypeWrapper;
-import com.seibel.lod.common.wrappers.world.WorldWrapper;
-
-import net.minecraft.CrashReport;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.Options;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.client.multiplayer.ServerData;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.client.renderer.LightTexture;
-import net.minecraft.client.resources.model.ModelManager;
-import net.minecraft.client.server.IntegratedServer;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.dimension.DimensionType;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * A singleton that wraps the Minecraft class
- * to allow for easier movement between Minecraft versions.
- *
- * @author James Seibel
- * @version 3-5-2022
- */
-public class MinecraftClientWrapper implements IMinecraftClientWrapper
-{
-    public static final MinecraftClientWrapper INSTANCE = new MinecraftClientWrapper();
-
-    public final Minecraft mc = Minecraft.getInstance();
-
-    /**
-     * The lightmap for the current:
-     * Time, dimension, brightness setting, etc.
-     */
-    private NativeImage lightMap = null;
-
-    private ProfilerWrapper profilerWrapper;
-
-
-    private MinecraftClientWrapper()
-    {
-
-    }
-
-
-
-    //================//
-    // helper methods //
-    //================//
-
-    /**
-     * This should be called at the beginning of every frame to
-     * clear any Minecraft data that becomes out of date after a frame. <br> <br>
-     * <p>
-     * LightMaps and other time sensitive objects fall in this category. <br> <br>
-     * <p>
-     * This doesn't affect OpenGL objects in any way.
-     */
-    @Override
-    public void clearFrameObjectCache()
-    {
-        lightMap = null;
-    }
-
-
-
-    //=================//
-    // method wrappers //
-    //=================//
-
-    @Override
-    public float getShade(LodDirection lodDirection) {
-        if (mc.level != null)
-        {
-            Direction mcDir = McObjectConverter.Convert(lodDirection);
-            return mc.level.getShade(mcDir, true);
-        }
-        else return 0.0f;
-    }
-
-    @Override
-    public boolean hasSinglePlayerServer()
-    {
-        return mc.hasSingleplayerServer();
-    }
-
-    @Override
-    public String getCurrentServerName()
-    {
-        return mc.getCurrentServer().name;
-    }
-
-    @Override
-    public String getCurrentServerIp()
-    {
-        return mc.getCurrentServer().ip;
-    }
-
-    @Override
-    public String getCurrentServerVersion()
-    {
-        return mc.getCurrentServer().version.getString();
-    }
-
-    /** Returns the dimension the player is currently in */
-    @Override
-    public IDimensionTypeWrapper getCurrentDimension()
-    {
-        if (mc.player != null)
-            return DimensionTypeWrapper.getDimensionTypeWrapper(mc.player.level.dimensionType());
-        else return null;
-    }
-
-    @Override
-    public String getCurrentDimensionId()
-    {
-        return LodUtil.getDimensionIDFromWorld(WorldWrapper.getWorldWrapper(mc.level));
-    }
-
-    /** This texture changes every frame */
-    @Override
-    public ILightMapWrapper getCurrentLightMap()
-    {
-        // get the current lightMap if the cache is empty
-        if (lightMap == null)
-        {
-            LightTexture tex = mc.gameRenderer.lightTexture();
-            lightMap = tex.lightPixels;
-        }
-        return new LightMapWrapper(lightMap);
-    }
-
-    /**
-     * Returns the color int at the given pixel coordinates
-     * from the current lightmap.
-     * @param blockLight x location in texture space
-     * @param skyLight z location in texture space
-     */
-    @Override
-    public int getColorIntFromLightMap(int blockLight, int skyLight)
-    {
-        if (lightMap == null)
-        {
-            sendChatMessage("new");
-            // make sure the lightMap is up-to-date
-            getCurrentLightMap();
-        }
-
-        return lightMap.getPixelRGBA(blockLight, skyLight);
-    }
-
-    /**
-     * Returns the Color at the given pixel coordinates
-     * from the current lightmap.
-     * @param blockLight x location in texture space
-     * @param skyLight z location in texture space
-     */
-    @Override
-    public Color getColorFromLightMap(int blockLight, int skyLight) {
-        if (lightMap == null) {
-            // make sure the lightMap is up-to-date
-            getCurrentLightMap();
-        }
-
-        return LodUtil.intToColor(lightMap.getPixelRGBA(blockLight, skyLight));
-    }
-
-
-
-
-    //=============//
-    // Simple gets //
-    //=============//
-
-    public LocalPlayer getPlayer()
-    {
-        return mc.player;
-    }
-
-    @Override
-    public boolean playerExists()
-    {
-        return mc.player != null;
-    }
-
-    @Override
-    public BlockPosWrapper getPlayerBlockPos()
-    {
-        BlockPos playerPos = getPlayer().blockPosition();
-        return new BlockPosWrapper(playerPos.getX(), playerPos.getY(), playerPos.getZ());
-    }
-
-    @Override
-    public ChunkPosWrapper getPlayerChunkPos()
-    {
-        ChunkPos playerPos = getPlayer().chunkPosition();
-        return new ChunkPosWrapper(playerPos.x, playerPos.z);
-    }
-
-    public Options getOptions()
-    {
-        return mc.options;
-    }
-
-    public ModelManager getModelManager()
-    {
-        return mc.getModelManager();
-    }
-
-    public ClientLevel getClientLevel()
-    {
-        return mc.level;
-    }
-
-    @Override
-    public IWorldWrapper getWrappedServerWorld()
-    {
-        if (mc.level == null)
-            return null;
-
-        DimensionType dimension = mc.level.dimensionType();
-        IntegratedServer server = mc.getSingleplayerServer();
-
-        if (server == null)
-            return null;
-
-        ServerLevel serverWorld = null;
-        Iterable<ServerLevel> worlds = server.getAllLevels();
-        for (ServerLevel world : worlds)
-        {
-            if (world.dimensionType() == dimension)
-            {
-                serverWorld = world;
-                break;
-            }
-        }
-        return WorldWrapper.getWorldWrapper(serverWorld);
-    }
-
-    public WorldWrapper getWrappedClientLevel()
-    {
-        return WorldWrapper.getWorldWrapper(mc.level);
-    }
-
-    public WorldWrapper getWrappedServerLevel()
-    {
-
-        if (mc.level == null)
-            return null;
-        DimensionType dimension = mc.level.dimensionType();
-        IntegratedServer server = mc.getSingleplayerServer();
-        if (server == null)
-            return null;
-
-        Iterable<ServerLevel> worlds = server.getAllLevels();
-        ServerLevel returnWorld = null;
-
-        for (ServerLevel world : worlds)
-        {
-            if (world.dimensionType() == dimension)
-            {
-                returnWorld = world;
-                break;
-            }
-        }
-
-        return WorldWrapper.getWorldWrapper(returnWorld);
-    }
-
-    @Nullable
-    @Override
-    public IWorldWrapper getWrappedClientWorld()
-    {
-        return WorldWrapper.getWorldWrapper(mc.level);
-    }
-
-    @Override
-    public File getGameDirectory()
-    {
-        return mc.gameDirectory;
-    }
-
-    @Override
-    public IProfilerWrapper getProfiler()
-    {
-        if (profilerWrapper == null)
-            profilerWrapper = new ProfilerWrapper(mc.getProfiler());
-        else if (mc.getProfiler() != profilerWrapper.profiler)
-            profilerWrapper.profiler = mc.getProfiler();
-
-        return profilerWrapper;	}
-
-    public ClientPacketListener getConnection()
-    {
-        return mc.getConnection();
-    }
-
-    public GameRenderer getGameRenderer()
-    {
-        return mc.gameRenderer;
-    }
-
-    public Entity getCameraEntity()
-    {
-        return mc.cameraEntity;
-    }
-
-    public Window getWindow()
-    {
-        return mc.getWindow();
-    }
-
-    @Override
-    public float getSkyDarken(float partialTicks)
-    {
-        return mc.level.getSkyDarken(partialTicks);
-    }
-
-    public IntegratedServer getSinglePlayerServer()
-    {
-        return mc.getSingleplayerServer();
-    }
-
-    @Override
-    public boolean connectedToServer()
-    {
-        return mc.getCurrentServer() != null;
-    }
-
-    public ServerData getCurrentServer()
-    {
-        return mc.getCurrentServer();
-    }
-
-    public LevelRenderer getLevelRenderer()
-    {
-        return mc.levelRenderer;
-    }
-
-    /** Returns all worlds available to the server */
-    @Override
-    public ArrayList<IWorldWrapper> getAllServerWorlds()
-    {
-        ArrayList<IWorldWrapper> worlds = new ArrayList<IWorldWrapper>();
-
-        Iterable<ServerLevel> serverWorlds = mc.getSingleplayerServer().getAllLevels();
-        for (ServerLevel world : serverWorlds)
-        {
-            worlds.add(WorldWrapper.getWorldWrapper(world));
-        }
-
-        return worlds;
-    }
-
-
-
-    @Override
-    public void sendChatMessage(String string)
-    {
-        getPlayer().sendMessage(new TextComponent(string), getPlayer().getUUID());
-    }
-
-    /**
-     * Crashes Minecraft, displaying the given errorMessage <br> <br>
-     * In the following format: <br>
-     *
-     * The game crashed whilst <strong>errorMessage</strong>  <br>
-     * Error: <strong>ExceptionClass: exceptionErrorMessage</strong>  <br>
-     * Exit Code: -1  <br>
-     */
-    @Override
-    public void crashMinecraft(String errorMessage, Throwable exception)
-    {
-        ApiShared.LOGGER.error(ModInfo.READABLE_NAME + " had the following error: [" + errorMessage + "]. Crashing Minecraft...");
-        CrashReport report = new CrashReport(errorMessage, exception);
-        Minecraft.crash(report);
-    }
-
-
-
-
-
-}

common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java

@@ -1,328 +0,0 @@
-package com.seibel.lod.common.wrappers.minecraft;
-
-import java.awt.*;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.stream.Collectors;
-
-import com.mojang.blaze3d.pipeline.RenderTarget;
-import com.mojang.blaze3d.platform.NativeImage;
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.seibel.lod.common.wrappers.misc.LightMapWrapper;
-import com.seibel.lod.core.api.ApiShared;
-import com.seibel.lod.core.api.ClientApi;
-import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorHandler;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.util.LodUtil;
-
-import net.minecraft.client.renderer.LightTexture;
-
-import com.mojang.math.Vector3f;
-import com.seibel.lod.core.objects.math.Mat4f;
-import com.seibel.lod.core.objects.math.Vec3d;
-import com.seibel.lod.core.objects.math.Vec3f;
-import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
-import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
-import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
-import com.seibel.lod.common.wrappers.McObjectConverter;
-import com.seibel.lod.common.wrappers.WrapperFactory;
-import com.seibel.lod.common.wrappers.block.BlockPosWrapper;
-
-import net.minecraft.client.Camera;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.FogRenderer;
-import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.effect.MobEffects;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.level.material.FogType;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.Vec3;
-
-
-/**
- * A singleton that contains everything
- * related to rendering in Minecraft.
- *
- * @author James Seibel
- * @version 12-12-2021
- */
-public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
-{
-	public static final MinecraftRenderWrapper INSTANCE = new MinecraftRenderWrapper();
-	
-	private static final Minecraft MC = Minecraft.getInstance();
-	private static final GameRenderer GAME_RENDERER = MC.gameRenderer;
-	private static final IWrapperFactory FACTORY = WrapperFactory.INSTANCE;
-	
-	@Override
-	public Vec3f getLookAtVector()
-	{
-		Camera camera = GAME_RENDERER.getMainCamera();
-		Vector3f cameraDir = camera.getLookVector();
-		return new Vec3f(cameraDir.x(), cameraDir.y(), cameraDir.z());
-	}
-	
-	@Override
-	public AbstractBlockPosWrapper getCameraBlockPosition()
-	{
-		Camera camera = GAME_RENDERER.getMainCamera();
-		BlockPos blockPos = camera.getBlockPosition();
-		return new BlockPosWrapper(blockPos.getX(), blockPos.getY(), blockPos.getZ());
-	}
-	
-	@Override
-	public boolean playerHasBlindnessEffect()
-	{
-		return MC.player.getActiveEffectsMap().get(MobEffects.BLINDNESS) != null;
-	}
-	
-	@Override
-	public Vec3d getCameraExactPosition()
-	{
-		Camera camera = GAME_RENDERER.getMainCamera();
-		Vec3 projectedView = camera.getPosition();
-		
-		return new Vec3d(projectedView.x, projectedView.y, projectedView.z);
-	}
-	
-	@Override
-	public Mat4f getDefaultProjectionMatrix(float partialTicks)
-	{
-		return McObjectConverter.Convert(GAME_RENDERER.getProjectionMatrix(GAME_RENDERER.getFov(GAME_RENDERER.getMainCamera(), partialTicks, true)));
-	}
-	
-	@Override
-	public double getGamma()
-	{
-		return MC.options.gamma;
-	}
-	
-	@Override
-	public Color getFogColor(float partialTicks) {
-		FogRenderer.setupColor(GAME_RENDERER.getMainCamera(), partialTicks, MC.level, 1, GAME_RENDERER.getDarkenWorldAmount(partialTicks));
-		float[] colorValues = RenderSystem.getShaderFogColor();
-		return new Color(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
-	}
-	// getSpecialFogColor() is the same as getFogColor()
-	
-	@Override
-	public Color getSkyColor() {
-		if (MC.level.dimensionType().hasSkyLight()) {
-			Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getPosition(), MC.getFrameTime());
-			return new Color((float) colorValues.x, (float) colorValues.y, (float) colorValues.z);
-		} else
-			return new Color(0, 0, 0);
-	}
-	
-	@Override
-	public double getFov(float partialTicks)
-	{
-		return GAME_RENDERER.getFov(GAME_RENDERER.getMainCamera(), partialTicks, true);
-	}
-	
-	/** Measured in chunks */
-	@Override
-	public int getRenderDistance()
-	{
-        return MC.options.getEffectiveRenderDistance();
-	}
-	
-	@Override
-	public int getScreenWidth()
-	{
-		return MC.getWindow().getWidth();
-	}
-	@Override
-	public int getScreenHeight()
-	{
-		return MC.getWindow().getHeight();
-	}
-	
-    private RenderTarget getRenderTarget() {
-        RenderTarget r = null; //MC.levelRenderer.getCloudsTarget();
-        return r!=null ? r : MC.getMainRenderTarget();
-    }
-
-    @Override
-    public int getTargetFrameBuffer() {
-        return getRenderTarget().frameBufferId;
-    }
-
-    @Override
-    public int getTargetFrameBufferViewportWidth() {
-        return getRenderTarget().viewWidth;
-    }
-
-    @Override
-    public int getTargetFrameBufferViewportHeight() {
-        return getRenderTarget().viewHeight;
-    }
-
-	/**
-	 * This method returns the ChunkPos of all chunks that Minecraft
-	 * is going to render this frame. <br><br>
-	 * <p>
-	 */
-	
-    public boolean usingBackupGetVanillaRenderedChunks = true;
-	@Override
-	public HashSet<AbstractChunkPosWrapper> getVanillaRenderedChunks()
-	{
-		ISodiumAccessor sodium = ModAccessorHandler.get(ISodiumAccessor.class);
-		if (sodium != null)
-		{
-			return sodium.getNormalRenderedChunks();
-		}
-		IOptifineAccessor optifine = ModAccessorHandler.get(IOptifineAccessor.class);
-		if (optifine != null)
-		{
-			HashSet<AbstractChunkPosWrapper> pos = optifine.getNormalRenderedChunks();
-			if (pos == null)
-				pos = getMaximumRenderedChunks();
-			return pos;
-		}
-		if (!usingBackupGetVanillaRenderedChunks) {
-			try {
-				LevelRenderer levelRenderer = MC.levelRenderer;
-				LinkedHashSet<LevelRenderer.RenderChunkInfo> chunks = levelRenderer.renderChunkStorage.get().renderChunks;
-				return (chunks.stream().map((chunk) -> {
-                #if MC_VERSION_1_18_2
-					AABB chunkBoundingBox = chunk.chunk.getBoundingBox();
-                #elif MC_VERSION_1_18_1
-				AABB chunkBoundingBox = chunk.chunk.bb;
-                #endif
-					return FACTORY.createChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16),
-							Math.floorDiv((int) chunkBoundingBox.minZ, 16));
-				}).collect(Collectors.toCollection(HashSet::new)));
-			} catch (LinkageError e) {
-				try {
-					MinecraftClientWrapper.INSTANCE.sendChatMessage(
-							"\u00A7e\u00A7l\u00A7uWARNING: Distant Horizons: getVanillaRenderedChunks method failed."
-									+ " Using Backup Method.");
-					MinecraftClientWrapper.INSTANCE.sendChatMessage(
-							"\u00A7eOverdraw prevention will be worse than normal.");
-				} catch (Exception e2) {}
-				ApiShared.LOGGER.error("getVanillaRenderedChunks Error: ", e);
-				usingBackupGetVanillaRenderedChunks = true;
-			}
-		}
-		return getMaximumRenderedChunks();
-	}
-	
-	@Override
-	public int[] getLightmapPixels()
-	{
-		LightTexture tex = GAME_RENDERER.lightTexture();
-		tex.tick(); // This call makes no sense, but it fixes pause menu flicker bug
-		NativeImage lightMapPixels = tex.lightPixels;
-		LightMapWrapper lightMap = new LightMapWrapper(lightMapPixels);
-		
-		
-		int lightMapHeight = getLightmapTextureHeight();
-		int lightMapWidth = getLightmapTextureWidth();
-		
-		int[] pixels = new int[lightMapWidth * lightMapHeight];
-		for (int u = 0; u < lightMapWidth; u++)
-		{
-			for (int v = 0; v < lightMapWidth; v++)
-			{
-				// this could probably be kept as a int, but
-				// it is easier to test and see the colors when debugging this way.
-				// When creating a new release this should be changed to the int version.
-				Color c = LodUtil.intToColor(lightMap.getLightValue(u, v));
-				
-				// these should both create a totally white image
-//					int col =
-//							Integer.MAX_VALUE;
-//					int col =
-//							0b11111111 + // red
-//							(0b11111111 << 8) + // green
-//							(0b11111111 << 16) + // blue
-//							(0b11111111 << 24); // blue
-				
-				int col =
-						((c.getRed() & 0xFF) << 16) | // blue
-								((c.getGreen() & 0xFF) << 8) | // green
-								((c.getBlue() & 0xFF)) | // red
-								((c.getAlpha() & 0xFF) << 24); // alpha
-				
-				// 2D array stored in a 1D array.
-				// Thank you Tim from College ;)
-				pixels[u * lightMapWidth + v] = col;
-			}
-		}
-		
-		return pixels;
-	}
-	
-	
-	@Override
-	public int getLightmapTextureHeight()
-	{
-		int height = -1;
-		
-		LightTexture lightTexture = GAME_RENDERER.lightTexture();
-		if (lightTexture != null)
-		{
-			NativeImage tex = lightTexture.lightPixels;
-			if (tex != null)
-			{
-				height = tex.getHeight();
-			}
-		}
-		
-		return height;
-	}
-	
-	@Override
-	public int getLightmapTextureWidth()
-	{
-		int width = -1;
-		
-		LightTexture lightTexture = GAME_RENDERER.lightTexture();
-		if (lightTexture != null)
-		{
-			NativeImage tex = lightTexture.lightPixels;
-			if (tex != null)
-			{
-				width = tex.getWidth();
-			}
-		}
-		
-		return width;
-	}
-	
-	
-	@Override
-	public int getLightmapGLFormat() {
-		int glFormat = -1;
-		
-		LightTexture lightTexture = GAME_RENDERER.lightTexture();
-		if (lightTexture != null) {
-			NativeImage tex = lightTexture.lightPixels;
-			if (tex != null) {
-				glFormat = tex.format().glFormat();
-			}
-		}
-		
-		return glFormat;
-	}
-	
-	@Override
-	public boolean isFogStateSpecial() {
-		Entity entity = GAME_RENDERER.getMainCamera().getEntity();
-		boolean isBlind = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
-		return GAME_RENDERER.getMainCamera().getFluidInCamera() != FogType.NONE || isBlind;
-	}
-	
-	@Override
-	public boolean tryDisableVanillaFog() {
-		return true; // Handled via MixinFogRenderer in both forge and fabric
-	}
-}

common/src/main/java/com/seibel/lod/common/wrappers/minecraft/ProfilerWrapper.java

@@ -1,41 +0,0 @@
-package com.seibel.lod.common.wrappers.minecraft;
-
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper;
-
-import net.minecraft.util.profiling.ProfilerFiller;
-
-/**
- * @author James Seibel
- * @version 11-20-2021
- */
-public class ProfilerWrapper implements IProfilerWrapper
-{
-    public ProfilerFiller profiler;
-
-    public ProfilerWrapper(ProfilerFiller newProfiler)
-    {
-        profiler = newProfiler;
-    }
-
-
-    /** starts a new section inside the currently running section */
-    @Override
-    public void push(String newSection)
-    {
-        profiler.push(newSection);
-    }
-
-    /** ends the currently running section and starts a new one */
-    @Override
-    public void popPush(String newSection)
-    {
-        profiler.popPush(newSection);
-    }
-
-    /** ends the currently running section */
-    @Override
-    public void pop()
-    {
-        profiler.pop();
-    }
-}

common/src/main/java/com/seibel/lod/common/wrappers/misc/LightMapWrapper.java

@@ -1,29 +0,0 @@
-package com.seibel.lod.common.wrappers.misc;
-
-import com.mojang.blaze3d.platform.NativeImage;
-import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper;
-
-/**
- * @author James Seibel
- * @version 11-21-2021
- */
-public class LightMapWrapper implements ILightMapWrapper
-{
-    static NativeImage lightMap = null;
-
-    public LightMapWrapper(NativeImage newLightMap)
-    {
-        lightMap = newLightMap;
-    }
-
-    public static void setLightMap(NativeImage newLightMap)
-    {
-        lightMap = newLightMap;
-    }
-
-    @Override
-    public int getLightValue(int skyLight, int blockLight)
-    {
-        return lightMap.getPixelRGBA(skyLight, blockLight);
-    }
-}

common/src/main/java/com/seibel/lod/common/wrappers/world/BiomeWrapper.java

@@ -1,162 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.common.wrappers.world;
-
-import java.awt.Color;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import com.seibel.lod.core.util.LodUtil;
-import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;
-
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.material.MaterialColor;
-
-//This class wraps the minecraft BlockPos.Mutable (and BlockPos) class
-public class BiomeWrapper implements IBiomeWrapper
-{
-
-    public static final ConcurrentMap<Biome, BiomeWrapper> biomeWrapperMap = new ConcurrentHashMap<>();
-    private final Biome biome;
-
-    public BiomeWrapper(Biome biome)
-    {
-        this.biome = biome;
-    }
-
-    static public IBiomeWrapper getBiomeWrapper(Biome biome)
-    {
-        //first we check if the biome has already been wrapped
-        if(biomeWrapperMap.containsKey(biome) && biomeWrapperMap.get(biome) != null)
-            return biomeWrapperMap.get(biome);
-
-
-        //if it hasn't been created yet, we create it and save it in the map
-        BiomeWrapper biomeWrapper = new BiomeWrapper(biome);
-        biomeWrapperMap.put(biome, biomeWrapper);
-
-        //we return the newly created wrapper
-        return biomeWrapper;
-    }
-
-
-    /** Returns a color int for the given biome. */
-    @Override
-    public int getColorForBiome(int x, int z)
-    {
-        int colorInt;
-
-        switch (biome.biomeCategory)
-        {
-
-            case NETHER:
-                colorInt = Blocks.NETHERRACK.defaultBlockState().getMaterial().getColor().col;
-                break;
-
-            case THEEND:
-                colorInt = Blocks.END_STONE.defaultBlockState().getMaterial().getColor().col;
-                break;
-
-            case BEACH:
-            case DESERT:
-                colorInt = Blocks.SAND.defaultBlockState().getMaterial().getColor().col;
-                break;
-
-            case EXTREME_HILLS:
-                colorInt = Blocks.STONE.defaultMaterialColor().col;
-                break;
-
-            case MUSHROOM:
-                colorInt = MaterialColor.COLOR_LIGHT_GRAY.col;
-                break;
-
-            case ICY:
-                colorInt = Blocks.SNOW.defaultMaterialColor().col;
-                break;
-
-            case MESA:
-                colorInt = Blocks.RED_SAND.defaultMaterialColor().col;
-                break;
-
-            case OCEAN:
-            case RIVER:
-                colorInt = biome.getWaterColor();
-                break;
-
-            case NONE:
-            case FOREST:
-            case TAIGA:
-            case JUNGLE:
-            case PLAINS:
-            case SAVANNA:
-            case SWAMP:
-            default:
-                Color tmp = LodUtil.intToColor(biome.getGrassColor(x, z));
-                tmp = tmp.darker();
-                colorInt = LodUtil.colorToInt(tmp);
-                break;
-
-        }
-
-        return colorInt;
-    }
-    
-    @Override public String getName()
-    {
-        return biome.toString();
-    }
-    
-    @Override
-    public int getGrassTint(int x, int z)
-    {
-        return biome.getGrassColor(x, z);
-    }
-
-    @Override
-    public int getFolliageTint()
-    {
-        return biome.getFoliageColor();
-    }
-
-    @Override
-    public int getWaterTint()
-    {
-        return biome.getWaterColor();
-    }
-
-
-    @Override public boolean equals(Object obj)
-    {
-        if (this == obj)
-            return true;
-        if (!(obj instanceof BiomeWrapper))
-            return false;
-        BiomeWrapper that = (BiomeWrapper) obj;
-        return Objects.equals(biome, that.biome);
-    }
-
-    @Override public int hashCode()
-    {
-        return Objects.hash(biome);
-    }
-
-}

common/src/main/java/com/seibel/lod/common/wrappers/world/DimensionTypeWrapper.java

@@ -1,82 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.common.wrappers.world;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import com.seibel.lod.core.wrapperInterfaces.world.IDimensionTypeWrapper;
-
-import net.minecraft.world.level.dimension.DimensionType;
-
-/**
- *
- * @author James Seibel
- * @version 11-21-2021
- */
-public class DimensionTypeWrapper implements IDimensionTypeWrapper
-{
-    private static final ConcurrentMap<DimensionType, DimensionTypeWrapper> dimensionTypeWrapperMap = new ConcurrentHashMap<>();
-    private final DimensionType dimensionType;
-
-    public DimensionTypeWrapper(DimensionType dimensionType)
-    {
-        this.dimensionType = dimensionType;
-    }
-
-    public static DimensionTypeWrapper getDimensionTypeWrapper(DimensionType dimensionType)
-    {
-        //first we check if the biome has already been wrapped
-        if(dimensionTypeWrapperMap.containsKey(dimensionType) && dimensionTypeWrapperMap.get(dimensionType) != null)
-            return dimensionTypeWrapperMap.get(dimensionType);
-
-
-        //if it hasn't been created yet, we create it and save it in the map
-        DimensionTypeWrapper dimensionTypeWrapper = new DimensionTypeWrapper(dimensionType);
-        dimensionTypeWrapperMap.put(dimensionType, dimensionTypeWrapper);
-
-        //we return the newly created wrapper
-        return dimensionTypeWrapper;
-    }
-
-    public static void clearMap()
-    {
-        dimensionTypeWrapperMap.clear();
-    }
-
-
-    @Override
-    public String getDimensionName()
-    {
-        return dimensionType.effectsLocation().getPath();
-    }
-
-    @Override
-    public boolean hasCeiling()
-    {
-        return dimensionType.hasCeiling();
-    }
-
-    @Override
-    public boolean hasSkyLight()
-    {
-        return dimensionType.hasSkyLight();
-    }
-}

common/src/main/java/com/seibel/lod/common/wrappers/world/WorldWrapper.java

@@ -1,187 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.common.wrappers.world;
-
-import java.io.File;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import com.seibel.lod.core.enums.WorldType;
-import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
-import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
-import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
-import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
-
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerChunkCache;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.LightLayer;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkSource;
-import net.minecraft.world.level.chunk.ChunkStatus;
-
-import org.jetbrains.annotations.Nullable;
-
-/**
- * @author James Seibel
- * @author ??
- * @version 11-21-2021
- */
-public class WorldWrapper implements IWorldWrapper
-{
-    private static final ConcurrentMap<LevelAccessor, WorldWrapper> worldWrapperMap = new ConcurrentHashMap<>();
-    private final LevelAccessor world;
-    public final WorldType worldType;
-    
-    
-    public WorldWrapper(LevelAccessor newWorld)
-    {
-        world = newWorld;
-        
-        if (world.getClass() == ServerLevel.class)
-            worldType = WorldType.ServerWorld;
-        else if (world.getClass() == ClientLevel.class)
-            worldType = WorldType.ClientWorld;
-        else
-            worldType = WorldType.Unknown;
-    }
-    
-    
-    @Nullable
-    public static WorldWrapper getWorldWrapper(LevelAccessor world)
-    {
-        if (world == null) return null;
-        //first we check if the biome has already been wrapped
-        if(worldWrapperMap.containsKey(world) && worldWrapperMap.get(world) != null)
-            return worldWrapperMap.get(world);
-        
-        
-        //if it hasn't been created yet, we create it and save it in the map
-        WorldWrapper worldWrapper = new WorldWrapper(world);
-        worldWrapperMap.put(world, worldWrapper);
-        
-        //we return the newly created wrapper
-        return worldWrapper;
-    }
-    
-    public static void clearMap()
-    {
-        worldWrapperMap.clear();
-    }
-    
-    @Override
-    public WorldType getWorldType()
-    {
-        return worldType;
-    }
-    
-    @Override
-    public DimensionTypeWrapper getDimensionType()
-    {
-        return DimensionTypeWrapper.getDimensionTypeWrapper(world.dimensionType());
-    }
-    
-    @Override
-    public int getBlockLight(int x, int y, int z)
-    {
-        return world.getBrightness(LightLayer.BLOCK, new BlockPos(x,y,z));
-    }
-    
-    @Override
-    public int getSkyLight(int x, int y, int z)
-    {
-        return world.getBrightness(LightLayer.SKY, new BlockPos(x,y,z));
-    }
-    
-    public LevelAccessor getWorld()
-    {
-        return world;
-    }
-    
-    @Override
-    public boolean hasCeiling()
-    {
-        return world.dimensionType().hasCeiling();
-    }
-    
-    @Override
-    public boolean hasSkyLight()
-    {
-        return world.dimensionType().hasSkyLight();
-    }
-    
-    @Override
-    public int getHeight()
-    {
-        return world.getHeight();
-    }
-    
-    @Override
-    public short getMinHeight()
-    {
-        return (short) world.getMinBuildHeight();
-    }
-    
-    /** @throws UnsupportedOperationException if the WorldWrapper isn't for a ServerWorld */
-    @Override
-    public File getSaveFolder() throws UnsupportedOperationException
-    {
-        if (worldType != WorldType.ServerWorld)
-            throw new UnsupportedOperationException("getSaveFolder can only be called for ServerWorlds.");
-        
-        ServerChunkCache chunkSource = ((ServerLevel) world).getChunkSource();
-        return chunkSource.getDataStorage().dataFolder;
-    }
-    
-    
-    /** @throws UnsupportedOperationException if the WorldWrapper isn't for a ServerWorld */
-    public ServerLevel getServerWorld() throws UnsupportedOperationException
-    {
-        if (worldType != WorldType.ServerWorld)
-            throw new UnsupportedOperationException("getSaveFolder can only be called for ServerWorlds.");
-        
-        return (ServerLevel) world;
-    }
-    
-    @Override
-    public int getSeaLevel()
-    {
-        // TODO this is depreciated, what should we use instead?
-        return world.getSeaLevel();
-    }
-    
-    @Override
-    public IChunkWrapper tryGetChunk(AbstractChunkPosWrapper pos) {
-        ChunkAccess chunk = world.getChunk(pos.getX(), pos.getZ(), ChunkStatus.EMPTY, false);
-        if (chunk == null) return null;
-        return new ChunkWrapper(chunk, world);
-    }
-    
-    @Override
-    public boolean hasChunkLoaded(int chunkX, int chunkZ) {
-        // world.hasChunk(chunkX, chunkZ); THIS DOES NOT WORK FOR CLIENT LEVEL CAUSE MOJANG ALWAYS RETURN TRUE FOR THAT!
-        ChunkSource source = world.getChunkSource();
-        return source.hasChunk(chunkX, chunkZ);
-    }
-
-    
-}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java

@@ -1,607 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2021 Tom Lee (TomTheFurry)
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.common.wrappers.worldGeneration;
-
-import com.seibel.lod.core.api.ApiShared;
-import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
-import com.seibel.lod.core.builders.lodBuilding.LodBuilderConfig;
-import com.seibel.lod.core.enums.config.DistanceGenerationMode;
-import com.seibel.lod.core.enums.config.LightGenerationMode;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.objects.lod.LodDimension;
-import com.seibel.lod.core.util.gridList.ArrayGridList;
-import com.seibel.lod.core.util.LodThreadFactory;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
-import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
-import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper;
-
-import java.time.Duration;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-import com.seibel.lod.common.wrappers.DependencySetupDoneCheck;
-import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.lod.common.wrappers.world.WorldWrapper;
-import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.ChunkLoader;
-import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.LightGetterAdaptor;
-import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.LightedWorldGenRegion;
-import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.WorldGenLevelLightEngine;
-import com.seibel.lod.common.wrappers.worldGeneration.step.StepBiomes;
-import com.seibel.lod.common.wrappers.worldGeneration.step.StepFeatures;
-import com.seibel.lod.common.wrappers.worldGeneration.step.StepLight;
-import com.seibel.lod.common.wrappers.worldGeneration.step.StepNoise;
-import com.seibel.lod.common.wrappers.worldGeneration.step.StepStructureReference;
-import com.seibel.lod.common.wrappers.worldGeneration.step.StepStructureStart;
-import com.seibel.lod.common.wrappers.worldGeneration.step.StepSurface;
-
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.chunk.ProtoChunk;
-import net.minecraft.world.level.chunk.UpgradeData;
-import net.minecraft.world.level.levelgen.DebugLevelSource;
-import net.minecraft.world.level.levelgen.FlatLevelSource;
-import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
-import net.minecraft.core.Registry;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-
-/*
-Total:                   3.135214124s
-=====================================
-Empty Chunks:            0.000558328s
-StructureStart Step:     0.025177207s
-StructureReference Step: 0.00189559s
-Biome Step:              0.13789155s
-Noise Step:              1.570347555s
-Surface Step:            0.741238194s
-Carver Step:             0.000009923s
-Feature Step:            0.389072425s
-Lod Generation:          0.269023348s
-*/
-
-public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnvionmentWrapper
-{
-	public static final boolean ENABLE_PERF_LOGGING = false;
-	public static final boolean ENABLE_EVENT_LOGGING = false;
-	public static final boolean ENABLE_LOAD_EVENT_LOGGING = false;
-	//TODO: Make actual proper support for StarLight
-	
-	public static class PrefEvent
-	{
-		long beginNano = 0;
-		long emptyNano = 0;
-		long structStartNano = 0;
-		long structRefNano = 0;
-		long biomeNano = 0;
-		long noiseNano = 0;
-		long surfaceNano = 0;
-		long carverNano = 0;
-		long featureNano = 0;
-		long lightNano = 0;
-		long endNano = 0;
-		
-		@Override
-		public String toString()
-		{
-			return "beginNano: " + beginNano + ",\n" +
-					"emptyNano: " + emptyNano + ",\n" +
-					"structStartNano: " + structStartNano + ",\n" +
-					"structRefNano: " + structRefNano + ",\n" +
-					"biomeNano: " + biomeNano + ",\n" +
-					"noiseNano: " + noiseNano + ",\n" +
-					"surfaceNano: " + surfaceNano + ",\n" +
-					"carverNano: " + carverNano + ",\n" +
-					"featureNano: " + featureNano + ",\n" +
-					"lightNano: " + lightNano + ",\n" +
-					"endNano: " + endNano + "\n";
-		}
-	}
-	
-	public static class PerfCalculator
-	{
-		public static final int SIZE = 50;
-		Rolling totalTime = new Rolling(SIZE);
-		Rolling emptyTime = new Rolling(SIZE);
-		Rolling structStartTime = new Rolling(SIZE);
-		Rolling structRefTime = new Rolling(SIZE);
-		Rolling biomeTime = new Rolling(SIZE);
-		Rolling noiseTime = new Rolling(SIZE);
-		Rolling surfaceTime = new Rolling(SIZE);
-		Rolling carverTime = new Rolling(SIZE);
-		Rolling featureTime = new Rolling(SIZE);
-		Rolling lightTime = new Rolling(SIZE);
-		Rolling lodTime = new Rolling(SIZE);
-		
-		public void recordEvent(PrefEvent e)
-		{
-			long preTime = e.beginNano;
-			totalTime.add(e.endNano - preTime);
-			if (e.emptyNano != 0)
-			{
-				emptyTime.add(e.emptyNano - preTime);
-				preTime = e.emptyNano;
-			}
-			if (e.structStartNano != 0)
-			{
-				structStartTime.add(e.structStartNano - preTime);
-				preTime = e.structStartNano;
-			}
-			if (e.structRefNano != 0)
-			{
-				structRefTime.add(e.structRefNano - preTime);
-				preTime = e.structRefNano;
-			}
-			if (e.biomeNano != 0)
-			{
-				biomeTime.add(e.biomeNano - preTime);
-				preTime = e.biomeNano;
-			}
-			if (e.noiseNano != 0)
-			{
-				noiseTime.add(e.noiseNano - preTime);
-				preTime = e.noiseNano;
-			}
-			if (e.surfaceNano != 0)
-			{
-				surfaceTime.add(e.surfaceNano - preTime);
-				preTime = e.surfaceNano;
-			}
-			if (e.carverNano != 0)
-			{
-				carverTime.add(e.carverNano - preTime);
-				preTime = e.carverNano;
-			}
-			if (e.featureNano != 0)
-			{
-				featureTime.add(e.featureNano - preTime);
-				preTime = e.featureNano;
-			}
-			if (e.lightNano != 0)
-			{
-				lightTime.add(e.lightNano - preTime);
-				preTime = e.lightNano;
-			}
-			if (e.endNano != 0)
-			{
-				lodTime.add(e.endNano - preTime);
-			}
-		}
-		
-		public String toString()
-		{
-			return "Total: " + Duration.ofNanos((long) totalTime.getAverage()) + ", Empty/LoadChunk: "
-					+ Duration.ofNanos((long) emptyTime.getAverage()) + ", StructStart: "
-					+ Duration.ofNanos((long) structStartTime.getAverage()) + ", StructRef: "
-					+ Duration.ofNanos((long) structRefTime.getAverage()) + ", Biome: "
-					+ Duration.ofNanos((long) biomeTime.getAverage()) + ", Noise: "
-					+ Duration.ofNanos((long) noiseTime.getAverage()) + ", Surface: "
-					+ Duration.ofNanos((long) surfaceTime.getAverage()) + ", Carver: "
-					+ Duration.ofNanos((long) carverTime.getAverage()) + ", Feature: "
-					+ Duration.ofNanos((long) featureTime.getAverage()) + ", Light: "
-					+ Duration.ofNanos((long) lightTime.getAverage()) + ", Lod: "
-					+ Duration.ofNanos((long) lodTime.getAverage());
-		}
-	}
-	
-	public static final int TIMEOUT_SECONDS = 60;
-	
-	//=================Generation Step===================
-	
-	public final LinkedList<GenerationEvent> events = new LinkedList<>();
-	public final GlobalParameters params;
-	public final StepStructureStart stepStructureStart = new StepStructureStart(this);
-	public final StepStructureReference stepStructureReference = new StepStructureReference(this);
-	public final StepBiomes stepBiomes = new StepBiomes(this);
-	public final StepNoise stepNoise = new StepNoise(this);
-	public final StepSurface stepSurface = new StepSurface(this);
-	public final StepFeatures stepFeatures = new StepFeatures(this);
-	public final StepLight stepLight = new StepLight(this);
-	public boolean unsafeThreadingRecorded = false;
-	//public boolean safeMode = false;
-	private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
-	private static final IMinecraftClientWrapper MC = SingletonHandler.get(IMinecraftClientWrapper.class);
-	public static final long EXCEPTION_TIMER_RESET_TIME = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS);
-	public static final int EXCEPTION_COUNTER_TRIGGER = 20;
-	public static final int RANGE_TO_RANGE_EMPTY_EXTENSION = 1;
-	public int unknownExceptionCount = 0;
-	public long lastExceptionTriggerTime = 0;
-	
-	public static final LodThreadFactory threadFactory = new LodThreadFactory("Gen-Worker-Thread", Thread.MIN_PRIORITY);
-	
-	public static ThreadLocal<Boolean> isDistantGeneratorThread = new ThreadLocal<>();
-	
-	public static boolean isCurrentThreadDistantGeneratorThread() {
-		return (isDistantGeneratorThread.get() != null);
-	}
-	
-	static {
-		DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread = BatchGenerationEnvironment::isCurrentThreadDistantGeneratorThread;
-	}
-	
-	public ExecutorService executors = Executors.newFixedThreadPool(
-			CONFIG.client().advanced().threading().getNumberOfWorldGenerationThreads(), threadFactory);
-
-	public <T> T joinSync(CompletableFuture<T> f) {
-		if (!unsafeThreadingRecorded && !f.isDone()) {
-			MC.sendChatMessage("\u00A74\u00A7l\u00A7uERROR: Distant Horizons: Unsafe Threading in Chunk Generator Detected!");
-			MC.sendChatMessage("\u00A7eTo increase stability, it is recommended to set world generation threads count to 1.");
-			ApiShared.LOGGER.error("Unsafe Threading in Chunk Generator: ", new RuntimeException("Concurrent future"));
-			unsafeThreadingRecorded = true;
-		}
-		return f.join();
-	}
-	
-	public void resizeThreadPool(int newThreadCount)
-	{
-		executors = Executors.newFixedThreadPool(newThreadCount,
-				new LodThreadFactory("Gen-Worker-Thread", Thread.MIN_PRIORITY));
-	}
-	
-	public boolean tryAddPoint(int px, int pz, int range, Steps target, boolean genAllDetails)
-	{
-		int boxSize = range * 2 + 1;
-		int x = Math.floorDiv(px, boxSize) * boxSize + range;
-		int z = Math.floorDiv(pz, boxSize) * boxSize + range;
-		
-		for (GenerationEvent event : events)
-		{
-			if (event.tooClose(x, z, range))
-				return false;
-		}
-		// System.out.println(x + ", "+z);
-		events.add(new GenerationEvent(new ChunkPos(x, z), range, this, target, genAllDetails));
-		return true;
-	}
-	
-	public void updateAllFutures()
-	{
-		if (unknownExceptionCount > 0) {
-			if (System.nanoTime() - lastExceptionTriggerTime >= EXCEPTION_TIMER_RESET_TIME) {
-				unknownExceptionCount = 0;
-			}
-		}
-		
-		// Update all current out standing jobs
-		Iterator<GenerationEvent> iter = events.iterator();
-		while (iter.hasNext())
-		{
-			GenerationEvent event = iter.next();
-			if (event.isCompleted())
-			{
-				try
-				{
-					event.join();
-				}
-				catch (Throwable e)
-				{
-					ApiShared.LOGGER.error("Batching World Generator: Event {} gotten an exception", event);
-					ApiShared.LOGGER.error("Exception: ", e);
-					unknownExceptionCount++;
-					lastExceptionTriggerTime = System.nanoTime();
-				}
-				finally
-				{
-					iter.remove();
-				}
-			}
-			else if (event.hasTimeout(TIMEOUT_SECONDS, TimeUnit.SECONDS))
-			{
-				ApiShared.LOGGER.error("Batching World Generator: " + event + " timed out and terminated!");
-				ApiShared.LOGGER.info("Dump PrefEvent: " + event.pEvent);
-				try
-				{
-					if (!event.terminate())
-						ApiShared.LOGGER.error("Failed to terminate the stuck generation event!");
-				}
-				finally
-				{
-					iter.remove();
-				}
-			}
-		}
-		if (unknownExceptionCount > EXCEPTION_COUNTER_TRIGGER) {
-			try {
-				MC.sendChatMessage("\u00A74\u00A7l\u00A7uERROR: Distant Horizons: Too many exceptions in Batching World Generator! Disabling the generator.");
-			} catch (Exception e) {}
-			ApiShared.LOGGER.error("Too many exceptions in Batching World Generator! Now disabling.");
-			unknownExceptionCount = 0;
-			CONFIG.client().worldGenerator().setEnableDistantGeneration(false);
-		}
-	}
-	
-	public BatchGenerationEnvironment(IWorldWrapper serverlevel, LodBuilder lodBuilder, LodDimension lodDim)
-	{
-		super(serverlevel, lodBuilder, lodDim);
-		ApiShared.LOGGER.info("================WORLD_GEN_STEP_INITING=============");
-		ChunkGenerator generator =  ((WorldWrapper) serverlevel).getServerWorld().getChunkSource().getGenerator();
-		if (!(generator instanceof NoiseBasedChunkGenerator ||
-				generator instanceof DebugLevelSource ||
-				generator instanceof FlatLevelSource)) {
-			MC.sendChatMessage("\u00A74\u00A7l\u00A7uWARNING: Distant Horizons: Unknown Chunk Generator Detected! Distant Generation May Fail!");
-			MC.sendChatMessage("\u00A7eIf it does crash, set Distant Generation to OFF or Generation Mode to None.");
-			ApiShared.LOGGER.warn("Unknown Chunk Generator detected: {}", generator.getClass());
-		}
-		params = new GlobalParameters((ServerLevel) ((WorldWrapper) serverlevel).getWorld(), lodBuilder, lodDim);
-	}
-	
-	@SuppressWarnings("resource")
-	public static ChunkAccess loadOrMakeChunk(ChunkPos chunkPos, ServerLevel level, LevelLightEngine lightEngine)
-	{
-		CompoundTag chunkData = null;
-		try
-		{
-			chunkData = level.getChunkSource().chunkMap.readChunk(chunkPos);
-		}
-		catch (Exception e)
-		{
-			ApiShared.LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e);
-		}
-		if (chunkData == null)
-		{
-			return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), null);
-		}
-		else
-		{
-			try {
-			return ChunkLoader.read(level, lightEngine, chunkPos, chunkData);
-			} catch (Exception e) {
-				ApiShared.LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e);
-				return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), null);
-			}
-		}
-		
-	}
-	
-	public void generateLodFromList(GenerationEvent e)
-	{
-		if (ENABLE_EVENT_LOGGING)
-			ApiShared.LOGGER.info("Lod Generate Event: " + e.pos);
-		e.pEvent.beginNano = System.nanoTime();
-		ArrayGridList<ChunkAccess> referencedChunks;
-		ArrayGridList<ChunkAccess> genChunks;
-		DistanceGenerationMode generationMode;
-		LightedWorldGenRegion region;
-		WorldGenLevelLightEngine lightEngine;
-		LightGetterAdaptor adaptor;
-		int refRange = e.range + RANGE_TO_RANGE_EMPTY_EXTENSION;
-		int refOffsetX = e.pos.x - refRange;
-		int refOffsetZ = e.pos.z - refRange;
-		try
-		{
-			adaptor = new LightGetterAdaptor(params.level);
-			lightEngine = new WorldGenLevelLightEngine(adaptor);
-
-			@SuppressWarnings("resource")
-			EmptyChunkGenerator generator = (int x, int z) ->
-			{
-				ChunkPos chunkPos = new ChunkPos(x, z);
-				ChunkAccess target = null;
-				try
-				{
-					target = loadOrMakeChunk(chunkPos, params.level, lightEngine);
-				}
-				catch (RuntimeException e2)
-				{
-					// Continue...
-				}
-				if (target == null)
-					target = new ProtoChunk(chunkPos, UpgradeData.EMPTY, params.level,
-							params.biomes, null);
-				return target;
-			};
-
-			referencedChunks = new ArrayGridList<>(refRange*2+1,
-					(x,z) -> generator.generate(x + refOffsetX,z + refOffsetZ)
-			);
-			e.pEvent.emptyNano = System.nanoTime();
-			e.refreshTimeout();
-			region = new LightedWorldGenRegion(params.level, lightEngine, referencedChunks,
-					ChunkStatus.STRUCTURE_STARTS, refRange, e.lightMode, generator);
-			adaptor.setRegion(region);
-			e.tParam.makeStructFeat(region);
-			genChunks = new ArrayGridList<>(referencedChunks, RANGE_TO_RANGE_EMPTY_EXTENSION,
-					referencedChunks.gridSize - RANGE_TO_RANGE_EMPTY_EXTENSION);
-			generateDirect(e, genChunks, e.target, region);
-		}
-		catch (StepStructureStart.StructStartCorruptedException f)
-		{
-			e.tParam.markAsInvalid();
-			return;
-		}
-		
-		switch (e.target)
-		{
-		case Empty:
-		case StructureStart:
-		case StructureReference:
-			generationMode = DistanceGenerationMode.NONE;
-			break;
-		case Biomes:
-			generationMode = DistanceGenerationMode.BIOME_ONLY;
-		case Noise:
-			generationMode = DistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT;
-			break;
-		case Surface:
-		case Carvers:
-			generationMode = DistanceGenerationMode.SURFACE;
-			break;
-		case Features:
-			generationMode = DistanceGenerationMode.FEATURES;
-			break;
-		case Light:
-		case LiquidCarvers:
-		default:
-			return;
-		}
-		
-		for (int oy = 0; oy < genChunks.gridSize; oy++)
-		{
-			for (int ox = 0; ox < genChunks.gridSize; ox++)
-			{
-				ChunkAccess target = genChunks.get(ox, oy);
-				ChunkWrapper wrappedChunk = new ChunkWrapper(target, region);
-				if (!wrappedChunk.isLightCorrect()) {
-					throw new RuntimeException("The generated chunk somehow has isLightCorrect() returning false");
-				}
-				
-				boolean isFull = target.getStatus() == ChunkStatus.FULL || target instanceof LevelChunk;
-				boolean isPartial = target.isOldNoiseGeneration();
-				if (isFull)
-				{
-					if (ENABLE_LOAD_EVENT_LOGGING)
-						ApiShared.LOGGER.info("Detected full existing chunk at {}", target.getPos());
-					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk,
-							new LodBuilderConfig(DistanceGenerationMode.FULL), true, e.genAllDetails);
-				}
-				else if (isPartial)
-				{
-					if (ENABLE_LOAD_EVENT_LOGGING)
-						ApiShared.LOGGER.info("Detected old existing chunk at {}", target.getPos());
-					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk,
-							new LodBuilderConfig(generationMode), true, e.genAllDetails);
-				}
-				else if (target.getStatus() == ChunkStatus.EMPTY && generationMode == DistanceGenerationMode.NONE)
-				{
-					params.lodBuilder.generateLodNodeFromChunk(params.lodDim,wrappedChunk,
-							LodBuilderConfig.getFillVoidConfig(), true, e.genAllDetails);
-				}
-				else
-				{
-					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk,
-							new LodBuilderConfig(generationMode), true, e.genAllDetails);
-				}
-				if (e.lightMode == LightGenerationMode.FANCY || isFull)
-				{
-					lightEngine.retainData(target.getPos(), false);
-				}
-				
-			}
-		}
-		e.pEvent.endNano = System.nanoTime();
-		e.refreshTimeout();
-		if (ENABLE_PERF_LOGGING)
-		{
-			e.tParam.perf.recordEvent(e.pEvent);
-			ApiShared.LOGGER.info(e.tParam.perf);
-		}
-	}
-	
-	public void generateDirect(GenerationEvent e, ArrayGridList<ChunkAccess> subRange, Steps step,
-													 LightedWorldGenRegion region)
-	{
-		try
-		{
-			subRange.forEach((chunk) ->
-			{
-				if (chunk instanceof ProtoChunk)
-				{
-					((ProtoChunk) chunk).setLightEngine(region.getLightEngine());
-					region.getLightEngine().retainData(chunk.getPos(), true);
-				}
-			});
-			if (step == Steps.Empty)
-				return;
-			stepStructureStart.generateGroup(e.tParam, region, subRange);
-			e.pEvent.structStartNano = System.nanoTime();
-			e.refreshTimeout();
-			if (step == Steps.StructureStart)
-				return;
-			stepStructureReference.generateGroup(e.tParam, region, subRange);
-			e.pEvent.structRefNano = System.nanoTime();
-			e.refreshTimeout();
-			if (step == Steps.StructureReference)
-				return;
-			stepBiomes.generateGroup(e.tParam, region, subRange);
-			e.pEvent.biomeNano = System.nanoTime();
-			e.refreshTimeout();
-			if (step == Steps.Biomes)
-				return;
-			stepNoise.generateGroup(e.tParam, region, subRange);
-			e.pEvent.noiseNano = System.nanoTime();
-			e.refreshTimeout();
-			if (step == Steps.Noise)
-				return;
-			stepSurface.generateGroup(e.tParam, region, subRange);
-			e.pEvent.surfaceNano = System.nanoTime();
-			e.refreshTimeout();
-			if (step == Steps.Surface)
-				return;
-			if (step == Steps.Carvers)
-				return;
-			stepFeatures.generateGroup(e.tParam, region, subRange);
-			e.pEvent.featureNano = System.nanoTime();
-			e.refreshTimeout();
-		}
-		finally
-		{
-			switch (region.lightMode)
-			{
-			case FANCY:
-				stepLight.generateGroup(region.getLightEngine(), subRange);
-				break;
-			case FAST:
-				subRange.forEach((p) ->
-				{
-					if (p instanceof ProtoChunk)
-						((ProtoChunk) p).setLightCorrect(true);
-					if (p instanceof LevelChunk) {
-						((LevelChunk) p).setLightCorrect(true);
-						((LevelChunk) p).setClientLightReady(true);
-					}
-				});
-				break;
-			}
-			e.pEvent.lightNano = System.nanoTime();
-			e.refreshTimeout();
-		}
-	}
-	
-	public interface EmptyChunkGenerator
-	{
-		ChunkAccess generate(int x, int z);
-	}
-
-	@Override
-	public int getEventCount() {
-		return events.size();
-	}
-
-	@Override
-	public void stop(boolean blocking) {
-		ApiShared.LOGGER.info("Batch Chunk Generator shutting down...");
-		executors.shutdownNow();
-		if (blocking) try {
-			if (!executors.awaitTermination(10, TimeUnit.SECONDS)) {
-				ApiShared.LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...");
-			}
-		} catch (InterruptedException e) {
-			ApiShared.LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...", e);
-		}
-	}
-}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GenerationEvent.java

@@ -1,111 +0,0 @@
-
-package com.seibel.lod.common.wrappers.worldGeneration;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment.PrefEvent;
-import com.seibel.lod.core.api.ApiShared;
-import com.seibel.lod.core.enums.config.LightGenerationMode;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.util.LodUtil;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper.Steps;
-
-import net.minecraft.world.level.ChunkPos;
-
-//======================= Main Event class======================
-public final class GenerationEvent
-{
-	static private final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
-	
-	private static int generationFutureDebugIDs = 0;
-	final ThreadedParameters tParam;
-	final ChunkPos pos;
-	final int range;
-	final Future<?> future;
-	long nanotime;
-	final int id;
-	final Steps target;
-	final LightGenerationMode lightMode;
-	final PrefEvent pEvent = new PrefEvent();
-	final boolean genAllDetails;
-	
-	public GenerationEvent(ChunkPos pos, int range, BatchGenerationEnvironment generationGroup, Steps target, boolean genAllDetails)
-	{
-		nanotime = System.nanoTime();
-		this.pos = pos;
-		this.range = range;
-		id = generationFutureDebugIDs++;
-		this.target = target;
-		this.tParam = ThreadedParameters.getOrMake(generationGroup.params);
-		LightGenerationMode mode = CONFIG.client().worldGenerator().getLightGenerationMode();
-		
-		this.lightMode = mode;
-		this.genAllDetails = genAllDetails;
-		
-		future = generationGroup.executors.submit(() ->
-		{
-			BatchGenerationEnvironment.isDistantGeneratorThread.set(true);
-			try {
-				generationGroup.generateLodFromList(this);
-			} finally {
-				BatchGenerationEnvironment.isDistantGeneratorThread.remove();
-			}
-		});
-	}
-	
-	public boolean isCompleted()
-	{
-		return future.isDone();
-	}
-	
-	public boolean hasTimeout(int duration, TimeUnit unit)
-	{
-		long currentTime = System.nanoTime();
-		long delta = currentTime - nanotime;
-		return (delta > TimeUnit.NANOSECONDS.convert(duration, unit));
-	}
-	
-	public boolean terminate()
-	{
-		ApiShared.LOGGER.info("======================DUMPING ALL THREADS FOR WORLD GEN=======================");
-		BatchGenerationEnvironment.threadFactory.dumpAllThreadStacks();
-		future.cancel(true);
-		return future.isCancelled();
-	}
-	
-	public void join()
-	{
-		try
-		{
-			future.get();
-		}
-		catch (InterruptedException | ExecutionException e)
-		{
-			throw new RuntimeException(e.getCause()==null? e : e.getCause());
-		}
-	}
-	
-	public boolean tooClose(int cx, int cz, int cr)
-	{
-		int distX = Math.abs(cx - pos.x);
-		int distZ = Math.abs(cz - pos.z);
-		int minRange = cr + range + 1; // Need one to account for the center
-		minRange += 1 + 1; // Account for required empty chunks
-		return distX < minRange && distZ < minRange;
-	}
-	
-	public void refreshTimeout()
-	{
-		nanotime = System.nanoTime();
-		LodUtil.checkInterruptsUnchecked();
-	}
-	
-	@Override
-	public String toString()
-	{
-		return id + ":" + range + "@" + pos + "(" + target + ")";
-	}
-}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java

@@ -1,59 +0,0 @@
-
-package com.seibel.lod.common.wrappers.worldGeneration;
-
-import com.mojang.datafixers.DataFixer;
-import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.objects.lod.LodDimension;
-
-import net.minecraft.core.Registry;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ThreadedLevelLightEngine;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.BiomeManager;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.chunk.storage.ChunkScanAccess;
-import net.minecraft.world.level.levelgen.DebugLevelSource;
-import net.minecraft.world.level.levelgen.FlatLevelSource;
-import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
-import net.minecraft.world.level.levelgen.WorldGenSettings;
-import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
-import net.minecraft.world.level.storage.WorldData;
-
-public final class GlobalParameters
-{
-	public final ChunkGenerator generator;
-	public final StructureManager structures;
-	public final BiomeManager biomeManager;
-	public final WorldGenSettings worldGenSettings;
-	public final ThreadedLevelLightEngine lightEngine;
-	public final LodBuilder lodBuilder;
-	public final LodDimension lodDim;
-	public final Registry<Biome> biomes;
-	public final RegistryAccess registry;
-	public final long worldSeed;
-	public final ChunkScanAccess chunkScanner;
-	public final ServerLevel level; // TODO: Figure out a way to remove this. Maybe ClientLevel also works?
-	public final DataFixer fixerUpper;
-	
-	public GlobalParameters(ServerLevel level, LodBuilder lodBuilder, LodDimension lodDim)
-	{
-		this.lodBuilder = lodBuilder;
-		this.lodDim = lodDim;
-		this.level = level;
-		lightEngine = (ThreadedLevelLightEngine) level.getLightEngine();
-		MinecraftServer server = level.getServer();
-		WorldData worldData = server.getWorldData();
-		worldGenSettings = worldData.worldGenSettings();
-		registry = server.registryAccess();
-		biomes = registry.registryOrThrow(Registry.BIOME_REGISTRY);
-		worldSeed = worldGenSettings.seed();
-		biomeManager = new BiomeManager(level, BiomeManager.obfuscateSeed(worldSeed));
-		structures = server.getStructureManager();
-		generator = level.getChunkSource().getGenerator();
-		chunkScanner = level.getChunkSource().chunkScanner();
-		fixerUpper = server.getFixerUpper();
-	}
-}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/Rolling.java

@@ -1,34 +0,0 @@
-
-package com.seibel.lod.common.wrappers.worldGeneration;
-
-//FIXME: Move this outside the WorldGenerationStep thingy
-public class Rolling
-{
-	
-	private final int size;
-	private double total = 0d;
-	private int index = 0;
-	private final double[] samples;
-	
-	public Rolling(int size)
-	{
-		this.size = size;
-		samples = new double[size];
-		for (int i = 0; i < size; i++)
-			samples[i] = 0d;
-	}
-	
-	public void add(double x)
-	{
-		total -= samples[index];
-		samples[index] = x;
-		total += x;
-		if (++index == size)
-			index = 0; // cheaper than modulus
-	}
-	
-	public double getAverage()
-	{
-		return total / size;
-	}
-}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/ThreadedParameters.java

@@ -1,48 +0,0 @@
-
-package com.seibel.lod.common.wrappers.worldGeneration;
-
-import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment.PerfCalculator;
-import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.WorldGenStructFeatManager;
-
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.WorldGenLevel;
-import net.minecraft.world.level.levelgen.structure.StructureCheck;
-
-public final class ThreadedParameters
-{
-	private static final ThreadLocal<ThreadedParameters> localParam = new ThreadLocal<ThreadedParameters>();
-	final ServerLevel level;
-	public final WorldGenStructFeatManager structFeat;
-	public final StructureCheck structCheck;
-	boolean isValid = true;
-	public final PerfCalculator perf = new PerfCalculator();
-	
-	public static ThreadedParameters getOrMake(GlobalParameters param)
-	{
-		ThreadedParameters tParam = localParam.get();
-		if (tParam != null && tParam.isValid && tParam.level == param.level)
-			return tParam;
-		tParam = new ThreadedParameters(param);
-		localParam.set(tParam);
-		return tParam;
-	}
-	
-	public void markAsInvalid()
-	{
-		isValid = false;
-	}
-	
-	private ThreadedParameters(GlobalParameters param)
-	{
-		level = param.level;
-		structCheck = new StructureCheck(param.chunkScanner, param.registry, param.structures,
-				param.level.dimension(), param.generator, level, param.generator.getBiomeSource(), param.worldSeed,
-				param.fixerUpper);
-		structFeat = new WorldGenStructFeatManager(level, param.worldGenSettings, null, structCheck);
-	}
-	
-	public void makeStructFeat(WorldGenLevel genLevel)
-	{
-		structFeat.setGenLevel(genLevel);
-	}
-}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java

@@ -1,323 +0,0 @@
-
-package com.seibel.lod.common.wrappers.worldGeneration.mimicObject;
-
-import com.google.common.collect.Maps;
-import com.mojang.serialization.Codec;
-import com.mojang.serialization.Dynamic;
-import com.seibel.lod.core.api.ApiShared;
-import com.seibel.lod.core.api.ClientApi;
-
-import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
-import it.unimi.dsi.fastutil.longs.LongSet;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-
-#if MC_VERSION_1_18_2
-import net.minecraft.core.Holder;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
-#endif
-
-import net.minecraft.core.Registry;
-import net.minecraft.core.SectionPos;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.nbt.NbtOps;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.LightLayer;
-import net.minecraft.world.level.WorldGenLevel;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.Biomes;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.chunk.DataLayer;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.chunk.LevelChunkSection;
-import net.minecraft.world.level.chunk.PalettedContainer;
-import net.minecraft.world.level.chunk.UpgradeData;
-import net.minecraft.world.level.levelgen.Heightmap;
-import net.minecraft.world.level.levelgen.blending.BlendingData;
-import net.minecraft.world.level.levelgen.feature.StructureFeature;
-import net.minecraft.world.level.levelgen.structure.StructureStart;
-import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceSerializationContext;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-import net.minecraft.world.level.material.Fluid;
-import net.minecraft.world.ticks.LevelChunkTicks;
-import org.apache.logging.log4j.Logger;
-
-public class ChunkLoader
-{
-	private static final Codec<PalettedContainer<BlockState>> BLOCK_STATE_CODEC = PalettedContainer.codec(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState());
-	private static final Logger LOGGER = ApiShared.LOGGER;
-	private static final String TAG_UPGRADE_DATA = "UpgradeData";
-	private static final String BLOCK_TICKS_TAG = "block_ticks";
-	private static final String FLUID_TICKS_TAG = "fluid_ticks";
-	
-	private static BlendingData readBlendingData(CompoundTag chunkData)
-	{
-		BlendingData blendingData = null;
-		if (chunkData.contains("blending_data", 10))
-		{
-			@SuppressWarnings({ "unchecked", "rawtypes" })
-			Dynamic<CompoundTag> blendingDataTag = new Dynamic(NbtOps.INSTANCE, chunkData.getCompound("blending_data"));
-			blendingData = BlendingData.CODEC.parse(blendingDataTag).resultOrPartial(LOGGER::error).orElse(null);
-		}
-		return blendingData;
-	}
-	
-	private static LevelChunkSection[] readSections(LevelAccessor level, LevelLightEngine lightEngine, ChunkPos chunkPos, CompoundTag chunkData)
-	{
-		Registry<Biome> biomes = level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY);
-		#if MC_VERSION_1_18_1
-		Codec<PalettedContainer<Biome>> biomeCodec = PalettedContainer.codec(
-				biomes, biomes.byNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getOrThrow(Biomes.PLAINS));
-		#elif MC_VERSION_1_18_2
-		Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codec(
-				biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getHolderOrThrow(Biomes.PLAINS));
-		#endif
-
-		int i = level.getSectionsCount();
-		LevelChunkSection[] chunkSections = new LevelChunkSection[i];
-
-		boolean isLightOn = chunkData.getBoolean("isLightOn");
-		boolean hasSkyLight = level.dimensionType().hasSkyLight();
-		ListTag tagSections = chunkData.getList("sections", 10);
-
-		for (int j = 0; j < tagSections.size(); ++j)
-		{
-			CompoundTag tagSection = tagSections.getCompound(j);
-			byte sectionYPos = tagSection.getByte("Y");
-			int sectionId = level.getSectionIndexFromSectionY(sectionYPos);
-			if (sectionId >= 0 && sectionId < chunkSections.length)
-			{
-				PalettedContainer<BlockState> blockStateContainer;
-				#if MC_VERSION_1_18_1
-				PalettedContainer<Biome> biomeContainer;
-				#elif MC_VERSION_1_18_2
-				PalettedContainer<Holder<Biome>> biomeContainer;
-				#endif
-
-				blockStateContainer = tagSection.contains("block_states", 10)
-						? BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagSection.getCompound("block_states")).promotePartial(string -> logErrors(chunkPos, sectionYPos, string)).getOrThrow(false, LOGGER::error)
-						: new PalettedContainer<BlockState>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES);
-
-				#if MC_VERSION_1_18_1
-				biomeContainer = tagSection.contains("biomes", 10)
-						? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logErrors(chunkPos, sectionYPos, string)).getOrThrow(false, LOGGER::error)
-						: new PalettedContainer<Biome>(biomes, biomes.getOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
-				#elif MC_VERSION_1_18_2
-				biomeContainer = tagSection.contains("biomes", 10)
-						? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logErrors(chunkPos, i, (String) string)).getOrThrow(false, LOGGER::error)
-						: new PalettedContainer<Holder<Biome>>(biomes.asHolderIdMap(), biomes.getHolderOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
-				#endif
-
-
-				chunkSections[sectionId] = new LevelChunkSection(sectionYPos, blockStateContainer, biomeContainer);
-			}
-
-			if (!isLightOn)
-				continue;
-
-			if (tagSection.contains("BlockLight", 7))
-				lightEngine.queueSectionData(LightLayer.BLOCK, SectionPos.of(chunkPos, sectionYPos), new DataLayer(tagSection.getByteArray("BlockLight")), true);
-			if (hasSkyLight && tagSection.contains("SkyLight", 7))
-				lightEngine.queueSectionData(LightLayer.SKY, SectionPos.of(chunkPos, sectionYPos), new DataLayer(tagSection.getByteArray("SkyLight")), true);
-		}
-		return chunkSections;
-	}
-	
-	private static void readHeightmaps(LevelChunk chunk, CompoundTag chunkData)
-	{
-		CompoundTag tagHeightmaps = chunkData.getCompound("Heightmaps");
-		for (Heightmap.Types type : ChunkStatus.FULL.heightmapsAfter())
-		{
-			String heightmap = type.getSerializationKey();
-			if (tagHeightmaps.contains(heightmap, 12))
-				chunk.setHeightmap(type, tagHeightmaps.getLongArray(heightmap));
-		}
-		Heightmap.primeHeightmaps(chunk, ChunkStatus.FULL.heightmapsAfter());
-	}
-
-	#if MC_VERSION_1_18_1
-	private static Map<StructureFeature<?>, StructureStart<?>> unpackStructureStart(StructurePieceSerializationContext structurePieceSerializationContext, CompoundTag compoundTag, long l)
-	{
-		HashMap<StructureFeature<?>, StructureStart<?>> map = Maps.newHashMap();
-		CompoundTag compoundTag2 = compoundTag.getCompound("starts");
-		for (String string : compoundTag2.getAllKeys())
-		{
-			String string2 = string.toLowerCase(Locale.ROOT);
-			StructureFeature<?> structureFeature = StructureFeature.STRUCTURES_REGISTRY.get(string2);
-			if (structureFeature == null)
-			{
-				LOGGER.error("Unknown structure start: {}", (Object) string2);
-				continue;
-			}
-			StructureStart<?> structureStart = StructureFeature.loadStaticStart(structurePieceSerializationContext, compoundTag2.getCompound(string), l);
-			if (structureStart == null)
-				continue;
-			map.put(structureFeature, structureStart);
-		}
-		return map;
-	}
-
-	private static Map<StructureFeature<?>, LongSet> unpackStructureReferences(ChunkPos chunkPos, CompoundTag compoundTag)
-	{
-		HashMap<StructureFeature<?>, LongSet> map = Maps.newHashMap();
-		CompoundTag compoundTag2 = compoundTag.getCompound("References");
-		for (String string : compoundTag2.getAllKeys())
-		{
-			String string2 = string.toLowerCase(Locale.ROOT);
-			StructureFeature<?> structureFeature = StructureFeature.STRUCTURES_REGISTRY.get(string2);
-			if (structureFeature == null)
-			{
-				LOGGER.warn("Found reference to unknown structure '{}' in chunk {}, discarding", (Object) string2, (Object) chunkPos);
-				continue;
-			}
-			map.put(structureFeature, new LongOpenHashSet(Arrays.stream(compoundTag2.getLongArray(string)).filter(l ->
-			{
-				ChunkPos chunkPos2 = new ChunkPos(l);
-				if (chunkPos2.getChessboardDistance(chunkPos) > 8)
-				{
-					LOGGER.warn("Found invalid structure reference [ {} @ {} ] for chunk {}.", (Object) string2, (Object) chunkPos2, (Object) chunkPos);
-					return false;
-				}
-				return true;
-			}).toArray()));
-		}
-		return map;
-	}
-	#elif MC_VERSION_1_18_2
-	private static Map<ConfiguredStructureFeature<?, ?>, StructureStart> unpackStructureStart(StructurePieceSerializationContext structurePieceSerializationContext, CompoundTag compoundTag, long l) {
-		Map<ConfiguredStructureFeature<?, ?>, StructureStart> map = Maps.newHashMap();
-		Registry<ConfiguredStructureFeature<?, ?>> structStartRegistry = structurePieceSerializationContext.registryAccess().registryOrThrow(Registry.CONFIGURED_STRUCTURE_FEATURE_REGISTRY);
-		CompoundTag compoundTag2 = compoundTag.getCompound("starts");
-		for (String string : compoundTag2.getAllKeys()) {
-			ResourceLocation resourceLocation = ResourceLocation.tryParse(string);
-			ConfiguredStructureFeature<?, ?> structureFeature = structStartRegistry.get(resourceLocation);
-//			String string2 = string.toLowerCase(Locale.ROOT);
-//			ConfiguredStructureFeature<?, ?> structureFeature = StructureFeature.STRUCTURES_REGISTRY.get(string2);
-			if (structureFeature == null) {
-				LOGGER.error("Unknown structure start: {}", resourceLocation);
-				continue;
-			}
-			StructureStart structureStart = StructureFeature.loadStaticStart(structurePieceSerializationContext, compoundTag2.getCompound(string), l);
-			if (structureStart == null)
-				continue;
-			map.put(structureFeature, structureStart);
-		}
-		return map;
-	}
-
-	private static Map<ConfiguredStructureFeature<?, ?>, LongSet> unpackStructureReferences(RegistryAccess registryAccess, ChunkPos chunkPos, CompoundTag compoundTag)
-	{
-		Map<ConfiguredStructureFeature<?, ?>, LongSet> map = Maps.newHashMap();
-		Registry<ConfiguredStructureFeature<?, ?>> structRegistry = registryAccess.registryOrThrow(Registry.CONFIGURED_STRUCTURE_FEATURE_REGISTRY);
-		CompoundTag compoundTag2 = compoundTag.getCompound("References");
-		for (String string : compoundTag2.getAllKeys())
-		{
-		    ResourceLocation resourceLocation = ResourceLocation.tryParse(string);
-			ConfiguredStructureFeature<?, ?> structureFeature = structRegistry.get(resourceLocation);
-//			String string2 = string.toLowerCase(Locale.ROOT);
-//			ConfiguredStructureFeature<?, ?> structureFeature = StructureFeature.STRUCTURES_REGISTRY.get(string2);
-			if (structureFeature == null)
-			{
-				LOGGER.warn("Found reference to unknown structure '{}' in chunk {}, discarding", resourceLocation, chunkPos);
-				continue;
-			}
-			map.put(structureFeature, new LongOpenHashSet(Arrays.stream(compoundTag2.getLongArray(string)).filter(l ->
-			{
-				ChunkPos chunkPos2 = new ChunkPos(l);
-				if (chunkPos2.getChessboardDistance(chunkPos) > 8)
-				{
-					LOGGER.warn("Found invalid structure reference [ {} @ {} ] for chunk {}.", resourceLocation, chunkPos2, chunkPos);
-					return false;
-				}
-				return true;
-			}).toArray()));
-		}
-		return map;
-	}
-	#endif
-
-	private static void readStructures(WorldGenLevel level, LevelChunk chunk, CompoundTag chunkData)
-	{
-		CompoundTag tagStructures = chunkData.getCompound("structures");
-		chunk.setAllStarts(
-				unpackStructureStart(StructurePieceSerializationContext.fromLevel(level.getLevel()), tagStructures, level.getSeed()));
-		chunk.setAllReferences(unpackStructureReferences(#if MC_VERSION_1_18_2 level.registryAccess() ,#endif chunk.getPos(), tagStructures));
-	}
-	
-	private static void readPostPocessings(LevelChunk chunk, CompoundTag chunkData)
-	{
-		ListTag tagPostProcessings = chunkData.getList("PostProcessing", 9);
-		for (int n = 0; n < tagPostProcessings.size(); ++n)
-		{
-			ListTag listTag3 = tagPostProcessings.getList(n);
-			for (int o = 0; o < listTag3.size(); ++o)
-			{
-				chunk.addPackedPostProcess(listTag3.getShort(o), n);
-			}
-		}
-	}
-	
-	public static ChunkStatus.ChunkType readChunkType(CompoundTag compoundTag)
-	{
-		return ChunkStatus.byName(compoundTag.getString("Status")).getChunkType();
-	}
-	
-	public static LevelChunk read(WorldGenLevel level, LevelLightEngine lightEngine, ChunkPos chunkPos, CompoundTag chunkData)
-	{
-		
-		ChunkPos actualPos = new ChunkPos(chunkData.getInt("xPos"), chunkData.getInt("zPos"));
-		if (!Objects.equals(chunkPos, actualPos))
-		{
-			LOGGER.error("Distant Horizons: Chunk file at {} is in the wrong location; Ignoring. (Expected {}, got {})", (Object) chunkPos, (Object) chunkPos, (Object) actualPos);
-			return null;
-		}
-		
-		ChunkStatus.ChunkType chunkType = readChunkType(chunkData);
-		BlendingData blendingData = readBlendingData(chunkData);
-		if (chunkType == ChunkStatus.ChunkType.PROTOCHUNK && (blendingData == null || !blendingData.oldNoise()))
-			return null;
-		
-		// Prepare the light engine
-		boolean isLightOn = chunkData.getBoolean("isLightOn");
-		if (isLightOn)
-			level.getLightEngine().retainData(chunkPos, true);
-		
-		// Read params for making the LevelChunk
-		UpgradeData upgradeData = chunkData.contains(TAG_UPGRADE_DATA, 10)
-				? new UpgradeData(chunkData.getCompound(TAG_UPGRADE_DATA), level)
-				: UpgradeData.EMPTY;
-		LevelChunkTicks<Block> blockTicks = LevelChunkTicks.load(chunkData.getList(BLOCK_TICKS_TAG, 10),
-				string -> Registry.BLOCK.getOptional(ResourceLocation.tryParse(string)), chunkPos);
-		LevelChunkTicks<Fluid> fluidTicks = LevelChunkTicks.load(chunkData.getList(FLUID_TICKS_TAG, 10),
-				string -> Registry.FLUID.getOptional(ResourceLocation.tryParse(string)), chunkPos);
-		long inhabitedTime = chunkData.getLong("InhabitedTime");
-		LevelChunkSection[] chunkSections = readSections(level, lightEngine, actualPos, chunkData);
-		
-		// Make chunk
-		LevelChunk chunk = new LevelChunk((Level) level, chunkPos, upgradeData, blockTicks, fluidTicks, inhabitedTime, chunkSections, null, blendingData);
-		
-		// Set some states after object creation
-		chunk.setLightCorrect(isLightOn);
-		readHeightmaps(chunk, chunkData);
-		readStructures(level, chunk, chunkData);
-		readPostPocessings(chunk, chunkData);
-		return chunk;
-	}
-	
-	private static void logErrors(ChunkPos chunkPos, int i, String string)
-	{
-		LOGGER.error("Distant Horizons: Recoverable errors when loading section [" + chunkPos.x + ", " + i + ", " + chunkPos.z + "]: " + string);
-	}
-}
-

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java

@@ -1,40 +0,0 @@
-package com.seibel.lod.common.wrappers.worldGeneration.mimicObject;
-
-import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorHandler;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IStarlightAccessor;
-
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.LevelHeightAccessor;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.chunk.LightChunkGetter;
-
-public class LightGetterAdaptor implements LightChunkGetter {
-	private final BlockGetter heightGetter;
-	public LightedWorldGenRegion genRegion = null;
-	final boolean shouldReturnNull;
-
-	public LightGetterAdaptor(BlockGetter heightAccessor) {
-		this.heightGetter = heightAccessor;
-		shouldReturnNull = ModAccessorHandler.get(IStarlightAccessor.class) != null;
-	}
-
-	public void setRegion(LightedWorldGenRegion region) {
-		genRegion = region;
-	}
-
-	@Override
-	public BlockGetter getChunkForLighting(int chunkX, int chunkZ) {
-		if (genRegion == null)
-			throw new IllegalStateException("World Gen region has not been set!");
-		// May be null
-		return genRegion.getChunk(chunkX, chunkZ, ChunkStatus.EMPTY, false);
-	}
-
-	@Override
-	public BlockGetter getLevel() {
-		return shouldReturnNull ? null : (genRegion != null ? genRegion : heightGetter);
-	}
-	public LevelHeightAccessor getLevelHeightAccessor() {
-		return heightGetter;
-	}
-}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java

@@ -1,281 +0,0 @@
-package com.seibel.lod.common.wrappers.worldGeneration.mimicObject;
-
-import java.util.List;
-
-import com.seibel.lod.core.api.ApiShared;
-import org.jetbrains.annotations.Nullable;
-
-import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment.EmptyChunkGenerator;
-import com.seibel.lod.core.api.ClientApi;
-import com.seibel.lod.core.enums.config.LightGenerationMode;
-
-import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
-import net.minecraft.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.color.block.BlockTintCache;
-import net.minecraft.client.renderer.BiomeColors;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Cursor3D;
-import net.minecraft.core.SectionPos;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.WorldGenRegion;
-import net.minecraft.util.Mth;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.ColorResolver;
-import net.minecraft.world.level.LevelHeightAccessor;
-import net.minecraft.world.level.LightLayer;
-import net.minecraft.world.level.StructureFeatureManager;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.chunk.ImposterProtoChunk;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.levelgen.Heightmap;
-import net.minecraft.world.level.levelgen.feature.StructureFeature;
-import net.minecraft.world.level.levelgen.structure.StructureStart;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-
-public class LightedWorldGenRegion extends WorldGenRegion {
-	public final WorldGenLevelLightEngine light;
-	public final LightGenerationMode lightMode;
-	public final EmptyChunkGenerator generator;
-	public final int writeRadius;
-	public final int size;
-	private final ChunkPos firstPos;
-	private final List<ChunkAccess> cache;
-	Long2ObjectOpenHashMap<ChunkAccess> chunkMap = new Long2ObjectOpenHashMap<ChunkAccess>();
-
-	public LightedWorldGenRegion(ServerLevel serverLevel, WorldGenLevelLightEngine lightEngine,
-			List<ChunkAccess> list, ChunkStatus chunkStatus, int i,
-			LightGenerationMode lightMode, EmptyChunkGenerator generator) {
-		super(serverLevel, list, chunkStatus, i);
-		this.lightMode = lightMode;
-		this.firstPos = list.get(0).getPos();
-		this.generator = generator;
-		light = lightEngine;
-		writeRadius = i;
-		cache = list;
-		size = Mth.floor(Math.sqrt(list.size()));
-		
-	    this.tintCaches = Util.make(new Object2ObjectArrayMap(3), object2ObjectArrayMap -> {
-	          object2ObjectArrayMap.put(BiomeColors.GRASS_COLOR_RESOLVER, new BlockTintCache((pos) -> {return calculateBlockTint(pos, BiomeColors.GRASS_COLOR_RESOLVER);}));
-	          object2ObjectArrayMap.put(BiomeColors.FOLIAGE_COLOR_RESOLVER, new BlockTintCache((pos) -> {return calculateBlockTint(pos, BiomeColors.FOLIAGE_COLOR_RESOLVER);}));
-	          object2ObjectArrayMap.put(BiomeColors.WATER_COLOR_RESOLVER, new BlockTintCache((pos) -> {return calculateBlockTint(pos, BiomeColors.WATER_COLOR_RESOLVER);}));
-	        });
-	}
-
-	// Bypass BCLib mixin overrides.
-    @Override
-    public boolean ensureCanWrite(BlockPos blockPos) {
-        int i = SectionPos.blockToSectionCoord(blockPos.getX());
-        int j = SectionPos.blockToSectionCoord(blockPos.getZ());
-        ChunkPos chunkPos = this.getCenter();
-        ChunkAccess center = this.getChunk(chunkPos.x, chunkPos.z);
-        int k = Math.abs(chunkPos.x - i);
-        int l = Math.abs(chunkPos.z - j);
-        if (k > this.writeRadius || l > this.writeRadius) {
-            return false;
-        }
-        if (center.isUpgrading()) {
-            LevelHeightAccessor levelHeightAccessor = center.getHeightAccessorForGeneration();
-            if (blockPos.getY() < levelHeightAccessor.getMinBuildHeight() || blockPos.getY() >= levelHeightAccessor.getMaxBuildHeight()) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-	// TODO Check this
-//	@Override
-//	public List<? extends StructureStart<?>> startsForFeature(SectionPos sectionPos,
-//			StructureFeature<?> structureFeature) {
-//		return structFeat.startsForFeature(sectionPos, structureFeature);
-//	}
-
-	// Skip updating the related tile entities
-	@Override
-	public boolean setBlock(BlockPos blockPos, BlockState blockState, int i, int j) {
-		ChunkAccess chunkAccess = this.getChunk(blockPos);
-		if (chunkAccess instanceof LevelChunk)
-			return true;
-		chunkAccess.setBlockState(blockPos, blockState, false);
-		// This is for post ticking for water on gen and stuff like that. Not enabled
-		// for now.
-		// if (blockState.hasPostProcess(this, blockPos))
-		// this.getChunk(blockPos).markPosForPostprocessing(blockPos);
-		return true;
-	}
-
-	// Skip Dropping the item on destroy
-	@Override
-	public boolean destroyBlock(BlockPos blockPos, boolean bl, @Nullable Entity entity, int i) {
-		BlockState blockState = this.getBlockState(blockPos);
-		if (blockState.isAir()) {
-			return false;
-		}
-		return this.setBlock(blockPos, Blocks.AIR.defaultBlockState(), 3, i);
-	}
-
-	// Skip BlockEntity stuff. It aren't really needed
-	@Override
-	public BlockEntity getBlockEntity(BlockPos blockPos) {
-		return null;
-	}
-
-	// Skip BlockEntity stuff. It aren't really needed
-	@Override
-	public boolean addFreshEntity(Entity entity) {
-		return true;
-	}
-
-	// Allays have empty chunks even if it's outside the worldGenRegion
-	// @Override
-	// public boolean hasChunk(int i, int j) {
-	// return true;
-	// }
-
-	// Override to ensure no other mod mixins cause skipping the overrided
-	// getChunk(...)
-	@Override
-	public ChunkAccess getChunk(int i, int j) {
-		return this.getChunk(i, j, ChunkStatus.EMPTY);
-	}
-
-	// Override to ensure no other mod mixins cause skipping the overrided
-	// getChunk(...)
-	@Override
-	public ChunkAccess getChunk(int i, int j, ChunkStatus chunkStatus) {
-		return this.getChunk(i, j, chunkStatus, true);
-	}
-
-	// Use this instead of super.getChunk() to bypass C2ME concurrency checks
-	private ChunkAccess superGetChunk(int x, int z, ChunkStatus cs) {
-		int k = x - firstPos.x;
-		int l = z - firstPos.z;
-		return cache.get(k + l * size);
-	}
-
-	// Use this instead of super.hasChunk() to bypass C2ME concurrency checks
-	private boolean superHasChunk(int x, int z) {
-		int k = x - firstPos.x;
-		int l = z - firstPos.z;
-		return l >= 0 && l < size && k >= 0 && k < size;
-	}
-
-	// Allow creating empty chunks even if it's outside the worldGenRegion
-	@Override
-	@Nullable
-	public ChunkAccess getChunk(int i, int j, ChunkStatus chunkStatus, boolean bl) {
-		ChunkAccess chunk = getChunkAccess(i, j, chunkStatus, bl);
-		if (chunk instanceof LevelChunk) {
-			chunk = new ImposterProtoChunk((LevelChunk) chunk, true);
-		}
-		return chunk;
-	}
-
-	private static ChunkStatus debugTriggeredForStatus = null;
-
-	private ChunkAccess getChunkAccess(int i, int j, ChunkStatus chunkStatus, boolean bl) {
-		ChunkAccess chunk = superHasChunk(i, j) ? superGetChunk(i, j, ChunkStatus.EMPTY) : null;
-		if (chunk != null && chunk.getStatus().isOrAfter(chunkStatus)) {
-			return chunk;
-		}
-		if (!bl)
-			return null;
-		if (chunk == null) {
-			chunk = chunkMap.get(ChunkPos.asLong(i, j));
-			if (chunk == null) {
-				chunk = generator.generate(i, j);
-				if (chunk == null)
-					throw new NullPointerException("The provided generator should not return null!");
-				chunkMap.put(ChunkPos.asLong(i, j), chunk);
-			}
-		}
-		if (chunkStatus != ChunkStatus.EMPTY && chunkStatus != debugTriggeredForStatus) {
-			ApiShared.LOGGER.info("WorldGen requiring " + chunkStatus
-					+ " outside expected range detected. Force passing EMPTY chunk and seeing if it works.");
-			debugTriggeredForStatus = chunkStatus;
-		}
-		return chunk;
-	}
-
-	// Override force use of my own light engine
-	@Override
-	public LevelLightEngine getLightEngine() {
-		return light;
-	}
-
-	// Override force use of my own light engine
-	@Override
-	public int getBrightness(LightLayer lightLayer, BlockPos blockPos) {
-		if (lightMode != LightGenerationMode.FAST) {
-			return light.getLayerListener(lightLayer).getLightValue(blockPos);
-		}
-		if (lightLayer == LightLayer.BLOCK)
-			return 0;
-		BlockPos p = super.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, blockPos);
-		return (p.getY() <= blockPos.getY()) ? getMaxLightLevel() : 0;
-	}
-
-	// Override force use of my own light engine
-	@Override
-	public int getRawBrightness(BlockPos blockPos, int i) {
-		if (lightMode != LightGenerationMode.FAST) {
-			return light.getRawBrightness(blockPos, i);
-		}
-		BlockPos p = super.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, blockPos);
-		return (p.getY() <= blockPos.getY()) ? getMaxLightLevel() : 0;
-	}
-
-	// Override force use of my own light engine
-	@Override
-	public boolean canSeeSky(BlockPos blockPos) {
-		return (getBrightness(LightLayer.SKY, blockPos) >= getMaxLightLevel());
-	}
-
-	
-	
-	private final Object2ObjectArrayMap<ColorResolver, BlockTintCache> tintCaches;
-	
-	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
-	{
-		BlockTintCache blockTintCache = (BlockTintCache) this.tintCaches.get(colorResolver);
-		return blockTintCache.getColor(blockPos);
-	}
-
-	private Biome _getBiome(BlockPos pos) {
-		#if MC_VERSION_1_18_2
-		return getBiome(pos).value();
-		#elif MC_VERSION_1_18_1
-		return getBiome(pos);
-		#endif
-	}
-	
-	public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
-	{
-		int i = (Minecraft.getInstance()).options.biomeBlendRadius;
-		if (i == 0)
-			return colorResolver.getColor((Biome) _getBiome(blockPos), blockPos.getX(), blockPos.getZ());
-		int j = (i * 2 + 1) * (i * 2 + 1);
-		int k = 0;
-		int l = 0;
-		int m = 0;
-		Cursor3D cursor3D = new Cursor3D(blockPos.getX() - i, blockPos.getY(), blockPos.getZ() - i, blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + i);
-		BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
-		while (cursor3D.advance())
-		{
-			mutableBlockPos.set(cursor3D.nextX(), cursor3D.nextY(), cursor3D.nextZ());
-			int n = colorResolver.getColor((Biome) _getBiome((BlockPos) mutableBlockPos), mutableBlockPos.getX(), mutableBlockPos.getZ());
-			k += (n & 0xFF0000) >> 16;
-			l += (n & 0xFF00) >> 8;
-			m += n & 0xFF;
-		}
-		return (k / j & 0xFF) << 16 | (l / j & 0xFF) << 8 | m / j & 0xFF;
-	}
-
-}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/WorldGenLevelLightEngine.java

@@ -1,176 +0,0 @@
-package com.seibel.lod.common.wrappers.worldGeneration.mimicObject;
-
-import org.jetbrains.annotations.Nullable;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.SectionPos;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.LevelHeightAccessor;
-import net.minecraft.world.level.LightLayer;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.DataLayer;
-import net.minecraft.world.level.chunk.LevelChunkSection;
-import net.minecraft.world.level.lighting.BlockLightEngine;
-import net.minecraft.world.level.lighting.LayerLightEventListener;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-import net.minecraft.world.level.lighting.SkyLightEngine;
-
-public class WorldGenLevelLightEngine extends LevelLightEngine {
-	public static final int MAX_SOURCE_LEVEL = 15;
-    public static final int LIGHT_SECTION_PADDING = 1;
-    protected final LevelHeightAccessor levelHeightAccessor;
-    @Nullable
-    public final BlockLightEngine blockEngine;
-    @Nullable
-    public final SkyLightEngine skyEngine;
-
-    public WorldGenLevelLightEngine(LightGetterAdaptor genRegion) {
-    	super(genRegion, false, false);
-        this.levelHeightAccessor = genRegion.getLevelHeightAccessor();
-        this.blockEngine = new BlockLightEngine(genRegion);
-        this.skyEngine = new SkyLightEngine(genRegion);
-    }
-
-    @Override
-    public void checkBlock(BlockPos blockPos) {
-        if (this.blockEngine != null) {
-            this.blockEngine.checkBlock(blockPos);
-        }
-        if (this.skyEngine != null) {
-            this.skyEngine.checkBlock(blockPos);
-        }
-    }
-
-    @Override
-    public void onBlockEmissionIncrease(BlockPos blockPos, int i) {
-        if (this.blockEngine != null) {
-            this.blockEngine.onBlockEmissionIncrease(blockPos, i);
-        }
-    }
-
-    @Override
-    public boolean hasLightWork() {
-        if (this.skyEngine != null && this.skyEngine.hasLightWork()) {
-            return true;
-        }
-        return this.blockEngine != null && this.blockEngine.hasLightWork();
-    }
-
-    @Override
-    public int runUpdates(int i, boolean bl, boolean bl2) {
-        if (this.blockEngine != null && this.skyEngine != null) {
-            int j = i / 2;
-            int k = this.blockEngine.runUpdates(j, bl, bl2);
-            int l = i - j + k;
-            int m = this.skyEngine.runUpdates(l, bl, bl2);
-            if (k == 0 && m > 0) {
-                return this.blockEngine.runUpdates(m, bl, bl2);
-            }
-            return m;
-        }
-        if (this.blockEngine != null) {
-            return this.blockEngine.runUpdates(i, bl, bl2);
-        }
-        if (this.skyEngine != null) {
-            return this.skyEngine.runUpdates(i, bl, bl2);
-        }
-        return i;
-    }
-
-    @Override
-    public void updateSectionStatus(SectionPos sectionPos, boolean bl) {
-        if (this.blockEngine != null) {
-            this.blockEngine.updateSectionStatus(sectionPos, bl);
-        }
-        if (this.skyEngine != null) {
-            this.skyEngine.updateSectionStatus(sectionPos, bl);
-        }
-    }
-
-    @Override
-    public void enableLightSources(ChunkPos chunkPos, boolean bl) {
-        if (this.blockEngine != null) {
-            this.blockEngine.enableLightSources(chunkPos, bl);
-        }
-        if (this.skyEngine != null) {
-            this.skyEngine.enableLightSources(chunkPos, bl);
-        }
-    }
-
-    @Override
-    public LayerLightEventListener getLayerListener(LightLayer lightLayer) {
-        if (lightLayer == LightLayer.BLOCK) {
-            if (this.blockEngine == null) {
-                return LayerLightEventListener.DummyLightLayerEventListener.INSTANCE;
-            }
-            return this.blockEngine;
-        }
-        if (this.skyEngine == null) {
-            return LayerLightEventListener.DummyLightLayerEventListener.INSTANCE;
-        }
-        return this.skyEngine;
-    }
-
-    @Override
-    public int getRawBrightness(BlockPos blockPos, int i) {
-        int j = this.skyEngine == null ? 0 : this.skyEngine.getLightValue(blockPos) - i;
-        int k = this.blockEngine == null ? 0 : this.blockEngine.getLightValue(blockPos);
-        return Math.max(k, j);
-    }
-
-    public void lightChunk(ChunkAccess chunkAccess, boolean needLightBlockUpdate) {
-    	ChunkPos chunkPos = chunkAccess.getPos();
-        chunkAccess.setLightCorrect(false);
-        
-        LevelChunkSection[] levelChunkSections = chunkAccess.getSections();
-        for (int i = 0; i < chunkAccess.getSectionsCount(); ++i) {
-            LevelChunkSection levelChunkSection = levelChunkSections[i];
-            if (levelChunkSection.hasOnlyAir()) continue;
-            int j = this.levelHeightAccessor.getSectionYFromSectionIndex(i);
-            updateSectionStatus(SectionPos.of(chunkPos, j), false);
-        }
-        enableLightSources(chunkPos, true);
-        if (needLightBlockUpdate) {
-            chunkAccess.getLights().forEach(blockPos ->
-            onBlockEmissionIncrease(blockPos, chunkAccess.getLightEmission(blockPos)));
-        }
-        
-        chunkAccess.setLightCorrect(true);
-    }
-
-    @Override
-    public String getDebugData(LightLayer lightLayer, SectionPos sectionPos) {
-    	throw new UnsupportedOperationException("This should never be used!");
-    }
-    @Override
-    public void queueSectionData(LightLayer lightLayer, SectionPos sectionPos, @Nullable DataLayer dataLayer, boolean bl) {
-        if (lightLayer == LightLayer.BLOCK) {
-            if (this.blockEngine != null) {
-                this.blockEngine.queueSectionData(sectionPos.asLong(), dataLayer, bl);
-            }
-        } else if (this.skyEngine != null) {
-            this.skyEngine.queueSectionData(sectionPos.asLong(), dataLayer, bl);
-        }
-    }
-    @Override
-    public void retainData(ChunkPos chunkPos, boolean bl) {
-        if (this.blockEngine != null) {
-            this.blockEngine.retainData(chunkPos, bl);
-        }
-        if (this.skyEngine != null) {
-            this.skyEngine.retainData(chunkPos, bl);
-        }
-    }
-    @Override
-    public int getLightSectionCount() {
-    	throw new UnsupportedOperationException("This should never be used!");
-    }
-    @Override
-    public int getMinLightSection() {
-    	throw new UnsupportedOperationException("This should never be used!");
-    }
-    @Override
-    public int getMaxLightSection() {
-    	throw new UnsupportedOperationException("This should never be used!");
-    }
-}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/WorldGenStructFeatManager.java

@@ -1,82 +0,0 @@
-package com.seibel.lod.common.wrappers.worldGeneration.mimicObject;
-
-import java.util.List;
-import java.util.stream.Stream;
-
-import com.google.common.collect.ImmutableList;
-
-import it.unimi.dsi.fastutil.longs.LongIterator;
-import it.unimi.dsi.fastutil.longs.LongSet;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.SectionPos;
-import net.minecraft.server.level.WorldGenRegion;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.StructureFeatureManager;
-import net.minecraft.world.level.WorldGenLevel;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.levelgen.WorldGenSettings;
-import net.minecraft.world.level.levelgen.feature.StructureFeature;
-import net.minecraft.world.level.levelgen.structure.StructureCheck;
-import net.minecraft.world.level.levelgen.structure.StructureStart;
-
-public class WorldGenStructFeatManager extends StructureFeatureManager {
-	WorldGenLevel genLevel;
-	WorldGenSettings worldGenSettings;
-	StructureCheck structureCheck;
-	public WorldGenStructFeatManager(LevelAccessor levelAccessor, WorldGenSettings worldGenSettings,
-			WorldGenLevel genLevel, StructureCheck structureCheck) {
-		super(levelAccessor, worldGenSettings, structureCheck);
-		this.genLevel = genLevel;
-		this.worldGenSettings = worldGenSettings;
-	}
-	
-	public void setGenLevel(WorldGenLevel genLevel) {
-		this.genLevel = genLevel;
-	}
-
-	@Override
-	public WorldGenStructFeatManager forWorldGenRegion(WorldGenRegion worldGenRegion) {
-		if (worldGenRegion == genLevel)
-			return this;
-		return new WorldGenStructFeatManager(worldGenRegion, worldGenSettings, worldGenRegion, structureCheck);
-	}
-
-	@Override
-    public boolean hasAnyStructureAt(BlockPos blockPos) {
-        SectionPos sectionPos = SectionPos.of(blockPos);
-		ChunkAccess chunk = genLevel.getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES,
-				false);
-		if (chunk == null) return false;
-        return chunk.hasAnyStructureReferences();
-    }
-
-	// TODO Check this
-	/*
-	@Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-	public List<? extends StructureStart<?>> startsForFeature(SectionPos sectionPos,
-			StructureFeature<?> structureFeature) {
-		if (genLevel == null)
-			return List.of();
-		ChunkAccess chunk = genLevel.getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES,
-				false);
-		if (chunk == null)
-			return List.of();
-		LongSet longSet = chunk.getReferencesForFeature(structureFeature);
-			ImmutableList.Builder builder = ImmutableList.builder();
-	        LongIterator longIterator = longSet.iterator();
-	        while (longIterator.hasNext()) {
-	            long l = (Long)longIterator.next();
-	            SectionPos sectPos = SectionPos.of(new ChunkPos(l), genLevel.getMinSection());
-	            ChunkAccess startChunk = genLevel.getChunk(sectPos.x(), sectPos.z(), ChunkStatus.STRUCTURE_STARTS, false);
-	            if (startChunk == null) continue;
-	            StructureStart<?> structureStart = this.getStartForFeature(sectPos, structureFeature, startChunk);
-	            if (structureStart == null || !structureStart.isValid()) continue;
-	            builder.add(structureStart);
-	        }
-	        return builder.build();
-	}
-	 */
-}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepBiomes.java

@@ -1,55 +0,0 @@
-package com.seibel.lod.common.wrappers.worldGeneration.step;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;
-
-import net.minecraft.core.Registry;
-import net.minecraft.server.level.WorldGenRegion;
-import net.minecraft.world.level.StructureFeatureManager;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.chunk.ProtoChunk;
-import net.minecraft.world.level.levelgen.DebugLevelSource;
-import net.minecraft.world.level.levelgen.FlatLevelSource;
-import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
-import net.minecraft.world.level.levelgen.blending.Blender;
-
-public final class StepBiomes {
-	/**
-	 * 
-	 */
-	private final BatchGenerationEnvironment environment;
-
-	/**
-	 * @param batchGenerationEnvironment
-	 */
-	public StepBiomes(BatchGenerationEnvironment batchGenerationEnvironment)
-	{
-		environment = batchGenerationEnvironment;
-	}
-
-	public final ChunkStatus STATUS = ChunkStatus.BIOMES;
-	
-	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			List<ChunkAccess> chunks) {
-
-		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
-		
-		for (ChunkAccess chunk : chunks) {
-			if (chunk.getStatus().isOrAfter(STATUS)) continue;
-			((ProtoChunk) chunk).setStatus(STATUS);
-			chunksToDo.add(chunk);
-		}
-		
-		for (ChunkAccess chunk : chunksToDo) {
-			// System.out.println("StepBiomes: "+chunk.getPos());
-			chunk = environment.joinSync(environment.params.generator.createBiomes(environment.params.biomes, Runnable::run, Blender.of(worldGenRegion),
-					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
-		}
-	}
-}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepFeatures.java

@@ -1,60 +0,0 @@
-package com.seibel.lod.common.wrappers.worldGeneration.step;
-
-import java.util.ArrayList;
-
-import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;
-import com.seibel.lod.core.util.gridList.ArrayGridList;
-
-import net.minecraft.ReportedException;
-import net.minecraft.server.level.WorldGenRegion;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.chunk.ProtoChunk;
-import net.minecraft.world.level.levelgen.blending.Blender;
-
-public final class StepFeatures {
-	/**
-	 * 
-	 */
-	private final BatchGenerationEnvironment environment;
-
-	/**
-	 * @param batchGenerationEnvironment
-	 */
-	public StepFeatures(BatchGenerationEnvironment batchGenerationEnvironment)
-	{
-		environment = batchGenerationEnvironment;
-	}
-
-	public final ChunkStatus STATUS = ChunkStatus.FEATURES;
-
-	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			ArrayGridList<ChunkAccess> chunks) {
-		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
-		
-		for (ChunkAccess chunk : chunks) {
-			if (chunk.getStatus().isOrAfter(STATUS)) continue;
-			((ProtoChunk) chunk).setStatus(STATUS);
-			chunksToDo.add(chunk);
-		}
-		
-		for (ChunkAccess chunk : chunksToDo) {
-			try {
-				environment.params.generator.applyBiomeDecoration(worldGenRegion, chunk,
-						tParams.structFeat.forWorldGenRegion(worldGenRegion));
-				Blender.generateBorderTicks(worldGenRegion, chunk);
-			} catch (ReportedException e) {
-				e.printStackTrace();
-				// FIXME: Features concurrent modification issue. Something about cocobeans just
-				// aren't happy
-				// For now just retry.
-			}
-		}/*
-		for (ChunkAccess chunk : chunks) {
-			Heightmap.primeHeightmaps(chunk,
-					EnumSet.of(Heightmap.Types.MOTION_BLOCKING, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES,
-							Heightmap.Types.OCEAN_FLOOR, Heightmap.Types.WORLD_SURFACE));
-		}*/
-	}
-}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepLight.java

@@ -1,60 +0,0 @@
-package com.seibel.lod.common.wrappers.worldGeneration.step;
-
-import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.WorldGenLevelLightEngine;
-import com.seibel.lod.core.util.gridList.ArrayGridList;
-
-import net.minecraft.server.level.ThreadedLevelLightEngine;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.chunk.ProtoChunk;
-import net.minecraft.world.level.lighting.LightEventListener;
-
-public final class StepLight {
-	/**
-	 * 
-	 */
-	private final BatchGenerationEnvironment environment;
-
-	/**
-	 * @param batchGenerationEnvironment
-	 */
-	public StepLight(BatchGenerationEnvironment batchGenerationEnvironment)
-	{
-		environment = batchGenerationEnvironment;
-	}
-
-	public final ChunkStatus STATUS = ChunkStatus.LIGHT;
-	
-	public void generateGroup(LightEventListener lightEngine,
-			ArrayGridList<ChunkAccess> chunks) {
-		//ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
-		
-		for (ChunkAccess chunk : chunks) {
-			if (chunk.getStatus().isOrAfter(STATUS)) continue;
-			((ProtoChunk) chunk).setStatus(STATUS);
-		}
-		
-		for (ChunkAccess chunk : chunks) {
-			boolean hasCorrectBlockLight = (chunk instanceof LevelChunk && chunk.isLightCorrect());
-			try {
-				if (lightEngine == null) {
-					// Do nothing
-				} else if (lightEngine instanceof WorldGenLevelLightEngine) {
-					((WorldGenLevelLightEngine)lightEngine).lightChunk(chunk, !hasCorrectBlockLight);
-				} else if (lightEngine instanceof ThreadedLevelLightEngine) {
-					((ThreadedLevelLightEngine) lightEngine).lightChunk(chunk, !hasCorrectBlockLight).join();
-				} else {
-					assert(false);
-				}
-				
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			if (chunk instanceof LevelChunk) ((LevelChunk)chunk).setClientLightReady(true);
-			chunk.setLightCorrect(true);
-		}
-		lightEngine.runUpdates(Integer.MAX_VALUE, true, true);
-	}
-}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepNoise.java

@@ -1,57 +0,0 @@
-package com.seibel.lod.common.wrappers.worldGeneration.step;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
-import com.google.common.collect.Sets;
-import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;
-
-import net.minecraft.server.level.WorldGenRegion;
-import net.minecraft.util.Mth;
-import net.minecraft.world.level.LevelHeightAccessor;
-import net.minecraft.world.level.StructureFeatureManager;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.chunk.LevelChunkSection;
-import net.minecraft.world.level.chunk.ProtoChunk;
-import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
-import net.minecraft.world.level.levelgen.NoiseSettings;
-import net.minecraft.world.level.levelgen.blending.Blender;
-
-public final class StepNoise {
-	/**
-	 * 
-	 */
-	private final BatchGenerationEnvironment environment;
-
-	/**
-	 * @param batchGenerationEnvironment
-	 */
-	public StepNoise(BatchGenerationEnvironment batchGenerationEnvironment)
-	{
-		environment = batchGenerationEnvironment;
-	}
-	
-	public final ChunkStatus STATUS = ChunkStatus.NOISE;
-    
-	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			List<ChunkAccess> chunks) {
-
-		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
-		
-		for (ChunkAccess chunk : chunks) {
-			if (chunk.getStatus().isOrAfter(STATUS)) continue;
-			((ProtoChunk) chunk).setStatus(STATUS);
-			chunksToDo.add(chunk);
-		}
-		
-		for (ChunkAccess chunk : chunksToDo) {
-			// System.out.println("StepNoise: "+chunk.getPos());
-			chunk = environment.joinSync(environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion),
-						tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
-		}
-	}
-}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepStructureReference.java

@@ -1,54 +0,0 @@
-package com.seibel.lod.common.wrappers.worldGeneration.step;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;
-
-import net.minecraft.CrashReport;
-import net.minecraft.CrashReportCategory;
-import net.minecraft.ReportedException;
-import net.minecraft.core.Registry;
-import net.minecraft.core.SectionPos;
-import net.minecraft.server.level.WorldGenRegion;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.StructureFeatureManager;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.chunk.ProtoChunk;
-import net.minecraft.world.level.levelgen.structure.StructureStart;
-
-public final class StepStructureReference {
-	/**
-	 * 
-	 */
-	private final BatchGenerationEnvironment environment;
-
-	/**
-	 * @param batchGenerationEnvironment
-	 */
-	public StepStructureReference(BatchGenerationEnvironment batchGenerationEnvironment)
-	{
-		environment = batchGenerationEnvironment;
-	}
-
-	public final ChunkStatus STATUS = ChunkStatus.STRUCTURE_REFERENCES;
-
-	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			List<ChunkAccess> chunks) {
-
-		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
-		
-		for (ChunkAccess chunk : chunks) {
-			if (chunk.getStatus().isOrAfter(STATUS)) continue;
-			((ProtoChunk) chunk).setStatus(STATUS);
-			chunksToDo.add(chunk);
-		}
-		
-		for (ChunkAccess chunk : chunksToDo) {
-			// System.out.println("StepStructureReference: "+chunk.getPos());
-			environment.params.generator.createReferences(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk);
-		}
-	}
-}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepStructureStart.java

@@ -1,67 +0,0 @@
-package com.seibel.lod.common.wrappers.worldGeneration.step;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;
-
-import net.minecraft.server.level.WorldGenRegion;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.chunk.ProtoChunk;
-
-public final class StepStructureStart {
-	/**
-	 * 
-	 */
-	private final BatchGenerationEnvironment environment;
-
-	/**
-	 * @param batchGenerationEnvironment
-	 */
-	public StepStructureStart(BatchGenerationEnvironment batchGenerationEnvironment)
-	{
-		environment = batchGenerationEnvironment;
-	}
-
-	public final ChunkStatus STATUS = ChunkStatus.STRUCTURE_STARTS;
-	
-	public static class StructStartCorruptedException extends RuntimeException {
-		private static final long serialVersionUID = -8987434342051563358L;
-
-		public StructStartCorruptedException(ArrayIndexOutOfBoundsException e) {
-			super("StructStartCorruptedException");
-			super.initCause(e);
-			fillInStackTrace();
-		}
-	}
-
-	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			List<ChunkAccess> chunks) {
-
-		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
-		
-		for (ChunkAccess chunk : chunks) {
-			if (chunk.getStatus().isOrAfter(STATUS)) continue;
-			((ProtoChunk) chunk).setStatus(STATUS);
-			chunksToDo.add(chunk);
-		}
-		
-		if (environment.params.worldGenSettings.generateFeatures()) {
-			for (ChunkAccess chunk : chunksToDo) {
-				// System.out.println("StepStructureStart: "+chunk.getPos());
-				environment.params.generator.createStructures(environment.params.registry, tParams.structFeat, chunk, environment.params.structures,
-						environment.params.worldSeed);
-				try {
-					tParams.structCheck.onStructureLoad(chunk.getPos(), chunk.getAllStarts());
-				} catch (ArrayIndexOutOfBoundsException e) {
-					// There's a rare issue with StructStart where it throws ArrayIndexOutOfBounds
-					// This means the structFeat is corrupted (For some reason) and I need to reset it.
-					// TODO: Figure out in the future why this happens even though I am using new structFeat
-					throw new StepStructureStart.StructStartCorruptedException(e);
-				}
-			}
-		}
-	}
-}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepSurface.java

@@ -1,46 +0,0 @@
-package com.seibel.lod.common.wrappers.worldGeneration.step;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;
-
-import net.minecraft.server.level.WorldGenRegion;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.chunk.ProtoChunk;
-
-public final class StepSurface {
-	/**
-	 * 
-	 */
-	private final BatchGenerationEnvironment environment;
-
-	/**
-	 * @param batchGenerationEnvironment
-	 */
-	public StepSurface(BatchGenerationEnvironment batchGenerationEnvironment)
-	{
-		environment = batchGenerationEnvironment;
-	}
-
-	public final ChunkStatus STATUS = ChunkStatus.SURFACE;
-
-	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			List<ChunkAccess> chunks) {
-		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
-		
-		for (ChunkAccess chunk : chunks) {
-			if (chunk.getStatus().isOrAfter(STATUS)) continue;
-			((ProtoChunk) chunk).setStatus(STATUS);
-			chunksToDo.add(chunk);
-		}
-		
-		for (ChunkAccess chunk : chunksToDo) {
-			// System.out.println("StepSurface: "+chunk.getPos());
-			environment.params.generator.buildSurface(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion),
-					chunk);
-		}
-	}
-}

common/src/main/resources/lod.accesswidener

@@ -1,48 +0,0 @@
-accessWidener v1 named
-
-# used when determining where to save files to
-accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File;
-
-# used when rendering
-accessible field com/mojang/blaze3d/vertex/VertexBuffer indexCount I
-accessible field com/mojang/blaze3d/vertex/VertexBuffer vertextBufferId I
-accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D
-
-# used for grabbing vanilla rendered chunks
-accessible field net/minecraft/client/renderer/LevelRenderer renderChunkStorage Ljava/util/concurrent/atomic/AtomicReference;
-accessible class net/minecraft/client/renderer/LevelRenderer$RenderChunkStorage
-accessible class net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo
-accessible field net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo chunk Lnet/minecraft/client/renderer/chunk/ChunkRenderDispatcher$RenderChunk;
-
-# lighting
-accessible field net/minecraft/client/renderer/LightTexture lightPixels Lcom/mojang/blaze3d/platform/NativeImage;
-accessible field net/minecraft/world/level/lighting/LevelLightEngine blockEngine Lnet/minecraft/world/level/lighting/LayerLightEngine;
-accessible field net/minecraft/world/level/lighting/LevelLightEngine skyEngine Lnet/minecraft/world/level/lighting/LayerLightEngine;
-
-# world generation
-accessible method net/minecraft/world/level/levelgen/Heightmap setHeight (III)V
-accessible field net/minecraft/world/level/biome/Biome generationSettings Lnet/minecraft/world/level/biome/BiomeGenerationSettings;
-accessible field net/minecraft/world/level/biome/Biome biomeCategory Lnet/minecraft/world/level/biome/Biome$BiomeCategory;
-# accessible field net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator settings Lnet/minecraft/core/Holder;
-accessible method net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator doFill (Lnet/minecraft/world/level/levelgen/blending/Blender;Lnet/minecraft/world/level/StructureFeatureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;II)Lnet/minecraft/world/level/chunk/ChunkAccess;
-#accessible method net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator doCreateBiomes (Lnet/minecraft/core/Registry;Lnet/minecraft/world/level/levelgen/blending/Blender;Lnet/minecraft/world/level/StructureFeatureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;)V
-accessible method net/minecraft/world/level/lighting/LayerLightEngine queueSectionData (JLnet/minecraft/world/level/chunk/DataLayer;Z)V
-
-# lod generation from save file
-accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;
-accessible method net/minecraft/server/level/ChunkMap readChunk (Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/nbt/CompoundTag;
-
-
-# grabbing textures
-accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite animatedTexture Lnet/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture;
-accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite width I
-accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite height I
-accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite mainImage [Lcom/mojang/blaze3d/platform/NativeImage;
-accessible class net/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture
-accessible method net/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture getFrameX (I)I
-accessible method net/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture getFrameY (I)I
-extendable class com/mojang/math/Matrix4f
-
-# hacky stuff
-accessible field net/minecraft/util/ThreadingDetector lock Ljava/util/concurrent/Semaphore;
-mutable field net/minecraft/util/ThreadingDetector lock Ljava/util/concurrent/Semaphore;

fabric/build.gradle

@@ -1,169 +0,0 @@
-plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.0"
-}
-
-version = rootProject.mod_version+"-"+rootProject.minecraft_version+"-"+new Date().format("yyyy_MM_dd_HH_mm")
-
-loom {
-    accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener"))
-}
-
-architectury {
-    platformSetupLoomIde()
-    fabric()
-}
-
-configurations {
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentFabric.extendsFrom common
-}
-
-repositories {
-    // Required for ModMenu
-    maven { url "https://maven.terraformersmc.com/" }
-}
-
-def addMod(path, enabled) {
-    if (enabled == "2")
-        dependencies { modImplementation(path) }
-    else if (enabled == "1")
-        dependencies { modCompileOnly(path) }
-}
-
-dependencies {
-    // Fabric loader
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-
-    // Fabric API
-    modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
-
-    // Mod Menu
-    modImplementation("com.terraformersmc:modmenu:${rootProject.modmenu_version}") {
-        exclude(group: "net.fabricmc.fabric-api")
-    }
-
-    // Starlight
-    addMod("curse.maven:starlight-521783:${rootProject.starlight_version_fabric}", rootProject.enable_starlight)
-
-    // Sodium
-    addMod("curse.maven:sodium-394468:${rootProject.sodium_version}", rootProject.enable_sodium)
-    implementation "org.joml:joml:1.10.2"
-	
-	// Lithium
-    addMod("maven.modrinth:lithium:${rootProject.lithium_version}", rootProject.enable_lithium)
-
-    // Iris
-    addMod("maven.modrinth:iris:${rootProject.iris_version}", rootProject.enable_iris)
-
-    // BCLib
-    addMod("com.github.paulevsGitch:BCLib:${rootProject.bclib_version}", rootProject.enable_bclib)
-
-    // Immersive Portals
-    /*
-    modImplementation("com.github.qouteall.ImmersivePortalsMod:build:${rootProject.immersive_portals_version}") {
-        exclude(group: "net.fabricmc.fabric-api")
-        transitive(false)
-    }
-    modImplementation("com.github.qouteall.ImmersivePortalsMod:imm_ptl_core:${rootProject.immersive_portals_version}") {
-        exclude(group: "net.fabricmc.fabric-api")
-        transitive(false)
-    }
-    modImplementation("com.github.qouteall.ImmersivePortalsMod:q_misc_util:${rootProject.immersive_portals_version}") {
-        exclude(group: "net.fabricmc.fabric-api")
-        transitive(false)
-    }
-    */
-
-
-
-    // Toml
-    shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}
-
-    common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowMe(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
-
-    // Compression
-    common 'org.tukaani:xz:1.9'
-    common 'org.apache.commons:commons-compress:1.21'
-    shadowMe 'org.tukaani:xz:1.9'
-    shadowMe 'org.apache.commons:commons-compress:1.21'
-}
-
-// This method copies the access wideners from the common project to the fabric project. And it was generated by Github Copilot
-task copyAccessWidener(type: Copy) {
-    from project(":common").file("src/main/resources/lod.accesswidener")
-    into file("src/generated/resources")
-}
-
-task copyCoreResources(type: Copy) {
-    from fileTree(project(":core").file("src/main/resources"))
-    into file("build/resources/main")
-}
-
-task deleteResources(type: Delete) {
-    delete file("build/resources/main")
-}
-
-task copyCommonResources(type: Copy) {
-    from fileTree(project(":common").file("src/main/resources"))
-    into file("build/resources/main")
-}
-
-runClient {
-    dependsOn(copyCoreResources)
-    dependsOn(copyCommonResources)
-    jvmArgs "-XX:-OmitStackTraceInFastThrow"
-    finalizedBy(deleteResources)
-}
-
-processResources {
-    dependsOn(copyAccessWidener)
-}
-
-shadowJar {
-    configurations = [project.configurations.shadowMe]
-    relocate 'org.tukaani', 'shaded.tukaani'
-    relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress'
-    relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig'
-
-    relocate 'com.seibel.lod.common', 'fabric.com.seibel.lod.common'
-
-    classifier "dev-shadow"
-}
-
-remapJar {
-    input.set shadowJar.archiveFile
-    dependsOn shadowJar
-    classifier null
-}
-
-jar {
-    classifier "dev"
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-publishing {
-    publications {
-        mavenFabric(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}

fabric/src/main/java/com/seibel/lod/fabric/ClientProxy.java

@@ -1,194 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.fabric;
-
-import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.lod.core.api.ClientApi;
-import com.seibel.lod.core.api.EventApi;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.mojang.blaze3d.platform.InputConstants;
-import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.lod.common.wrappers.world.DimensionTypeWrapper;
-import com.seibel.lod.common.wrappers.world.WorldWrapper;
-import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-
-import com.seibel.lod.fabric.mixins.MixinUtilBackgroudThread;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.Minecraft;
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.chunk.LevelChunk;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.function.Supplier;
-
-import org.lwjgl.glfw.GLFW;
-
-/**
- * This handles all events sent to the client,
- * and is the starting point for most of the mod.
- * 
- * @author coolGi2007
- * @author Ran
- * @version 11-23-2021
- */
-public class ClientProxy
-{
-	private final EventApi eventApi = EventApi.INSTANCE;
-	private final ClientApi clientApi = ClientApi.INSTANCE;
-
-	public static Supplier<Boolean> isGenerationThreadChecker = null;
-
-	/**
-	 * Registers Fabric Events
-	 * @author Ran
-	 */
-	public void registerEvents() {
-		/* Registor the mod accessor*/
-
-		/* World Events */
-		//ServerTickEvents.START_SERVER_TICK.register(this::serverTickEvent);
-		ServerTickEvents.END_SERVER_TICK.register(this::serverTickEvent);
-
-		/* World Events */
-		//ServerChunkEvents.CHUNK_LOAD.register(this::chunkLoadEvent);
-		//ClientChunkEvents.CHUNK_LOAD.register(this::chunkLoadEvent);
-
-		/* World Events */
-		ServerWorldEvents.LOAD.register((server, level) -> this.worldLoadEvent(level));
-		ServerWorldEvents.UNLOAD.register((server, level) -> this.worldUnloadEvent(level));
-		
-		/* The Client World Events are in the mixins
-		Client world load event is in MixinClientLevel
-		Client world unload event is in MixinMinecraft */
-		/* The save events are in MixinServerLevel */
-
-		/* Keyboard Events */
-		ClientTickEvents.END_CLIENT_TICK.register(client -> {
-			if (client.player != null) onKeyInput();
-		});
-		isGenerationThreadChecker = BatchGenerationEnvironment::isCurrentThreadDistantGeneratorThread;
-
-	}
-
-
-	public void serverTickEvent(MinecraftServer server)
-	{
-		eventApi.serverTickEvent();
-	}
-
-	public void chunkLoadEvent(LevelAccessor level, LevelChunk chunk)
-	{
-		clientApi.clientChunkLoadEvent(new ChunkWrapper(chunk, level),
-				WorldWrapper.getWorldWrapper(level));
-	}
-
-	public void worldSaveEvent()
-	{
-		eventApi.worldSaveEvent();
-	}
-	
-	/** This is also called when a new dimension loads */
-	public void worldLoadEvent(Level level)
-	{
-		if (level != null) {
-			eventApi.worldLoadEvent(WorldWrapper.getWorldWrapper(level));
-		}
-	}
-
-	public void worldUnloadEvent(Level level)
-	{
-		if (level != null) {
-			eventApi.worldUnloadEvent(WorldWrapper.getWorldWrapper(level));
-		}
-	}
-
-	/**
-	 * Can someone tell me how to make this better
-	 * @author Ran
-	 *
-	 * public void blockChangeEvent(BlockEventData event) {
-	 * 		// we only care about certain block events
-	 * 		if (event.getClass() == BlockEventData.BreakEvent.class ||
-	 * 				event.getClass() == BlockEventData.EntityPlaceEvent.class ||
-	 * 				event.getClass() == BlockEventData.EntityMultiPlaceEvent.class ||
-	 * 				event.getClass() == BlockEventData.FluidPlaceBlockEvent.class ||
-	 * 				event.getClass() == BlockEventData.PortalSpawnEvent.class)
-	 *        {
-	 * 			IChunkWrapper chunk = new ChunkWrapper(event.getWorld().getChunk(event.getPos()));
-	 * 			DimensionTypeWrapper dimType = DimensionTypeWrapper.getDimensionTypeWrapper(event.getWorld().dimensionType());
-	 *
-	 * 			// recreate the LOD where the blocks were changed
-	 * 			eventApi.blockChangeEvent(chunk, dimType);
-	 *        }
-	 * }
-	 */
-	public void blockChangeEvent(LevelAccessor world, BlockPos pos) {
-		IChunkWrapper chunk = new ChunkWrapper(world.getChunk(pos), world);
-		DimensionTypeWrapper dimType = DimensionTypeWrapper.getDimensionTypeWrapper(world.dimensionType());
-
-		// recreate the LOD where the blocks were changed
-		eventApi.blockChangeEvent(chunk, dimType);
-	}
-	
-	private static final List<Integer> KEY_TO_CHECK_FOR = List.of(GLFW.GLFW_KEY_F6, GLFW.GLFW_KEY_F8);
-	
-	HashSet<Integer> previousKeyDown = new HashSet<Integer>();
-	
-	public void onKeyInput() {
-		ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
-		if (CONFIG.client().advanced().debugging().getDebugKeybindingsEnabled())
-		{
-			HashSet<Integer> currectKeyDown = new HashSet<Integer>();
-			
-			// Note: Minecraft's InputConstants is same as GLFW Key values
-			//TODO: Use mixin to hook directly into the GLFW Keyboard event in minecraft KeyboardHandler
-			// Check all keys we need
-			for (int i = InputConstants.KEY_A; i <= InputConstants.KEY_Z; i++) {
-				if (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), i)) {
-					currectKeyDown.add(i);
-				}
-			}
-			for (int i : KEY_TO_CHECK_FOR) {
-				if (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), i)) {
-					currectKeyDown.add(i);
-				}
-			}
-			
-			// Diff and trigger events
-			for (int c : currectKeyDown) {
-				if (!previousKeyDown.contains(c)) {
-					ClientApi.INSTANCE.keyPressedEvent(c);
-				}
-			}
-			
-			// Update the set
-			previousKeyDown = currectKeyDown;
-		}
-	}
-}

fabric/src/main/java/com/seibel/lod/fabric/Main.java

@@ -1,96 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.fabric;
-
-import com.seibel.lod.common.LodCommonMain;
-import com.seibel.lod.core.ModInfo;
-import com.seibel.lod.core.api.ApiShared;
-import com.seibel.lod.core.api.ClientApi;
-import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorHandler;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IStarlightAccessor;
-import com.seibel.lod.fabric.networking.NetworkHandler;
-import com.seibel.lod.fabric.wrappers.modAccessor.ModChecker;
-import com.seibel.lod.fabric.wrappers.modAccessor.OptifineAccessor;
-import com.seibel.lod.fabric.wrappers.modAccessor.SodiumAccessor;
-import com.seibel.lod.fabric.wrappers.modAccessor.StarlightAccessor;
-import com.seibel.lod.fabric.wrappers.FabricDependencySetup;
-
-import net.fabricmc.api.ClientModInitializer;
-
-/**
- * Initialize and setup the Mod. <br>
- * If you are looking for the real start of the mod
- * check out the ClientProxy.
- * 
- * @author coolGi2007
- * @author Ran
- * @version 12-1-2021
- */
-public class Main implements ClientModInitializer
-{
-	// This is a client mod so it should implement ClientModInitializer and in fabric.mod.json it should have "environment": "client"
-	// Once it works on servers change the implement to ModInitializer and in fabric.mod.json it should be "environment": "*"
-
-	public static ClientProxy client_proxy;
-
-
-	// Do if implements ClientModInitializer
-	// This loads the mod before minecraft loads which causes a lot of issues
-	@Override
-	public void onInitializeClient() {
-		// no.
-	}
-
-	// This loads the mod after minecraft loads which doesn't causes a lot of issues
-	public static void init() {
-		LodCommonMain.initConfig();
-		LodCommonMain.startup(null, false, new NetworkHandler());
-		FabricDependencySetup.createInitialBindings();
-		FabricDependencySetup.finishBinding();
-		ApiShared.LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
-
-		// Check if this works
-		client_proxy = new ClientProxy();
-		client_proxy.registerEvents();
-		if (SingletonHandler.get(IModChecker.class).isModLoaded("sodium")) {
-			ModAccessorHandler.bind(ISodiumAccessor.class, new SodiumAccessor());
-		}
-		if (SingletonHandler.get(IModChecker.class).isModLoaded("starlight")) {
-			ModAccessorHandler.bind(IStarlightAccessor.class, new StarlightAccessor());
-		}
-		if (SingletonHandler.get(IModChecker.class).isModLoaded("optifine")) {
-			ModAccessorHandler.bind(IOptifineAccessor.class, new OptifineAccessor());
-		}
-
-		ModAccessorHandler.finishBinding();
-	}
-
-	public static void initServer() {
-		LodCommonMain.initConfig();
-		LodCommonMain.startup(null, true, new NetworkHandler());
-		FabricDependencySetup.createInitialBindings();
-		FabricDependencySetup.finishBinding();
-		ApiShared.LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
-	}
-}

fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinDedicatedServer.java

@@ -1,16 +0,0 @@
-package com.seibel.lod.fabric.mixins;
-
-import com.seibel.lod.fabric.Main;
-import net.minecraft.server.dedicated.DedicatedServer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(DedicatedServer.class)
-public class MixinDedicatedServer {
-    @Inject(method = "initServer", at = @At("TAIL"))
-    public void initServer(CallbackInfoReturnable<Boolean> cir) {
-        Main.initServer();
-    }
-}

fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinFogRenderer.java

@@ -1,40 +0,0 @@
-package com.seibel.lod.fabric.mixins;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-
-import net.minecraft.client.Camera;
-import net.minecraft.client.renderer.FogRenderer;
-import net.minecraft.client.renderer.FogRenderer.FogMode;
-import net.minecraft.world.effect.MobEffects;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.level.material.FogType;
-
-@Mixin(FogRenderer.class)
-public class MixinFogRenderer {
-	private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
-	
-	// Using this instead of Float.MAX_VALUE because Sodium don't like it.
-	private static final float A_REALLY_REALLY_BIG_VALUE = 420694206942069.F;
-	private static final float A_EVEN_LARGER_VALUE = 42069420694206942069.F;
-	
-	@Inject(at = @At("RETURN"), method = "setupFog(Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/FogRenderer$FogMode;FZ)V")
-	private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, CallbackInfo callback) {
-	    FogType fogTypes = camera.getFluidInCamera();
-	    Entity entity = camera.getEntity();
-	    boolean isUnderWater = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
-	    if (!isUnderWater) {
-			if (fogMode == FogMode.FOG_TERRAIN && fogTypes == FogType.NONE && CONFIG.client().graphics().fogQuality().getDisableVanillaFog()) {
-			    RenderSystem.setShaderFogStart(A_REALLY_REALLY_BIG_VALUE);
-			    RenderSystem.setShaderFogEnd(A_EVEN_LARGER_VALUE);
-			}
-	    }
-	}
-}

fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinMinecraft.java

@@ -1,21 +0,0 @@
-package com.seibel.lod.fabric.mixins;
-
-import com.seibel.lod.fabric.Main;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.main.GameConfig;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-/**
- * Loads the mod after minecraft loads.
- * @author Ran
- */
-@Mixin(value = Minecraft.class)
-public class MixinMinecraft {
-    @Inject(method = "<init>", at = @At("TAIL"))
-    private void startMod(GameConfig gameConfig, CallbackInfo ci) {
-        Main.init();
-    }
-}

fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinOptionsScreen.java

@@ -1,52 +0,0 @@
-package com.seibel.lod.fabric.mixins;
-
-import com.seibel.lod.common.wrappers.config.ConfigGui;
-import com.seibel.lod.common.wrappers.config.TexturedButtonWidget;
-import com.seibel.lod.core.ModInfo;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import net.minecraft.client.gui.screens.OptionsScreen;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.resources.ResourceLocation;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.Objects;
-
-/**
- * Adds a button to the menu to goto the config
- *
- * @author coolGi2007
- * @version 12-02-2021
-*/
-@Mixin(OptionsScreen.class)
-public class MixinOptionsScreen extends Screen {
-    // Get the texture for the button
-    private static final ResourceLocation ICON_TEXTURE = new ResourceLocation(ModInfo.ID,"textures/gui/button.png");
-    protected MixinOptionsScreen(Component title) {
-        super(title);
-    }
-
-    @Inject(at = @At("HEAD"),method = "init")
-    private void lodconfig$init(CallbackInfo ci) {
-        if (SingletonHandler.get(ILodConfigWrapperSingleton.class).client().getOptionsButton())
-            this.addRenderableWidget(new TexturedButtonWidget(
-                // Where the button is on the screen
-                this.width / 2 - 180, this.height / 6 - 12,
-                // Width and height of the button
-                20, 20,
-                // Offset
-                0, 0,
-                // Some textuary stuff
-                20, ICON_TEXTURE, 20, 40,
-                // Create the button and tell it where to go
-                // For now it goes to the client option by default
-                (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(ConfigGui.getScreen(this, "client")),
-                // Add a title to the screen
-                new TranslatableComponent("text.autoconfig." + ModInfo.ID + ".title")));
-    }
-}

fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinUtilBackgroudThread.java

@@ -1,50 +0,0 @@
-package com.seibel.lod.fabric.mixins;
-
-import java.util.concurrent.ExecutorService;
-import java.util.function.Supplier;
-
-import com.seibel.lod.fabric.ClientProxy;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import com.seibel.lod.core.util.DummyRunExecutorService;
-
-import net.minecraft.Util;
-
-@Mixin(Util.class)
-public class MixinUtilBackgroudThread
-{
-	
-	@Inject(method = "wrapThreadWithTaskName(Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Runnable;",
-			at = @At("HEAD"), cancellable = true)
-	private static void overrideUtil$wrapThreadWithTaskName(String string, Runnable r, CallbackInfoReturnable<Runnable> ci)
-	{
-		if (ClientProxy.isGenerationThreadChecker != null && ClientProxy.isGenerationThreadChecker.get())
-		{
-			//ApiShared.LOGGER.info("util wrapThreadWithTaskName(Runnable) triggered");
-			ci.setReturnValue(r);
-		}
-	}
-	@Inject(method = "wrapThreadWithTaskName(Ljava/lang/String;Ljava/util/function/Supplier;)Ljava/util/function/Supplier;",
-			at = @At("HEAD"), cancellable = true)
-	private static void overrideUtil$wrapThreadWithTaskNameForSupplier(String string, Supplier<?> r, CallbackInfoReturnable<Supplier<?>> ci)
-	{
-		if (ClientProxy.isGenerationThreadChecker != null && ClientProxy.isGenerationThreadChecker.get())
-		{
-			//ApiShared.LOGGER.info("util wrapThreadWithTaskName(Supplier) triggered");
-			ci.setReturnValue(r);
-		}
-	}
-	
-	@Inject(method = "backgroundExecutor", at = @At("HEAD"), cancellable = true)
-	private static void overrideUtil$backgroundExecutor(CallbackInfoReturnable<ExecutorService> ci)
-	{
-		if (ClientProxy.isGenerationThreadChecker != null && ClientProxy.isGenerationThreadChecker.get())
-		{
-			//ApiShared.LOGGER.info("util backgroundExecutor triggered");
-			ci.setReturnValue(new DummyRunExecutorService());
-		}
-	}
-}

fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinWorldRenderer.java

@@ -1,96 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.fabric.mixins;
-
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Matrix4f;
-import com.seibel.lod.common.wrappers.McObjectConverter;
-import com.seibel.lod.core.api.ClientApi;
-import com.seibel.lod.core.objects.math.Mat4f;
-import net.minecraft.client.Camera;
-import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.client.renderer.RenderType;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-/**
- * This class is used to mix in my rendering code
- * before Minecraft starts rendering blocks.
- * If this wasn't done, and we used Forge's
- * render last event, the LODs would render on top
- * of the normal terrain.
- *
- * This is also the mixin for rendering the clouds
- *
- * @author coolGi2007
- * @author James Seibel
- * @version 12-31-2021
- */
-@Mixin(LevelRenderer.class)
-public class MixinWorldRenderer
-{
-	private static float previousPartialTicks = 0;
-
-	public MixinWorldRenderer() {
-		throw new NullPointerException("Null cannot be cast to non-null type.");
-	}
-
-	@Inject(method = "renderClouds", at = @At("HEAD"), cancellable = true)
-	public void renderClouds(PoseStack poseStack, Matrix4f projectionMatrix, float tickDelta, double cameraX, double cameraY, double cameraZ, CallbackInfo ci) {
-		// get the partial ticks since renderChunkLayer doesn't
-		// have access to them
-		previousPartialTicks = tickDelta;
-	}
-
-	// HEAD or RETURN
-	@Inject(at = @At("RETURN"),
-			method = "renderSky",
-			cancellable = true)
-	private void renderLod(PoseStack modelViewMatrixStack, Matrix4f projectionMatrix, float f,
-						   #if MC_VERSION_1_18_2 Camera camera, boolean bl,#endif Runnable r, CallbackInfo callback) {
-
-		Mat4f mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
-		Mat4f mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
-
-		ClientApi.INSTANCE.renderLods(mcModelViewMatrix, mcProjectionMatrix, previousPartialTicks);
-
-	}
-
-	/*
-
-	// HEAD or RETURN
-	@Inject(at = @At("HEAD"),
-			method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLcom/mojang/math/Matrix4f;)V",
-			cancellable = true)
-	private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double cameraXBlockPos, double cameraYBlockPos, double cameraZBlockPos, Matrix4f projectionMatrix, CallbackInfo callback)
-	{
-		// only render before solid blocks
-		if (renderType.equals(RenderType.solid()))
-		{
-			Mat4f mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
-			Mat4f mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
-
-			ClientApi.INSTANCE.renderLods(mcModelViewMatrix, mcProjectionMatrix, previousPartialTicks);
-		}
-		//callback.cancel();
-	}*/
-}

fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinBlockUpdate.java

@@ -1,27 +0,0 @@
-package com.seibel.lod.fabric.mixins.events;
-
-import com.seibel.lod.fabric.Main;
-import net.minecraft.client.Minecraft;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.protocol.game.ClientGamePacketListener;
-import net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-/**
- * If someone has a better way to do this then please let me know.
- *
- * @author Ran
- */
-@Mixin(ClientboundBlockUpdatePacket.class)
-public abstract class MixinBlockUpdate {
-    @Shadow public abstract BlockPos getPos();
-
-    @Inject(method = "handle(Lnet/minecraft/network/protocol/game/ClientGamePacketListener;)V", at = @At("TAIL"))
-    private void onBlockUpdate(ClientGamePacketListener clientGamePacketListener, CallbackInfo ci) {
-        Main.client_proxy.blockChangeEvent(Minecraft.getInstance().player.clientLevel, this.getPos());
-    }
-}

fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinClientLevel.java

@@ -1,46 +0,0 @@
-package com.seibel.lod.fabric.mixins.events;
-
-import com.seibel.lod.fabric.Main;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.client.renderer.LevelRenderer;
-#if MC_VERSION_1_18_2
-import net.minecraft.core.Holder;
-#endif
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.dimension.DimensionType;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.function.Supplier;
-
-/**
- * This class is used for world loading events
- * @author Ran
- */
-
-@Mixin(ClientLevel.class)
-public class MixinClientLevel {
-    #if MC_VERSION_1_18_2
-    @Inject(method = "<init>", at = @At("TAIL"))
-    private void loadWorldEvent(ClientPacketListener clientPacketListener, ClientLevel.ClientLevelData clientLevelData, ResourceKey resourceKey, Holder holder, int i, int j, Supplier supplier, LevelRenderer levelRenderer, boolean bl, long l, CallbackInfo ci) {
-        Main.client_proxy.worldLoadEvent((ClientLevel) (Object) this);
-    }
-    #elif MC_VERSION_1_18_1
-    @Inject(method = "<init>", at = @At("TAIL"))
-    private void loadWorldEvent(ClientPacketListener clientPacketListener, ClientLevel.ClientLevelData clientLevelData, ResourceKey resourceKey, DimensionType dimensionType, int i, int j, Supplier supplier, LevelRenderer levelRenderer, boolean bl, long l, CallbackInfo ci) {
-        Main.client_proxy.worldLoadEvent((ClientLevel) (Object) this);
-    }
-    #endif
-
-    @Inject(method = "setLightReady", at = @At("HEAD"))
-    private void onChunkLightReady(int x, int z, CallbackInfo ci) {
-    	ClientLevel l = (ClientLevel) (Object) this;
-    	LevelChunk chunk = l.getChunkSource().getChunk(x, z, false);
-    	if (chunk!=null && !chunk.isClientLightReady())
-    		Main.client_proxy.chunkLoadEvent(l, chunk);
-    }
-}

fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinMinecraft.java

@@ -1,32 +0,0 @@
-package com.seibel.lod.fabric.mixins.events;
-
-import com.seibel.lod.fabric.Main;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.multiplayer.ClientLevel;
-
-import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-/**
- * This class is used for world unloading events
- * @author Ran
- */
-@Mixin(Minecraft.class)
-public class MixinMinecraft {
-    @Shadow @Nullable public ClientLevel level;
-
-    @Inject(method = "setLevel", at = @At("HEAD"))
-    private void unloadWorldEvent_sL(ClientLevel clientLevel, CallbackInfo ci) {
-        if (level != null) Main.client_proxy.worldUnloadEvent(level);
-    }
-
-    @Inject(method = "clearLevel(Lnet/minecraft/client/gui/screens/Screen;)V", at = @At("HEAD"))
-    private void unloadWorldEvent_cL(Screen screen, CallbackInfo ci) {
-        if (this.level != null) Main.client_proxy.worldUnloadEvent(this.level);
-    }
-}

fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinServerLevel.java

@@ -1,26 +0,0 @@
-package com.seibel.lod.fabric.mixins.events;
-
-import com.seibel.lod.fabric.Main;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.util.ProgressListener;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-/**
- * This class is used for world saving events
- * @author Ran
- */
-@Mixin(ServerLevel.class)
-public class MixinServerLevel {
-    @Inject(method = "save", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;saveAll()V", shift = At.Shift.AFTER))
-    private void saveWorldEvent_sA(ProgressListener progressListener, boolean bl, boolean bl2, CallbackInfo ci) {
-        Main.client_proxy.worldSaveEvent();
-    }
-
-    @Inject(method = "save", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;autoSave()V", shift = At.Shift.AFTER))
-    private void saveWorldEvent_aS(ProgressListener progressListener, boolean bl, boolean bl2, CallbackInfo ci) {
-        Main.client_proxy.worldSaveEvent();
-    }
-}

fabric/src/main/java/com/seibel/lod/fabric/mixins/unsafe/MixinThreadingDectector.java

@@ -1,26 +0,0 @@
-package com.seibel.lod.fabric.mixins.unsafe;
-
-import net.minecraft.util.ThreadingDetector;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.concurrent.Semaphore;
-
-/**
- * Why does this exist? But okay! (Will be probably removed when the experimental generator is done)
- */
-@Mixin(ThreadingDetector.class)
-public class MixinThreadingDectector {
-    @Mutable
-    @Shadow
-    private Semaphore lock;
-
-    @Inject(method = "<init>", at = @At("RETURN"))
-    private void setSemaphore(CallbackInfo ci) {
-        this.lock = new Semaphore(2);
-    }
-}

fabric/src/main/java/com/seibel/lod/fabric/networking/NetworkHandler.java

@@ -1,25 +0,0 @@
-package com.seibel.lod.fabric.networking;
-
-import com.seibel.lod.common.networking.NetworkInterface;
-import com.seibel.lod.common.networking.Networking;
-import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
-import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
-
-/**
- * @author Ran
- */
-public class NetworkHandler implements NetworkInterface {
-    @Override
-    public void register_Client() {
-        ClientPlayNetworking.registerGlobalReceiver(Networking.resourceLocation_meow, (client, handler, buf, responseSender) -> {
-            com.seibel.lod.common.networking.NetworkHandler.receivePacketClient(client, handler, buf);
-        });
-    }
-
-    @Override
-    public void register_Server() {
-        ServerPlayNetworking.registerGlobalReceiver(Networking.resourceLocation_meow, (server, player, handler, buf, responseSender) -> {
-            com.seibel.lod.common.networking.NetworkHandler.receivePacketServer(server, player, handler, buf);
-        });
-    }
-}

fabric/src/main/java/com/seibel/lod/fabric/wrappers/FabricDependencySetup.java

@@ -1,31 +0,0 @@
-package com.seibel.lod.fabric.wrappers;
-
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.common.wrappers.config.LodConfigWrapperSingleton;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
-import com.seibel.lod.fabric.wrappers.modAccessor.ModChecker;
-
-/**
- * Binds all necessary dependencies, so we
- * can access them in Core. <br>
- * This needs to be called before any Core classes
- * are loaded.
- * 
- * @author James Seibel
- * @author Ran
- * @version 3-5-2022
- */
-public class FabricDependencySetup
-{
-	public static void createInitialBindings()
-	{
-		SingletonHandler.bind(IModChecker.class, ModChecker.INSTANCE);
-
-		SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE);
-	}
-
-	public static void finishBinding() {
-		SingletonHandler.finishBinding();
-	}
-}

fabric/src/main/java/com/seibel/lod/fabric/wrappers/config/ModMenuIntegration.java

@@ -1,19 +0,0 @@
-package com.seibel.lod.fabric.wrappers.config;
-
-import com.seibel.lod.common.wrappers.config.ConfigGui;
-import com.terraformersmc.modmenu.api.ConfigScreenFactory;
-import com.terraformersmc.modmenu.api.ModMenuApi;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-
-/**
- * For making the config show up in modmenu
- */
-@Environment(EnvType.CLIENT)
-public class ModMenuIntegration implements ModMenuApi {
-    // For the custom config code
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return parent -> ConfigGui.getScreen(parent, "");
-    }
-}

fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ModChecker.java

@@ -1,13 +0,0 @@
-package com.seibel.lod.fabric.wrappers.modAccessor;
-
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
-import net.fabricmc.loader.api.FabricLoader;
-
-public class ModChecker implements IModChecker {
-    public static final ModChecker INSTANCE = new ModChecker();
-
-    @Override
-    public boolean isModLoaded(String modid) {
-        return FabricLoader.getInstance().isModLoaded(modid);
-    }
-}

fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/OptifineAccessor.java

@@ -1,24 +0,0 @@
-package com.seibel.lod.fabric.wrappers.modAccessor;
-
-import java.util.HashSet;
-
-import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
-
-public class OptifineAccessor implements IOptifineAccessor
-{
-
-	@Override
-	public String getModName()
-	{
-		return "Optifine-Fabric-1.18.X";
-	}
-
-	@Override
-	public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks()
-	{
-		// TODO: Impl proper methods here
-		return null;
-	}
-	
-}

fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java

@@ -1,42 +0,0 @@
-package com.seibel.lod.fabric.wrappers.modAccessor;
-
-import java.util.HashSet;
-import java.util.stream.Collectors;
-
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
-import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
-
-import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.world.level.LevelHeightAccessor;
-
-public class SodiumAccessor implements ISodiumAccessor {
-	IWrapperFactory factory = SingletonHandler.get(IWrapperFactory.class);
-
-	@Override
-	public String getModName() {
-		return "Sodium-Fabric-1.18.X";
-	}
-
-	@Override
-	public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks() {
-		SodiumWorldRenderer renderer = SodiumWorldRenderer.instance();
-		LevelHeightAccessor height =  Minecraft.getInstance().level; 
-		// 0b11 = Lighted chunk & loaded chunk
-		return renderer.getChunkTracker().getChunks(0b00).filter(
-			(long l) -> {
-				return true;
-				//for (int i = height.getMinSection(); i<height.getMaxSection(); i++) {
-				//	SectionPos p = SectionPos.of(new ChunkPos(l), i);
-				//	if (renderer.isBoxVisible(p.minBlockX()+1, p.minBlockY()+1, p.minBlockZ()+1,
-				//			p.maxBlockX()-1, p.maxBlockY()-1, p.maxBlockZ()-1)) return true;
-				//}
-				//return false;
-			}).mapToObj((long l) -> {
-				return (AbstractChunkPosWrapper)factory.createChunkPos(l);
-			}).collect(Collectors.toCollection(HashSet::new));
-	}
-
-}

fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/StarlightAccessor.java

@@ -1,16 +0,0 @@
-package com.seibel.lod.fabric.wrappers.modAccessor;
-
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IStarlightAccessor;
-
-
-public class StarlightAccessor implements IStarlightAccessor {
-
-	@Override
-	public String getModName() {
-		return "Starlight-Fabric-1.18.X";
-	}
-	
-	public StarlightAccessor() {
-		
-	}
-}

fabric/src/main/resources/LICENSE-MinecraftForge.txt

@@ -1,458 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS

fabric/src/main/resources/fabric.lod.mixins.json

@@ -1,26 +0,0 @@
-{
-  "required": true,
-  "minVersion": "0.8",
-  "package": "com.seibel.lod.fabric.mixins",
-  "compatibilityLevel": "JAVA_17",
-  "mixins": [
-    "unsafe.MixinThreadingDectector",
-    "MixinUtilBackgroudThread",
-    "events.MixinServerLevel"
-  ],
-  "client": [
-    "MixinMinecraft",
-    "MixinOptionsScreen",
-    "MixinWorldRenderer",
-    "MixinFogRenderer",
-    "events.MixinClientLevel",
-    "events.MixinMinecraft",
-    "events.MixinBlockUpdate"
-  ],
-  "server": [
-    "MixinDedicatedServer"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}

fabric/src/main/resources/fabric.mod.json

@@ -1,51 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "lod",
-  "version": "${version}",
-
-  "name": "${mod_name}",
-  "description": "${description}",
-  "authors": ["${authors}"],
-
-  "contact": {
-    "homepage": "${homepage}",
-    "sources": "${source}",
-    "issues": "${issues}"
-  },
-
-  "license": "CC0-1.0",
-  "icon": "icon.png",
-
-  "environment": "client",
-  "entrypoints": {
-    "client": [
-      "com.seibel.lod.fabric.Main"
-    ],
-    "modmenu": [
-      "com.seibel.lod.fabric.wrappers.config.ModMenuIntegration"
-    ]
-  },
-
-  "mixins": [
-    "fabric.lod.mixins.json"
-  ],
-
-  "accessWidener" : "lod.accesswidener",
-  "depends": {
-    "fabricloader": "*",
-    "fabric": "*",
-    "minecraft": "${minecraft_version}",
-    "java": ">=${java_version}"
-  },
-  "suggests": {
-    "another-mod": "*"
-  },
-
-  "custom": {
-    "modmenu": {
-      "links": {
-        "modmenu.discord": "https://discord.gg/xAB8G4cENx"
-      }
-    }
-  }
-}

forge/build.gradle

@@ -1,123 +0,0 @@
-plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.0"
-}
-
-version = rootProject.mod_version+"-"+rootProject.minecraft_version+"-"+new Date().format("yyyy_MM_dd_HH_mm")
-
-loom {
-    accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener"))
-
-    forge {
-        convertAccessWideners.set(true)
-        extraAccessWideners.add("lod.accesswidener")
-        mixinConfigs("lod.mixins.json")
-    }
-}
-
-architectury {
-    platformSetupLoomIde()
-    forge()
-}
-
-configurations {
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentForge.extendsFrom common
-}
-
-def addMod(path, enabled) {
-    if (enabled == "2")
-        dependencies { modImplementation(path) }
-    else if (enabled == "1")
-        dependencies { modCompileOnly(path) }
-}
-
-dependencies {
-    // Forge loader
-    forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
-
-    // Starlight
-    addMod("curse.maven:starlight-forge-526854:${rootProject.starlight_version_forge}", rootProject.enable_starlight_forge)
-    annotationProcessor "org.spongepowered:mixin:0.8.4:processor"
-
-    common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowMe(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
-
-//    forgeDependencies(project(":core")) { transitive false }
-
-
-    // Toml
-    shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}
-
-    // Compression
-    forgeDependencies('org.tukaani:xz:1.9')
-    forgeDependencies('org.apache.commons:commons-compress:1.21')
-    shadowMe 'org.tukaani:xz:1.9'
-    shadowMe 'org.apache.commons:commons-compress:1.21'
-}
-
-task copyCoreResources(type: Copy) {
-    from fileTree(project(":core").file("src/main/resources"))
-    into file("build/resources/main")
-}
-
-task copyCommonResources(type: Copy) {
-    from fileTree(project(":common").file("src/main/resources"))
-    into file("build/resources/main")
-}
-
-processResources {
-    dependsOn(copyCoreResources)
-    dependsOn(copyCommonResources)
-}
-
-shadowJar {
-    dependencies {
-        exclude(dependency("net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"))
-    }
-    exclude "fabric.mod.json"
-    configurations = [project.configurations.shadowMe]
-    relocate 'org.tukaani', 'shaded.tukaani'
-    relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress'
-    relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig'    // This is already included with forge
-
-    relocate 'com.seibel.lod.common', 'forge.com.seibel.lod.common'
-
-    classifier "dev-shadow"
-}
-
-remapJar {
-    input.set shadowJar.archiveFile
-    dependsOn shadowJar
-    classifier null
-}
-
-jar {
-    classifier "dev"
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-publishing {
-    publications {
-        mavenForge(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}

forge/gradle.properties

@@ -1 +0,0 @@
-loom.platform=forge

forge/src/main/java/com/seibel/lod/forge/ForgeMain.java

@@ -1,105 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.forge;
-
-import com.seibel.lod.common.LodCommonMain;
-import com.seibel.lod.common.forge.LodForgeMethodCaller;
-import com.seibel.lod.common.wrappers.config.ConfigGui;
-import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper;
-import com.seibel.lod.core.ModInfo;
-import com.seibel.lod.core.api.ApiShared;
-import com.seibel.lod.core.handlers.ReflectionHandler;
-import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorHandler;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
-import com.seibel.lod.forge.networking.NetworkHandler;
-import com.seibel.lod.forge.wrappers.ForgeDependencySetup;
-
-import com.seibel.lod.forge.wrappers.modAccessor.ModChecker;
-import com.seibel.lod.forge.wrappers.modAccessor.OptifineAccessor;
-
-import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.client.model.data.ModelDataMap;
-import net.minecraftforge.client.ConfigGuiHandler;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.fml.loading.FMLLoader;
-
-import java.util.List;
-import java.util.Random;
-
-/**
- * Initialize and setup the Mod. <br>
- * If you are looking for the real start of the mod
- * check out the ClientProxy.
- * 
- * @author James Seibel
- * @version 11-21-2021
- */
-@Mod(ModInfo.ID)
-public class ForgeMain implements LodForgeMethodCaller
-{
-	public static ForgeClientProxy forgeClientProxy;
-	
-	private void init(final FMLCommonSetupEvent event)
-	{
-		// make sure the dependencies are set up before the mod needs them
-		LodCommonMain.initConfig();
-		LodCommonMain.startup(this, !FMLLoader.getDist().isClient(), new NetworkHandler());
-		ForgeDependencySetup.createInitialBindings();
-		ForgeDependencySetup.finishBinding();
-		ApiShared.LOGGER.info("Distant Horizons initializing...");
-	}
-	
-	public ForgeMain()
-	{
-		// Register the methods for server and other game events we are interested in
-		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::init);
-		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onClientStart);
-	}
-
-	private void onClientStart(final FMLClientSetupEvent event)
-	{
-		if (ReflectionHandler.instance.optifinePresent()) {
-			ModAccessorHandler.bind(IOptifineAccessor.class, new OptifineAccessor());
-		}
-
-		ModAccessorHandler.finishBinding();
-
-		ModLoadingContext.get().registerExtensionPoint(ConfigGuiHandler.ConfigGuiFactory.class,
-				() -> new ConfigGuiHandler.ConfigGuiFactory((client, parent) -> ConfigGui.getScreen(parent, "")));
-		forgeClientProxy = new ForgeClientProxy();
-		MinecraftForge.EVENT_BUS.register(forgeClientProxy);
-	}
-
-	private final ModelDataMap dataMap = new ModelDataMap.Builder().build();
-	@Override
-	public List<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, Random random) {
-		return mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random, dataMap);
-	}
-}

forge/src/main/java/com/seibel/lod/forge/fabric/api/client/networking/v1/C2SPlayChannelEvents.java

@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.client.networking.v1;
-
-import java.util.List;
-import com.seibel.lod.forge.fabric.api.event.Event;
-import com.seibel.lod.forge.fabric.api.event.EventFactory;
-import com.seibel.lod.forge.fabric.api.networking.v1.PacketSender;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.resources.ResourceLocation;
-
-/**
- * Offers access to events related to the indication of a connected server's ability to receive packets in certain channels.
- */
-
-public final class C2SPlayChannelEvents {
-	/**
-	 * An event for the client play network handler receiving an update indicating the connected server's ability to receive packets in certain channels.
-	 * This event may be invoked at any time after login and up to disconnection.
-	 */
-	public static final Event<Register> REGISTER = EventFactory.createArrayBacked(Register.class, callbacks -> (handler, sender, client, channels) -> {
-		for (Register callback : callbacks) {
-			callback.onChannelRegister(handler, sender, client, channels);
-		}
-	});
-
-	/**
-	 * An event for the client play network handler receiving an update indicating the connected server's lack of ability to receive packets in certain channels.
-	 * This event may be invoked at any time after login and up to disconnection.
-	 */
-	public static final Event<Unregister> UNREGISTER = EventFactory.createArrayBacked(Unregister.class, callbacks -> (handler, sender, client, channels) -> {
-		for (Unregister callback : callbacks) {
-			callback.onChannelUnregister(handler, sender, client, channels);
-		}
-	});
-
-	private C2SPlayChannelEvents() {
-	}
-
-	/**
-	 * @see C2SPlayChannelEvents#REGISTER
-	 */
-
-	@FunctionalInterface
-	public interface Register {
-		void onChannelRegister(ClientPacketListener handler, PacketSender sender, Minecraft client, List<ResourceLocation> channels);
-	}
-
-	/**
-	 * @see C2SPlayChannelEvents#UNREGISTER
-	 */
-
-	@FunctionalInterface
-	public interface Unregister {
-		void onChannelUnregister(ClientPacketListener handler, PacketSender sender, Minecraft client, List<ResourceLocation> channels);
-	}
-}

forge/src/main/java/com/seibel/lod/forge/fabric/api/client/networking/v1/ClientLoginConnectionEvents.java

@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.client.networking.v1;
-
-import com.seibel.lod.forge.fabric.api.event.Event;
-import com.seibel.lod.forge.fabric.api.event.EventFactory;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl;
-import net.minecraft.resources.ResourceLocation;
-
-/**
- * Offers access to events related to the connection to a server on the client while the server is processing the client's login request.
- */
-
-public final class ClientLoginConnectionEvents {
-	/**
-	 * Event indicating a connection entered the LOGIN state, ready for registering query request handlers.
-	 * This event may be used by mods to prepare their client side state.
-	 * This event does not guarantee that a login attempt will be successful.
-	 *
-	 * @see ClientLoginNetworking#registerReceiver(ResourceLocation, ClientLoginNetworking.LoginQueryRequestHandler)
-	 */
-	public static final Event<Init> INIT = EventFactory.createArrayBacked(Init.class, callbacks -> (handler, client) -> {
-		for (Init callback : callbacks) {
-			callback.onLoginStart(handler, client);
-		}
-	});
-
-	/**
-	 * An event for when the client has started receiving login queries.
-	 * A client can only start receiving login queries when a server has sent the first login query.
-	 * Vanilla servers will typically never make the client enter this login phase, but it is not a guarantee that the
-	 * connected server is a vanilla server since a modded server or proxy may have no login queries to send to the client
-	 * and therefore bypass the login query phase.
-	 * If this event is fired then it is a sign that a server is not a vanilla server or the server is behind a proxy which
-	 * is capable of handling login queries.
-	 *
-	 * <p>This event may be used to {@link ClientLoginNetworking.LoginQueryRequestHandler register login query handlers}
-	 * which may be used to send a response to a server.
-	 *
-	 * <p>No packets should be sent when this event is invoked.
-	 */
-	public static final Event<QueryStart> QUERY_START = EventFactory.createArrayBacked(QueryStart.class, callbacks -> (handler, client) -> {
-		for (QueryStart callback : callbacks) {
-			callback.onLoginQueryStart(handler, client);
-		}
-	});
-
-	/**
-	 * An event for when the client's login process has ended due to disconnection.
-	 *
-	 * <p>No packets should be sent when this event is invoked.
-	 */
-	public static final Event<Disconnect> DISCONNECT = EventFactory.createArrayBacked(Disconnect.class, callbacks -> (handler, client) -> {
-		for (Disconnect callback : callbacks) {
-			callback.onLoginDisconnect(handler, client);
-		}
-	});
-
-	private ClientLoginConnectionEvents() {
-	}
-
-	/**
-	 * @see ClientLoginConnectionEvents#INIT
-	 */
-
-	@FunctionalInterface
-	public interface Init {
-		void onLoginStart(ClientHandshakePacketListenerImpl handler, Minecraft client);
-	}
-
-	/**
-	 * @see ClientLoginConnectionEvents#QUERY_START
-	 */
-
-	@FunctionalInterface
-	public interface QueryStart {
-		void onLoginQueryStart(ClientHandshakePacketListenerImpl handler, Minecraft client);
-	}
-
-	/**
-	 * @see ClientLoginConnectionEvents#DISCONNECT
-	 */
-
-	@FunctionalInterface
-	public interface Disconnect {
-		void onLoginDisconnect(ClientHandshakePacketListenerImpl handler, Minecraft client);
-	}
-}

forge/src/main/java/com/seibel/lod/forge/fabric/api/client/networking/v1/ClientLoginNetworking.java

@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.client.networking.v1;
-
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Consumer;
-
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
-import org.jetbrains.annotations.Nullable;
-import com.seibel.lod.forge.fabric.api.networking.v1.ServerLoginNetworking;
-import com.seibel.lod.forge.fabric.impl.networking.client.ClientNetworkingImpl;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl;
-import net.minecraft.network.Connection;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.PacketListener;
-import net.minecraft.resources.ResourceLocation;
-
-/**
- * Offers access to login stage client-side networking functionalities.
- *
- * <p>The Minecraft login protocol only allows the client to respond to a server's request, but not initiate one of its own.
- *
- * @see ClientPlayNetworking
- * @see ServerLoginNetworking
- */
-
-public final class ClientLoginNetworking {
-	/**
-	 * Registers a handler to a query request channel.
-	 * A global receiver is registered to all connections, in the present and future.
-	 *
-	 * <p>If a handler is already registered to the {@code channel}, this method will return {@code false}, and no change will be made.
-	 * Use {@link #unregisterGlobalReceiver(ResourceLocation)} to unregister the existing handler.
-	 *
-	 * @param channelName the id of the channel
-	 * @param queryHandler the handler
-	 * @return false if a handler is already registered to the channel
-	 * @see ClientLoginNetworking#unregisterGlobalReceiver(ResourceLocation)
-	 * @see ClientLoginNetworking#registerReceiver(ResourceLocation, LoginQueryRequestHandler)
-	 */
-	public static boolean registerGlobalReceiver(ResourceLocation channelName, LoginQueryRequestHandler queryHandler) {
-		return ClientNetworkingImpl.LOGIN.registerGlobalReceiver(channelName, queryHandler);
-	}
-
-	/**
-	 * Removes the handler of a query request channel.
-	 * A global receiver is registered to all connections, in the present and future.
-	 *
-	 * <p>The {@code channel} is guaranteed not to have a handler after this call.
-	 *
-	 * @param channelName the id of the channel
-	 * @return the previous handler, or {@code null} if no handler was bound to the channel
-	 * @see ClientLoginNetworking#registerGlobalReceiver(ResourceLocation, LoginQueryRequestHandler)
-	 * @see ClientLoginNetworking#unregisterReceiver(ResourceLocation)
-	 */
-	@Nullable
-	public static ClientLoginNetworking.LoginQueryRequestHandler unregisterGlobalReceiver(ResourceLocation channelName) {
-		return ClientNetworkingImpl.LOGIN.unregisterGlobalReceiver(channelName);
-	}
-
-	/**
-	 * Gets all query request channel names which global receivers are registered for.
-	 * A global receiver is registered to all connections, in the present and future.
-	 *
-	 * @return all channel names which global receivers are registered for.
-	 */
-	public static Set<ResourceLocation> getGlobalReceivers() {
-		return ClientNetworkingImpl.LOGIN.getChannels();
-	}
-
-	/**
-	 * Registers a handler to a query request channel.
-	 *
-	 * <p>If a handler is already registered to the {@code channelName}, this method will return {@code false}, and no change will be made.
-	 * Use {@link #unregisterReceiver(ResourceLocation)} to unregister the existing handler.
-	 *
-	 * @param channelName the id of the channel
-	 * @param queryHandler the handler
-	 * @return false if a handler is already registered to the channel name
-	 * @throws IllegalStateException if the client is not logging in
-	 */
-	public static boolean registerReceiver(ResourceLocation channelName, LoginQueryRequestHandler queryHandler) throws IllegalStateException {
-		final Connection connection = ClientNetworkingImpl.getLoginConnection();
-
-		if (connection != null) {
-			final PacketListener packetListener = connection.getPacketListener();
-
-			if (packetListener instanceof ClientHandshakePacketListenerImpl) {
-				return ClientNetworkingImpl.getAddon(((ClientHandshakePacketListenerImpl) packetListener)).registerChannel(channelName, queryHandler);
-			}
-		}
-
-		throw new IllegalStateException("Cannot register receiver while client is not logging in!");
-	}
-
-	/**
-	 * Removes the handler of a query request channel.
-	 *
-	 * <p>The {@code channelName} is guaranteed not to have a handler after this call.
-	 *
-	 * @param channelName the id of the channel
-	 * @return the previous handler, or {@code null} if no handler was bound to the channel name
-	 * @throws IllegalStateException if the client is not logging in
-	 */
-	@Nullable
-	public static LoginQueryRequestHandler unregisterReceiver(ResourceLocation channelName) throws IllegalStateException {
-		final Connection connection = ClientNetworkingImpl.getLoginConnection();
-
-		if (connection != null) {
-			final PacketListener packetListener = connection.getPacketListener();
-
-			if (packetListener instanceof ClientHandshakePacketListenerImpl) {
-				return ClientNetworkingImpl.getAddon(((ClientHandshakePacketListenerImpl) packetListener)).unregisterChannel(channelName);
-			}
-		}
-
-		throw new IllegalStateException("Cannot unregister receiver while client is not logging in!");
-	}
-
-	private ClientLoginNetworking() {
-	}
-
-	@FunctionalInterface
-	public interface LoginQueryRequestHandler {
-		/**
-		 * Handles an incoming query request from a server.
-		 *
-		 * <p>This method is executed on {@linkplain io.netty.channel.EventLoop netty's event loops}.
-		 * Modification to the game should be {@linkplain net.minecraft.util.thread.BlockableEventLoop#submit(Runnable) scheduled} using the provided Minecraft client instance.
-		 *
-		 * <p>The return value of this method is a completable future that may be used to delay the login process to the server until a task {@link CompletableFuture#isDone() is done}.
-		 * The future should complete in reasonably time to prevent disconnection by the server.
-		 * If your request processes instantly, you may use {@link CompletableFuture#completedFuture(Object)} to wrap your response for immediate sending.
-		 *
-		 * @param client the client
-		 * @param handler the network handler that received this packet
-		 * @param buf the payload of the packet
-		 * @param listenerAdder listeners to be called when the response packet is sent to the server
-		 * @return a completable future which contains the payload to respond to the server with.
-		 * If the future contains {@code null}, then the server will be notified that the client did not understand the query.
-		 */
-		CompletableFuture<@Nullable FriendlyByteBuf> receive(Minecraft client, ClientHandshakePacketListenerImpl handler, FriendlyByteBuf buf, Consumer<GenericFutureListener<? extends Future<? super Void>>> listenerAdder);
-	}
-}

forge/src/main/java/com/seibel/lod/forge/fabric/api/client/networking/v1/ClientPlayConnectionEvents.java

@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.client.networking.v1;
-
-import com.seibel.lod.forge.fabric.api.event.Event;
-import com.seibel.lod.forge.fabric.api.event.EventFactory;
-import com.seibel.lod.forge.fabric.api.networking.v1.PacketSender;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.resources.ResourceLocation;
-
-/**
- * Offers access to events related to the connection to a server on a logical client.
- */
-
-public final class ClientPlayConnectionEvents {
-	/**
-	 * Event indicating a connection entered the PLAY state, ready for registering channel handlers.
-	 *
-	 * @see ClientPlayNetworking#registerReceiver(ResourceLocation, ClientPlayNetworking.PlayChannelHandler)
-	 */
-	public static final Event<Init> INIT = EventFactory.createArrayBacked(Init.class, callbacks -> (handler, client) -> {
-		for (Init callback : callbacks) {
-			callback.onPlayInit(handler, client);
-		}
-	});
-
-	/**
-	 * An event for notification when the client play network handler is ready to send packets to the server.
-	 *
-	 * <p>At this stage, the network handler is ready to send packets to the server.
-	 * Since the client's local state has been setup.
-	 */
-	public static final Event<Join> JOIN = EventFactory.createArrayBacked(Join.class, callbacks -> (handler, sender, client) -> {
-		for (Join callback : callbacks) {
-			callback.onPlayReady(handler, sender, client);
-		}
-	});
-
-	/**
-	 * An event for the disconnection of the client play network handler.
-	 *
-	 * <p>No packets should be sent when this event is invoked.
-	 */
-	public static final Event<Disconnect> DISCONNECT = EventFactory.createArrayBacked(Disconnect.class, callbacks -> (handler, client) -> {
-		for (Disconnect callback : callbacks) {
-			callback.onPlayDisconnect(handler, client);
-		}
-	});
-
-	private ClientPlayConnectionEvents() {
-	}
-
-
-	@FunctionalInterface
-	public interface Init {
-		void onPlayInit(ClientPacketListener handler, Minecraft client);
-	}
-
-
-	@FunctionalInterface
-	public interface Join {
-		void onPlayReady(ClientPacketListener handler, PacketSender sender, Minecraft client);
-	}
-
-
-	@FunctionalInterface
-	public interface Disconnect {
-		void onPlayDisconnect(ClientPacketListener handler, Minecraft client);
-	}
-}

forge/src/main/java/com/seibel/lod/forge/fabric/api/client/networking/v1/ClientPlayNetworking.java

@@ -1,256 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.client.networking.v1;
-
-import java.util.Objects;
-import java.util.Set;
-
-import org.jetbrains.annotations.Nullable;
-import com.seibel.lod.forge.fabric.api.networking.v1.PacketSender;
-import com.seibel.lod.forge.fabric.api.networking.v1.ServerPlayNetworking;
-import com.seibel.lod.forge.fabric.impl.networking.client.ClientNetworkingImpl;
-import com.seibel.lod.forge.fabric.impl.networking.client.ClientPlayNetworkAddon;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.resources.ResourceLocation;
-
-/**
- * Offers access to play stage client-side networking functionalities.
- *
- * <p>Client-side networking functionalities include receiving clientbound packets,
- * sending serverbound packets, and events related to client-side network handlers.
- *
- * <p>This class should be only used on the physical client and for the logical client.
- *
- * @see ClientLoginNetworking
- * @see ServerPlayNetworking
- */
-
-public final class ClientPlayNetworking {
-	/**
-	 * Registers a handler to a channel.
-	 * A global receiver is registered to all connections, in the present and future.
-	 *
-	 * <p>If a handler is already registered to the {@code channel}, this method will return {@code false}, and no change will be made.
-	 * Use {@link #unregisterGlobalReceiver(ResourceLocation)} to unregister the existing handler.
-	 *
-	 * @param channelName the id of the channel
-	 * @param channelHandler the handler
-	 * @return false if a handler is already registered to the channel
-	 * @see ClientPlayNetworking#unregisterGlobalReceiver(ResourceLocation)
-	 * @see ClientPlayNetworking#registerReceiver(ResourceLocation, PlayChannelHandler)
-	 */
-	public static boolean registerGlobalReceiver(ResourceLocation channelName, PlayChannelHandler channelHandler) {
-		return ClientNetworkingImpl.PLAY.registerGlobalReceiver(channelName, channelHandler);
-	}
-
-	/**
-	 * Removes the handler of a channel.
-	 * A global receiver is registered to all connections, in the present and future.
-	 *
-	 * <p>The {@code channel} is guaranteed not to have a handler after this call.
-	 *
-	 * @param channelName the id of the channel
-	 * @return the previous handler, or {@code null} if no handler was bound to the channel
-	 * @see ClientPlayNetworking#registerGlobalReceiver(ResourceLocation, PlayChannelHandler)
-	 * @see ClientPlayNetworking#unregisterReceiver(ResourceLocation)
-	 */
-	@Nullable
-	public static PlayChannelHandler unregisterGlobalReceiver(ResourceLocation channelName) {
-		return ClientNetworkingImpl.PLAY.unregisterGlobalReceiver(channelName);
-	}
-
-	/**
-	 * Gets all channel names which global receivers are registered for.
-	 * A global receiver is registered to all connections, in the present and future.
-	 *
-	 * @return all channel names which global receivers are registered for.
-	 */
-	public static Set<ResourceLocation> getGlobalReceivers() {
-		return ClientNetworkingImpl.PLAY.getChannels();
-	}
-
-	/**
-	 * Registers a handler to a channel.
-	 *
-	 * <p>If a handler is already registered to the {@code channel}, this method will return {@code false}, and no change will be made.
-	 * Use {@link #unregisterReceiver(ResourceLocation)} to unregister the existing handler.
-	 *
-	 * <p>For example, if you only register a receiver using this method when a {@linkplain ClientLoginNetworking#registerGlobalReceiver(ResourceLocation, ClientLoginNetworking.LoginQueryRequestHandler)}
-	 * login query has been received, you should use {@link ClientPlayConnectionEvents#INIT} to register the channel handler.
-	 *
-	 * @param channelName the id of the channel
-	 * @return false if a handler is already registered to the channel
-	 * @throws IllegalStateException if the client is not connected to a server
-	 * @see ClientPlayConnectionEvents#INIT
-	 */
-	public static boolean registerReceiver(ResourceLocation channelName, PlayChannelHandler channelHandler) {
-		final ClientPlayNetworkAddon addon = ClientNetworkingImpl.getClientPlayAddon();
-
-		if (addon != null) {
-			return addon.registerChannel(channelName, channelHandler);
-		}
-
-		throw new IllegalStateException("Cannot register receiver while not in game!");
-	}
-
-	/**
-	 * Removes the handler of a channel.
-	 *
-	 * <p>The {@code channelName} is guaranteed not to have a handler after this call.
-	 *
-	 * @param channelName the id of the channel
-	 * @return the previous handler, or {@code null} if no handler was bound to the channel
-	 * @throws IllegalStateException if the client is not connected to a server
-	 */
-	@Nullable
-	public static PlayChannelHandler unregisterReceiver(ResourceLocation channelName) throws IllegalStateException {
-		final ClientPlayNetworkAddon addon = ClientNetworkingImpl.getClientPlayAddon();
-
-		if (addon != null) {
-			return addon.unregisterChannel(channelName);
-		}
-
-		throw new IllegalStateException("Cannot unregister receiver while not in game!");
-	}
-
-	/**
-	 * Gets all the channel names that the client can receive packets on.
-	 *
-	 * @return All the channel names that the client can receive packets on
-	 * @throws IllegalStateException if the client is not connected to a server
-	 */
-	public static Set<ResourceLocation> getReceived() throws IllegalStateException {
-		final ClientPlayNetworkAddon addon = ClientNetworkingImpl.getClientPlayAddon();
-
-		if (addon != null) {
-			return addon.getReceivableChannels();
-		}
-
-		throw new IllegalStateException("Cannot get a list of channels the client can receive packets on while not in game!");
-	}
-
-	/**
-	 * Gets all channel names that the connected server declared the ability to receive a packets on.
-	 *
-	 * @return All the channel names the connected server declared the ability to receive a packets on
-	 * @throws IllegalStateException if the client is not connected to a server
-	 */
-	public static Set<ResourceLocation> getSendable() throws IllegalStateException {
-		final ClientPlayNetworkAddon addon = ClientNetworkingImpl.getClientPlayAddon();
-
-		if (addon != null) {
-			return addon.getSendableChannels();
-		}
-
-		throw new IllegalStateException("Cannot get a list of channels the server can receive packets on while not in game!");
-	}
-
-	/**
-	 * Checks if the connected server declared the ability to receive a packet on a specified channel name.
-	 *
-	 * @param channelName the channel name
-	 * @return True if the connected server has declared the ability to receive a packet on the specified channel.
-	 * False if the client is not in game.
-	 */
-	public static boolean canSend(ResourceLocation channelName) throws IllegalArgumentException {
-		// You cant send without a client player, so this is fine
-		if (Minecraft.getInstance().getConnection() != null) {
-			return ClientNetworkingImpl.getAddon(Minecraft.getInstance().getConnection()).getSendableChannels().contains(channelName);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Creates a packet which may be sent to a the connected server.
-	 *
-	 * @param channelName the channel name
-	 * @param buf the packet byte buf which represents the payload of the packet
-	 * @return a new packet
-	 */
-	public static Packet<?> createC2SPacket(ResourceLocation channelName, FriendlyByteBuf buf) {
-		Objects.requireNonNull(channelName, "Channel name cannot be null");
-		Objects.requireNonNull(buf, "Buf cannot be null");
-
-		return ClientNetworkingImpl.createPlayC2SPacket(channelName, buf);
-	}
-
-	/**
-	 * Gets the packet sender which sends packets to the connected server.
-	 *
-	 * @return the client's packet sender
-	 * @throws IllegalStateException if the client is not connected to a server
-	 */
-	public static PacketSender getSender() throws IllegalStateException {
-		// You cant send without a client player, so this is fine
-		if (Minecraft.getInstance().getConnection() != null) {
-			return ClientNetworkingImpl.getAddon(Minecraft.getInstance().getConnection());
-		}
-
-		throw new IllegalStateException("Cannot get packet sender when not in game!");
-	}
-
-	/**
-	 * Sends a packet to the connected server.
-	 *
-	 * @param channelName the channel of the packet
-	 * @param buf the payload of the packet
-	 * @throws IllegalStateException if the client is not connected to a server
-	 */
-	public static void send(ResourceLocation channelName, FriendlyByteBuf buf) throws IllegalStateException {
-		// You cant send without a client player, so this is fine
-		if (Minecraft.getInstance().getConnection() != null) {
-			Minecraft.getInstance().getConnection().send(createC2SPacket(channelName, buf));
-			return;
-		}
-
-		throw new IllegalStateException("Cannot send packets when not in game!");
-	}
-
-	private ClientPlayNetworking() {
-	}
-
-	@FunctionalInterface
-	public interface PlayChannelHandler {
-		/**
-		 * Handles an incoming packet.
-		 *
-		 * <p>This method is executed on {@linkplain io.netty.channel.EventLoop netty's event loops}.
-		 * Modification to the game should be {@linkplain net.minecraft.util.thread.BlockableEventLoop#submit(Runnable) scheduled} using the provided Minecraft client instance.
-		 *
-		 * <p>An example usage of this is to display an overlay message:
-		 * <pre>{@code
-		 * ClientPlayNetworking.registerReceiver(new Identifier("mymod", "overlay"), (client, handler, buf, responseSender) -&rt; {
-		 * 	String message = buf.readString(32767);
-		 *
-		 * 	// All operations on the server or world must be executed on the server thread
-		 * 	client.execute(() -&rt; {
-		 * 		client.inGameHud.setOverlayMessage(message, true);
-		 * 	});
-		 * });
-		 * }</pre>
-		 *  @param client the client
-		 * @param handler the network handler that received this packet
-		 * @param buf the payload of the packet
-		 * @param responseSender the packet sender
-		 */
-		void receive(Minecraft client, ClientPacketListener handler, FriendlyByteBuf buf, PacketSender responseSender);
-	}
-}

forge/src/main/java/com/seibel/lod/forge/fabric/api/client/networking/v1/package-info.java

@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * The Networking API (client side), version 1.
- *
- * <p>For login stage networking see {@link net.fabricmc.fabric.api.client.networking.v1.ClientLoginNetworking}.
- * For play stage networking see {@link net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking}.
- *
- * <p>For events related to connection to a server see {@link net.fabricmc.fabric.api.client.networking.v1.ClientLoginConnectionEvents} for login stage
- * or {@link net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents} for play stage.
- *
- * <p>For events related to the ability of a server to receive packets on a channel of a specific name see {@link net.fabricmc.fabric.api.client.networking.v1.C2SPlayChannelEvents}.
- */
-
-package com.seibel.lod.forge.fabric.api.client.networking.v1;

forge/src/main/java/com/seibel/lod/forge/fabric/api/event/AutoInvokingEvent.java

@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.event;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicates that this {@link Event} is auto-invoking:
- * it calls the event callback implemented by a context parameter type automatically and without registration.
- *
- * <p>This means that this event can be listened to in two ways:
- * <ul>
- *     <li>If the consumer is the context parameter and it implements the callback, it will be automatically invoked, don't register manually.
- *     <li>Otherwise, there is no invocation and the listener needs manual registration as usual.
- * </ul>
- *
- * <p>Do note that there may be more than one context parameter.
- *
- * <p>A typical use case is feature augmentation, for example to expose raw clicks to slots.
- * The event callback has a slot parameter - the context parameter - and the event itself is carrying this annotation.
- * All the slot needs to receive slot clicks is to implement {@code SlotClickCallback} on itself.
- * It shouldn't do any explicit event registration like {@code SLOT_CLICK_EVENT.register(this::onSlotClick)},
- * otherwise it will see extraneous callback invocations.
- *
- * <p>In general, an auto-invoking event bridges the gap between the flexibility of an event with global reach,
- * and the convenience of implementing an interface that gets detected automatically.
- *
- * <p>This is a documentation-only annotation, the event factory has to implement the functionality explicitly by checking the parameter type and invoking it.
- * On top of adding this annotation, the event field or method should document which parameters are context parameters,
- * and under which circumstances they are invoked.
- */
-
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.METHOD })
-public @interface AutoInvokingEvent {
-}

forge/src/main/java/com/seibel/lod/forge/fabric/api/event/Event.java

@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.event;
-
-import org.jetbrains.annotations.ApiStatus;
-
-import net.minecraft.resources.ResourceLocation;
-
-/**
- * Base class for Fabric's event implementations.
- *
- * @param <T> The listener type.
- * @see EventFactory
- */
-@ApiStatus.NonExtendable // Should only be extended by fabric API.
-public abstract class Event<T> {
-	/**
-	 * The invoker field. This should be updated by the implementation to
-	 * always refer to an instance containing all code that should be
-	 * executed upon event emission.
-	 */
-	protected volatile T invoker;
-
-	/**
-	 * Returns the invoker instance.
-	 *
-	 * <p>An "invoker" is an object which hides multiple registered
-	 * listeners of type T under one instance of type T, executing
-	 * them and leaving early as necessary.
-	 *
-	 * @return The invoker instance.
-	 */
-	public final T invoker() {
-		return invoker;
-	}
-
-	/**
-	 * Register a listener to the event, in the default phase.
-	 * Have a look at {@link #addPhaseOrdering} for an explanation of event phases.
-	 *
-	 * @param listener The desired listener.
-	 */
-	public abstract void register(T listener);
-
-	/**
-	 * The ResourceLocation of the default phase.
-	 * Have a look at {@link EventFactory#createWithPhases} for an explanation of event phases.
-	 */
-	public static final ResourceLocation DEFAULT_PHASE = new ResourceLocation("fabric", "default");
-
-	/**
-	 * Register a listener to the event for the specified phase.
-	 * Have a look at {@link EventFactory#createWithPhases} for an explanation of event phases.
-	 *
-	 * @param phase ResourceLocation of the phase this listener should be registered for. It will be created if it didn't exist yet.
-	 * @param listener The desired listener.
-	 */
-	public void register(ResourceLocation phase, T listener) {
-		// This is done to keep compatibility with existing Event subclasses, but they should really not be subclassing Event.
-		register(listener);
-	}
-
-	/**
-	 * Request that listeners registered for one phase be executed before listeners registered for another phase.
-	 * Relying on the default phases supplied to {@link EventFactory#createWithPhases} should be preferred over manually
-	 * registering phase ordering dependencies.
-	 *
-	 * <p>Incompatible ordering constraints such as cycles will lead to inconsistent behavior:
-	 * some constraints will be respected and some will be ignored. If this happens, a warning will be logged.
-	 *
-	 * @param firstPhase The ResourceLocation of the phase that should run before the other. It will be created if it didn't exist yet.
-	 * @param secondPhase The ResourceLocation of the phase that should run after the other. It will be created if it didn't exist yet.
-	 */
-	public void addPhaseOrdering(ResourceLocation firstPhase, ResourceLocation secondPhase) {
-		// This is not abstract to avoid breaking existing Event subclasses, but they should really not be subclassing Event.
-	}
-}

forge/src/main/java/com/seibel/lod/forge/fabric/api/event/EventFactory.java

@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.event;
-
-import java.util.function.Function;
-
-import net.minecraft.resources.ResourceLocation;
-
-import com.seibel.lod.forge.fabric.impl.base.event.EventFactoryImpl;
-
-/**
- * Helper for creating {@link Event} classes.
- */
-public final class EventFactory {
-	private static boolean profilingEnabled = true;
-
-	private EventFactory() { }
-
-	/**
-	 * @return True if events are supposed to be profiled.
-	 */
-	public static boolean isProfilingEnabled() {
-		return profilingEnabled;
-	}
-
-	/**
-	 * Invalidate and re-create all existing "invoker" instances across
-	 * events created by this EventFactory. Use this if, for instance,
-	 * the profilingEnabled field changes.
-	 */
-	// TODO: Turn this into an event?
-	public static void invalidate() {
-		EventFactoryImpl.invalidate();
-	}
-
-	/**
-	 * Create an "array-backed" Event instance.
-	 *
-	 * <p>If your factory simply delegates to the listeners without adding custom behavior,
-	 * consider using {@linkplain #createArrayBacked(Class, Object, Function) the other overload}
-	 * if performance of this event is critical.
-	 *
-	 * @param type           The listener class type.
-	 * @param invokerFactory The invoker factory, combining multiple listeners into one instance.
-	 * @param <T>            The listener type.
-	 * @return The Event instance.
-	 */
-	public static <T> Event<T> createArrayBacked(Class<? super T> type, Function<T[], T> invokerFactory) {
-		return EventFactoryImpl.createArrayBacked(type, invokerFactory);
-	}
-
-	/**
-	 * Create an "array-backed" Event instance with a custom empty invoker,
-	 * for an event whose {@code invokerFactory} only delegates to the listeners.
-	 * <ul>
-	 *   <li>If there is no listener, the custom empty invoker will be used.</li>
-	 *   <li><b>If there is only one listener, that one will be used as the invoker
-	 *   and the factory will not be called.</b></li>
-	 *   <li>Only when there are at least two listeners will the factory be used.</li>
-	 * </ul>
-	 *
-	 * <p>Having a custom empty invoker (of type (...) -&gt; {}) increases performance
-	 * relative to iterating over an empty array; however, it only really matters
-	 * if the event is executed thousands of times a second.
-	 *
-	 * @param type           The listener class type.
-	 * @param emptyInvoker   The custom empty invoker.
-	 * @param invokerFactory The invoker factory, combining multiple listeners into one instance.
-	 * @param <T>            The listener type.
-	 * @return The Event instance.
-	 */
-	public static <T> Event<T> createArrayBacked(Class<T> type, T emptyInvoker, Function<T[], T> invokerFactory) {
-		return createArrayBacked(type, listeners -> {
-			if (listeners.length == 0) {
-				return emptyInvoker;
-			} else if (listeners.length == 1) {
-				return listeners[0];
-			} else {
-				return invokerFactory.apply(listeners);
-			}
-		});
-	}
-
-	/**
-	 * Create an array-backed event with a list of default phases that get invoked in order.
-	 * Exposing the ResourceLocations of the default phases as {@code public static final} constants is encouraged.
-	 *
-	 * <p>An event phase is a named group of listeners, which may be ordered before or after other groups of listeners.
-	 * This allows some listeners to take priority over other listeners.
-	 * Adding separate events should be considered before making use of multiple event phases.
-	 *
-	 * <p>Phases may be freely added to events created with any of the factory functions,
-	 * however using this function is preferred for widely used event phases.
-	 * If more phases are necessary, discussion with the author of the Event is encouraged.
-	 *
-	 * <p>Refer to {@link Event#addPhaseOrdering} for an explanation of event phases.
-	 *
-	 * @param type           The listener class type.
-	 * @param invokerFactory The invoker factory, combining multiple listeners into one instance.
-	 * @param defaultPhases  The default phases of this event, in the correct order. Must contain {@link Event#DEFAULT_PHASE}.
-	 * @param <T>            The listener type.
-	 * @return The Event instance.
-	 */
-	public static <T> Event<T> createWithPhases(Class<? super T> type, Function<T[], T> invokerFactory, ResourceLocation... defaultPhases) {
-		EventFactoryImpl.ensureContainsDefault(defaultPhases);
-		EventFactoryImpl.ensureNoDuplicates(defaultPhases);
-
-		Event<T> event = createArrayBacked(type, invokerFactory);
-
-		for (int i = 1; i < defaultPhases.length; ++i) {
-			event.addPhaseOrdering(defaultPhases[i-1], defaultPhases[i]);
-		}
-
-		return event;
-	}
-
-	/**
-	 * Get the listener object name. This can be used in debugging/profiling
-	 * scenarios.
-	 *
-	 * @param handler The listener object.
-	 * @return The listener name.
-	 */
-	public static String getHandlerName(Object handler) {
-		return handler.getClass().getName();
-	}
-}

forge/src/main/java/com/seibel/lod/forge/fabric/api/networking/v1/EntityTrackingEvents.java

@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.networking.v1;
-
-import com.seibel.lod.forge.fabric.api.event.Event;
-import com.seibel.lod.forge.fabric.api.event.EventFactory;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.Entity;
-
-/**
- * Events related to a tracking entities within a player's view distance.
- */
-public final class EntityTrackingEvents {
-	/**
-	 * An event that is called before player starts tracking an entity.
-	 * Typically this occurs when an entity enters a client's view distance.
-	 * This event is called before the player's client is sent the entity's {@link Entity#getAddEntityPacket() spawn packet}.
-	 */
-	public static final Event<StartTracking> START_TRACKING = EventFactory.createArrayBacked(StartTracking.class, callbacks -> (trackedEntity, player) -> {
-		for (StartTracking callback : callbacks) {
-			callback.onStartTracking(trackedEntity, player);
-		}
-	});
-
-	/**
-	 * An event that is called after a player has stopped tracking an entity.
-	 * The client at this point was sent a packet to {@link net.minecraft.network.protocol.game.ClientboundRemoveEntitiesPacket destroy} the entity on the client.
-	 * The entity still exists on the server.
-	 */
-	public static final Event<StopTracking> STOP_TRACKING = EventFactory.createArrayBacked(StopTracking.class, callbacks -> (trackedEntity, player) -> {
-		for (StopTracking callback : callbacks) {
-			callback.onStopTracking(trackedEntity, player);
-		}
-	});
-
-	@FunctionalInterface
-	public interface StartTracking {
-		/**
-		 * Called before an entity starts getting tracked by a player.
-		 *
-		 * @param trackedEntity the entity that will be tracked
-		 * @param player the player that will track the entity
-		 */
-		void onStartTracking(Entity trackedEntity, ServerPlayer player);
-	}
-
-	@FunctionalInterface
-	public interface StopTracking {
-		/**
-		 * Called after an entity stops getting tracked by a player.
-		 *
-		 * @param trackedEntity the entity that is no longer being tracked
-		 * @param player the player that is no longer tracking the entity
-		 */
-		void onStopTracking(Entity trackedEntity, ServerPlayer player);
-	}
-
-	private EntityTrackingEvents() {
-	}
-}

forge/src/main/java/com/seibel/lod/forge/fabric/api/networking/v1/FutureListeners.java

@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.networking.v1;
-
-import java.util.Objects;
-import net.minecraft.network.FriendlyByteBuf;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.local.LocalChannel;
-import io.netty.channel.local.LocalServerChannel;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.FutureListener;
-import io.netty.util.concurrent.GenericFutureListener;
-
-/**
- * Utilities for working with netty's future listeners.
- * @see FutureListener
- * @see ChannelFutureListener
- */
-public final class FutureListeners {
-	/**
-	 * Returns a future listener that releases a packet byte buf when the buffer has been sent to a remote connection.
-	 *
-	 * @param buf the buffer
-	 * @return the future listener
-	 */
-	public static ChannelFutureListener free(FriendlyByteBuf buf) {
-		Objects.requireNonNull(buf, "PacketByteBuf cannot be null");
-
-		return (future) -> {
-			if (!isLocalChannel(future.channel())) {
-				buf.release();
-			}
-		};
-	}
-
-	/**
-	 * Returns whether a netty channel performs local transportation, or if the message objects in the channel are directly passed than written to and read from a byte buf.
-	 *
-	 * @param channel the channel to check
-	 * @return whether the channel is local
-	 */
-	public static boolean isLocalChannel(Channel channel) {
-		return channel instanceof LocalServerChannel || channel instanceof LocalChannel;
-	}
-
-	/**
-	 * Combines two future listeners.
-	 *
-	 * @param first  the first future listener
-	 * @param second the second future listener
-	 * @param <A> the future type of the first listener, used for casting
-	 * @param <B> the future type of the second listener, used for casting
-	 * @return the combined future listener.
-	 */
-	// A, B exist just to allow casting
-	@SuppressWarnings("unchecked")
-	public static <A extends Future<? super Void>, B extends Future<? super Void>> GenericFutureListener<? extends Future<? super Void>> union(GenericFutureListener<A> first, GenericFutureListener<B> second) {
-		// Return an empty future listener in the case of both parameters somehow being null
-		if (first == null && second == null) {
-			return future -> { };
-		}
-
-		if (first == null) {
-			return second;
-		}
-
-		if (second == null) {
-			return first;
-		}
-
-		return future -> {
-			first.operationComplete((A) future);
-			second.operationComplete((B) future);
-		};
-	}
-
-	private FutureListeners() {
-	}
-}

forge/src/main/java/com/seibel/lod/forge/fabric/api/networking/v1/PacketByteBufs.java

@@ -1,204 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.networking.v1;
-
-import java.util.Objects;
-import net.minecraft.network.FriendlyByteBuf;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-
-/**
- * Helper methods for working with and creating {@link FriendlyByteBuf}s.
- */
-public final class PacketByteBufs {
-	private static final FriendlyByteBuf EMPTY_PACKET_BYTE_BUF = new FriendlyByteBuf(Unpooled.EMPTY_BUFFER);
-
-	/**
-	 * Returns an empty instance of packet byte buf.
-	 *
-	 * @return an empty buf
-	 */
-	public static FriendlyByteBuf empty() {
-		return EMPTY_PACKET_BYTE_BUF;
-	}
-
-	/**
-	 * Returns a new heap memory-backed instance of packet byte buf.
-	 *
-	 * @return a new buf
-	 */
-	public static FriendlyByteBuf create() {
-		return new FriendlyByteBuf(Unpooled.buffer());
-	}
-
-	// Convenience methods for byte buf methods that return a new byte buf
-
-	/**
-	 * Wraps the newly created buf from {@code buf.readBytes} in a packet byte buf.
-	 *
-	 * @param buf    the original buf
-	 * @param length the number of bytes to transfer
-	 * @return the transferred bytes
-	 * @see ByteBuf#readBytes(int)
-	 */
-	public static FriendlyByteBuf readBytes(ByteBuf buf, int length) {
-		Objects.requireNonNull(buf, "ByteBuf cannot be null");
-
-		return new FriendlyByteBuf(buf.readBytes(length));
-	}
-
-	/**
-	 * Wraps the newly created buf from {@code buf.readSlice} in a packet byte buf.
-	 *
-	 * @param buf    the original buf
-	 * @param length the size of the new slice
-	 * @return the newly created slice
-	 * @see ByteBuf#readSlice(int)
-	 */
-	public static FriendlyByteBuf readSlice(ByteBuf buf, int length) {
-		Objects.requireNonNull(buf, "ByteBuf cannot be null");
-
-		return new FriendlyByteBuf(buf.readSlice(length));
-	}
-
-	/**
-	 * Wraps the newly created buf from {@code buf.readRetainedSlice} in a packet byte buf.
-	 *
-	 * @param buf    the original buf
-	 * @param length the size of the new slice
-	 * @return the newly created slice
-	 * @see ByteBuf#readRetainedSlice(int)
-	 */
-	public static FriendlyByteBuf readRetainedSlice(ByteBuf buf, int length) {
-		Objects.requireNonNull(buf, "ByteBuf cannot be null");
-
-		return new FriendlyByteBuf(buf.readRetainedSlice(length));
-	}
-
-	/**
-	 * Wraps the newly created buf from {@code buf.copy} in a packet byte buf.
-	 *
-	 * @param buf the original buf
-	 * @return a copy of the buf
-	 * @see ByteBuf#copy()
-	 */
-	public static FriendlyByteBuf copy(ByteBuf buf) {
-		Objects.requireNonNull(buf, "ByteBuf cannot be null");
-
-		return new FriendlyByteBuf(buf.copy());
-	}
-
-	/**
-	 * Wraps the newly created buf from {@code buf.copy} in a packet byte buf.
-	 *
-	 * @param buf    the original buf
-	 * @param index  the starting index
-	 * @param length the size of the copy
-	 * @return a copy of the buf
-	 * @see ByteBuf#copy(int, int)
-	 */
-	public static FriendlyByteBuf copy(ByteBuf buf, int index, int length) {
-		Objects.requireNonNull(buf, "ByteBuf cannot be null");
-
-		return new FriendlyByteBuf(buf.copy(index, length));
-	}
-
-	/**
-	 * Wraps the newly created buf from {@code buf.slice} in a packet byte buf.
-	 *
-	 * @param buf the original buf
-	 * @return a slice of the buf
-	 * @see ByteBuf#slice()
-	 */
-	public static FriendlyByteBuf slice(ByteBuf buf) {
-		Objects.requireNonNull(buf, "ByteBuf cannot be null");
-
-		return new FriendlyByteBuf(buf.slice());
-	}
-
-	/**
-	 * Wraps the newly created buf from {@code buf.retainedSlice} in a packet byte buf.
-	 *
-	 * @param buf the original buf
-	 * @return a slice of the buf
-	 * @see ByteBuf#retainedSlice()
-	 */
-	public static FriendlyByteBuf retainedSlice(ByteBuf buf) {
-		Objects.requireNonNull(buf, "ByteBuf cannot be null");
-
-		return new FriendlyByteBuf(buf.retainedSlice());
-	}
-
-	/**
-	 * Wraps the newly created buf from {@code buf.slice} in a packet byte buf.
-	 *
-	 * @param buf    the original buf
-	 * @param index  the starting index
-	 * @param length the size of the copy
-	 * @return a slice of the buf
-	 * @see ByteBuf#slice(int, int)
-	 */
-	public static FriendlyByteBuf slice(ByteBuf buf, int index, int length) {
-		Objects.requireNonNull(buf, "ByteBuf cannot be null");
-
-		return new FriendlyByteBuf(buf.slice(index, length));
-	}
-
-	/**
-	 * Wraps the newly created buf from {@code buf.retainedSlice} in a packet byte buf.
-	 *
-	 * @param buf    the original buf
-	 * @param index  the starting index
-	 * @param length the size of the copy
-	 * @return a slice of the buf
-	 * @see ByteBuf#retainedSlice(int, int)
-	 */
-	public static FriendlyByteBuf retainedSlice(ByteBuf buf, int index, int length) {
-		Objects.requireNonNull(buf, "ByteBuf cannot be null");
-
-		return new FriendlyByteBuf(buf.retainedSlice(index, length));
-	}
-
-	/**
-	 * Wraps the newly created buf from {@code buf.duplicate} in a packet byte buf.
-	 *
-	 * @param buf the original buf
-	 * @return a duplicate of the buf
-	 * @see ByteBuf#duplicate()
-	 */
-	public static FriendlyByteBuf duplicate(ByteBuf buf) {
-		Objects.requireNonNull(buf, "ByteBuf cannot be null");
-
-		return new FriendlyByteBuf(buf.duplicate());
-	}
-
-	/**
-	 * Wraps the newly created buf from {@code buf.retainedDuplicate} in a packet byte buf.
-	 *
-	 * @param buf the original buf
-	 * @return a duplicate of the buf
-	 * @see ByteBuf#retainedDuplicate()
-	 */
-	public static FriendlyByteBuf retainedDuplicate(ByteBuf buf) {
-		Objects.requireNonNull(buf, "ByteBuf cannot be null");
-
-		return new FriendlyByteBuf(buf.retainedDuplicate());
-	}
-
-	private PacketByteBufs() {
-	}
-}

forge/src/main/java/com/seibel/lod/forge/fabric/api/networking/v1/PacketSender.java

@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.networking.v1;
-
-import java.util.Objects;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.resources.ResourceLocation;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Represents something that supports sending packets to channels.
- * @see PacketByteBufs
- */
-public interface PacketSender {
-	/**
-	 * Makes a packet for a channel.
-	 *
-	 * @param channelName the id of the channel
-	 * @param buf     the content of the packet
-	 */
-	Packet<?> createPacket(ResourceLocation channelName, FriendlyByteBuf buf);
-
-	/**
-	 * Sends a packet.
-	 *
-	 * @param packet the packet
-	 */
-	void sendPacket(Packet<?> packet);
-
-	/**
-	 * Sends a packet.
-	 *
-	 * @param packet the packet
-	 * @param callback an optional callback to execute after the packet is sent, may be {@code null}. The callback may also accept a {@link ChannelFutureListener}.
-	 */
-	void sendPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> callback);
-
-	/**
-	 * Sends a packet to a channel.
-	 *
-	 * @param channel the id of the channel
-	 * @param buf the content of the packet
-	 */
-	default void sendPacket(ResourceLocation channel, FriendlyByteBuf buf) {
-		Objects.requireNonNull(channel, "Channel cannot be null");
-		Objects.requireNonNull(buf, "Payload cannot be null");
-
-		this.sendPacket(this.createPacket(channel, buf));
-	}
-
-	/**
-	 * Sends a packet to a channel.
-	 *
-	 * @param channel  the id of the channel
-	 * @param buf the content of the packet
-	 * @param callback an optional callback to execute after the packet is sent, may be {@code null}
-	 */
-	// the generic future listener can accept ChannelFutureListener
-	default void sendPacket(ResourceLocation channel, FriendlyByteBuf buf, @Nullable GenericFutureListener<? extends Future<? super Void>> callback) {
-		Objects.requireNonNull(channel, "Channel cannot be null");
-		Objects.requireNonNull(buf, "Payload cannot be null");
-
-		this.sendPacket(this.createPacket(channel, buf), callback);
-	}
-}

forge/src/main/java/com/seibel/lod/forge/fabric/api/networking/v1/PlayerLookup.java

@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.networking.v1;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Vec3i;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ChunkMap;
-import net.minecraft.server.level.ServerChunkCache;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.network.ServerPlayerConnection;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.chunk.ChunkSource;
-import net.minecraft.world.phys.Vec3;
-import com.seibel.lod.forge.mixins.fabric.mixin.networking.accessor.EntityTrackerAccessor;
-import com.seibel.lod.forge.mixins.fabric.mixin.networking.accessor.ThreadedAnvilChunkStorageAccessor;
-
-/**
- * For example, a block entity may use the methods in this class to send a packet to all clients which can see the block entity in order notify clients about a change.
- *
- * <p>The word "tracking" means that an entity/chunk on the server is known to a player's client (within in view distance) and the (block) entity should notify tracking clients of changes.
- *
- * <p>These methods should only be called on the server thread and only be used on logical a server.
- */
-public final class PlayerLookup {
-	/**
-	 * Gets all the players on the minecraft server.
-	 *
-	 * <p>The returned collection is immutable.
-	 *
-	 * @param server the server
-	 * @return all players on the server
-	 */
-	public static Collection<ServerPlayer> all(MinecraftServer server) {
-		Objects.requireNonNull(server, "The server cannot be null");
-
-		// return an immutable collection to guard against accidental removals.
-		if (server.getPlayerList() != null) {
-			return Collections.unmodifiableCollection(server.getPlayerList().getPlayers());
-		}
-
-		return Collections.emptyList();
-	}
-
-	/**
-	 * Gets all the players in a server world.
-	 *
-	 * <p>The returned collection is immutable.
-	 *
-	 * @param world the server world
-	 * @return the players in the server world
-	 */
-	public static Collection<ServerPlayer> world(ServerLevel world) {
-		Objects.requireNonNull(world, "The world cannot be null");
-
-		// return an immutable collection to guard against accidental removals.
-		return Collections.unmodifiableCollection(world.players());
-	}
-
-	/**
-	 * Gets all players tracking a chunk in a server world.
-	 *
-	 * @param world the server world
-	 * @param pos   the chunk in question
-	 * @return the players tracking the chunk
-	 */
-	public static Collection<ServerPlayer> tracking(ServerLevel world, ChunkPos pos) {
-		Objects.requireNonNull(world, "The world cannot be null");
-		Objects.requireNonNull(pos, "The chunk pos cannot be null");
-
-		return world.getChunkSource().chunkMap.getPlayers(pos, false);
-	}
-
-	/**
-	 * Gets all players tracking an entity in a server world.
-	 *
-	 * <p>The returned collection is immutable.
-	 *
-	 * <p><b>Warning</b>: If the provided entity is a player, it is not
-	 * guaranteed by the contract that said player is included in the
-	 * resulting stream.
-	 *
-	 * @param entity the entity being tracked
-	 * @return the players tracking the entity
-	 * @throws IllegalArgumentException if the entity is not in a server world
-	 */
-	public static Collection<ServerPlayer> tracking(Entity entity) {
-		Objects.requireNonNull(entity, "Entity cannot be null");
-		ChunkSource manager = entity.level.getChunkSource();
-
-		if (manager instanceof ServerChunkCache) {
-			ChunkMap storage = ((ServerChunkCache) manager).chunkMap;
-			EntityTrackerAccessor tracker = ((ThreadedAnvilChunkStorageAccessor) storage).getEntityMap().get(entity.getId());
-
-			// return an immutable collection to guard against accidental removals.
-			if (tracker != null) {
-				return Collections.unmodifiableCollection(tracker.getPlayersTracking()
-						.stream().map(ServerPlayerConnection::getPlayer).collect(Collectors.toSet()));
-			}
-
-			return Collections.emptySet();
-		}
-
-		throw new IllegalArgumentException("Only supported on server worlds!");
-	}
-
-	/**
-	 * Gets all players tracking a block entity in a server world.
-	 *
-	 * @param blockEntity the block entity
-	 * @return the players tracking the block position
-	 * @throws IllegalArgumentException if the block entity is not in a server world
-	 */
-	public static Collection<ServerPlayer> tracking(BlockEntity blockEntity) {
-		Objects.requireNonNull(blockEntity, "BlockEntity cannot be null");
-
-		//noinspection ConstantConditions - IJ intrinsics don't know hasWorld == true will result in no null
-		if (!blockEntity.hasLevel() || blockEntity.getLevel().isClientSide()) {
-			throw new IllegalArgumentException("Only supported on server worlds!");
-		}
-
-		return tracking((ServerLevel) blockEntity.getLevel(), blockEntity.getBlockPos());
-	}
-
-	/**
-	 * Gets all players tracking a block position in a server world.
-	 *
-	 * @param world the server world
-	 * @param pos   the block position
-	 * @return the players tracking the block position
-	 */
-	public static Collection<ServerPlayer> tracking(ServerLevel world, BlockPos pos) {
-		Objects.requireNonNull(pos, "BlockPos cannot be null");
-
-		return tracking(world, new ChunkPos(pos));
-	}
-
-	/**
-	 * Gets all players around a position in a world.
-	 *
-	 * <p>The distance check is done in the three-dimensional space instead of in the horizontal plane.
-	 *
-	 * @param world  the world
-	 * @param pos the position
-	 * @param radius the maximum distance from the position in blocks
-	 * @return the players around the position
-	 */
-	public static Collection<ServerPlayer> around(ServerLevel world, Vec3 pos, double radius) {
-		double radiusSq = radius * radius;
-
-		return world(world)
-				.stream()
-				.filter((p) -> p.distanceToSqr(pos) <= radiusSq)
-				.collect(Collectors.toList());
-	}
-
-	/**
-	 * Gets all players around a position in a world.
-	 *
-	 * <p>The distance check is done in the three-dimensional space instead of in the horizontal plane.
-	 *
-	 * @param world  the world
-	 * @param pos    the position (can be a block pos)
-	 * @param radius the maximum distance from the position in blocks
-	 * @return the players around the position
-	 */
-	public static Collection<ServerPlayer> around(ServerLevel world, Vec3i pos, double radius) {
-		double radiusSq = radius * radius;
-
-		return world(world)
-				.stream()
-				.filter((p) -> p.distanceToSqr(pos.getX(), pos.getY(), pos.getZ()) <= radiusSq)
-				.collect(Collectors.toList());
-	}
-
-	private PlayerLookup() {
-	}
-}

forge/src/main/java/com/seibel/lod/forge/fabric/api/networking/v1/S2CPlayChannelEvents.java

@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.networking.v1;
-
-import java.util.List;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.network.ServerGamePacketListenerImpl;
-import com.seibel.lod.forge.fabric.api.event.Event;
-import com.seibel.lod.forge.fabric.api.event.EventFactory;
-
-/**
- * Offers access to events related to the indication of a connected client's ability to receive packets in certain channels.
- */
-public final class S2CPlayChannelEvents {
-	/**
-	 * An event for the server play network handler receiving an update indicating the connected client's ability to receive packets in certain channels.
-	 * This event may be invoked at any time after login and up to disconnection.
-	 */
-	public static final Event<Register> REGISTER = EventFactory.createArrayBacked(Register.class, callbacks -> (handler, sender, server, channels) -> {
-		for (Register callback : callbacks) {
-			callback.onChannelRegister(handler, sender, server, channels);
-		}
-	});
-
-	/**
-	 * An event for the server play network handler receiving an update indicating the connected client's lack of ability to receive packets in certain channels.
-	 * This event may be invoked at any time after login and up to disconnection.
-	 */
-	public static final Event<Unregister> UNREGISTER = EventFactory.createArrayBacked(Unregister.class, callbacks -> (handler, sender, server, channels) -> {
-		for (Unregister callback : callbacks) {
-			callback.onChannelUnregister(handler, sender, server, channels);
-		}
-	});
-
-	private S2CPlayChannelEvents() {
-	}
-
-	/**
-	 * @see S2CPlayChannelEvents#REGISTER
-	 */
-	@FunctionalInterface
-	public interface Register {
-		void onChannelRegister(ServerGamePacketListenerImpl handler, PacketSender sender, MinecraftServer server, List<ResourceLocation> channels);
-	}
-
-	/**
-	 * @see S2CPlayChannelEvents#UNREGISTER
-	 */
-	@FunctionalInterface
-	public interface Unregister {
-		void onChannelUnregister(ServerGamePacketListenerImpl handler, PacketSender sender, MinecraftServer server, List<ResourceLocation> channels);
-	}
-}

forge/src/main/java/com/seibel/lod/forge/fabric/api/networking/v1/ServerLoginConnectionEvents.java

@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.networking.v1;
-
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.network.ServerLoginPacketListenerImpl;
-import com.seibel.lod.forge.fabric.api.event.Event;
-import com.seibel.lod.forge.fabric.api.event.EventFactory;
-
-/**
- * Offers access to events related to the connection to a client on a logical server while a client is logging in.
- */
-public final class ServerLoginConnectionEvents {
-	/**
-	 * Event indicating a connection entered the LOGIN state, ready for registering query response handlers.
-	 *
-	 * @see ServerLoginNetworking#registerReceiver(ServerLoginPacketListenerImpl, ResourceLocation, ServerLoginNetworking.LoginQueryResponseHandler)
-	 */
-	public static final Event<Init> INIT = EventFactory.createArrayBacked(Init.class, callbacks -> (handler, server) -> {
-		for (Init callback : callbacks) {
-			callback.onLoginInit(handler, server);
-		}
-	});
-
-	/**
-	 * An event for the start of login queries of the server login network handler.
-	 * This event may be used to register {@link ServerLoginNetworking.LoginQueryResponseHandler login query response handlers}
-	 * using {@link ServerLoginNetworking#registerReceiver(ServerLoginPacketListenerImpl, ResourceLocation, ServerLoginNetworking.LoginQueryResponseHandler)}
-	 * since this event is fired just before the first login query response is processed.
-	 *
-	 * <p>You may send login queries to the connected client using the provided {@link PacketSender}.
-	 */
-	public static final Event<QueryStart> QUERY_START = EventFactory.createArrayBacked(QueryStart.class, callbacks -> (handler, server, sender, synchronizer) -> {
-		for (QueryStart callback : callbacks) {
-			callback.onLoginStart(handler, server, sender, synchronizer);
-		}
-	});
-
-	/**
-	 * An event for the disconnection of the server login network handler.
-	 *
-	 * <p>No packets should be sent when this event is invoked.
-	 */
-	public static final Event<Disconnect> DISCONNECT = EventFactory.createArrayBacked(Disconnect.class, callbacks -> (handler, server) -> {
-		for (Disconnect callback : callbacks) {
-			callback.onLoginDisconnect(handler, server);
-		}
-	});
-
-	private ServerLoginConnectionEvents() {
-	}
-
-	/**
-	 * @see ServerLoginConnectionEvents#INIT
-	 */
-	@FunctionalInterface
-	public interface Init {
-		void onLoginInit(ServerLoginPacketListenerImpl handler, MinecraftServer server);
-	}
-
-	/**
-	 * @see ServerLoginConnectionEvents#QUERY_START
-	 */
-	@FunctionalInterface
-	public interface QueryStart {
-		void onLoginStart(ServerLoginPacketListenerImpl handler, MinecraftServer server, PacketSender sender, ServerLoginNetworking.LoginSynchronizer synchronizer);
-	}
-
-	/**
-	 * @see ServerLoginConnectionEvents#DISCONNECT
-	 */
-	@FunctionalInterface
-	public interface Disconnect {
-		void onLoginDisconnect(ServerLoginPacketListenerImpl handler, MinecraftServer server);
-	}
-}

forge/src/main/java/com/seibel/lod/forge/fabric/api/networking/v1/ServerLoginNetworking.java

@@ -1,196 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.networking.v1;
-
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.Future;
-
-import org.jetbrains.annotations.Nullable;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.network.ServerLoginPacketListenerImpl;
-import com.seibel.lod.forge.fabric.api.client.networking.v1.ClientLoginNetworking;
-import com.seibel.lod.forge.fabric.impl.networking.server.ServerNetworkingImpl;
-import com.seibel.lod.forge.mixins.fabric.mixin.networking.accessor.ServerLoginNetworkHandlerAccessor;
-
-/**
- * Offers access to login stage server-side networking functionalities.
- *
- * <p>Server-side networking functionalities include receiving serverbound query responses and sending clientbound query requests.
- *
- * @see ServerPlayNetworking
- * @see ClientLoginNetworking
- */
-public final class ServerLoginNetworking {
-	/**
-	 * Registers a handler to a query response channel.
-	 * A global receiver is registered to all connections, in the present and future.
-	 *
-	 * <p>If a handler is already registered to the {@code channel}, this method will return {@code false}, and no change will be made.
-	 * Use {@link #unregisterGlobalReceiver(ResourceLocation)} to unregister the existing handler.
-	 *
-	 * @param channelName the id of the channel
-	 * @param channelHandler the handler
-	 * @return false if a handler is already registered to the channel
-	 * @see ServerLoginNetworking#unregisterGlobalReceiver(ResourceLocation)
-	 * @see ServerLoginNetworking#registerReceiver(ServerLoginPacketListenerImpl, ResourceLocation, LoginQueryResponseHandler)
-	 */
-	public static boolean registerGlobalReceiver(ResourceLocation channelName, LoginQueryResponseHandler channelHandler) {
-		return ServerNetworkingImpl.LOGIN.registerGlobalReceiver(channelName, channelHandler);
-	}
-
-	/**
-	 * Removes the handler of a query response channel.
-	 * A global receiver is registered to all connections, in the present and future.
-	 *
-	 * <p>The {@code channel} is guaranteed not to have a handler after this call.
-	 *
-	 * @param channelName the id of the channel
-	 * @return the previous handler, or {@code null} if no handler was bound to the channel
-	 * @see ServerLoginNetworking#registerGlobalReceiver(ResourceLocation, LoginQueryResponseHandler)
-	 * @see ServerLoginNetworking#unregisterReceiver(ServerLoginPacketListenerImpl, ResourceLocation)
-	 */
-	@Nullable
-	public static ServerLoginNetworking.LoginQueryResponseHandler unregisterGlobalReceiver(ResourceLocation channelName) {
-		return ServerNetworkingImpl.LOGIN.unregisterGlobalReceiver(channelName);
-	}
-
-	/**
-	 * Gets all channel names which global receivers are registered for.
-	 * A global receiver is registered to all connections, in the present and future.
-	 *
-	 * @return all channel names which global receivers are registered for.
-	 */
-	public static Set<ResourceLocation> getGlobalReceivers() {
-		return ServerNetworkingImpl.LOGIN.getChannels();
-	}
-
-	/**
-	 * Registers a handler to a query response channel.
-	 *
-	 * <p>If a handler is already registered to the {@code channelName}, this method will return {@code false}, and no change will be made.
-	 * Use {@link #unregisterReceiver(ServerLoginPacketListenerImpl, ResourceLocation)} to unregister the existing handler.
-	 *
-	 * @param networkHandler the handler
-	 * @param channelName the id of the channel
-	 * @param responseHandler the handler
-	 * @return false if a handler is already registered to the channel name
-	 */
-	public static boolean registerReceiver(ServerLoginPacketListenerImpl networkHandler, ResourceLocation channelName, LoginQueryResponseHandler responseHandler) {
-		Objects.requireNonNull(networkHandler, "Network handler cannot be null");
-
-		return ServerNetworkingImpl.getAddon(networkHandler).registerChannel(channelName, responseHandler);
-	}
-
-	/**
-	 * Removes the handler of a query response channel.
-	 *
-	 * <p>The {@code channelName} is guaranteed not to have a handler after this call.
-	 *
-	 * @param channelName the id of the channel
-	 * @return the previous handler, or {@code null} if no handler was bound to the channel name
-	 */
-	@Nullable
-	public static ServerLoginNetworking.LoginQueryResponseHandler unregisterReceiver(ServerLoginPacketListenerImpl networkHandler, ResourceLocation channelName) {
-		Objects.requireNonNull(networkHandler, "Network handler cannot be null");
-
-		return ServerNetworkingImpl.getAddon(networkHandler).unregisterChannel(channelName);
-	}
-
-	// Helper methods
-
-	/**
-	 * Returns the <i>Minecraft</i> Server of a server login network handler.
-	 *
-	 * @param handler the server login network handler
-	 */
-	public static MinecraftServer getServer(ServerLoginPacketListenerImpl handler) {
-		Objects.requireNonNull(handler, "Network handler cannot be null");
-
-		return ((ServerLoginNetworkHandlerAccessor) handler).getServer();
-	}
-
-	private ServerLoginNetworking() {
-	}
-
-	@FunctionalInterface
-	public interface LoginQueryResponseHandler {
-		/**
-		 * Handles an incoming query response from a client.
-		 *
-		 * <p>This method is executed on {@linkplain io.netty.channel.EventLoop netty's event loops}.
-		 * Modification to the game should be {@linkplain net.minecraft.util.thread.BlockableEventLoop#submit(Runnable) scheduled} using the provided Minecraft client instance.
-		 *
-		 * <p><b>Whether the client understood the query should be checked before reading from the payload of the packet.</b>
-		 * @param server the server
-		 * @param handler the network handler that received this packet, representing the player/client who sent the response
-		 * @param understood whether the client understood the packet
-		 * @param buf the payload of the packet
-		 * @param synchronizer the synchronizer which may be used to delay log-in till a {@link Future} is completed.
-		 * @param responseSender the packet sender
-		 */
-		void receive(MinecraftServer server, ServerLoginPacketListenerImpl handler, boolean understood, FriendlyByteBuf buf, LoginSynchronizer synchronizer, PacketSender responseSender);
-	}
-
-	/**
-	 * Allows blocking client log-in until all all futures passed into {@link LoginSynchronizer#waitFor(Future)} are completed.
-	 *
-	 * @apiNote this interface is not intended to be implemented by users of api.
-	 */
-	@FunctionalInterface
-	public interface LoginSynchronizer {
-		/**
-		 * Allows blocking client log-in until the {@code future} is {@link Future#isDone() done}.
-		 *
-		 * <p>Since packet reception happens on netty's event loops, this allows handlers to
-		 * perform logic on the Server Thread, etc. For instance, a handler can prepare an
-		 * upcoming query request or check necessary login data on the server thread.</p>
-		 *
-		 * <p>Here is an example where the player log-in is blocked so that a credential check and
-		 * building of a followup query request can be performed properly on the logical server
-		 * thread before the player successfully logs in:
-		 * <pre>{@code
-		 * ServerLoginNetworking.registerGlobalReceiver(CHECK_CHANNEL, (server, handler, understood, buf, synchronizer, responseSender) -&gt; {
-		 * 	if (!understood) {
-		 * 		handler.disconnect(new LiteralText("Only accept clients that can check!"));
-		 * 		return;
-		 * 	}
-		 *
-		 * 	String checkMessage = buf.readString(32767);
-		 *
-		 * 	// Just send the CompletableFuture returned by the server's submit method
-		 * 	synchronizer.waitFor(server.submit(() -&gt; {
-		 * 		LoginInfoChecker checker = LoginInfoChecker.get(server);
-		 *
-		 * 		if (!checker.check(handler.getConnectionInfo(), checkMessage)) {
-		 * 			handler.disconnect(new LiteralText("Invalid credentials!"));
-		 * 			return;
-		 * 		}
-		 *
-		 * 		responseSender.send(UPCOMING_CHECK, checker.buildSecondQueryPacket(handler, checkMessage));
-		 * 	}));
-		 * });
-		 * }</pre>
-		 * Usually it is enough to pass the return value for {@link net.minecraft.util.thread.BlockableEventLoop#submit(Runnable)} for {@code future}.</p>
-		 *
-		 * @param future the future that must be done before the player can log in
-		 */
-		void waitFor(Future<?> future);
-	}
-}