Update buildscript

* Port over (most of) renderHand

.github/ISSUE_TEMPLATE/000-report-bug.yml

@@ -1,101 +0,0 @@
-name: Report Bug
-description: "Report a bug."
-body:
-  - type: markdown
-    attributes:
-      value: "A bug/crash report with sufficient information and logs to reproduce and track down."
-  - type: input
-    id: discord
-    attributes:
-      label: Your GTNH Discord Username
-      description: Leave empty if you don't have one, but this will make it harder to contact you if we need additional info.
-      placeholder: "Example: Fake#1234"
-  - type: input
-    id: version
-    attributes:
-      label: Mod Version
-      description: "What version of the Mod are you using?"
-      placeholder: "Example: 1.0.0-alpha1"
-    validations:
-      required: true
-  - type: textarea
-    id: report
-    attributes:
-      label: Bug Report
-      description: "Relevant information, as well as relevant logs attached such as `logs/fml-client-latest.log."
-      placeholder: "Example: https://mclo.gs/ OR submit the file to github by dragging it to this textbox."
-    validations:
-      required: true
-  - type: dropdown
-    id: java
-    attributes:
-      label: Java Version
-      description: What Java version are you using? It's worth mentioning that if you play on Java9+ you should try update to latest minor release (e.g. prefer Java 17.0.6 over 17.0.2) of that version.
-      options:
-        - Java 8
-        - Java 9
-        - Java 11
-        - Java 17
-        - Java 19
-        - Java 20
-        - Java 21
-        - Other (Please Specify)
-    validations:
-      required: true
-  - type: dropdown
-    id: graphics
-    attributes:
-      label: Graphics Card Vendor
-      description: What graphics card vendor are you using?
-      options:
-        - Other (Please Specify)
-        - NVidia
-        - AMD/ATI
-        - Intel iGPU
-        - AMD iGPU
-        - Mesa/Software
-    validations:
-      required: true
-  - type: dropdown
-    id: shaders
-    attributes:
-      label: Shaders
-      description: Do you have a shaderpack enabled?
-      options:
-        - "No"
-        - "Yes: Please put relevant information about shaderpack in the report(what shaderpack, any special settings of note, etc)"
-    validations:
-      required: true
-  - type: dropdown
-    id: mcpf
-    attributes:
-      label: MCPF or other features disabled by default
-      description: Do you have MCPF or any other features that are disabled by default enabled?
-      options:
-        - "No: Go ahead and create an issue"
-        - "Yes: I will not create an issue"
-        - "Yes: I don't read and shouldn't be creating an issue"
-    validations:
-      required: true
-  - type: textarea
-    id: modlist
-    attributes:
-      label: Mod List or GTNH Pack Version
-      description: "List of mods, ideally a minimal reproducible set (can be retrieved from latest.log).  If using GTNH please indicate pack version and any changed mods, not the entire modlist."
-      placeholder: "List of mods or GTNH Pack version goes here"
-    validations:
-      required: true
-  - type: checkboxes
-    id: final
-    attributes:
-      label: Final Checklist
-      description: Certify that you read things
-      options:
-        - label: "I have searched the issues and haven't found a similar issue."
-          required: true
-        - label: "I have read the known incompatibilities and this is not related to one of those."
-          required: true
-        - label: "I am running an officially released version.  (Or, if I've compiled it myself I plan to fix the issue)"
-          required: true
-
-

.github/ISSUE_TEMPLATE/001-request-feature.yml

@@ -1,33 +0,0 @@
-name: Feature Request
-description: "Request a feature."
-labels: ["enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: "Please use this form to request features. We ask you check if it was already requested though"
-  - type: input
-    id: discord
-    attributes:
-      label: Your GTNH Discord Username
-      description: Leave empty if you don't have one, but this will make it harder to contact you if we need additional info.
-      placeholder: "Example: Wumpus#1234"
-  - type: textarea
-    id: request
-    attributes:
-      label: Feature Request
-      description: "Relevant information, as well as relevant images"
-      placeholder: "Example: https://mclo.gs/ OR submit the file to github by dragging it to this textbox."
-    validations:
-      required: true
-  - type: checkboxes
-    id: final
-    attributes:
-      label: Final Checklist
-      description: Certify that you read things
-      options:
-        - label: "I have searched the issues and haven't found a similar issue."
-          required: true
-        - label: "I have read the known incompatibilities and this is not related to one of those."
-          required: true
-        - label: "This issue is not related to a feature that is disabed by default - MCPF, etc.  [They'll be enabled when they're ready for testing]"
-          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +0,0 @@
-blank_issues_enabled: false

.gitignore

@@ -1,7 +1,6 @@
 .gradle
 .settings
 /.idea/
-/.vs/
 /.vscode/
 /run/
 /build/
@@ -31,10 +30,3 @@ src/main/resources/mixins.*([!.]).json
 *.bat
 *.DS_Store
 !gradlew.bat
-layout.json
-addon.local.gradle
-addon.local.gradle.kts
-addon.late.local.gradle
-addon.late.local.gradle.kts
-/*.csv
-!gl_functions.csv

README.MD

@@ -1,84 +1,19 @@
-# Angelica<img src="img/logo-readme.png" align="right">
+# Angelica
+the little angle that supports shaders while saving your fps from a certain death - boubou
 
-<sup>**[CurseForge](https://www.curseforge.com/minecraft/mc-mods/angelica) | [Modrinth](https://modrinth.com/mod/angelica)**</sup>
+Not yet in an usable state
 
-* The little Angle [sic] that supports shaders while saving your fps from a certain death -boubou
-* Is it obtuse, or accute? -Caedis
-* It's a cute angle -mitchej123
-* It's the angel that pulls you out of OptiFine's hell -Roadhog360
-
-## **Beta Quality - Here there be Dragons** 
-* Shaders sneak preview - Please don't report issues yet, but please do submit fixes
-   * Complementary & BSL mostly function, but have some bugs
-   * Sildurs, Seus, and any other shader probably doesn't work
-
-
-# Required Dependencies
-* [UniMixins](https://github.com/LegacyModdingMC/UniMixins/releases) >= 0.1.14
-* [GTNHLib](https://github.com/GTNewHorizons/GTNHLib/releases) >= 0.4.2
-* NOTE: Some mods are not required, but a specific version is required if present - see: `Permanent Incompatibilities` below.
-
-# Known (temporary) Incompatibilities
-* Forge Relocation - Currently non Thread Safe; safe if not in use
-* ProjectRed Frames - Currently non Thread Safe; safe if not in use'
-
-# Potential Incompatibilities
-* EndlessIDs - Compat commits have been made, might work, might not - not fully tested
-
-# Known Incompatibilities
-* FalseTweaks - Not currently planned (Looking for volunteers) [Might work if you effectively disable most of the mod]
-* SmoothFont - Not currently planned (Looking for volunteers)
-* RPLE - Not currently planned (Looking for volunteers)
-
-# Permanent Incompatibilities
-* OptiFine [Disabled, won't fix]
-* FastCraft [Disabled, won't fix]
-* BetterFPS [Disabled, won't fix]
-* OptimizationsAndTweaks [Disabled, won't fix]
-* [Amazing Trophies 1.2.1 and below](https://github.com/GTNewHorizons/Amazing-Trophies/releases) - use 1.2.2+
-* [LWJGL3ify 1.5.4 and below](https://github.com/GTNewHorizons/lwjgl3ify/releases/) - Use the latest version available, 1.5.7+
-* [ArchaicFix 0.6.2 and below](https://www.curseforge.com/minecraft/mc-mods/archaicfix/files/all?page=1&pageSize=20) - Use 0.7.0 or above
-* [Hodgepodge 2.4.3 and below](https://github.com/GTNewHorizons/Hodgepodge/releases) - Use 0.4.5 or above
-* CodeChicken[Core](https://github.com/GTNewHorizons/CodeChickenCore/releases)/[Lib](https://github.com/GTNewHorizons/CodeChickenLib/releases) <1.2.0 - Threading issues, use 1.3.0+
-* Neodymium - Untested, but unlikely to be compatible. (Chunk Meshing is definitely incompatible, other features might work depending on config)
-
-# Credits
-* ShadersMod
-  * Original ShadersMods: karyonix, sonic ether, id_miner, daxnitro
-  * eigenraven, Caedis, glowredman, and mitchej123 for the conversion of ASM to Mixin
-  * eigenraven and vlaetansky for getting the original ShadersMod compiling again
-* ArchaicFix
-  * Includes graphic enhancements from [ArchaicFix](https://github.com/embeddedt/ArchaicFix/tree/4afb943751883b27a1f0aa7c5ba71698bc897e95) by embeddedt under the [LGPL](https://github.com/embeddedt/ArchaicFix/blob/main/LICENSE.md)
-* NotFine
-  * Includes modified version of [NotFine](https://github.com/jss2a98aj/NotFine/tree/a2652e24b5654f437fb7138f6d1f5e947a7d7125) by jss2a98aj under the LGPL
-* Iris Shaders
-  * The [Iris](https://github.com/IrisShaders/Iris) Team: coderbot, IMS212, Justsnoopy30, FoundationGames
-  * Asek3 for the Iris Forge port [Oculus](https://github.com/Asek3/Oculus/tree/839ce8eca8cf0c4f6b7a1322b906e5c99125ca69)
-  * Backported code under the LGPL
-* Sodium
-  * JellySquid & the CaffeineMC team, for making Sodium in the first place
-  * Embeddedt for [Embeddium](https://github.com/embeddedt/embeddium/tree/dc59ca357c25beefd6288f0d1d40b4cd8e670ab8) under the [LGPL 3.0](https://github.com/embeddedt/embeddium/blob/16.x/forge/LICENSE)
-* Reese's Sodium Options
-  * FlashyReese for [Reese's Sodium Options](https://github.com/FlashyReese/reeses-sodium-options/tree/aa4ea67047cf53e54976e93c6bb1ab5ba16b142b) under the [MIT license](https://github.com/FlashyReese/reeses-sodium-options/blob/aa4ea67047cf53e54976e93c6bb1ab5ba16b142b/LICENSE.txt)
-* Neodymium
-  * Makamys for [Neodymium](https://github.com/makamys/Neodymium) - Various Tessellator -> Quad functionality taken under the LGPL 3
-* MCPatcherForge
-  * Original [MCPatcher](https://bitbucket.org/prupe/mcpatcher/src/master/): Paul Rupe
-  * [Forge version](https://bitbucket.org/prupe/mcpatcher/src/master/): Mist475 under LGPL 3.0 with default ctm textures for glass and bookshelves by DarkBum under CC-BY-SA
-* HUDCaching
-  * Created by [Moulberry](https://github.com/Moulberry/MCHUDCaching), backported from [Patcher](https://github.com/Sk1erLLC/Patcher) mod by Alexdoru under the CC-BY-SA-NC 4.0 license
-* Angelica
-  * mitchej123, Omni, Makamys, Embeddedt, NanoLive, Caedis, Cardinalstar, Alexdoru, Eigenraven, mist475, Clepto, kurrycat for helping get Angelica up and running!
-  * IMS, jss2a98aj, || dbp ||, roadhog360 for advice and moral support
-* Forge 1.12+
-  * Some files have been taken from Minecraft Forge under the LGPL 2.1 license and are marked as such
-* FRAPI and Indigo
-  * Model building API heavily inspired by/copied from Fabric's; upstream may use it under the original Apache 2.0
-    license, see LICENSE in `com.gtnewhorizons.angelica.models`
-* Dynamic Lights
-  * LambdAurora for [LambDynamicLights](https://github.com/LambdAurora/LambDynamicLights) under the MIT license, and the Forge port anthxnymc for [DynamicLightsReforged](https://github.com/anthxnymc/DynamicLightsReforged), also under the MIT license
-* Embeddedt and Ferri_Arnus for [glsl-transformation-lib](https://github.com/TauMC/glsl-transformation-lib)
-  * Also for work on [Monocle](https://github.com/ferriarnus/Monocle) which was used as a reference for implementing glsl-transformation-lib
-  * Code from both glsl-transformation-lib and Monocle taken under their respective LGPL 3.0 licenses
-* FalseTweaks
-  * FalsePattern for [FalseTweaks](https://github.com/falsepattern/falsetweaks) - Item Rendering Optimizations taken from FalseTweaks under the LGPL 3.0 license
+Original build instructions obtained via minecraftforums archeology:
+```
+Developing environment
+ - Extract forge src to forge folder. Run "gradlew setupDecompWorkspace setupDevWorkspace" until it succeeded, then "gradlew build", then "gradlew eclipse".
+ - Delete everything in src\main folder inside forge folder.
+ - Extract smc-2.3.18-mc1.7.10-src.7z to src\main folder.
+ - Read patch file shadersmod-mcf.patch
+ - Find %userprofile%\.gradle\caches\minecraft\net\minecraftforge\forge\*\forgeSrc-*-sources.jar and extract it somewhere.
+ -- Select files that need to be patched and copy them to src\main with correct folder structure.
+ - Apply patch shadersmod-mcf.patch
+ - In eclipse, add java_dev folder as another source folder.
+ - In eclipse, exclude InitNames in src folder from build path. Use InitNames in java_dev folder instead.
+ - Find %userprofile%\.gradle\caches\modules-2\files-2.1\net.minecraftforge\forge\*\*\forge-*-userdev.jar and extract conf\*.csv and conf\*.srg in it to forge\conf and rename packaged.srg to joined.srg.
+```

addon.gradle

@@ -0,0 +1,11 @@
+
+configurations {
+    compileStubs
+}
+
+sourceSets {
+    compileStubsStubs
+    compileStubs {
+        compileClasspath += configurations.compileStubs
+    }
+}

build.gradle.kts

@@ -1,33 +0,0 @@
-plugins {
-    id("com.gtnewhorizons.gtnhconvention")
-}
-
-minecraft {
-    extraRunJvmArguments.add("-Dangelica.enableTestBlocks=true")
-}
-
-tasks.test {
-    useJUnitPlatform()
-    testLogging {
-        events("passed", "skipped", "failed")
-    }
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(8)
-    }
-    dependsOn(tasks.extractNatives2)
-    jvmArgs("-Djava.library.path=${tasks.extractNatives2.get().destinationFolder.asFile.get().path}")
-}
-
-tasks.processResources {
-    inputs.property("version", project.version.toString())
-    filesMatching("META-INF/rfb-plugin/*") {
-        expand("version" to project.version.toString())
-    }
-}
-
-tasks.register<Copy>("copyDependencies") {
-    group = "Angelica"
-    description = "Collect dependencies into the testDependencies folder"
-    from(configurations.default)
-    into("testDependencies")
-}

dependencies.gradle

@@ -1,122 +1,7 @@
-/*
- * Add your dependencies here. Supported configurations:
- *  - api("group:name:version:classifier"): if you use the types from this dependency in the public API of this mod
- *       Available at runtime and compiletime for mods depending on this mod
- *  - implementation("g:n:v:c"): if you need this for internal implementation details of the mod, but none of it is visible via the public API
- *       Available at runtime but not compiletime for mods depending on this mod
- *  - compileOnly("g:n:v:c"): if the mod you're building doesn't need this dependency during runtime at all, e.g. for optional mods
- *       Not available at all for mods depending on this mod, only visible at compiletime for this mod
- *  - compileOnlyApi("g:n:v:c"): like compileOnly, but also visible at compiletime for mods depending on this mod
- *       Available at compiletime but not runtime for mods depending on this mod
- *  - runtimeOnlyNonPublishable("g:n:v:c"): if you want to include a mod in this mod's runClient/runServer runs, but not publish it as a dependency
- *       Not available at all for mods depending on this mod, only visible at runtime for this mod
- *  - devOnlyNonPublishable("g:n:v:c"): a combination of runtimeOnlyNonPublishable and compileOnly for dependencies present at both compiletime and runtime,
- *       but not published as Maven dependencies - useful for RFG-deobfuscated dependencies or local testing
- *  - runtimeOnly("g:n:v:c"): if you don't need this at compile time, but want it to be present at runtime
- *       Available at runtime for mods depending on this mod
- *  - annotationProcessor("g:n:v:c"): mostly for java compiler plugins, if you know you need this, use it, otherwise don't worry
- *  - testCONFIG("g:n:v:c") - replace CONFIG by one of the above (except api), same as above but for the test sources instead of main
- *
- *  - shadowImplementation("g:n:v:c"): effectively the same as API, but the dependency is included in your jar under a renamed package name
- *       Requires you to enable usesShadowedDependencies in gradle.properties
- *
- *  - compile("g:n:v:c"): deprecated, replace with "api" (works like the old "compile") or "implementation" (can be more efficient)
- *
- * You can exclude transitive dependencies (dependencies of the chosen dependency) by appending { transitive = false } if needed,
- * but use this sparingly as it can break using your mod as another mod's dependency if you're not careful.
- *
- * To depend on obfuscated jars you can use `devOnlyNonPublishable(rfg.deobf("dep:spec:1.2.3"))` to fetch an obfuscated jar from maven,
- * or `devOnlyNonPublishable(rfg.deobf(project.files("libs/my-mod-jar.jar")))` to use a file.
- *
- * Gradle names for some of the configuration can be misleading, compileOnlyApi and runtimeOnly both get published as dependencies in Maven, but compileOnly does not.
- * The buildscript adds runtimeOnlyNonPublishable to also have a runtime dependency that's not published.
- *
- * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
- */
-configurations {
-    transformedMod // Mods that can be transformed - used for compiling angelica, but not necessary at runtime
-    transformedMod.canBeConsumed = false
-    transformedModCompileOnly
-    transformedModCompileOnly.canBeConsumed = false
-
-    // Add the transformed mod dependencies to the compilation classpaths, but don't publish them in the Maven metadata
-    compileClasspath.extendsFrom(transformedMod, transformedModCompileOnly)
-    testCompileClasspath.extendsFrom(transformedMod, transformedModCompileOnly)
-
-    // Can be enabled for testing if desired
-    // runtimeClasspath.extendsFrom(transformedMod)
-    // testRuntimeClasspath.extendsFrom(transformedMod)
-}
 
 dependencies {
-    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.78")
+    compileOnly(sourceSets.compileStubs.output)
+    compileStubs(sourceSets.compileStubsStubs.output)
 
-    compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:0.4.0") { transitive = false }
-
-    compileOnly("org.projectlombok:lombok:1.18.22") { transitive = false }
-    annotationProcessor("org.projectlombok:lombok:1.18.22")
-
-    // Use modern models+textures to inject QuadProviders
-    devOnlyNonPublishable('com.github.GTNewHorizons:TX-Loader:1.7.2:dev')
-
-    // Iris Shaders
-    compileOnly('org.jetbrains:annotations:24.0.1')
-    api("com.github.GTNewHorizons:GTNHLib:0.5.20:dev")
-    shadowImplementation("org.anarres:jcpp:1.4.14") // Apache 2.0
-    shadowImplementation("org.taumc:glsl-transformation-lib:0.2.0-4.g6b42bca") {
-        exclude module: "antlr4" // we only want to shadow the runtime module
-    }
-    shadowImplementation("org.antlr:antlr4-runtime:4.13.2")
-    compileOnly "org.apache.ant:ant:1.8.2"
-
-    // Because who doesn't want NEI
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.45-GTNH:dev')
-    devOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:1.3.10:dev')
-
-    // Notfine Deps
-    compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
-    devOnlyNonPublishable("com.github.GTNewHorizons:Baubles:1.0.4:dev")
-    compileOnly("com.github.GTNewHorizons:twilightforest:2.6.35:dev") { transitive = false }
-    compileOnly(rfg.deobf('curse.maven:witchery-69673:2234410'))
-    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.14-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Natura:2.7.5:dev")
-
-    compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.6.4:dev")
-
-    compileOnly("com.github.GTNewHorizons:Battlegear2:1.4.1:dev") { transitive = false }
-    compileOnly(rfg.deobf('maven.modrinth:backhand:1.4.1')) { transitive = false }
-
-    compileOnly("com.falsepattern:chunkapi-mc1.7.10:0.5.1:api") { transitive = false }
-    compileOnly("com.falsepattern:endlessids-mc1.7.10:1.5-beta0003:dev") { transitive = false }
-
-    compileOnly(rfg.deobf("curse.maven:extrautils-225561:2264383"))
-    compileOnly(rfg.deobf("curse.maven:dynamiclights-227874:2337326"))
-
-    compileOnly("curse.maven:minefactory-reloaded-66672:2277486")
-
-    compileOnly("com.github.GTNewHorizons:NotEnoughIds:2.1.6:dev") // Mixin Version
-    compileOnly("com.github.GTNewHorizons:NotEnoughIds-Legacy:1.4.7:dev") // ASM Version
-
-    compileOnly(rfg.deobf("curse.maven:campfirebackport-387444:4611675"))
-    compileOnly(rfg.deobf("curse.maven:xaeros-minimap-263420:5060684"))
-
-    compileOnly("com.github.GTNewHorizons:HoloInventory:2.4.13-GTNH:dev")
-
-    runtimeOnlyNonPublishable(rfg.deobf("CoreTweaks:CoreTweaks:0.3.3.2"))
-
-    // Hodgepodge
-    transformedMod("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
-
-    // Better Crashes
-    compileOnly("com.github.GTNewHorizons:BetterCrashes:1.4.0-GTNH:dev")
-
-    // Tests
-    testImplementation(platform('org.junit:junit-bom:5.9.2'))
-    testImplementation('org.junit.jupiter:junit-jupiter')
-    testImplementation("org.mockito:mockito-core:3.+")
-    testImplementation("org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209")
-
-    devOnlyNonPublishable("com.github.javaparser:javaparser-symbol-solver-core:3.26.2") {
-        exclude module: "guava"
-    }
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.3.55-GTNH:dev")
 }

docs/model-spec.md

@@ -1,34 +0,0 @@
-# A specification for models
-This is borrowed from [the unofficial Minecraft wiki](https://minecraft.wiki/w/Tutorials/Models) under the CC BY-NC-SA 3.0.
-
-The folder `assets/<namespace>/models/block` holds the model files for all the specified variants. The names of the files can be changed, but must always correspond with the names used in the variant files.
-
-* `[TAG_compound]` The root tag
-  * `[TAG_string]` **parent**: Loads a different model from the given path, in form of a [resource location](https://minecraft.wiki/w/Tutorials/Models#File_path). If both `"parent"` and `"elements"` are set, the `"elements"` tag overrides the `"elements"` tag from the previous model.
-    * Can be set to `"builtin/generated"` to use a model that is created out of the specified icon. Note that only the first layer is supported, and rotation can be achieved only by using block states files.
-  * `[TAG_byte]` **ambientocclusion**: Whether to use [ambient occlusion](http://en.wikipedia.org/wiki/Ambient_occlusion) (`true` - default), or not (`false`). Note:only works on Parent file
-  * `[TAG_object]` **display**: Holds the different places where item models are displayed.
-    * `[TAG_compound]` ***Position***: Named `thirdperson_righthand`, `thirdperson_lefthand`, `firstperson_righthand`, `firstperson_lefthand`, `gui`, `head`, `ground`, or `fixed`. Place where an item model is displayed. Holds its rotation, translation and scale for the specified situation. '''fixed''' refers to item frames, while the rest are as their name states. Note that translations are applied to the model before rotations.
-      * `[TAG_list]` **rotation**: Specifies the rotation of the model according to the scheme `[x, y, z]`.
-      * `[TAG_list]` **translation**: Specifies the position of the model according to the scheme `[x, y, z]`. The values are clamped between -80 and 80.
-      * `[TAG_list]` **scale**: Specifies the scale of the model according to the scheme `[x, y, z]`. If the value is greater than 4, it is displayed as 4.
-  * `[TAG_compound]` **textures**: Holds the textures of the model, in form of a [resource location](https://minecraft.wiki/w/Tutorials/Models#File_path) or can be another texture variable.
-    * `[TAG_string]` **particle**: What texture to load particles from. This texture is also used as an overlay if you are in a [nether portal](https://minecraft.wiki/w/Nether_portal), and used for [water](https://minecraft.wiki/w/water) and [lava](https://minecraft.wiki/w/Lava)'s still textures.<sup>[[1]](https://bugs.mojang.com/browse/MC-240042)</sup> This texture is also considered a texture variable that can be referenced as `"#particle"`. Note: All breaking particles from non-model blocks are hard-coded, such as for [barriers](https://minecraft.wiki/w/Barrier).
-    * `[TAG_string]` ***Texture variable***: Defines a texture variable with `name` and assigns it to a texture or another variable.
-  * `[TAG_list]` **elements**: Contains all the elements of the model. They can have only cubic forms. If both `"parent"` and `"elements"` are set, the `"elements"` tag overrides the `"elements"` tag from the previous model.
-    * `[TAG_compound]` An element.
-      * `[TAG_list]` **from**: Start point of a cuboid according to the scheme `[x, y, z]`. Values must be between -16 and 32.
-      * `[TAG_list]` **to**: Stop point of a cuboid according to the scheme `[x, y, z]`. Values must be between -16 and 32.
-      * `[TAG_compound]` **rotation**: Defines the rotation of an element.
-        * `[TAG_list]` **origin**: Sets the center of the rotation according to the scheme `[x, y, z]`.
-        * `[TAG_string]` **axis**: Specifies the direction of rotation, can be `"x"`, `"y"` or `"z"`.
-        * `[TAG_float]` **angle**: Specifies the angle of rotation. Can be 45 through -45 degrees in 22.5 degree increments.
-        * `[TAG_byte]` **rescale**: Specifies whether or not to scale the faces across the whole block. Can be true or false. Defaults to false.
-      * `[TAG_byte]` **shade**: Defines if shadows are rendered (`true` - default), not (`false`).
-      * `[TAG_compound]` **faces**: Holds all the faces of the cuboid. If a face is left out, it does not render.
-        * `[TAG_compound]` ***Face***: Named `down`, `up`, `north`, `south`, `west` or `east`. Contains the properties of the specified face.
-          * `[TAG_list]` **uv**: Defines the area of the texture to use according to the scheme `[x1, y1, x2, y2]`. The texture behavior is inconsistent if UV extends below 0 or above 16. If the numbers of `x1` and `x2` are swapped (e.g. from `0, 0, 16, 16` to `16, 0, 0, 16`), the texture flips. UV is optional, and if not supplied it automatically generates based on the element's position.
-          * `[TAG_string]` **texture**: Specifies the texture in form of the texture variable prepended with a `#`.
-          * `[TAG_string]` **cullface**: Specifies whether a face does not need to be rendered when there is a block touching it in the specified position. The position can be: `down`, `up`, `north`, `south`, `west`, or `east`. It also determines the side of the block to use the light level from for lighting the face, and if unset, defaults to the side.
-          * `[TAG_int]` **rotation**: Rotates the texture clockwise by the specified number of degrees. Can be 0, 90, 180, or 270. Defaults to 0. Rotation does not affect which part of the texture is used. Instead, it amounts to permutation of the selected texture vertexes (selected implicitly, or explicitly though `uv`).
-          * `[TAG_int]` **tintindex**: Determines whether to tint the texture using a hardcoded tint index. The default value, -1, indicates not to use the tint. Any other number is provided to BlockColors to get the tint value corresponding to that index. However, most blocks do not have a tint value defined (in which case white is used). Furthermore, no vanilla block currently uses multiple tint values, and thus the tint index value is ignored (as long as it is set to something other than -1); it could be used for modded blocks that need multiple distinct tint values in the same block though.

gradle.properties

@@ -1,109 +1,81 @@
-# ExampleMod tag to use as Blowdryer (Spotless, etc.) settings version, leave empty to disable.
-# LOCAL to test local config updates.
-gtnh.settings.blowdryerTag = 0.2.2
-
-# Human-readable mod name, available for mcmod.info population.
 modName = Angelica
 
-# Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation.
-# Conventionally lowercase.
+# This is a case-sensitive string to identify your mod. Convention is to use lower case.
 modId = angelica
 
-# Root package of the mod, used to find various classes in other properties,
-# mcmod.info substitution, enabling assertions in run tasks, etc.
 modGroup = com.gtnewhorizons.angelica
 
-# Whether to use modGroup as the maven publishing group.
-# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
-useModGroupForPublishing = false
+# WHY is there no version field?
+# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
+# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
 
-# Updates your build.gradle and settings.gradle automatically whenever an update is available.
+# Will update your build.gradle automatically whenever an update is available
 autoUpdateBuildScript = false
 
-# Version of Minecraft to target
 minecraftVersion = 1.7.10
-
-# Version of Minecraft Forge to target
 forgeVersion = 10.13.4.1614
 
-# Specify an MCP channel for dependency deobfuscation and the deobfParams task.
+# Specify a MCP channel and mappings version for dependency deobfuscation and the deobfParams task.
 channel = stable
-
-# Specify an MCP mappings version for dependency deobfuscation and the deobfParams task.
 mappingsVersion = 12
 
-# Defines other MCP mappings for dependency deobfuscation.
-remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
+# Define other MCP mappings for dependency deobfuscation
+remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
 
-# Select a default username for testing your mod. You can always override this per-run by running
-# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
+# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
+# restart Minecraft in development. Choose this dependent on your mod:
+# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
+# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
 developmentEnvironmentUserName = Developer
 
-# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
+# Enables using modern java syntax (up to version 17) via Jabel, while still targetting JVM 8.
 # See https://github.com/bsideup/jabel for details on how this works.
 enableModernJavaSyntax = true
 
-# Enables injecting missing generics into the decompiled source code for a better coding experience.
-# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
+# Enables injecting missing generics into the decompiled source code for a better coding experience
+# Turns most publically visible List, Map, etc. into proper List<Type>, Map<K, V> types
 enableGenericInjection = true
 
-# Generate a class with a String field for the mod version named as defined below.
-# If generateGradleTokenClass is empty or not missing, no such class will be generated.
-# If gradleTokenVersion is empty or missing, the field will not be present in the class.
-generateGradleTokenClass = com.gtnewhorizons.angelica.Tags
-
-# Name of the token containing the project's current version to generate/replace.
-gradleTokenVersion = VERSION
-
-# [DEPRECATED] Mod ID replacement token.
-gradleTokenModId =
-
-# [DEPRECATED] Mod name replacement token.
-gradleTokenModName =
-
-# [DEPRECATED] Mod Group replacement token.
-gradleTokenGroupName =
-
-# [DEPRECATED]
-# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
+# Define a source file of your project with:
 # public static final String VERSION = "GRADLETOKEN_VERSION";
 # The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
-# version in @Mod([...], version = VERSION, [...]).
-# Leave these properties empty to skip individual token replacements.
+# version in @Mod([...], version = VERSION, [...])
+# Leave these properties empty to skip individual token replacements
+generateGradleTokenClass = com.gtnewhorizons.angelica.Tags
+gradleTokenModId =
+gradleTokenModName =
+gradleTokenVersion = VERSION
+gradleTokenGroupName =
+# [DEPRECATED]
+# Multiple source files can be defined here by providing a comma-seperated list: Class1.java,Class2.java,Class3.java
+# public static final String VERSION = "GRADLETOKEN_VERSION";
+# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
+# version in @Mod([...], version = VERSION, [...])
+# Leave these properties empty to skip individual token replacements
 replaceGradleTokenInFile =
 
 # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
 # leave this property empty.
-# Example value: (apiPackage = api) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.api
-apiPackage = api
+# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
+apiPackage =
 
 # Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
-# There can be multiple files in a space-separated list.
-# Example value: mymodid_at.cfg nei_at.cfg
-accessTransformersFile = angelica_at.cfg notfine_at.cfg archaicfix_at.cfg mcpatcherforge_at.cfg
+# There can be multiple files in a comma-separated list.
+# Example value: mymodid_at.cfg,nei_at.cfg
+accessTransformersFile = angelica_at.cfg
 
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = true
-
-# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
-# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
-# Mixin classes will have access to "main" classes, but not the other way around.
-separateMixinSourceSet = mixin
-
-# Adds some debug arguments like verbose output and class export.
-usesMixinDebug = false
-
+# Adds some debug arguments like verbose output and export
+usesMixinDebug = true
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
-
 # Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
 mixinsPackage = mixins
-
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
 # This parameter is for legacy compatibility only
-# Example value: (coreModClass = asm.FMLPlugin) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.asm.FMLPlugin
+# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
 coreModClass = loading.AngelicaTweaker
-
 # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
 # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
 containsMixinsAndOrCoreModOnly = false
@@ -111,39 +83,23 @@ containsMixinsAndOrCoreModOnly = false
 # Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins.
 forceEnableMixins = false
 
-# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated into your jar. It is your
-# responsibility to check the license and request permission for distribution if required.
-usesShadowedDependencies = true
-
-# If disabled, won't remove unused classes from shadowed dependencies. Some libraries use reflection to access
+# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated in your jar. It is your
+# responsibility check the licence and request permission for distribution, if required.
+usesShadowedDependencies = false
+# If disabled, won't remove unused classes from shaded dependencies. Some libraries use reflection to access
 # their own classes, making the minimization unreliable.
 minimizeShadowedDependencies = true
-
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
+# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories
 includeWellKnownRepositories = true
 
-# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
-# list of strings, with the acceptable keys being(case does not matter):
-# cursemaven
-# modrinth
-excludeWellKnownRepositories =
+# Publishing to modrinth requires you to set the MODRINTH_TOKEN environment variable to your current modrinth API token.
 
-# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
-# Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
-# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
-usesMavenPublishing = true
-
-# Maven repository to publish the mod to.
-# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/
-
-# Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token.
-#
 # The project's ID on Modrinth. Can be either the slug or the ID.
-# Leave this empty if you don't want to publish to Modrinth.
-modrinthProjectId = angelica
+# Leave this empty if you don't want to publish on Modrinth.
+modrinthProjectId =
 
 # The project's relations on Modrinth. You can use this to refer to other projects on Modrinth.
 # Syntax: scope1-type1:name1;scope2-type2:name2;...
@@ -152,52 +108,40 @@ modrinthProjectId = angelica
 #       and the name is the Modrinth project or version slug/id of the other mod.
 # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
 # Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
-modrinthRelations = required-project\:gtnhlib
+modrinthRelations =
+
 
 # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
-#
+
 # The project's numeric ID on CurseForge. You can find this in the About Project box.
 # Leave this empty if you don't want to publish on CurseForge.
-curseForgeProjectId = 988067
+curseForgeProjectId =
 
 # The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
 # Syntax: type1:name1;type2:name2;...
 # Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
 #       and the name is the CurseForge project slug of the other mod.
 # Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft
-# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
-curseForgeRelations = requiredDependency\:gtnhlib
+# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
+curseForgeRelations =
 
-# Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older
+
+# Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
 # projects. New projects should not use this parameter.
 # customArchiveBaseName =
 
-# Optional parameter to have the build automatically fail if an illegal version is used.
-# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
-# The check is ONLY performed if the version is a git tag.
-# Note: the specified string must be escaped, so e.g. 1\\.1\\.\\d+ instead of 1\.1\.\d+
-# versionPattern =
+# Optional parameter to prevent the source code from being published
+# noPublishedSources =
 
-# Uncomment to prevent the source code from being published.
-# noPublishedSources = true
-
-# Uncomment this to disable Spotless checks.
+# Uncomment this to disable spotless checks
 # This should only be uncommented to keep it easier to sync with upstream/other forks.
 # That is, if there is no other active fork/upstream, NEVER change this.
-disableSpotless = true
+# disableSpotless = true
 
-# Uncomment this to disable Checkstyle checks (currently wildcard import check).
-# disableCheckstyle = true
-
-# Override the IDEA build type. Valid values are: "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle"
+# Override the IDEA build type. Valid value is "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle"
 # (force use delegated build).
 # This is meant to be set in $HOME/.gradle/gradle.properties.
-# e.g. add "systemProp.org.gradle.project.ideaOverrideBuildType=idea" will override the build type to be native build.
+# e.g. add "systemProp.org.gradle.project.ideaOverrideBuildType=idea" will override the build type to be always native build.
 # WARNING: If you do use this option, it will overwrite whatever you have in your existing projects. This might not be what you want!
 # Usually there is no need to uncomment this here as other developers do not necessarily use the same build type as you.
 # ideaOverrideBuildType = idea
-
-# Whether IDEA should run spotless checks when pressing the Build button.
-# This is meant to be set in $HOME/.gradle/gradle.properties.
-# ideaCheckSpotlessOnBuild = true
-

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -85,9 +83,7 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -134,13 +130,10 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -148,7 +141,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -156,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,11 +198,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -45,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
@@ -59,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 

img/logo-readme.png.generate.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-magick convert logo-1x.png -scale 200% \( +clone -background black -shadow 60x6+0+0 \) +swap -background none -layers merge logo-readme.png

repositories.gradle

@@ -1,36 +1,5 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
-    maven {
-        name = 'mavenpattern'
-        url = 'https://mvn.falsepattern.com/releases'
-        content {
-            includeGroup 'com.falsepattern'
-        }
-    }
-    exclusiveContent {
-        forRepository {
-            ivy {
-                name = 'CoreTweaks releases'
-                url = 'https://github.com/makamys/CoreTweaks/releases/download/'
-                patternLayout {
-                    artifact '[revision]/[module]-1.7.10-[revision]+nomixin(-[classifier])(.[ext])'
-                }
-                metadataSources {
-                    artifact()
-                }
-            }
-        }
-        filter {
-            includeGroup('CoreTweaks')
-        }
-    }
-    maven {
-        name = 'taumc'
-        url = 'https://maven.taumc.org/releases'
-        content {
-            includeGroup 'org.taumc'
-        }
-    }
-    mavenLocal()
+
 }

settings.gradle

@@ -1,12 +1,13 @@
+
 pluginManagement {
     repositories {
         maven {
             // RetroFuturaGradle
             name "GTNH Maven"
-            url "https://nexus.gtnewhorizons.com/repository/public/"
+            url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
+            allowInsecureProtocol = true
             mavenContent {
-                includeGroup("com.gtnewhorizons")
-                includeGroupByRegex("com\\.gtnewhorizons\\..+")
+                includeGroup("com.gtnewhorizons.retrofuturagradle")
             }
         }
         gradlePluginPortal()
@@ -16,5 +17,12 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.29'
+    id 'com.diffplug.blowdryerSetup' version '1.6.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' // Provides java toolchains
+}
+
+blowdryerSetup {
+    repoSubfolder 'gtnhShared'
+    github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.0')
+    //devLocal '.' // Use this when testing config updates locally
 }

src/compileStubs/java/net/minecraft/client/model/ModelBase.java

@@ -0,0 +1,8 @@
+package net.minecraft.client.model;
+
+import java.util.List;
+
+public class ModelBase {
+
+    public List boxList;
+}

src/compileStubs/java/net/minecraft/client/renderer/WorldRenderer.java

@@ -0,0 +1,14 @@
+package net.minecraft.client.renderer;
+
+import net.minecraft.client.renderer.culling.ICamera;
+
+public class WorldRenderer {
+
+    public boolean isInFrustum;
+
+    public boolean skipAllRenderPasses() {
+        return false;
+    }
+
+    public void updateInFrustum(ICamera frustrum) {}
+}

src/compileStubs/java/net/minecraft/client/renderer/culling/Frustrum.java

@@ -0,0 +1,6 @@
+package net.minecraft.client.renderer.culling;
+
+public class Frustrum implements ICamera {
+
+    public void setPosition(double x, double y, double z) {}
+}

src/compileStubs/java/net/minecraft/client/renderer/culling/ICamera.java

@@ -0,0 +1,4 @@
+package net.minecraft.client.renderer.culling;
+
+public interface ICamera {
+}

src/compileStubs/java/net/minecraft/client/renderer/texture/AbstractTexture.java

@@ -0,0 +1,17 @@
+package net.minecraft.client.renderer.texture;
+
+import com.gtnewhorizons.angelica.client.MultiTexID;
+
+public abstract class AbstractTexture implements ITextureObject {
+
+    public int glTextureId = -1;
+    public MultiTexID multiTex;
+
+    public int getGlTextureId() {
+        return 0;
+    }
+
+    public MultiTexID getMultiTexID() {
+        return null;
+    }
+}

src/compileStubs/java/net/minecraft/client/renderer/texture/DynamicTexture.java

@@ -0,0 +1,14 @@
+package net.minecraft.client.renderer.texture;
+
+public class DynamicTexture extends AbstractTexture {
+
+    public DynamicTexture(int i, int i1) {
+        super();
+    }
+
+    public int[] getTextureData() {
+        return null;
+    }
+
+    public void updateDynamicTexture() {}
+}

src/compileStubs/java/net/minecraft/client/renderer/texture/ITextureObject.java

@@ -0,0 +1,10 @@
+package net.minecraft.client.renderer.texture;
+
+import com.gtnewhorizons.angelica.client.MultiTexID;
+
+public interface ITextureObject {
+
+    MultiTexID getMultiTexID();
+
+    int getGlTextureId();
+}

src/compileStubs/java/net/minecraft/client/renderer/texture/TextureAtlasSprite.java

@@ -0,0 +1,8 @@
+package net.minecraft.client.renderer.texture;
+
+public class TextureAtlasSprite {
+
+    public boolean useAnisotropicFiltering;
+
+    public void updateAnimation() {}
+}

src/compileStubs/java/net/minecraft/client/renderer/texture/TextureMap.java

@@ -0,0 +1,18 @@
+package net.minecraft.client.renderer.texture;
+
+import net.minecraft.util.ResourceLocation;
+
+public class TextureMap extends AbstractTexture {
+
+    public static ResourceLocation locationBlocksTexture;
+    public int atlasWidth;
+    public int atlasHeight;
+
+    public int getTextureType() {
+        return 0;
+    }
+
+    public ResourceLocation completeResourceLocation(ResourceLocation resourceLocation, int i) {
+        return null;
+    }
+}

src/compileStubsStubs/README.MD

@@ -0,0 +1 @@
+Stubs for the compile stubs

src/compileStubsStubs/java/com/gtnewhorizons/angelica/client/MultiTexID.java

@@ -0,0 +1,4 @@
+package com.gtnewhorizons.angelica.client;
+
+public class MultiTexID {
+}

src/compileStubsStubs/java/net/minecraft/client/shader/TesselatorVertexState.java

@@ -0,0 +1,4 @@
+package net.minecraft.client.shader;
+
+public class TesselatorVertexState {
+}

src/compileStubsStubs/java/net/minecraft/util/ResourceLocation.java

@@ -0,0 +1,4 @@
+package net.minecraft.util;
+
+public class ResourceLocation {
+}

src/main/java/GLFunctionParser.java

@@ -1,120 +0,0 @@
-import com.github.javaparser.StaticJavaParser;
-import com.github.javaparser.ast.CompilationUnit;
-import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
-import com.github.javaparser.ast.body.MethodDeclaration;
-import com.github.javaparser.ast.body.Parameter;
-import com.github.javaparser.ast.visitor.VoidVisitorWithDefaults;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * Used to generate gl_functions.csv. Which contains a mapping of OpenGL functions provided by LWJGL
- * corresponding to the earliest GL version they appear in.
- */
-public class GLFunctionParser {
-    final static String glPath = "util/gl"; // Path to LWJGL OpenGL bindings source code
-
-    public static void main(String[] args) throws FileNotFoundException {
-        HashMap<String, Set<String>> byFunction = new HashMap<>();
-        File dir = new File(glPath);
-        for (File file : dir.listFiles()) {
-            final String filename = file.getName();
-            if (filename.endsWith(".java") && filename.startsWith("GL") && Character.isDigit(filename.charAt(2))) {
-                Path p = Paths.get(filename);
-
-                String parsedFile = removeFileExtension(p.getFileName().toString());
-
-                CompilationUnit cu = StaticJavaParser.parse(file);
-                cu.accept(new VoidVisitorWithDefaults<>() {
-
-                    @Override
-                    public void defaultAction(Node n, Object arg) {
-                        for( Node child : n.getChildNodes()) {
-                            if(child instanceof ClassOrInterfaceDeclaration cd) {
-                                for (MethodDeclaration md : cd.getMethods()) {
-                                    String methodName = md.getNameAsString() + "(";
-                                    for (Parameter p : md.getParameters()) {
-                                        methodName = methodName + p.getTypeAsString();
-                                    }
-                                    methodName = methodName + ")";
-                                    if(methodName.startsWith("n")) continue;
-
-                                    Set<String> functionSet = byFunction.computeIfAbsent(methodName, k -> new HashSet<>());
-                                    functionSet.add(parsedFile);
-                                }
-                            }
-                        }
-                    }
-                }, null);
-
-            }
-        }
-
-        Map<String, String> functionVersionMap = new HashMap<>();
-
-        for(String function : byFunction.keySet()) {
-
-            Set<String> versionsForFunction = byFunction.get(function);
-            int lowestInt = 46;
-            String lowestString = "GL46";
-            for(String version : versionsForFunction) {
-                int i = Integer.parseInt(version.substring(2, 4));
-                if (i < lowestInt) {
-                    lowestInt = i;
-                    lowestString = version;
-                }
-            }
-            functionVersionMap.put(function, lowestString);
-        }
-
-        List<String[]> outputLines = new ArrayList<>();
-
-        for (Map.Entry<String, String> entry : functionVersionMap.entrySet()) {
-            outputLines.add(new String[] {entry.getKey(), entry.getValue()});
-        }
-
-        File output = new File("output.csv");
-        try (PrintWriter writer = new PrintWriter(output)) {
-            outputLines.stream().map(GLSMFunctionComparison::convertToCSV).forEach(writer::println);
-        }
-    }
-
-    public static String convertToCSV(String[] data) {
-        return Stream.of(data).map(GLSMFunctionComparison::escapeSpecialCharacters).collect(Collectors.joining(","));
-    }
-
-    public static String escapeSpecialCharacters(String data) {
-        if (data == null) {
-            throw new IllegalArgumentException("Input data cannot be null");
-        }
-        String escapedData = data.replaceAll("\\R", " ");
-        if (data.contains(",") || data.contains("\"") || data.contains("'")) {
-            data = data.replace("\"", "\"\"");
-            escapedData = "\"" + data + "\"";
-        }
-        return escapedData;
-    }
-
-    public static String removeFileExtension(String filename) {
-        if (filename == null || filename.isEmpty()) {
-            return filename;
-        }
-
-        String extPattern = "(?<!^)[.]" + "[^.]*$";
-        return filename.replaceAll(extPattern, "");
-    }
-
-}

src/main/java/GLSMFunctionComparison.java

@@ -1,135 +0,0 @@
-import com.github.javaparser.ParserConfiguration;
-import com.github.javaparser.StaticJavaParser;
-import com.github.javaparser.ast.CompilationUnit;
-import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
-import com.github.javaparser.ast.body.MethodDeclaration;
-import com.github.javaparser.ast.body.Parameter;
-import com.github.javaparser.ast.visitor.VoidVisitorWithDefaults;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * Used to compare OpenGL functions from gl_functions.csv to current GLStateManager
- * source code to determine what functions have an implementation in GLSM, and what ones don't.
- * Only considers functions which appear in GL 2.1 and lower
- */
-public class GLSMFunctionComparison {
-
-    /**
-     * If set to true, then the outputted CSV will show functions which do have an implementation in GLSM
-     */
-    final static boolean INCLUDE_TRUE = false;
-
-    final static String glFunctionsCsvPath = "gl_functions.csv";
-    final static String glsmPath = "src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java";
-
-    public static Map<String, String> parseGLFunctions() {
-        Map<String, String> map = new HashMap<>();
-
-        try (BufferedReader br = new BufferedReader(new FileReader(glFunctionsCsvPath))) {
-            String line;
-            while ((line = br.readLine()) != null) {
-                String[] values = line.split(",");
-                if (values.length == 2) {
-                    String key = values[0].trim();
-                    String value = values[1].trim();
-                    int versionInt = Integer.parseInt(value.substring(2, 4));
-                    if (versionInt < 30) map.put(key, value);
-                }
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return map;
-    }
-
-    public static void main(String[] args) throws FileNotFoundException {
-        //GLSM will fail to parse without increasing language level
-        StaticJavaParser.getParserConfiguration().setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_17);
-
-        Map<String, String> functionMap = parseGLFunctions();
-        Set<String> glsmFunctions = new HashSet<>();
-
-        File glsmFile = new File(glsmPath);
-        CompilationUnit cu = StaticJavaParser.parse(glsmFile);
-        cu.accept(new VoidVisitorWithDefaults<>() {
-
-            @Override
-            public void defaultAction(Node n, Object arg) {
-                for (Node child : n.getChildNodes()) {
-                    if (child instanceof ClassOrInterfaceDeclaration cd) {
-                        for (MethodDeclaration md : cd.getMethods()) {
-                            String methodName = md.getNameAsString() + "(";
-                            for (Parameter p : md.getParameters()) {
-                                methodName = methodName + p.getTypeAsString();
-                            }
-                            methodName = methodName + ")";
-                            glsmFunctions.add(methodName);
-                        }
-                    }
-                }
-            }
-        }, null);
-
-        Map<String, String> functionGLSMMap = new HashMap<>();
-
-        for(String function : functionMap.keySet()) {
-            if (!glsmFunctions.contains(function)) {
-                functionGLSMMap.put(function, "false");
-            } else if (INCLUDE_TRUE) {
-                functionGLSMMap.put(function, "true");
-            }
-        }
-
-        List<String[]> outputLines = new ArrayList<>();
-
-        for (Map.Entry<String, String> entry : functionGLSMMap.entrySet()) {
-            outputLines.add(new String[] {entry.getKey(), functionMap.get(entry.getKey()), entry.getValue()});
-        }
-
-        File output = new File("glsm_function_comparison.csv");
-        try (PrintWriter writer = new PrintWriter(output)) {
-            outputLines.stream().map(GLSMFunctionComparison::convertToCSV).forEach(writer::println);
-        }
-    }
-
-    public static String convertToCSV(String[] data) {
-        return Stream.of(data).map(GLSMFunctionComparison::escapeSpecialCharacters).collect(Collectors.joining(","));
-    }
-
-    public static String escapeSpecialCharacters(String data) {
-        if (data == null) {
-            throw new IllegalArgumentException("Input data cannot be null");
-        }
-        String escapedData = data.replaceAll("\\R", " ");
-        if (data.contains(",") || data.contains("\"") || data.contains("'")) {
-            data = data.replace("\"", "\"\"");
-            escapedData = "\"" + data + "\"";
-        }
-        return escapedData;
-    }
-
-    public static String removeFileExtension(String filename) {
-        if (filename == null || filename.isEmpty()) {
-            return filename;
-        }
-
-        String extPattern = "(?<!^)[.]" + "[^.]*$";
-        return filename.replaceAll(extPattern, "");
-    }
-
-}

src/main/java/com/gtnewhorizons/angelica/AngelicaLateMixins.java

@@ -1,22 +0,0 @@
-package com.gtnewhorizons.angelica;
-
-import com.gtnewhorizon.gtnhmixins.ILateMixinLoader;
-import com.gtnewhorizon.gtnhmixins.LateMixin;
-import com.gtnewhorizons.angelica.mixins.Mixins;
-
-import java.util.List;
-import java.util.Set;
-
-@LateMixin
-public class AngelicaLateMixins implements ILateMixinLoader {
-    @Override
-    public String getMixinConfig() {
-        return "mixins.angelica.late.json";
-    }
-
-    @Override
-    public List<String> getMixins(Set<String> loadedMods) {
-        return Mixins.getLateMixins(loadedMods);
-    }
-
-}

src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java

@@ -1,49 +1,12 @@
 package com.gtnewhorizons.angelica;
 
-import com.gtnewhorizons.angelica.common.BlockError;
-import com.gtnewhorizons.angelica.compat.ModStatus;
-import com.gtnewhorizons.angelica.proxy.CommonProxy;
-import com.gtnewhorizons.angelica.utils.AnimationMode;
-import com.gtnewhorizons.angelica.utils.ManagedEnum;
 import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 
 @Mod(
         modid = "angelica",
         name = "Angelica",
         version = Tags.VERSION,
-        dependencies = " before:lwjgl3ify@[1.5.3,);" + " after:hodgepodge@[2.4.4,);" + " after:CodeChickenCore@[1.2.0,);"
-                     + " after:archaicfix@[0.7.0,);" + " required-after:gtnhlib@[0.4.2,);",
-        acceptedMinecraftVersions = "[1.7.10]",
-        acceptableRemoteVersions = "*",
-        guiFactory = "com.gtnewhorizons.angelica.config.AngelicaGuiConfigFactory")
+        acceptedMinecraftVersions = "[1.7.10,)",
+        acceptableRemoteVersions = "*")
 public class AngelicaMod {
-    @SidedProxy(clientSide = "com.gtnewhorizons.angelica.proxy.ClientProxy", serverSide = "com.gtnewhorizons.angelica.proxy.CommonProxy")
-    public static CommonProxy proxy;
-
-    public static final boolean lwjglDebug = Boolean.parseBoolean(System.getProperty("org.lwjgl.util.Debug", "false"));
-
-    public static final ManagedEnum<AnimationMode> animationsMode = new ManagedEnum<>(AnimationMode.VISIBLE_ONLY);
-
-    public static BlockError blockError;
-
-    @Mod.EventHandler
-    public void preInit(FMLPreInitializationEvent event) {
-        ModStatus.preInit();
-        proxy.preInit(event);
-        blockError = new BlockError();
-    }
-
-    @Mod.EventHandler
-    public void init(FMLInitializationEvent event) {
-        proxy.init(event);
-    }
-
-    @Mod.EventHandler
-    public void postInit(FMLPostInitializationEvent event) {
-        proxy.postInit(event);
-    }
 }

src/main/java/com/gtnewhorizons/angelica/api/IDynamicLightProducer.java

@@ -1,8 +0,0 @@
-package com.gtnewhorizons.angelica.api;
-
-/**
- * To be used for modded items that don't have blocks. Baubles for example.
- */
-public interface IDynamicLightProducer {
-    int getLuminance();
-}

src/main/java/com/gtnewhorizons/angelica/api/ThreadSafeISBRH.java

@@ -1,35 +0,0 @@
-package com.gtnewhorizons.angelica.api;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Marks an ISBRH as thread-safe, allowing Angelica to run it off-thread.
- * 
- * <p>Note: Any tessellator access <i>must</i> be done within the methods of the ISBRH and not cached in the class.</p>
- */
-@Documented
-@Target({ TYPE })
-@Retention(RUNTIME)
-public @interface ThreadSafeISBRH {
-    /**
-     * Specifies whether Angelica should create a thread local instance of the class for each thread.
-     * <ul>
-     *   <li>If this is set to <tt>true</tt>, a new instance will be created using the default constructor on each thread.</li>
-     *   <ul>
-     *     <li>Note: If your renderer requires arguments to the constructor, do <i>not</i> use this annotation;
-     *     instead use the {@link ThreadSafeISBRHFactory} interface and implement the {@link ThreadSafeISBRHFactory#newInstance} method. </li>
-     *   </ul>
-     *   <li>If this is set to <tt>false</tt>, the main thread instance will be used on all threads.
-     *   Use this option if your renderer class has no state, and can be safely used from multiple threads as is.</li>
-     *   <ul>
-     *     <li>No state/non final variables should be stored in the ISBRH as it is not guaranteed to be thread safe.</li>
-     *   </ul>
-     * </ul>
-     */
-    boolean perThread();
-}

src/main/java/com/gtnewhorizons/angelica/api/ThreadSafeISBRHFactory.java

@@ -1,22 +0,0 @@
-package com.gtnewhorizons.angelica.api;
-
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-
-/**
- * Marks an ISBRH as thread-safe using a thread local instance, allowing Angelica to run it off-thread.
- * Use this when your ISBRH uses a non-default constructor.
- * <p>To avoid a hard dependency on Angelica, you will likely want to mark this as an optional interface using:</p>
- * <pre>
- * @Optional.Interface(modid = "angelica", iface = "com.gtnewhorizons.angelica.api.ThreadSafeISBRHFactory")
- * </pre>
- * 
- * <p><b>Notes</b></p>
- * <ul>
- *   <li>Any tessellator access <i>must</i> be done within the methods of the ISBRH and not cached in the class.</li>
- *   <li>If your class uses a default constructor or is thread-safe by default, consider using the simpler {@link ThreadSafeISBRH}
- *   annotation instead.
- * </ul>
- */
-public interface ThreadSafeISBRHFactory extends ISimpleBlockRenderingHandler {
-    ThreadSafeISBRHFactory newInstance();
-}

src/main/java/com/gtnewhorizons/angelica/client/DefaultTexture.java

@@ -0,0 +1,16 @@
+package com.gtnewhorizons.angelica.client;
+
+import net.minecraft.client.renderer.texture.AbstractTexture;
+import net.minecraft.client.resources.IResourceManager;
+
+public class DefaultTexture extends AbstractTexture {
+
+    public DefaultTexture() {
+        loadTexture(null);
+    }
+
+    public void loadTexture(IResourceManager resourcemanager) {
+        int[] aint = ShadersTex.createAIntImage(1, 0xFFFFFFFF);
+        ShadersTex.setupTexture(this.getMultiTexID(), aint, 1, 1, false, false);
+    }
+}

src/main/java/com/gtnewhorizons/angelica/client/GuiShaders.java

@@ -0,0 +1,365 @@
+package com.gtnewhorizons.angelica.client;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.util.List;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.settings.GameSettings;
+
+import org.lwjgl.Sys;
+
+public class GuiShaders extends GuiScreen {
+
+    /** This GUI's parent GUI. */
+    protected GuiScreen parentGui;
+
+    private int updateTimer = -1;
+    public boolean needReinit;
+
+    /*
+     * private class GuiListShaderpacks { int posX,posY,sizeX,sizeY; int viewPosY; int itemHeight = 20; int selection;
+     * ArrayList<String> listShaderpacks; public void draw() { Tessellator tess = Tessellator.instance; int listSize =
+     * listShaderpacks.size(); int i,j; for (i=viewPosY/itemHeight, j=Math.min((viewPosY+sizeY)/itemHeight,listSize);
+     * i<j; ++i) { int itemY = posY-viewPosY+itemHeight*i; boolean selected = i==selection; tess.startDrawingQuads();
+     * tess.setColorRGBA(0,0,selected?128:0,128); tess.addVertex(posX,itemY,0); tess.addVertex(posX,itemY+itemHeight,0);
+     * tess.addVertex(posX+sizeX,itemY+itemHeight,0); tess.addVertex(posX+sizeX,itemY,0); tess.draw();
+     * field_146289_q.drawString(listShaderpacks.get(i), posX, itemY, 0xFFFFFFFF, true); } } } private
+     * GuiListShaderpacks guiListShaderpacks;
+     */
+
+    private GuiSlotShaders shaderList;
+
+    /** This GUI's 'Done' button. */
+    // private GuiSmallButton doneButton;
+
+    public GuiShaders(GuiScreen par1GuiScreen, GameSettings par2GameSettings) {
+        this.parentGui = par1GuiScreen;
+    }
+
+    private static String toStringOnOff(boolean value) {
+        return value ? "On" : "Off";
+    }
+
+    @Override
+    /**
+     * Adds the buttons (and other controls) to the screen in question.
+     */
+    public void initGui() {
+        if (Shaders.shadersConfig == null) Shaders.loadConfig();
+        List buttonList = this.buttonList;
+        int width = this.width;
+        int height = this.height;
+        buttonList.add(
+                new GuiButton(
+                        17,
+                        width * 3 / 4 - 60,
+                        30,
+                        160,
+                        18,
+                        "NormapMap: " + toStringOnOff(Shaders.configNormalMap)));
+        buttonList.add(
+                new GuiButton(
+                        18,
+                        width * 3 / 4 - 60,
+                        50,
+                        160,
+                        18,
+                        "SpecularMap: " + toStringOnOff(Shaders.configSpecularMap)));
+        buttonList.add(
+                new GuiButton(
+                        15,
+                        width * 3 / 4 - 60,
+                        70,
+                        160,
+                        18,
+                        "RenderResMul: " + String.format("%.04f", Shaders.configRenderResMul)));
+        buttonList.add(
+                new GuiButton(
+                        16,
+                        width * 3 / 4 - 60,
+                        90,
+                        160,
+                        18,
+                        "ShadowResMul: " + String.format("%.04f", Shaders.configShadowResMul)));
+        buttonList.add(
+                new GuiButton(
+                        10,
+                        width * 3 / 4 - 60,
+                        110,
+                        160,
+                        18,
+                        "HandDepth: " + String.format("%.04f", Shaders.configHandDepthMul)));
+        buttonList.add(
+                new GuiButton(
+                        9,
+                        width * 3 / 4 - 60,
+                        130,
+                        160,
+                        18,
+                        "CloudShadow: " + toStringOnOff(Shaders.configCloudShadow)));
+        // buttonList.add(new GuiButton(14, width *3 /4 -60, 150, 160, 18, "ShadowClipFrustrum: "
+        // +toStringOnOff(Shaders.configShadowClipFrustrum)));
+        buttonList.add(
+                new GuiButton(
+                        4,
+                        width * 3 / 4 - 60,
+                        170,
+                        160,
+                        18,
+                        "tweakBlockDamage: " + toStringOnOff(Shaders.configTweakBlockDamage)));
+        buttonList.add(
+                new GuiButton(
+                        19,
+                        width * 3 / 4 - 60,
+                        190,
+                        160,
+                        18,
+                        "OldLighting: " + toStringOnOff(Shaders.configOldLighting)));
+        // buttonList.add(new GuiButton(11, width *3 /4 -60, 210, 160, 18, "Tex Min: "
+        // +Shaders.texMinFilDesc[Shaders.configTexMinFilB]));
+        // buttonList.add(new GuiButton(12, width *3 /4 -60, 230, 160, 18, "Tex_n Mag: "
+        // +Shaders.texMagFilDesc[Shaders.configTexMagFilN]));
+        // buttonList.add(new GuiButton(13, width *3 /4 -60, 250, 160, 18, "Tex_s Mag: "
+        // +Shaders.texMagFilDesc[Shaders.configTexMagFilS]));
+        buttonList.add(new GuiButton(6, width * 3 / 4 - 60, height - 25, 160, 20, "Done"));
+        buttonList.add(new GuiButton(5, width / 4 - 80, height - 25, 160, 20, "Open shaderpacks folder"));
+        this.shaderList = new GuiSlotShaders(this);
+        this.shaderList.registerScrollButtons(7, 8); // registerScrollButtons(7, 8);
+        this.needReinit = false;
+    }
+
+    @Override
+    /**
+     * actionPerformed Fired when a control is clicked. This is the equivalent of
+     * ActionListener.actionPerformed(ActionEvent e).
+     */
+    protected void actionPerformed(GuiButton par1GuiButton) {
+        if (par1GuiButton.enabled) // enabled
+        {
+            switch (par1GuiButton.id) // id
+            {
+                case 4: /* New block breaking */
+                    Shaders.configTweakBlockDamage = !Shaders.configTweakBlockDamage;
+                    // displayString
+                    par1GuiButton.displayString = "tweakBlockDamage: " + toStringOnOff(Shaders.configTweakBlockDamage);
+                    break;
+
+                case 9: /* Cloud shadow */
+                    Shaders.configCloudShadow = !Shaders.configCloudShadow;
+                    par1GuiButton.displayString = "CloudShadow: " + toStringOnOff(Shaders.configCloudShadow);
+                    break;
+
+                case 10: /* Hand Depth */ {
+                    float val = Shaders.configHandDepthMul;
+                    float[] choices = { 0.0625f, 0.125f, 0.25f, 0.5f, 1.0f };
+                    int i;
+                    if (!isShiftKeyDown()) { // isShiftKeyDown
+                        for (i = 0; i < choices.length && choices[i] <= val; ++i) {}
+                        if (i == choices.length) i = 0;
+                    } else {
+                        for (i = choices.length - 1; i >= 0 && val <= choices[i]; --i) {}
+                        if (i < 0) i = choices.length - 1;
+                    }
+                    Shaders.configHandDepthMul = choices[i];
+                    par1GuiButton.displayString = "HandDepth: " + String.format("%.4f", Shaders.configHandDepthMul);
+                    break;
+                }
+
+                case 15: /* Render Resolution Multiplier */ {
+                    float val = Shaders.configRenderResMul;
+                    float[] choices = { 0.25f, 0.3333333333f, 0.5f, 0.7071067812f, 1.0f, 1.414213562f, 2.0f };
+                    int i;
+                    if (!isShiftKeyDown()) {
+                        for (i = 0; i < choices.length && choices[i] <= val; ++i) {}
+                        if (i == choices.length) i = 0;
+                    } else {
+                        for (i = choices.length - 1; i >= 0 && val <= choices[i]; --i) {}
+                        if (i < 0) i = choices.length - 1;
+                    }
+                    Shaders.configRenderResMul = choices[i];
+                    par1GuiButton.displayString = "RenderResMul: " + String.format("%.4f", Shaders.configRenderResMul);
+                    Shaders.scheduleResize();
+                    break;
+                }
+
+                case 16: /* Shadow Resolution Multiplier */ {
+                    float val = Shaders.configShadowResMul;
+                    float[] choices = { 0.25f, 0.3333333333f, 0.5f, 0.7071067812f, 1.0f, 1.414213562f, 2.0f, 3.0f,
+                            4.0f };
+                    int i;
+                    if (!isShiftKeyDown()) {
+                        for (i = 0; i < choices.length && choices[i] <= val; ++i) {}
+                        if (i == choices.length) i = 0;
+                    } else {
+                        for (i = choices.length - 1; i >= 0 && val <= choices[i]; --i) {}
+                        if (i < 0) i = choices.length - 1;
+                    }
+                    Shaders.configShadowResMul = choices[i];
+                    par1GuiButton.displayString = "ShadowResMul: " + String.format("%.4f", Shaders.configShadowResMul);
+                    Shaders.scheduleResizeShadow();
+                    break;
+                }
+
+                case 17: /* Normal Map */ {
+                    Shaders.configNormalMap = !Shaders.configNormalMap;
+                    // displayString
+                    par1GuiButton.displayString = "NormapMap: " + toStringOnOff(Shaders.configNormalMap);
+                    mc.scheduleResourcesRefresh(); // schedule refresh texture
+                    break;
+                }
+
+                case 18: /* Normal Map */ {
+                    Shaders.configSpecularMap = !Shaders.configSpecularMap;
+                    // displayString
+                    par1GuiButton.displayString = "SpecularMap: " + toStringOnOff(Shaders.configSpecularMap);
+                    mc.scheduleResourcesRefresh(); // schedule refresh texture
+                    break;
+                }
+
+                case 19: /* old Lighting */ {
+                    Shaders.configOldLighting = !Shaders.configOldLighting;
+                    // displayString
+                    par1GuiButton.displayString = "OldLighting: " + toStringOnOff(Shaders.configOldLighting);
+                    Shaders.updateBlockLightLevel();
+                    mc.renderGlobal.loadRenderers();
+                    break;
+                }
+
+                case 11: /* texture filter */ {
+                    Shaders.configTexMinFilB = (Shaders.configTexMinFilB + 1) % Shaders.texMinFilRange;
+                    Shaders.configTexMinFilN = Shaders.configTexMinFilS = Shaders.configTexMinFilB;
+                    par1GuiButton.displayString = "Tex Min: " + Shaders.texMinFilDesc[Shaders.configTexMinFilB];
+                    ShadersTex.updateTextureMinMagFilter();
+                    break;
+                }
+
+                case 12: /* texture filter */ {
+                    Shaders.configTexMagFilN = (Shaders.configTexMagFilN + 1) % Shaders.texMagFilRange;
+                    par1GuiButton.displayString = "Tex_n Mag: " + Shaders.texMagFilDesc[Shaders.configTexMagFilN];
+                    ShadersTex.updateTextureMinMagFilter();
+                    break;
+                }
+
+                case 13: /* texture filter */ {
+                    Shaders.configTexMagFilS = (Shaders.configTexMagFilS + 1) % Shaders.texMagFilRange;
+                    par1GuiButton.displayString = "Tex_s Mag: " + Shaders.texMagFilDesc[Shaders.configTexMagFilS];
+                    ShadersTex.updateTextureMinMagFilter();
+                    break;
+                }
+
+                case 14: /* shadow frustum clipping */ {
+                    Shaders.configShadowClipFrustrum = !Shaders.configShadowClipFrustrum;
+                    par1GuiButton.displayString = "ShadowClipFrustrum: "
+                            + toStringOnOff(Shaders.configShadowClipFrustrum);
+                    ShadersTex.updateTextureMinMagFilter();
+                    break;
+                }
+
+                case 5: /* Open shaderpacks folder */
+                    switch (net.minecraft.util.Util.getOSType()) {
+                        case OSX: {
+                            try {
+                                Runtime.getRuntime().exec(
+                                        new String[] { "/usr/bin/open", Shaders.shaderpacksdir.getAbsolutePath() });
+                                return;
+                            } catch (IOException var7) {
+                                var7.printStackTrace();
+                            }
+                        }
+                            break;
+                        case WINDOWS: {
+                            String var2 = String.format(
+                                    "cmd.exe /C start \"Open file\" \"%s\"",
+                                    new Object[] { Shaders.shaderpacksdir.getAbsolutePath() });
+
+                            try {
+                                Runtime.getRuntime().exec(var2);
+                                return;
+                            } catch (IOException var6) {
+                                var6.printStackTrace();
+                            }
+                        }
+                            break;
+                        default:
+                            break;
+                    }
+                    boolean var8 = false;
+
+                    try {
+                        Class var3 = Class.forName("java.awt.Desktop");
+                        Object var4 = var3.getMethod("getDesktop", new Class[0]).invoke((Object) null, new Object[0]);
+                        var3.getMethod("browse", new Class[] { URI.class }).invoke(
+                                var4,
+                                new Object[] { (new File(mc.mcDataDir, Shaders.shaderpacksdirname)).toURI() });
+                    } catch (Throwable var5) {
+                        var5.printStackTrace();
+                        var8 = true;
+                    }
+
+                    if (var8) {
+                        System.out.println("Opening via system class!");
+                        Sys.openURL("file://" + Shaders.shaderpacksdir.getAbsolutePath());
+                    }
+                    break;
+
+                case 6: /* Done */
+                    File confshader = new File(Shaders.shadersdir, "current.cfg");
+                    try {
+                        Shaders.storeConfig();
+                    } catch (Exception ex) {}
+                    if (needReinit) {
+                        needReinit = false;
+                        Shaders.loadShaderPack();
+                        Shaders.uninit();
+                        this.mc.renderGlobal.loadRenderers();
+                    }
+                    this.mc.displayGuiScreen(this.parentGui); // displayGuiScreen
+                    break;
+
+                default:
+                    this.shaderList.actionPerformed(par1GuiButton); // actionPerformed
+            }
+        }
+    }
+
+    @Override
+    /**
+     * Draws the screen and all the components in it.
+     */
+    public void drawScreen(int par1, int par2, float par3) {
+        drawDefaultBackground(); // background
+        this.shaderList.drawScreen(par1, par2, par3); // drawScreen
+
+        if (this.updateTimer <= 0) {
+            this.shaderList.updateList();
+            this.updateTimer += 20;
+        }
+
+        this.drawCenteredString(this.fontRendererObj, "Shaders ", this.width / 2, 16, 0xffffff);
+        this.drawCenteredString(this.fontRendererObj, " v" + Shaders.versionString, this.width - 40, 10, 0x808080);
+        // this.drawCenteredString(this.fontRenderer, "( Place zipped Shader files here. )", this.width / 4 + 10,
+        // this.height - 26, 0x808080);
+        super.drawScreen(par1, par2, par3);
+    }
+
+    @Override
+    /**
+     * Called from the main game loop to update the screen.
+     */
+    public void updateScreen() {
+        super.updateScreen();
+        --this.updateTimer;
+    }
+
+    public Minecraft getMc() {
+        return this.mc;
+    }
+
+    public void drawCenteredString(String par1, int par2, int par3, int par4) {
+        this.drawCenteredString(this.fontRendererObj, par1, par2, par3, par4);
+    }
+}

src/main/java/com/gtnewhorizons/angelica/client/GuiSlotShaders.java

@@ -0,0 +1,80 @@
+package com.gtnewhorizons.angelica.client;
+
+import java.util.ArrayList;
+
+import net.minecraft.client.gui.GuiSlot;
+import net.minecraft.client.renderer.Tessellator;
+
+class GuiSlotShaders extends GuiSlot {
+
+    private ArrayList shaderslist;
+
+    final GuiShaders shadersGui;
+
+    public GuiSlotShaders(GuiShaders par1GuiShaders) {
+        // super(par1GuiShaders.getMc(), par1GuiShaders.width / 2 + 20, par1GuiShaders.height, 40, par1GuiShaders.height
+        // - 70, 16);
+        super(
+                par1GuiShaders.getMc(),
+                par1GuiShaders.width / 2 + 20,
+                par1GuiShaders.height,
+                40,
+                par1GuiShaders.height - 70,
+                16);
+        this.shadersGui = par1GuiShaders;
+        this.shaderslist = Shaders.listofShaders();
+    }
+
+    public void updateList() {
+        this.shaderslist = Shaders.listofShaders();
+    }
+
+    @Override
+    /** getSize */
+    protected int getSize() {
+        return this.shaderslist.size();
+    }
+
+    @Override
+    /** elementClicked */
+    protected void elementClicked(int par1, boolean par2, int par3, int par4) {
+        Shaders.setShaderPack((String) shaderslist.get(par1));
+        shadersGui.needReinit = false;
+        Shaders.loadShaderPack();
+        Shaders.uninit();
+    }
+
+    @Override
+    /** isSelected */
+    protected boolean isSelected(int par1) {
+        return ((String) this.shaderslist.get(par1)).equals(Shaders.currentshadername);
+    }
+
+    @Override
+    /** getScrollBarX */
+    protected int getScrollBarX() {
+        return this.width - 6;
+    }
+
+    @Override
+    /** getContentHeight */
+    protected int getContentHeight() {
+        return this.getSize() * 18;
+    }
+
+    @Override
+    /** drawBackground */
+    protected void drawBackground() {
+        // this.shadersGui.drawDefaultBackground();
+    }
+
+    @Override
+    /** drawSlot */
+    protected void drawSlot(int par1, int par2, int par3, int par4, Tessellator par5, int par6, int par7) {
+        this.shadersGui.drawCenteredString(
+                (String) this.shaderslist.get(par1),
+                this.shadersGui.width / 4 + 10,
+                par3 + 1,
+                0xffffff);
+    }
+}

src/main/java/com/gtnewhorizons/angelica/client/HFNoiseTexture.java

@@ -0,0 +1,86 @@
+package com.gtnewhorizons.angelica.client;
+
+import java.nio.ByteBuffer;
+
+import org.lwjgl.BufferUtils;
+import org.lwjgl.opengl.GL11;
+
+/**
+ *
+ * @author Nathanael Lane
+ */
+public class HFNoiseTexture {
+
+    public int texID;
+    public int textureUnit;
+
+    public HFNoiseTexture(int width, int height) {
+        texID = GL11.glGenTextures();
+        textureUnit = 15;
+
+        byte[] image = genHFNoiseImage(width, height);
+        ByteBuffer data = BufferUtils.createByteBuffer(image.length);
+        data.put(image);
+        data.flip();
+
+        // GL13.glActiveTexture(GL13.GL_TEXTURE0 + this.textureUnit);
+        GL11.glBindTexture(GL11.GL_TEXTURE_2D, texID);
+        GL11.glTexImage2D(
+                GL11.GL_TEXTURE_2D,
+                0,
+                GL11.GL_RGB,
+                width,
+                height,
+                0,
+                GL11.GL_RGB,
+                GL11.GL_UNSIGNED_BYTE,
+                data);
+        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_REPEAT);
+        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, GL11.GL_REPEAT);
+        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR);
+        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR);
+        // GL30.glGenerateMipmap(GL11.GL_TEXTURE_2D);
+        GL11.glBindTexture(GL11.GL_TEXTURE_2D, 0);
+    }
+
+    public int getID() {
+        return texID;
+    }
+
+    public void destroy() {
+        GL11.glDeleteTextures(texID);
+        texID = 0;
+    }
+
+    // from George Marsaglia's paper on XORshift PRNGs
+    private int random(int seed) {
+        seed ^= (seed << 13);
+        seed ^= (seed >> 17);
+        seed ^= (seed << 5);
+        return seed;
+    }
+
+    private byte random(int x, int y, int z) {
+        int seed = (random(x) + random(y * 19)) * random(z * 23) - z;
+        return (byte) (random(seed) % 128);
+    }
+
+    /*
+     * Just a random value for each pixel to get maximum frequency
+     */
+    private byte[] genHFNoiseImage(int width, int height) {
+
+        byte[] image = new byte[width * height * 3];
+        int index = 0;
+
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                for (int z = 1; z < 4; z++) {
+                    image[index++] = random(x, y, z);
+                }
+            }
+        }
+
+        return image;
+    }
+}

src/main/java/com/gtnewhorizons/angelica/client/IShaderPack.java

@@ -0,0 +1,10 @@
+package com.gtnewhorizons.angelica.client;
+
+import java.io.InputStream;
+
+public interface IShaderPack {
+
+    void close();
+
+    InputStream getResourceAsStream(String resName);
+}

src/main/java/com/gtnewhorizons/angelica/client/MultiTexID.java

@@ -0,0 +1,14 @@
+package com.gtnewhorizons.angelica.client;
+
+public class MultiTexID {
+
+    public int base;
+    public int norm;
+    public int spec;
+
+    public MultiTexID(int baseTex, int normTex, int specTex) {
+        base = baseTex;
+        norm = normTex;
+        spec = specTex;
+    }
+}

src/main/java/com/gtnewhorizons/angelica/client/ShaderPackDefault.java

@@ -0,0 +1,16 @@
+package com.gtnewhorizons.angelica.client;
+
+import java.io.InputStream;
+
+public class ShaderPackDefault implements IShaderPack {
+
+    public ShaderPackDefault() {}
+
+    @Override
+    public void close() {}
+
+    @Override
+    public InputStream getResourceAsStream(String resName) {
+        return ShaderPackDefault.class.getResourceAsStream(resName);
+    }
+}

src/main/java/com/gtnewhorizons/angelica/client/ShaderPackFolder.java

@@ -0,0 +1,29 @@
+package com.gtnewhorizons.angelica.client;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+public class ShaderPackFolder implements IShaderPack {
+
+    protected File packFile;
+
+    public ShaderPackFolder(String name, File file) {
+        packFile = file;
+    }
+
+    @Override
+    public void close() {}
+
+    @Override
+    public InputStream getResourceAsStream(String resName) {
+        try {
+            File resFile = new File(packFile, resName.substring(1));
+            if (resFile != null) {
+                return new BufferedInputStream(new FileInputStream(resFile));
+            }
+        } catch (Exception excp) {}
+        return null;
+    }
+}

src/main/java/com/gtnewhorizons/angelica/client/ShaderPackNone.java

@@ -0,0 +1,16 @@
+package com.gtnewhorizons.angelica.client;
+
+import java.io.InputStream;
+
+public class ShaderPackNone implements IShaderPack {
+
+    public ShaderPackNone() {}
+
+    @Override
+    public void close() {}
+
+    @Override
+    public InputStream getResourceAsStream(String resName) {
+        return null;
+    }
+}

src/main/java/com/gtnewhorizons/angelica/client/ShaderPackZip.java

@@ -0,0 +1,45 @@
+package com.gtnewhorizons.angelica.client;
+
+import java.io.File;
+import java.io.InputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+public class ShaderPackZip implements IShaderPack {
+
+    protected File packFile;
+    protected ZipFile packZipFile;
+
+    public ShaderPackZip(String name, File file) {
+        packFile = file;
+        packZipFile = null;
+    }
+
+    @Override
+    public void close() {
+        if (packZipFile != null) {
+            try {
+                packZipFile.close();
+            } catch (Exception excp) {}
+            packZipFile = null;
+        }
+    }
+
+    @Override
+    public InputStream getResourceAsStream(String resName) {
+        if (packZipFile == null) {
+            try {
+                packZipFile = new ZipFile(packFile);
+            } catch (Exception excp) {}
+        }
+        if (packZipFile != null) {
+            try {
+                ZipEntry entry = packZipFile.getEntry(resName.substring(1));
+                if (entry != null) {
+                    return packZipFile.getInputStream(entry);
+                }
+            } catch (Exception excp) {}
+        }
+        return null;
+    }
+}

src/main/java/com/gtnewhorizons/angelica/client/ShadersRender.java

@@ -0,0 +1,90 @@
+package com.gtnewhorizons.angelica.client;
+
+import java.nio.IntBuffer;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockIce;
+import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.client.renderer.ItemRenderer;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.culling.Frustrum;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+
+import org.lwjgl.opengl.GL11;
+
+import com.gtnewhorizons.angelica.mixins.early.accessors.WorldRenderersAccessor;
+
+public class ShadersRender {
+
+    public static void setFrustrumPosition(Frustrum frustrum, double x, double y, double z) {
+        frustrum.setPosition(x, y, z);
+    }
+
+    public static void clipRenderersByFrustrum(RenderGlobal renderGlobal, Frustrum frustrum, float par2) {
+        Shaders.checkGLError("pre clip");
+        WorldRenderer[] worldRenderers = ((WorldRenderersAccessor) renderGlobal).getWorldRenderers();
+        if (!Shaders.isShadowPass) {
+            for (WorldRenderer worldRenderer : worldRenderers) {
+                if (!worldRenderer.skipAllRenderPasses()) {
+                    worldRenderer.updateInFrustum(frustrum);
+                }
+            }
+        } else {
+            for (WorldRenderer worldRenderer : worldRenderers) {
+                if (!worldRenderer.skipAllRenderPasses()) {
+                    worldRenderer.isInFrustum = true;
+                }
+            }
+        }
+    }
+
+    public static void renderHand0(EntityRenderer er, float par1, int par2) {
+        if (!Shaders.isShadowPass) {
+            Item item = (Shaders.itemToRender != null) ? Shaders.itemToRender.getItem() : null;
+            Block block = (item instanceof ItemBlock) ? ((ItemBlock) item).field_150939_a : null;
+            // ItemCloth is for semitransparent block : stained glass, wool
+            if (!(item instanceof ItemBlock) && !(block instanceof BlockIce)) {
+                Shaders.readCenterDepth();
+                Shaders.beginHand();
+                er.renderHand(par1, par2);
+                Shaders.endHand();
+                Shaders.isHandRendered = true;
+            }
+        }
+    }
+
+    public static void renderHand1(EntityRenderer er, float par1, int par2) {
+        if (!Shaders.isShadowPass) {
+            if (!Shaders.isHandRendered) {
+                Shaders.readCenterDepth();
+                GL11.glEnable(GL11.GL_BLEND);
+                Shaders.beginHand();
+                er.renderHand(par1, par2);
+                Shaders.endHand();
+                Shaders.isHandRendered = true;
+            }
+        }
+    }
+
+    public static void renderItemFP(ItemRenderer itemRenderer, float par1) {
+        // clear depth buffer locally
+        GL11.glDepthFunc(GL11.GL_GEQUAL);
+        GL11.glPushMatrix();
+        IntBuffer drawBuffers = Shaders.activeDrawBuffers;
+        Shaders.setDrawBuffers(Shaders.drawBuffersNone);
+        itemRenderer.renderItemInFirstPerson(par1);
+        Shaders.setDrawBuffers(drawBuffers);
+        GL11.glPopMatrix();
+        GL11.glDepthFunc(GL11.GL_LEQUAL);
+        // really render item or hand
+        itemRenderer.renderItemInFirstPerson(par1);
+    }
+
+    public static void renderFPOverlay(EntityRenderer er, float par1, int par2) {
+        Shaders.beginFPOverlay();
+        er.renderHand(par1, par2);
+        Shaders.endFPOverlay();
+    }
+}

src/main/java/com/gtnewhorizons/angelica/client/ShadersTess.java

@@ -0,0 +1,267 @@
+package com.gtnewhorizons.angelica.client;
+
+import static org.lwjgl.opengl.ARBVertexShader.glDisableVertexAttribArrayARB;
+import static org.lwjgl.opengl.ARBVertexShader.glEnableVertexAttribArrayARB;
+import static org.lwjgl.opengl.ARBVertexShader.glVertexAttribPointerARB;
+
+import java.nio.FloatBuffer;
+import java.nio.ShortBuffer;
+import java.util.Arrays;
+
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL13;
+
+import com.gtnewhorizons.angelica.mixins.interfaces.TessellatorAccessor;
+import com.gtnewhorizons.angelica.transform.ALog;
+
+public class ShadersTess {
+
+    public static final int vertexStride = 16;
+
+    public static int draw(Tessellator tess) {
+        final TessellatorAccessor tessa = (TessellatorAccessor) tess;
+        if (!tess.isDrawing) {
+            throw new IllegalStateException("Not tesselating!");
+        } else {
+            tess.isDrawing = false;
+            if (tess.drawMode == GL11.GL_QUADS && tess.vertexCount % 4 != 0) {
+                ALog.warning("%s", "bad vertexCount");
+            }
+            int voffset = 0;
+            int realDrawMode = tess.drawMode;
+            while (voffset < tess.vertexCount) {
+                int vcount;
+                vcount = Math.min(
+                        tess.vertexCount - voffset,
+                        tessa.getAngelica$byteBuffer().capacity() / (vertexStride * 4));
+                if (realDrawMode == GL11.GL_QUADS) vcount = vcount / 4 * 4;
+                tessa.getAngelica$floatBuffer().clear();
+                tessa.getAngelica$shortBuffer().clear();
+                tessa.getAngelica$intBuffer().clear();
+                tessa.getAngelica$intBuffer().put(tess.rawBuffer, voffset * vertexStride, vcount * vertexStride);
+                tessa.getAngelica$byteBuffer().position(0);
+                tessa.getAngelica$byteBuffer().limit(vcount * (vertexStride * 4));
+                voffset += vcount;
+
+                if (tess.hasTexture) {
+                    tessa.getAngelica$floatBuffer().position(3);
+                    GL11.glTexCoordPointer(2, (vertexStride * 4), tessa.getAngelica$floatBuffer());
+                    GL11.glEnableClientState(GL11.GL_TEXTURE_COORD_ARRAY);
+                }
+                if (tess.hasBrightness) {
+                    OpenGlHelper.setClientActiveTexture(OpenGlHelper.lightmapTexUnit);
+                    tessa.getAngelica$shortBuffer().position(6 * 2);
+                    GL11.glTexCoordPointer(2, (vertexStride * 4), tessa.getAngelica$shortBuffer());
+                    GL11.glEnableClientState(GL11.GL_TEXTURE_COORD_ARRAY);
+                    OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit);
+                }
+                if (tess.hasColor) {
+                    tessa.getAngelica$byteBuffer().position(5 * 4);
+                    GL11.glColorPointer(4, true, (vertexStride * 4), tessa.getAngelica$byteBuffer());
+                    GL11.glEnableClientState(GL11.GL_COLOR_ARRAY);
+                }
+                if (tess.hasNormals) {
+                    tessa.getAngelica$floatBuffer().position(9);
+                    GL11.glNormalPointer((vertexStride * 4), tessa.getAngelica$floatBuffer());
+                    GL11.glEnableClientState(GL11.GL_NORMAL_ARRAY);
+                }
+                tessa.getAngelica$floatBuffer().position(0);
+                GL11.glVertexPointer(3, (vertexStride * 4), tessa.getAngelica$floatBuffer());
+                ShadersTess.preDrawArray(tess);
+
+                GL11.glEnableClientState(GL11.GL_VERTEX_ARRAY);
+                GL11.glDrawArrays(realDrawMode, 0, vcount);
+            }
+            // end loop
+
+            GL11.glDisableClientState(GL11.GL_VERTEX_ARRAY);
+            ShadersTess.postDrawArray(tess);
+            if (tess.hasTexture) {
+                GL11.glDisableClientState(GL11.GL_TEXTURE_COORD_ARRAY);
+            }
+            if (tess.hasBrightness) {
+                OpenGlHelper.setClientActiveTexture(OpenGlHelper.lightmapTexUnit);
+                GL11.glDisableClientState(GL11.GL_TEXTURE_COORD_ARRAY);
+                OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit);
+            }
+            if (tess.hasColor) {
+                GL11.glDisableClientState(GL11.GL_COLOR_ARRAY);
+            }
+            if (tess.hasNormals) {
+                GL11.glDisableClientState(GL11.GL_NORMAL_ARRAY);
+            }
+
+            int n = tess.rawBufferIndex * 4;
+            tess.reset();
+            return n;
+        }
+    }
+
+    public static void preDrawArray(Tessellator tess) {
+        final TessellatorAccessor tessa = (TessellatorAccessor) tess;
+        // Shaders.checkGLError("preDrawArray");
+        if (Shaders.useMultiTexCoord3Attrib && tess.hasTexture) {
+            GL13.glClientActiveTexture(GL13.GL_TEXTURE3);
+            GL11.glTexCoordPointer(2, (vertexStride * 4), (FloatBuffer) tessa.getAngelica$floatBuffer().position(12));
+            GL11.glEnableClientState(GL11.GL_TEXTURE_COORD_ARRAY);
+            GL13.glClientActiveTexture(GL13.GL_TEXTURE0);
+        }
+        if (Shaders.useMidTexCoordAttrib && tess.hasTexture) {
+            glVertexAttribPointerARB(
+                    Shaders.midTexCoordAttrib,
+                    2,
+                    false,
+                    vertexStride * 4,
+                    (FloatBuffer) tessa.getAngelica$floatBuffer().position(12));
+            glEnableVertexAttribArrayARB(Shaders.midTexCoordAttrib);
+        }
+        if (Shaders.useEntityAttrib) {
+            glVertexAttribPointerARB(
+                    Shaders.entityAttrib,
+                    3,
+                    false,
+                    false,
+                    vertexStride * 4,
+                    (ShortBuffer) tessa.getAngelica$shortBuffer().position(7 * 2));
+            glEnableVertexAttribArrayARB(Shaders.entityAttrib);
+        }
+        // Shaders.checkGLError("preDrawArray");
+    }
+
+    public static void preDrawArrayVBO(Tessellator tess) {
+        // Shaders.checkGLError("preDrawArray");
+        if (Shaders.useMultiTexCoord3Attrib && tess.hasTexture) {
+            GL13.glClientActiveTexture(GL13.GL_TEXTURE3);
+            GL11.glTexCoordPointer(2, GL11.GL_FLOAT, (vertexStride * 4), 12 * 4L);
+            GL11.glEnableClientState(GL11.GL_TEXTURE_COORD_ARRAY);
+            GL13.glClientActiveTexture(GL13.GL_TEXTURE0);
+        }
+        if (Shaders.useMidTexCoordAttrib && tess.hasTexture) {
+            glVertexAttribPointerARB(Shaders.midTexCoordAttrib, 2, GL11.GL_FLOAT, false, vertexStride * 4, 12 * 4L);
+            glEnableVertexAttribArrayARB(Shaders.midTexCoordAttrib);
+        }
+        if (Shaders.useEntityAttrib) {
+            glVertexAttribPointerARB(Shaders.entityAttrib, 3, GL11.GL_SHORT, false, vertexStride * 4, 7 * 4L);
+            glEnableVertexAttribArrayARB(Shaders.entityAttrib);
+        }
+        // Shaders.checkGLError("preDrawArray");
+    }
+
+    public static void postDrawArray(Tessellator tess) {
+        // Shaders.checkGLError("postDrawArray");
+        if (Shaders.useEntityAttrib) {
+            glDisableVertexAttribArrayARB(Shaders.entityAttrib);
+        }
+        if (Shaders.useMidTexCoordAttrib && tess.hasTexture) {
+            glDisableVertexAttribArrayARB(Shaders.midTexCoordAttrib);
+        }
+        if (Shaders.useMultiTexCoord3Attrib && tess.hasTexture) {
+            GL13.glClientActiveTexture(GL13.GL_TEXTURE3);
+            GL11.glDisableClientState(GL11.GL_TEXTURE_COORD_ARRAY);
+            GL13.glClientActiveTexture(GL13.GL_TEXTURE0);
+        }
+        // Shaders.checkGLError("postDrawArray");
+    }
+
+    public static void addVertex(Tessellator tess, double parx, double pary, double parz) {
+        final TessellatorAccessor tessa = (TessellatorAccessor) (Object) tess;
+        int[] rawBuffer = tess.rawBuffer;
+        int rbi = tess.rawBufferIndex;
+        float fx = (float) (parx + tess.xOffset);
+        float fy = (float) (pary + tess.yOffset);
+        float fz = (float) (parz + tess.zOffset);
+        // Check if buffer is nearly full
+        if (rbi >= tess.bufferSize - vertexStride * 4) {
+            if (tess.bufferSize >= 0x1000000) {
+                // Max size reached. Just draw.
+                if (tess.addedVertices % 4 == 0) {
+                    tess.draw();
+                    tess.isDrawing = true;
+                }
+            } else if (tess.bufferSize > 0) {
+                // Expand
+                tess.bufferSize *= 2;
+                tess.rawBuffer = rawBuffer = Arrays.copyOf(tess.rawBuffer, tess.bufferSize);
+                System.out.format("Expand tesselator buffer %d\n", tess.bufferSize);
+            } else {
+                // Initialize
+                tess.bufferSize = 0x10000;
+                tess.rawBuffer = rawBuffer = new int[tess.bufferSize];
+            }
+        }
+
+        // shaders mod calculate normal and mid UV
+        if (tess.drawMode == 7) {
+            int i = tess.addedVertices % 4;
+            float[] vertexPos = tessa.getAngelica$vertexPos();
+            vertexPos[i * 4 + 0] = fx;
+            vertexPos[i * 4 + 1] = fy;
+            vertexPos[i * 4 + 2] = fz;
+            if (i == 3) {
+                // calculate normal
+                float x1 = vertexPos[8 + 0] - vertexPos[+0];
+                float y1 = vertexPos[8 + 1] - vertexPos[+1];
+                float z1 = vertexPos[8 + 2] - vertexPos[+2];
+                float x2 = vertexPos[12 + 0] - vertexPos[4 + 0];
+                float y2 = vertexPos[12 + 1] - vertexPos[4 + 1];
+                float z2 = vertexPos[12 + 2] - vertexPos[4 + 2];
+                float vnx = y1 * z2 - y2 * z1;
+                float vny = z1 * x2 - z2 * x1;
+                float vnz = x1 * y2 - x2 * y1;
+                float lensq = vnx * vnx + vny * vny + vnz * vnz;
+                float mult = (lensq != 0.0) ? (float) (1f / Math.sqrt(lensq)) : 1f;
+                float normalX = vnx * mult;
+                float normalY = vny * mult;
+                float normalZ = vnz * mult;
+                tessa.setAngelica$normalX(normalX);
+                tessa.setAngelica$normalY(normalY);
+                tessa.setAngelica$normalZ(normalZ);
+                rawBuffer[rbi + (9 - vertexStride * 3)] = rawBuffer[rbi + (9 - vertexStride * 2)] = rawBuffer[rbi
+                        + (9 - vertexStride * 1)] = Float.floatToRawIntBits(normalX);
+                rawBuffer[rbi + (10 - vertexStride * 3)] = rawBuffer[rbi + (10 - vertexStride * 2)] = rawBuffer[rbi
+                        + (10 - vertexStride * 1)] = Float.floatToRawIntBits(normalY);
+                rawBuffer[rbi + (11 - vertexStride * 3)] = rawBuffer[rbi + (11 - vertexStride * 2)] = rawBuffer[rbi
+                        + (11 - vertexStride * 1)] = Float.floatToRawIntBits(normalZ);
+                tess.hasNormals = true;
+                // mid UV
+                tessa.setAngelica$midTextureU(
+                        (Float.intBitsToFloat(rawBuffer[rbi + (3 - vertexStride * 3)])
+                                + Float.intBitsToFloat(rawBuffer[rbi + (3 - vertexStride * 2)])
+                                + Float.intBitsToFloat(rawBuffer[rbi + (3 - vertexStride * 1)])
+                                + (float) tess.textureU) / 4);
+                tessa.setAngelica$midTextureV(
+                        (Float.intBitsToFloat(rawBuffer[rbi + (4 - vertexStride * 3)])
+                                + Float.intBitsToFloat(rawBuffer[rbi + (4 - vertexStride * 2)])
+                                + Float.intBitsToFloat(rawBuffer[rbi + (4 - vertexStride * 1)])
+                                + (float) tess.textureV) / 4);
+                rawBuffer[rbi + (12 - vertexStride * 3)] = rawBuffer[rbi + (12 - vertexStride * 2)] = rawBuffer[rbi
+                        + (12 - vertexStride * 1)] = Float.floatToRawIntBits(tessa.getAngelica$midTextureU());
+                rawBuffer[rbi + (13 - vertexStride * 3)] = rawBuffer[rbi + (13 - vertexStride * 2)] = rawBuffer[rbi
+                        + (13 - vertexStride * 1)] = Float.floatToRawIntBits(tessa.getAngelica$midTextureV());
+            }
+        }
+        // end normal and mid UV calculation
+
+        ++tess.addedVertices;
+        rawBuffer[rbi + 0] = Float.floatToRawIntBits((float) fx);
+        rawBuffer[rbi + 1] = Float.floatToRawIntBits((float) fy);
+        rawBuffer[rbi + 2] = Float.floatToRawIntBits((float) fz);
+        rawBuffer[rbi + 3] = Float.floatToRawIntBits((float) tess.textureU);
+        rawBuffer[rbi + 4] = Float.floatToRawIntBits((float) tess.textureV);
+        rawBuffer[rbi + 5] = tess.color;
+        rawBuffer[rbi + 6] = tess.brightness;
+        rawBuffer[rbi + 7] = Shaders.getEntityData();
+        rawBuffer[rbi + 8] = Shaders.getEntityData2();
+        rawBuffer[rbi + 9] = Float.floatToRawIntBits((float) tessa.getAngelica$normalX());
+        rawBuffer[rbi + 10] = Float.floatToRawIntBits((float) tessa.getAngelica$normalY());
+        rawBuffer[rbi + 11] = Float.floatToRawIntBits((float) tessa.getAngelica$normalZ());
+        rawBuffer[rbi + 12] = Float.floatToRawIntBits((float) tessa.getAngelica$midTextureU());
+        rawBuffer[rbi + 13] = Float.floatToRawIntBits((float) ((TessellatorAccessor) tess).getAngelica$midTextureV());
+
+        tess.rawBufferIndex = rbi += vertexStride;
+        ++tess.vertexCount;
+    }
+}

src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java

@@ -1,589 +0,0 @@
-package com.gtnewhorizons.angelica.client.font;
-
-import com.gtnewhorizons.angelica.compat.lwjgl.CompatMemoryUtil;
-import com.gtnewhorizons.angelica.glsm.GLStateManager;
-import com.gtnewhorizons.angelica.mixins.interfaces.FontRendererAccessor;
-import it.unimi.dsi.fastutil.chars.Char2ShortOpenHashMap;
-import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import jss.util.RandomXoshiro256StarStar;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.util.MathHelper;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.BufferUtils;
-import org.lwjgl.opengl.GL11;
-
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Objects;
-
-/**
- * A batching replacement for {@code FontRenderer}
- *
- * @author eigenraven
- */
-public class BatchingFontRenderer {
-
-    /** The underlying FontRenderer object that's being accelerated */
-    protected FontRenderer underlying;
-    /** Cached locations for each unicode page atlas */
-    private final ResourceLocation[] unicodePageLocations;
-    /** Array of width of all the characters in default.png */
-    protected int[] charWidth = new int[256];
-    /** Array of the start/end column (in upper/lower nibble) for every glyph in the /font directory. */
-    protected byte[] glyphWidth;
-    /**
-     * Array of RGB triplets defining the 16 standard chat colors followed by 16 darker version of the same colors for
-     * drop shadows.
-     */
-    private int[] colorCode;
-    /** Location of the primary font atlas to bind. */
-    protected final ResourceLocation locationFontTexture;
-    /** The RenderEngine used to load and setup glyph textures. */
-    private final TextureManager renderEngine;
-    private final RandomXoshiro256StarStar fontRandom = new RandomXoshiro256StarStar();
-
-    /** The full list of characters present in the default Minecraft font, excluding the Unicode font */
-    @SuppressWarnings("UnnecessaryUnicodeEscape")
-    private static final String MCFONT_CHARS = "\u00c0\u00c1\u00c2\u00c8\u00ca\u00cb\u00cd\u00d3\u00d4\u00d5\u00da\u00df\u00e3\u00f5\u011f\u0130\u0131\u0152\u0153\u015e\u015f\u0174\u0175\u017e\u0207\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb\u00e8\u00ef\u00ee\u00ec\u00c4\u00c5\u00c9\u00e6\u00c6\u00f4\u00f6\u00f2\u00fb\u00f9\u00ff\u00d6\u00dc\u00f8\u00a3\u00d8\u00d7\u0192\u00e1\u00ed\u00f3\u00fa\u00f1\u00d1\u00aa\u00ba\u00bf\u00ae\u00ac\u00bd\u00bc\u00a1\u00ab\u00bb\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255d\u255c\u255b\u2510\u2514\u2534\u252c\u251c\u2500\u253c\u255e\u255f\u255a\u2554\u2569\u2566\u2560\u2550\u256c\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256b\u256a\u2518\u250c\u2588\u2584\u258c\u2590\u2580\u03b1\u03b2\u0393\u03c0\u03a3\u03c3\u03bc\u03c4\u03a6\u0398\u03a9\u03b4\u221e\u2205\u2208\u2229\u2261\u00b1\u2265\u2264\u2320\u2321\u00f7\u2248\u00b0\u2219\u00b7\u221a\u207f\u00b2\u25a0\u0000";
-
-    private static final short[] MCFONT_ASCII_LUT = new short[512];
-    private static final Char2ShortOpenHashMap MCFONT_UNI_LUT = new Char2ShortOpenHashMap();
-
-    static {
-        Arrays.fill(MCFONT_ASCII_LUT, (short) -1);
-        for (short i = 0; i < MCFONT_CHARS.length(); i++) {
-            char ch = MCFONT_CHARS.charAt(i);
-            if (ch < MCFONT_ASCII_LUT.length) {
-                MCFONT_ASCII_LUT[ch] = i;
-            } else {
-                MCFONT_UNI_LUT.put(ch, i);
-            }
-        }
-    }
-
-    public static int lookupMcFontPosition(char ch) {
-        if (ch < MCFONT_ASCII_LUT.length) {
-            return MCFONT_ASCII_LUT[ch];
-        } else {
-            return MCFONT_UNI_LUT.getOrDefault(ch, (short) -1);
-        }
-    }
-
-    public BatchingFontRenderer(FontRenderer underlying, ResourceLocation[] unicodePageLocations, int[] charWidth,
-        byte[] glyphWidth, int[] colorCode, ResourceLocation locationFontTexture, TextureManager renderEngine) {
-        this.underlying = underlying;
-        this.unicodePageLocations = unicodePageLocations;
-        this.charWidth = charWidth;
-        this.glyphWidth = glyphWidth;
-        this.colorCode = colorCode;
-        this.locationFontTexture = locationFontTexture;
-        this.renderEngine = renderEngine;
-
-        for (int i = 0; i < 64; i++) {
-            batchCommandPool.add(new FontDrawCmd());
-        }
-    }
-
-    // === Batched rendering
-
-    private int batchDepth = 0;
-
-    private int vtxWriterIndex = 0;
-    private int idxWriterIndex = 0;
-    private static final int INITIAL_BATCH_SIZE = 256;
-    private static final ResourceLocation DUMMY_RESOURCE_LOCATION = new ResourceLocation("angelica$dummy",
-        "this is invalid!");
-    private FloatBuffer batchVtxPositions = BufferUtils.createFloatBuffer(INITIAL_BATCH_SIZE * 2);
-    private ByteBuffer batchVtxColors = BufferUtils.createByteBuffer(INITIAL_BATCH_SIZE * 4);
-    private FloatBuffer batchVtxTexCoords = BufferUtils.createFloatBuffer(INITIAL_BATCH_SIZE * 2);
-    private IntBuffer batchIndices = BufferUtils.createIntBuffer(INITIAL_BATCH_SIZE / 2 * 3);
-    private final ObjectArrayList<FontDrawCmd> batchCommands = ObjectArrayList.wrap(new FontDrawCmd[64], 0);
-    private final ObjectArrayList<FontDrawCmd> batchCommandPool = ObjectArrayList.wrap(new FontDrawCmd[64], 0);
-
-    /**  */
-    private void pushVtx(float x, float y, int rgba, float u, float v) {
-        final int oldCap = batchVtxPositions.capacity() / 2;
-        if (vtxWriterIndex >= oldCap) {
-            final int newCap = oldCap * 2;
-            batchVtxPositions = CompatMemoryUtil.memReallocDirect(batchVtxPositions, newCap * 2);
-            batchVtxColors = CompatMemoryUtil.memReallocDirect(batchVtxColors, newCap * 4);
-            batchVtxTexCoords = CompatMemoryUtil.memReallocDirect(batchVtxTexCoords, newCap * 2);
-            final int oldIdxCap = batchIndices.capacity();
-            final int newIdxCap = oldIdxCap * 2;
-            batchIndices = CompatMemoryUtil.memReallocDirect(batchIndices, newIdxCap);
-        }
-        final int idx = vtxWriterIndex;
-        final int idx2 = idx * 2;
-        final int idx4 = idx * 4;
-        batchVtxPositions.put(idx2, x);
-        batchVtxPositions.put(idx2 + 1, y);
-        // 0xAARRGGBB
-        batchVtxColors.put(idx4, (byte) ((rgba >> 16) & 0xFF));
-        batchVtxColors.put(idx4 + 1, (byte) ((rgba >> 8) & 0xFF));
-        batchVtxColors.put(idx4 + 2, (byte) (rgba & 0xFF));
-        batchVtxColors.put(idx4 + 3, (byte) ((rgba >> 24) & 0xFF));
-        batchVtxTexCoords.put(idx2, u);
-        batchVtxTexCoords.put(idx2 + 1, v);
-        vtxWriterIndex++;
-    }
-
-    private void pushUntexRect(float x, float y, float w, float h, int rgba) {
-        final int vtxId = vtxWriterIndex;
-        pushVtx(x, y, rgba, 0, 0);
-        pushVtx(x, y + h, rgba, 0, 0);
-        pushVtx(x + w, y, rgba, 0, 0);
-        pushVtx(x + w, y + h, rgba, 0, 0);
-        pushQuadIdx(vtxId);
-    }
-
-    private int pushQuadIdx(int startV) {
-        final int idx = idxWriterIndex;
-        batchIndices.put(idx, startV);
-        batchIndices.put(idx + 1, startV + 1);
-        batchIndices.put(idx + 2, startV + 2);
-        //
-        batchIndices.put(idx + 3, startV + 2);
-        batchIndices.put(idx + 4, startV + 1);
-        batchIndices.put(idx + 5, startV + 3);
-        idxWriterIndex += 6;
-        return idx;
-    }
-
-    private void pushDrawCmd(int startIdx, int idxCount, ResourceLocation texture) {
-        if (!batchCommands.isEmpty()) {
-            final FontDrawCmd lastCmd = batchCommands.get(batchCommands.size() - 1);
-            final int prevEndVtx = lastCmd.startVtx + lastCmd.idxCount;
-            if (prevEndVtx == startIdx && lastCmd.texture == texture) {
-                // Coalesce into one
-                lastCmd.idxCount += idxCount;
-                return;
-            }
-        }
-        if (batchCommandPool.isEmpty()) {
-            for (int i = 0; i < 64; i++) {
-                batchCommandPool.add(new FontDrawCmd());
-            }
-        }
-        final FontDrawCmd cmd = batchCommandPool.pop();
-        cmd.reset(startIdx, idxCount, texture);
-        batchCommands.add(cmd);
-    }
-
-    private static final class FontDrawCmd {
-
-        public int startVtx;
-        public int idxCount;
-        public ResourceLocation texture;
-
-        public void reset(int startVtx, int vtxCount, ResourceLocation texture) {
-            this.startVtx = startVtx;
-            this.idxCount = vtxCount;
-            this.texture = texture;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (obj == this) return true;
-            if (obj == null || obj.getClass() != this.getClass()) return false;
-            var that = (FontDrawCmd) obj;
-            return this.startVtx == that.startVtx && this.idxCount == that.idxCount && Objects.equals(this.texture,
-                that.texture);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(startVtx, idxCount, texture);
-        }
-
-        @Override
-        public String toString() {
-            return "FontDrawCmd["
-                + "startVtx="
-                + startVtx
-                + ", "
-                + "vtxCount="
-                + idxCount
-                + ", "
-                + "texture="
-                + texture
-                + ']';
-        }
-
-        public static final Comparator<FontDrawCmd> DRAW_ORDER_COMPARATOR = Comparator.comparing((FontDrawCmd fdc) -> fdc.texture,
-            Comparator.nullsLast(Comparator.comparing(ResourceLocation::getResourceDomain)
-                .thenComparing(ResourceLocation::getResourcePath))).thenComparing(fdc -> fdc.startVtx);
-    }
-
-    /**
-     * Starts a new batch of font rendering operations. Can be called from within another batch with a matching end, to
-     * allow for easier optimizing of blocks of font rendering code.
-     */
-    public void beginBatch() {
-        if (batchDepth == Integer.MAX_VALUE) {
-            throw new StackOverflowError("More than Integer.MAX_VALUE nested font rendering batch operations");
-        }
-        batchDepth++;
-    }
-
-    public void endBatch() {
-        if (batchDepth <= 0) {
-            batchDepth = 0;
-            return;
-        }
-        batchDepth--;
-        if (batchDepth == 0) {
-            // We finished any nested batches
-            flushBatch();
-        }
-    }
-
-    private void flushBatch() {
-        // Sort&Draw
-        batchCommands.sort(FontDrawCmd.DRAW_ORDER_COMPARATOR);
-
-        final boolean isTextureEnabledBefore = GLStateManager.glIsEnabled(GL11.GL_TEXTURE_2D);
-        final int boundTextureBefore = GLStateManager.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
-        boolean textureChanged = false;
-
-        ResourceLocation lastTexture = DUMMY_RESOURCE_LOCATION;
-        GLStateManager.enableTexture();
-        GLStateManager.enableAlphaTest();
-        GLStateManager.enableBlend();
-        GLStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
-        GLStateManager.glShadeModel(GL11.GL_FLAT);
-
-        GL11.glTexCoordPointer(2, 0, batchVtxTexCoords);
-        GL11.glEnableClientState(GL11.GL_TEXTURE_COORD_ARRAY);
-        GL11.glColorPointer(4, GL11.GL_UNSIGNED_BYTE, 0, batchVtxColors);
-        GL11.glEnableClientState(GL11.GL_COLOR_ARRAY);
-        GL11.glVertexPointer(2, 0, batchVtxPositions);
-        GL11.glEnableClientState(GL11.GL_VERTEX_ARRAY);
-        GLStateManager.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-
-        // Use plain for loop to avoid allocations
-        final FontDrawCmd[] cmdsData = batchCommands.elements();
-        final int cmdsSize = batchCommands.size();
-        for (int i = 0; i < cmdsSize; i++) {
-            final FontDrawCmd cmd = cmdsData[i];
-            if (!Objects.equals(lastTexture, cmd.texture)) {
-                if (lastTexture == null) {
-                    GLStateManager.glEnable(GL11.GL_TEXTURE_2D);
-                } else if (cmd.texture == null) {
-                    GLStateManager.glDisable(GL11.GL_TEXTURE_2D);
-                }
-                if (cmd.texture != null) {
-                    ((FontRendererAccessor) underlying).angelica$bindTexture(cmd.texture);
-                    textureChanged = true;
-                }
-                lastTexture = cmd.texture;
-            }
-            batchIndices.limit(cmd.startVtx + cmd.idxCount);
-            batchIndices.position(cmd.startVtx);
-            GL11.glDrawElements(GL11.GL_TRIANGLES, batchIndices);
-        }
-
-        GL11.glDisableClientState(GL11.GL_TEXTURE_COORD_ARRAY);
-        GL11.glDisableClientState(GL11.GL_COLOR_ARRAY);
-        GL11.glDisableClientState(GL11.GL_VERTEX_ARRAY);
-
-        if (isTextureEnabledBefore) {
-        	GLStateManager.glEnable(GL11.GL_TEXTURE_2D);
-        }
-        if (textureChanged) {
-        	GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, boundTextureBefore);
-        }
-
-        // Clear for the next batch
-        batchCommandPool.addAll(batchCommands);
-        batchCommands.clear();
-        vtxWriterIndex = 0;
-        idxWriterIndex = 0;
-        batchIndices.limit(batchIndices.capacity());
-        batchIndices.position(0);
-    }
-
-    // === Actual text mesh generation
-
-    public static boolean charInRange(char what, char fromInclusive, char toInclusive) {
-        return (what >= fromInclusive) && (what <= toInclusive);
-    }
-
-    private ResourceLocation getUnicodePageLocation(int page) {
-        final ResourceLocation lookup = unicodePageLocations[page];
-        if (lookup == null) {
-            final ResourceLocation rl = new ResourceLocation(String.format(
-                "textures/font/unicode_page_%02x.png",
-                page));
-            unicodePageLocations[page] = rl;
-            return rl;
-        } else {
-            return lookup;
-        }
-    }
-
-    private static final char FORMATTING_CHAR = 167; // §
-
-    public float drawString(final float anchorX, final float anchorY, final int color, final boolean enableShadow,
-        final boolean unicodeFlag, final CharSequence string, int stringOffset, int stringLength) {
-        // noinspection SizeReplaceableByIsEmpty
-        if (string == null || string.length() == 0) {
-            return anchorX + (enableShadow ? 1.0f : 0.0f);
-        }
-        final int shadowColor = (color & 0xfcfcfc) >> 2 | color & 0xff000000;
-
-        this.beginBatch();
-        float curX = anchorX;
-        try {
-            final int totalStringLength = string.length();
-            stringOffset = MathHelper.clamp_int(stringOffset, 0, totalStringLength);
-            stringLength = MathHelper.clamp_int(stringLength, 0, totalStringLength - stringOffset);
-            if (stringLength <= 0) {
-                return 0;
-            }
-            final int stringEnd = stringOffset + stringLength;
-
-            int curColor = color;
-            int curShadowColor = shadowColor;
-            boolean curItalic = false;
-            boolean curRandom = false;
-            boolean curBold = false;
-            boolean curStrikethrough = false;
-            boolean curUnderline = false;
-
-            final float underlineY = anchorY + underlying.FONT_HEIGHT - 1.0f;
-            float underlineStartX = 0.0f;
-            float underlineEndX = 0.0f;
-            final float strikethroughY = anchorY + (float) (underlying.FONT_HEIGHT / 2) - 1.0F;
-            float strikethroughStartX = 0.0f;
-            float strikethroughEndX = 0.0f;
-
-            for (int charIdx = stringOffset; charIdx < stringEnd; charIdx++) {
-                char chr = string.charAt(charIdx);
-                if (chr == FORMATTING_CHAR && (charIdx + 1) < stringEnd) {
-                    final char fmtCode = Character.toLowerCase(string.charAt(charIdx + 1));
-                    charIdx++;
-
-                    if (curUnderline && underlineStartX != underlineEndX) {
-                        final int ulIdx = idxWriterIndex;
-                        pushUntexRect(underlineStartX, underlineY, underlineEndX - underlineStartX, 1.0f, curColor);
-                        pushDrawCmd(ulIdx, 6, null);
-                        underlineStartX = underlineEndX;
-                    }
-                    if (curStrikethrough && strikethroughStartX != strikethroughEndX) {
-                        final int ulIdx = idxWriterIndex;
-                        pushUntexRect(
-                            strikethroughStartX,
-                            strikethroughY,
-                            strikethroughEndX - strikethroughStartX,
-                            1.0f,
-                            curColor);
-                        pushDrawCmd(ulIdx, 6, null);
-                        strikethroughStartX = strikethroughEndX;
-                    }
-
-                    final boolean is09 = charInRange(fmtCode, '0', '9');
-                    final boolean isAF = charInRange(fmtCode, 'a', 'f');
-                    if (is09 || isAF) {
-                        curRandom = false;
-                        curBold = false;
-                        curStrikethrough = false;
-                        curUnderline = false;
-                        curItalic = false;
-
-                        final int colorIdx = is09 ? (fmtCode - '0') : (fmtCode - 'a' + 10);
-                        final int rgb = this.colorCode[colorIdx];
-                        curColor = (curColor & 0xFF000000) | (rgb & 0x00FFFFFF);
-                        final int shadowRgb = this.colorCode[colorIdx + 16];
-                        curShadowColor = (curShadowColor & 0xFF000000) | (shadowRgb & 0x00FFFFFF);
-                    } else if (fmtCode == 'k') {
-                        curRandom = true;
-                    } else if (fmtCode == 'l') {
-                        curBold = true;
-                    } else if (fmtCode == 'm') {
-                        curStrikethrough = true;
-                        strikethroughStartX = curX - 1.0f;
-                        strikethroughEndX = strikethroughStartX;
-                    } else if (fmtCode == 'n') {
-                        curUnderline = true;
-                        underlineStartX = curX - 1.0f;
-                        underlineEndX = underlineStartX;
-                    } else if (fmtCode == 'o') {
-                        curItalic = true;
-                    } else if (fmtCode == 'r') {
-                        curRandom = false;
-                        curBold = false;
-                        curStrikethrough = false;
-                        curUnderline = false;
-                        curItalic = false;
-                        curColor = color;
-                        curShadowColor = shadowColor;
-                    }
-
-                    continue;
-                }
-
-                int lutIndex = lookupMcFontPosition(chr);
-                if (curRandom && lutIndex != -1) {
-                    int randomReplacementIndex;
-                    do {
-                        randomReplacementIndex = fontRandom.nextInt(this.charWidth.length);
-                    } while (this.charWidth[lutIndex] != this.charWidth[randomReplacementIndex]);
-
-                    lutIndex = randomReplacementIndex;
-                    chr = MCFONT_CHARS.charAt(lutIndex);
-                }
-
-                final float shadowOffset = unicodeFlag ? 0.5F : 1.0F;
-
-                // Check ASCII space, NBSP, NNBSP
-                if (chr == ' ' || chr == '\u00A0' || chr == '\u202F') {
-                    curX += 4;
-                    continue;
-                }
-
-                final float uStart;
-                final float vStart;
-                final float xAdvance;
-                final float glyphW;
-                final float uSz;
-                final float vSz;
-                final float itOff = curItalic ? 1.0F : 0.0F; // italic offset
-                final ResourceLocation texture;
-
-                if (lutIndex == -1 || unicodeFlag) {
-                    if (glyphWidth[chr] == 0) {
-                        continue;
-                    }
-                    // Draw unicode char
-                    final int uniPage = chr / 256;
-                    texture = getUnicodePageLocation(uniPage);
-                    final int startColumn = this.glyphWidth[chr] >>> 4;
-                    final int endColumn = this.glyphWidth[chr] & 15;
-                    final float startColumnF = (float) startColumn;
-                    final float endColumnF = (float) (endColumn + 1);
-                    uStart = ((float) (chr % 16 * 16) + startColumnF) / 256.0f;
-                    vStart = ((float) ((chr & 255) / 16 * 16)) / 256.0f;
-                    final float chrWidth = endColumnF - startColumnF - 0.02F;
-                    glyphW = chrWidth / 2.0f + 1.0f;
-                    xAdvance = (endColumnF - startColumnF) / 2.0F + 1.0F;
-                    uSz = chrWidth / 256.0f;
-                    vSz = 15.98f / 256.0f;
-
-                } else {
-                    // Draw "ASCII" char
-                    uStart = ((lutIndex % 16) * 8) / 128.0F;
-                    vStart = (float) ((lutIndex / 16) * 8) / 128.0F;
-                    xAdvance = this.charWidth[lutIndex];
-                    if (xAdvance == 0) {
-                        continue;
-                    }
-                    glyphW = xAdvance - 0.01F;
-                    uSz = (glyphW - 1.0F) / 128.0F;
-                    vSz = 7.99F / 128.0F;
-                    texture = locationFontTexture;
-                }
-
-                final int vtxId = vtxWriterIndex;
-                final int idxId = idxWriterIndex;
-
-                int vtxCount = 0;
-
-                if (enableShadow) {
-                    pushVtx(curX + itOff + shadowOffset, anchorY + shadowOffset, curShadowColor, uStart, vStart);
-                    pushVtx(
-                        curX - itOff + shadowOffset,
-                        anchorY + 7.99F + shadowOffset,
-                        curShadowColor,
-                        uStart,
-                        vStart + vSz);
-                    pushVtx(curX + glyphW - 1.0F + itOff + shadowOffset,
-                        anchorY + shadowOffset,
-                        curShadowColor,
-                        uStart + uSz,
-                        vStart);
-                    pushVtx(curX + glyphW - 1.0F - itOff + shadowOffset,
-                        anchorY + 7.99F + shadowOffset,
-                        curShadowColor,
-                        uStart + uSz,
-                        vStart + vSz);
-                    pushQuadIdx(vtxId + vtxCount);
-                    vtxCount += 4;
-
-                    if (curBold) {
-                        final float shadowOffset2 = 2.0f * shadowOffset;
-                        pushVtx(curX + itOff + shadowOffset2, anchorY + shadowOffset, curShadowColor, uStart, vStart);
-                        pushVtx(
-                            curX - itOff + shadowOffset2,
-                            anchorY + 7.99F + shadowOffset,
-                            curShadowColor,
-                            uStart,
-                            vStart + vSz);
-                        pushVtx(
-                            curX + glyphW - 1.0F + itOff + shadowOffset2,
-                            anchorY + shadowOffset,
-                            curShadowColor,
-                            uStart + uSz,
-                            vStart);
-                        pushVtx(curX + glyphW - 1.0F - itOff + shadowOffset2,
-                            anchorY + 7.99F + shadowOffset,
-                            curShadowColor,
-                            uStart + uSz,
-                            vStart + vSz);
-                        pushQuadIdx(vtxId + vtxCount);
-                        vtxCount += 4;
-                    }
-                }
-
-                pushVtx(curX + itOff, anchorY, curColor, uStart, vStart);
-                pushVtx(curX - itOff, anchorY + 7.99F, curColor, uStart, vStart + vSz);
-                pushVtx(curX + glyphW - 1.0F + itOff, anchorY, curColor, uStart + uSz, vStart);
-                pushVtx(curX + glyphW - 1.0F - itOff, anchorY + 7.99F, curColor, uStart + uSz, vStart + vSz);
-                pushQuadIdx(vtxId + vtxCount);
-                vtxCount += 4;
-
-                if (curBold) {
-                    pushVtx(shadowOffset + curX + itOff, anchorY, curColor, uStart, vStart);
-                    pushVtx(shadowOffset + curX - itOff, anchorY + 7.99F, curColor, uStart, vStart + vSz);
-                    pushVtx(shadowOffset + curX + glyphW - 1.0F + itOff, anchorY, curColor, uStart + uSz, vStart);
-                    pushVtx(shadowOffset + curX + glyphW - 1.0F - itOff,
-                        anchorY + 7.99F,
-                        curColor,
-                        uStart + uSz,
-                        vStart + vSz);
-                    pushQuadIdx(vtxId + vtxCount);
-                    vtxCount += 4;
-                }
-
-                pushDrawCmd(idxId, vtxCount / 2 * 3, texture);
-                curX += xAdvance + (curBold ? shadowOffset : 0.0f);
-                underlineEndX = curX;
-                strikethroughEndX = curX;
-            }
-
-            if (curUnderline && underlineStartX != underlineEndX) {
-                final int ulIdx = idxWriterIndex;
-                pushUntexRect(underlineStartX, underlineY, underlineEndX - underlineStartX, 1.0f, curColor);
-                pushDrawCmd(ulIdx, 6, null);
-            }
-            if (curStrikethrough && strikethroughStartX != strikethroughEndX) {
-                final int ulIdx = idxWriterIndex;
-                pushUntexRect(
-                    strikethroughStartX,
-                    strikethroughY,
-                    strikethroughEndX - strikethroughStartX,
-                    1.0f,
-                    curColor);
-                pushDrawCmd(ulIdx, 6, null);
-            }
-
-        } finally {
-            this.endBatch();
-        }
-        return curX + (enableShadow ? 1.0f : 0.0f);
-    }
-
-}

src/main/java/com/gtnewhorizons/angelica/client/gui/ScrollableGuiScreen.java

@@ -1,29 +0,0 @@
-package com.gtnewhorizons.angelica.client.gui;
-
-import com.gtnewhorizons.angelica.compat.mojang.Element;
-import net.minecraft.client.gui.GuiScreen;
-import org.lwjgl.input.Mouse;
-
-import java.util.List;
-
-public abstract class ScrollableGuiScreen extends GuiScreen {
-    @Override
-    public void drawScreen(int mouseX, int mouseY, float partialTicks) {
-        super.drawScreen(mouseX, mouseY, partialTicks);
-        handleMouseScroll(mouseX, mouseY, partialTicks);
-    }
-
-    public abstract List<? extends Element> children();
-
-    protected void handleMouseScroll(int mouseX, int mouseY, float partialTicks) {
-        for (; !this.mc.gameSettings.touchscreen && Mouse.next(); this.mc.currentScreen.handleMouseInput()) {
-            int dWheel = Mouse.getEventDWheel();
-
-            if (dWheel != 0) {
-                for(Element child : children()) {
-                    child.mouseScrolled(mouseX, mouseY, dWheel);
-                }
-            }
-        }
-    }
-}

src/main/java/com/gtnewhorizons/angelica/common/BlockError.java

@@ -1,48 +0,0 @@
-package com.gtnewhorizons.angelica.common;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.util.IIcon;
-import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.common.MinecraftForge;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-
-/**
- * This Block is not actually getting registered. A static instance is created in AngelicaMod.
- * Actually registering the block on the client but not the server can cause block IDs to
- * different between client/server, which is not good.
-
- * We're essentially injecting the block's texture, so that we may use this block as if it were
- * any normal block for rendering purposes with RenderBlocks and such, but not have to actually
- * register it as a block.
- */
-
-public class BlockError extends Block {
-
-    public static final IIcon[] icons = new IIcon[2];
-
-    public BlockError() {
-        super(Material.rock);
-
-        MinecraftForge.EVENT_BUS.register(this);
-    }
-
-    @SubscribeEvent
-    @SideOnly(Side.CLIENT)
-    public void onTextureStitch(TextureStitchEvent.Pre event) {
-        if (event.map.getTextureType() == 0) {
-            for (int i = 0; i < icons.length; i++) {
-                icons[i] = event.map.registerIcon("angelica:error_block_" + i);
-            }
-        }
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public IIcon getIcon(int side, int meta) {
-        return meta >= 0 && meta < icons.length ? icons[meta] : null;
-    }
-
-}

src/main/java/com/gtnewhorizons/angelica/common/BlockTest.java

@@ -1,60 +0,0 @@
-package com.gtnewhorizons.angelica.common;
-
-import com.gtnewhorizon.gtnhlib.client.renderer.quad.QuadProvider;
-import com.gtnewhorizon.gtnhlib.client.renderer.util.DirectionUtil;
-import com.gtnewhorizons.angelica.mixins.interfaces.ModeledBlock;
-import com.gtnewhorizons.angelica.utils.AssetLoader;
-import lombok.Getter;
-import lombok.Setter;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-import org.jetbrains.annotations.NotNull;
-
-import static com.gtnewhorizons.angelica.models.VanillaModels.LECTERN;
-
-public class BlockTest extends Block implements ModeledBlock {
-
-    @Getter
-    @Setter
-    private QuadProvider model;
-
-    public BlockTest() {
-
-        super(Material.rock);
-        this.setBlockTextureName("missingno");
-        this.setModel((world, pos, block, meta, dir, random, color, quadPool) -> {
-            if (meta < 2 || meta > 5) meta = 2;
-            return LECTERN.models[meta - 2].getQuads(world, pos, block, meta, dir, random, color, quadPool);
-        });
-    }
-
-    @Override
-    public boolean isOpaqueCube() {
-        return false;
-    }
-
-    @Override
-    public void registerBlockIcons(IIconRegister reg) {
-        for (String s : AssetLoader.testTexs) {
-            reg.registerIcon(s);
-        }
-    }
-
-    /**
-     * Called when a block is placed using its ItemBlock. Args: World, X, Y, Z, side, hitX, hitY, hitZ, block metadata
-     */
-    @Override
-    public int onBlockPlaced(@NotNull World worldIn, int x, int y, int z, int side, float subX, float subY, float subZ, int meta) {
-
-        // Face NORTH if placed up or down
-        final ForgeDirection s = DirectionUtil.ALL_DIRECTIONS[side];
-        if (s == ForgeDirection.UP || s == ForgeDirection.DOWN)
-            return 2;
-
-        // Face the placed side
-        return side;
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/ExtendedBlockStorageExt.java

@@ -1,82 +0,0 @@
-package com.gtnewhorizons.angelica.compat;
-
-import com.falsepattern.chunk.api.DataRegistry;
-import com.gtnewhorizons.angelica.mixins.interfaces.ExtendedBlockStorageAccessor;
-import com.gtnewhorizons.angelica.mixins.interfaces.ExtendedNibbleArray;
-import com.gtnewhorizons.neid.mixins.interfaces.IExtendedBlockStorageMixin;
-
-import net.minecraft.world.chunk.Chunk;
-import net.minecraft.world.chunk.NibbleArray;
-import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
-import ru.fewizz.idextender.Hooks;
-
-public class ExtendedBlockStorageExt extends ExtendedBlockStorage {
-    public boolean hasSky;
-
-    public ExtendedBlockStorageExt(int yBase, boolean hasSky) {
-        super(yBase, hasSky);
-        this.hasSky = hasSky;
-    }
-
-    public ExtendedBlockStorageExt(Chunk chunk, ExtendedBlockStorage storage) {
-        super(((ExtendedBlockStorageAccessor) storage).getYBase(), storage.getSkylightArray() != null);
-
-        if (ModStatus.isChunkAPILoaded) {
-            if (storage.getSkylightArray() != null) {
-                hasSky = true;
-            }
-            DataRegistry.cloneSubChunk(chunk, storage, this);
-        } else {
-            int arrayLen;
-            if (ModStatus.isNEIDLoaded){
-                final short[] block16BArray = ((IExtendedBlockStorageMixin)(Object)this).getBlock16BArray();
-                System.arraycopy(((IExtendedBlockStorageMixin)(Object)storage).getBlock16BArray(), 0, block16BArray, 0, block16BArray.length);
-                if(storage.getBlockMSBArray() != null) {
-                    this.setBlockMSBArray(new NibbleArray(block16BArray.length, 4));
-                    copyNibbleArray((ExtendedNibbleArray) storage.getBlockMSBArray(), (ExtendedNibbleArray) this.getBlockMSBArray());
-                }
-                arrayLen = block16BArray.length;
-                if (ModStatus.isNEIDMetadataExtended) {
-                    final short[] block16BMetaArray = ((IExtendedBlockStorageMixin)(Object)this).getBlock16BMetaArray();
-                    System.arraycopy(((IExtendedBlockStorageMixin)(Object)storage).getBlock16BMetaArray(), 0, block16BMetaArray, 0, block16BMetaArray.length);
-                }
-            }
-            else if (ModStatus.isOldNEIDLoaded){
-                final short[] blockLSBArray = Hooks.get(this);
-                System.arraycopy(Hooks.get(storage), 0, blockLSBArray, 0, blockLSBArray.length);
-                // getBlockMSBArray is nuked in asm version
-                arrayLen = blockLSBArray.length;
-            }
-            else {
-                final byte[] blockLSBArray = this.getBlockLSBArray();
-                System.arraycopy(storage.getBlockLSBArray(), 0, blockLSBArray, 0, blockLSBArray.length);
-                if(storage.getBlockMSBArray() != null) {
-                    this.setBlockMSBArray(new NibbleArray(blockLSBArray.length, 4));
-                    copyNibbleArray((ExtendedNibbleArray) storage.getBlockMSBArray(), (ExtendedNibbleArray) this.getBlockMSBArray());
-                }
-                arrayLen = blockLSBArray.length;
-            }
-
-
-            if (!ModStatus.isNEIDMetadataExtended) copyNibbleArray((ExtendedNibbleArray) storage.getMetadataArray(), (ExtendedNibbleArray)this.getMetadataArray());
-            copyNibbleArray((ExtendedNibbleArray) storage.getBlocklightArray(), (ExtendedNibbleArray)this.getBlocklightArray());
-            if(storage.getSkylightArray() != null) {
-                hasSky = true;
-                if(this.getSkylightArray() == null) {
-                    this.setSkylightArray(new NibbleArray(arrayLen, 4));
-                }
-                copyNibbleArray((ExtendedNibbleArray) storage.getSkylightArray(), (ExtendedNibbleArray) this.getSkylightArray());
-            }
-        }
-        ((ExtendedBlockStorageAccessor) this).setBlockRefCount(((ExtendedBlockStorageAccessor) storage).getBlockRefCount());
-    }
-
-
-    private static void copyNibbleArray(ExtendedNibbleArray srcArray, ExtendedNibbleArray dstArray) {
-        if (srcArray == null || dstArray == null) {
-            throw new RuntimeException("NibbleArray is null src: " + (srcArray == null) + " dst: " + (dstArray == null));
-        }
-        final byte[] data = srcArray.getData();
-        System.arraycopy(data, 0, dstArray.getData(), 0, data.length);
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java

@@ -1,80 +0,0 @@
-package com.gtnewhorizons.angelica.compat;
-
-import com.gtnewhorizons.angelica.helpers.LoadControllerHelper;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.versioning.ArtifactVersion;
-import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
-import mods.battlegear2.Battlegear;
-import net.dries007.holoInventory.HoloInventory;
-import xonin.backhand.Backhand;
-
-public class ModStatus {
-    /**
-     * Mixin Version
-     */
-    public static boolean isNEIDLoaded;
-    /**
-     * ASM Version
-     */
-    public static boolean isOldNEIDLoaded;
-
-    public static boolean isBetterCrashesLoaded;
-    public static boolean isNEIDMetadataExtended;
-    public static boolean isLotrLoaded;
-    public static boolean isChunkAPILoaded;
-    public static boolean isEIDBiomeLoaded;
-    public static boolean isXaerosMinimapLoaded;
-    public static boolean isHoloInventoryLoaded;
-    public static boolean isBattlegearLoaded;
-    public static boolean isBackhandLoaded;
-    public static boolean isThaumcraftLoaded;
-    public static boolean isThaumicHorizonsLoaded;
-    public static boolean isBaublesLoaded;
-
-    public static void preInit(){
-        isBetterCrashesLoaded = Loader.isModLoaded("bettercrashes");
-        isNEIDLoaded = Loader.isModLoaded("neid");
-        isOldNEIDLoaded = Loader.isModLoaded("notenoughIDs");
-        isLotrLoaded = Loader.isModLoaded("lotr");
-        isChunkAPILoaded = Loader.isModLoaded("chunkapi");
-        isEIDBiomeLoaded = Loader.isModLoaded("endlessids_biome");
-        isXaerosMinimapLoaded = Loader.isModLoaded("XaeroMinimap");
-        isHoloInventoryLoaded = Loader.isModLoaded("holoinventory");
-        isBattlegearLoaded = Loader.isModLoaded("battlegear2");
-        isBackhandLoaded = Loader.isModLoaded("backhand");
-        isThaumcraftLoaded = Loader.isModLoaded("Thaumcraft");
-        isThaumicHorizonsLoaded = Loader.isModLoaded("ThaumicHorizons");
-        isBaublesLoaded = Loader.isModLoaded("Baubles");
-
-        if (isHoloInventoryLoaded){
-            isHoloInventoryLoaded = new DefaultArtifactVersion("2.4.4-GTNH")
-                .compareTo(
-                    LoadControllerHelper.getOwningMod(HoloInventory.class).getProcessedVersion()
-                ) <= 0;
-        }
-
-        // remove compat with original release of BG2
-        if (isBattlegearLoaded){
-            isBattlegearLoaded = new DefaultArtifactVersion("1.2.0")
-                .compareTo(
-                    LoadControllerHelper.getOwningMod(Battlegear.class).getProcessedVersion()
-                ) <= 0;
-        }
-
-        if (isBackhandLoaded){
-            isBackhandLoaded = new DefaultArtifactVersion("1.4.1")
-                .compareTo(
-                    LoadControllerHelper.getOwningMod(Backhand.class).getProcessedVersion()
-                ) <= 0;
-        }
-
-
-        isNEIDMetadataExtended = false;
-        if (isNEIDLoaded) {
-            int majorVersion = Integer.parseInt(Loader.instance().getIndexedModList().get("neid").getVersion().split("\\.")[0]);
-            if (majorVersion >= 2) {
-                isNEIDMetadataExtended = true;
-            }
-        }
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/bettercrashes/BetterCrashesCompat.java

@@ -1,34 +0,0 @@
-package com.gtnewhorizons.angelica.compat.bettercrashes;
-
-import com.gtnewhorizons.angelica.glsm.GLStateManager;
-import com.gtnewhorizons.angelica.mixins.interfaces.IRenderGlobalExt;
-import cpw.mods.fml.common.Optional;
-import net.minecraft.client.Minecraft;
-import vfyjxf.bettercrashes.utils.StateManager;
-
-import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER;
-
-@Optional.Interface(modid = "angelica", iface = "vfyjxf.bettercrashes.utils.StateManager.IResettable")
-public class BetterCrashesCompat implements StateManager.IResettable {
-    private static BetterCrashesCompat INSTANCE;
-
-    public static void init() {
-        if (INSTANCE == null) {
-            INSTANCE = new BetterCrashesCompat();
-        }
-    }
-
-
-    public BetterCrashesCompat() {
-        LOGGER.info("BetterCrashesCompat initialized");
-        this.register();
-    }
-
-    @Override
-    public void resetState() {
-        LOGGER.info("Reloading SodiumRenderer");
-        ((IRenderGlobalExt) Minecraft.getMinecraft().renderGlobal).reload();
-        LOGGER.info("Resetting GLStateManager");
-        GLStateManager.reset();
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/endlessids/EndlessIDsCompat.java

@@ -1,37 +0,0 @@
-package com.gtnewhorizons.angelica.compat.endlessids;
-
-import com.falsepattern.endlessids.mixin.helpers.ChunkBiomeHook;
-import lombok.val;
-
-import net.minecraft.world.chunk.Chunk;
-
-import static com.falsepattern.endlessids.constants.ExtendedConstants.biomeIDMask;
-import static com.falsepattern.endlessids.constants.ExtendedConstants.biomeIDNull;
-
-public class EndlessIDsCompat {
-    public static void sodium$populateBiomes(Chunk chunk) {
-        if (!(chunk instanceof ChunkBiomeHook hook))
-            return;
-
-        val biomes = hook.getBiomeShortArray();
-        if (biomes == null)
-            return;
-
-        val cX = chunk.xPosition << 4;
-        val cZ = chunk.zPosition << 4;
-
-        val manager = chunk.worldObj.getWorldChunkManager();
-        for(var z = 0; z < 16; z++) {
-            for(var x = 0; x < 16; x++) {
-                val idx = (z << 4) + x;
-                val biome = biomes[idx] & biomeIDMask;
-                if(biome == biomeIDNull) {
-                    val generated = manager.getBiomeGenAt(cX + x, cZ + z);
-                    if (generated == null)
-                        continue;
-                    biomes[idx] = (short)(generated.biomeID & biomeIDMask);
-                }
-            }
-        }
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/lwjgl/CompatMemoryUtil.java

@@ -1,327 +0,0 @@
-package com.gtnewhorizons.angelica.compat.lwjgl;
-
-import static com.gtnewhorizons.angelica.compat.lwjgl.Pointer.BITS64;
-
-import it.unimi.dsi.fastutil.longs.LongPredicate;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import org.lwjgl.BufferUtils;
-
-/**
- * Backported from LWJGL3 under the BSD 3-Clause "New" or "Revised" License license
- *
- * <p>This class provides functionality for managing native memory.
- *
- * <p>All methods in this class will make use of {@link sun.misc.Unsafe} if it's available, for performance. If Unsafe is not available, the fallback
- * implementations make use of reflection and, in the worst-case, JNI.</p>
- *
- * <p>Method names in this class are prefixed with {@code mem} to avoid ambiguities when used with static imports.</p>
- */
-public class CompatMemoryUtil {
-    public static final long NULL = 0;
-
-    static final sun.misc.Unsafe UNSAFE;
-
-    private static final Class<? extends ByteBuffer> BUFFER_BYTE;
-    private static final Class<? extends IntBuffer> BUFFER_INT;
-    private static final Class<? extends FloatBuffer> BUFFER_FLOAT;
-
-    private static final long MARK;
-    private static final long POSITION;
-    private static final long LIMIT;
-    private static final long CAPACITY;
-
-    private static final long ADDRESS;
-
-    static {
-        ByteBuffer bb = ByteBuffer.allocateDirect(0).order(ByteOrder.nativeOrder());
-        BUFFER_BYTE = bb.getClass();
-        BUFFER_INT = bb.asIntBuffer().getClass();
-        BUFFER_FLOAT = bb.asFloatBuffer().getClass();
-
-        UNSAFE = getUnsafeInstance();
-
-        MARK = getMarkOffset();
-        POSITION = getPositionOffset();
-        LIMIT = getLimitOffset();
-        CAPACITY = getCapacityOffset();
-
-        ADDRESS = getAddressOffset();
-    }
-
-    public static ByteBuffer memReallocDirect(ByteBuffer old, int capacity) {
-        ByteBuffer newBuf = BufferUtils.createByteBuffer(capacity);
-        int oldPos = old.position();
-        old.rewind();
-        newBuf.put(old);
-        newBuf.position(Math.min(capacity, oldPos));
-        return newBuf;
-    }
-
-    public static IntBuffer memReallocDirect(IntBuffer old, int capacity) {
-        IntBuffer newBuf = BufferUtils.createIntBuffer(capacity);
-        int oldPos = old.position();
-        old.rewind();
-        newBuf.put(old);
-        newBuf.position(Math.min(capacity, oldPos));
-        return newBuf;
-    }
-
-    public static FloatBuffer memReallocDirect(FloatBuffer old, int capacity) {
-        FloatBuffer newBuf = BufferUtils.createFloatBuffer(capacity);
-        int oldPos = old.position();
-        old.rewind();
-        newBuf.put(old);
-        newBuf.position(Math.min(capacity, oldPos));
-        return newBuf;
-    }
-
-     /* -------------------------------------
-        -------------------------------------
-               UNSAFE MEMORY ACCESS API
-        -------------------------------------
-        ------------------------------------- */
-
-    private static final int  FILL_PATTERN_32 = Integer.divideUnsigned(-1, 255);
-    private static final long FILL_PATTERN_64 = Long.divideUnsigned(-1L, 255L);
-
-    /**
-     * Sets all bytes in a specified block of memory to a fixed value (usually zero).
-     *
-     * @param ptr   the starting memory address
-     * @param value the value to set (memSet will convert it to unsigned byte)
-     * @param bytes the number of bytes to set
-     */
-    public static void memSet(long ptr, int value, long bytes) {
-        if (/*DEBUG*/ false && (ptr == NULL || bytes < 0)) {
-            throw new IllegalArgumentException();
-        }
-
-        /*
-        - Unsafe.setMemory is very slow.
-        - A custom Java loop is fastest at small sizes, approximately up to 256 bytes.
-        - The native memset becomes fastest at bigger sizes, when the JNI overhead becomes negligible.
-        TODO: verify this
-         */
-
-        //UNSAFE.setMemory(ptr, bytes, (byte)(value & 0xFF));
-        //if (bytes < 256L) {
-        int p = (int)ptr;
-        if (BITS64) {
-            if ((p & 7) == 0) {
-                memSet64(ptr, value, (int)bytes & 0xFF);
-                return;
-            }
-        } else {
-            if ((p & 3) == 0) {
-                memSet32(p, value, (int)bytes & 0xFF);
-                return;
-            }
-        }
-        //}
-        //nmemset(ptr, value, bytes);
-    }
-    private static void memSet64(long ptr, int value, int bytes) {
-        int aligned = bytes & ~7;
-
-        // Aligned body
-        long valuel = (value & 0xFF) * FILL_PATTERN_64;
-        for (int i = 0; i < aligned; i += 8) {
-            UNSAFE.putLong(null, ptr + i, valuel);
-        }
-
-        // Unaligned tail
-        byte valueb = (byte)(value & 0xFF);
-        for (int i = aligned; i < bytes; i++) {
-            UNSAFE.putByte(null, ptr + i, valueb);
-        }
-    }
-    private static void memSet32(int ptr, int value, int bytes) {
-        int aligned = bytes & ~3;
-
-        // Aligned body
-        int vi = (value & 0xFF) * FILL_PATTERN_32;
-        for (int i = 0; i < aligned; i += 4) {
-            UNSAFE.putInt(null, (ptr + i) & 0xFFFF_FFFFL, vi);
-        }
-
-        // Unaligned tail
-        byte vb = (byte)(value & 0xFF);
-        for (int i = aligned; i < bytes; i++) {
-            UNSAFE.putByte(null, (ptr + i) & 0xFFFF_FFFFL, vb);
-        }
-    }
-
-    public static boolean memGetBoolean(long ptr) { return UNSAFE.getByte(null, ptr) != 0; }
-    public static byte memGetByte(long ptr)       { return UNSAFE.getByte(null, ptr); }
-    public static short memGetShort(long ptr)     { return UNSAFE.getShort(null, ptr); }
-    public static int memGetInt(long ptr)         { return UNSAFE.getInt(null, ptr); }
-    public static long memGetLong(long ptr)       { return UNSAFE.getLong(null, ptr); }
-    public static float memGetFloat(long ptr)     { return UNSAFE.getFloat(null, ptr); }
-    public static double memGetDouble(long ptr)   { return UNSAFE.getDouble(null, ptr); }
-
-    public static void memPutByte(long ptr, byte value)     { UNSAFE.putByte(null, ptr, value); }
-    public static void memPutShort(long ptr, short value)   { UNSAFE.putShort(null, ptr, value); }
-    public static void memPutInt(long ptr, int value)       { UNSAFE.putInt(null, ptr, value); }
-    public static void memPutLong(long ptr, long value)     { UNSAFE.putLong(null, ptr, value); }
-    public static void memPutFloat(long ptr, float value)   { UNSAFE.putFloat(null, ptr, value); }
-    public static void memPutDouble(long ptr, double value) { UNSAFE.putDouble(null, ptr, value); }
-
-    // -------------------------------------------------
-    // -------------------------------------------------
-    // -------------------------------------------------
-
-    private static sun.misc.Unsafe getUnsafeInstance() {
-        java.lang.reflect.Field[] fields = sun.misc.Unsafe.class.getDeclaredFields();
-
-        /*
-        Different runtimes use different names for the Unsafe singleton,
-        so we cannot use .getDeclaredField and we scan instead. For example:
-
-        Oracle: theUnsafe
-        PERC : m_unsafe_instance
-        Android: THE_ONE
-        */
-        for (java.lang.reflect.Field field : fields) {
-            if (!field.getType().equals(sun.misc.Unsafe.class)) {
-                continue;
-            }
-
-            int modifiers = field.getModifiers();
-            if (!(java.lang.reflect.Modifier.isStatic(modifiers) && java.lang.reflect.Modifier.isFinal(modifiers))) {
-                continue;
-            }
-
-            try {
-                field.setAccessible(true);
-                return (sun.misc.Unsafe)field.get(null);
-            } catch (Exception ignored) {
-            }
-            break;
-        }
-
-        throw new UnsupportedOperationException("LWJGL requires sun.misc.Unsafe to be available.");
-    }
-
-    /**
-     * Recursively searches an object and its superclasses for a field with the same name and type. If the field isn't
-     * public, it may not be stable across library/JVM versions, and these calls are likely not portable. You have been
-     * warned!
-     */
-    private static long getFieldOffset(Class<?> containerType, Class<?> fieldType, String name) {
-        Class<?> c = containerType;
-        while (c != Object.class) {
-            Field[] fields = c.getDeclaredFields();
-            for (Field field : fields) {
-                if (!field.getType().isAssignableFrom(fieldType) || Modifier.isStatic(field.getModifiers()) || field.isSynthetic()) {
-                    continue;
-                }
-
-                long offset = UNSAFE.objectFieldOffset(field);
-                if (field.getName().equals(name)) {
-                    return offset;
-                }
-            }
-            c = c.getSuperclass();
-        }
-        throw new UnsupportedOperationException("Failed to find field offset in class.");
-    }
-
-    private static long getFieldOffset(Class<?> containerType, Class<?> fieldType, LongPredicate predicate) {
-        Class<?> c = containerType;
-        while (c != Object.class) {
-            Field[] fields = c.getDeclaredFields();
-            for (Field field : fields) {
-                if (!field.getType().isAssignableFrom(fieldType) || Modifier.isStatic(field.getModifiers()) || field.isSynthetic()) {
-                    continue;
-                }
-
-                long offset = UNSAFE.objectFieldOffset(field);
-                if (predicate.test(offset)) {
-                    return offset;
-                }
-            }
-            c = c.getSuperclass();
-        }
-        throw new UnsupportedOperationException("Failed to find field offset in class.");
-    }
-
-    private static long getFieldOffsetInt(Object container, int value) {
-        return getFieldOffset(container.getClass(), int.class, offset -> UNSAFE.getInt(container, offset) == value);
-    }
-
-    private static long getAddressOffset() {
-        final ByteBuffer bb = ByteBuffer.allocateDirect(0);
-        return getFieldOffset(bb.getClass(), long.class, "address");
-
-        // TODO: do this portably
-        // long MAGIC_ADDRESS = 0xDEADBEEF8BADF00DL & (BITS32 ? 0xFFFF_FFFFL : 0xFFFF_FFFF_FFFF_FFFFL);
-        // ByteBuffer bb = Objects.requireNonNull(NewDirectByteBuffer(MAGIC_ADDRESS, 0));
-        //return getFieldOffset(bb.getClass(), long.class, offset -> UNSAFE.getLong(bb, offset) == MAGIC_ADDRESS);
-    }
-
-    private static final int MAGIC_CAPACITY = 0x0D15EA5E;
-    private static final int MAGIC_POSITION = 0x00FACADE;
-
-    private static long getMarkOffset() {
-        // TODO: is this actually reliable without NewDirectByteBuffer?
-        ByteBuffer bb = ByteBuffer.allocateDirect(0);
-        return getFieldOffsetInt(bb, -1);
-        // ByteBuffer bb = Objects.requireNonNull(NewDirectByteBuffer(1L, 0));
-        // return getFieldOffsetInt(bb, -1);
-    }
-
-    private static long getPositionOffset() {
-        ByteBuffer bb = ByteBuffer.allocateDirect(MAGIC_CAPACITY);
-        bb.position(MAGIC_POSITION);
-        return getFieldOffsetInt(bb, MAGIC_POSITION);
-    }
-
-    private static long getLimitOffset() {
-        ByteBuffer bb = ByteBuffer.allocateDirect(MAGIC_CAPACITY);
-        bb.limit(MAGIC_POSITION);
-        return getFieldOffsetInt(bb, MAGIC_POSITION);
-    }
-
-    private static long getCapacityOffset() {
-        ByteBuffer bb = ByteBuffer.allocateDirect(MAGIC_CAPACITY);
-        bb.limit(0);
-        return getFieldOffsetInt(bb, MAGIC_CAPACITY);
-    }
-
-    static IntBuffer wrapBufferInt(long address, int capacity) {
-        IntBuffer buffer;
-        try {
-            buffer = (IntBuffer)UNSAFE.allocateInstance(BUFFER_INT);
-        } catch (InstantiationException e) {
-            throw new UnsupportedOperationException(e);
-        }
-
-        UNSAFE.putLong(buffer, ADDRESS, address);
-        UNSAFE.putInt(buffer, MARK, -1);
-        UNSAFE.putInt(buffer, LIMIT, capacity);
-        UNSAFE.putInt(buffer, CAPACITY, capacity);
-
-        return buffer;
-    }
-
-    static FloatBuffer wrapBufferFloat(long address, int capacity) {
-        FloatBuffer buffer;
-        try {
-            buffer = (FloatBuffer)UNSAFE.allocateInstance(BUFFER_FLOAT);
-        } catch (InstantiationException e) {
-            throw new UnsupportedOperationException(e);
-        }
-
-        UNSAFE.putLong(buffer, ADDRESS, address);
-        UNSAFE.putInt(buffer, MARK, -1);
-        UNSAFE.putInt(buffer, LIMIT, capacity);
-        UNSAFE.putInt(buffer, CAPACITY, capacity);
-
-        return buffer;
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/lwjgl/MemoryStack.java

@@ -1,382 +0,0 @@
-/*
- * This class is backported from LWJGL3 under the BSD 3-clause "New" or "Revised" License
- */
-
-package com.gtnewhorizons.angelica.compat.lwjgl;
-
-
-import static com.gtnewhorizons.angelica.compat.lwjgl.CompatMemoryUtil.memPutDouble;
-import static com.gtnewhorizons.angelica.compat.lwjgl.CompatMemoryUtil.memPutFloat;
-import static com.gtnewhorizons.angelica.compat.lwjgl.CompatMemoryUtil.memPutInt;
-import static com.gtnewhorizons.angelica.compat.lwjgl.CompatMemoryUtil.memPutLong;
-import static com.gtnewhorizons.angelica.compat.lwjgl.CompatMemoryUtil.memPutShort;
-import static com.gtnewhorizons.angelica.compat.lwjgl.CompatMemoryUtil.memSet;
-import static com.gtnewhorizons.angelica.compat.lwjgl.CompatMemoryUtil.wrapBufferFloat;
-import static com.gtnewhorizons.angelica.compat.lwjgl.CompatMemoryUtil.wrapBufferInt;
-
-import com.gtnewhorizons.angelica.loading.AngelicaTweaker;
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.util.Arrays;
-import org.jetbrains.annotations.Nullable;
-import org.lwjgl.BufferUtils;
-import org.lwjgl.MemoryUtil;
-
-/**
- * An off-heap memory stack.
- *
- * <p>This class should be used in a thread-local manner for stack allocations.</p>
- *
- * @ see Configuration#STACK_SIZE
- * @ see Configuration#DEBUG_STACK
- */
-@SuppressWarnings("LombokGetterMayBeUsed")
-public class MemoryStack extends Pointer.Default implements AutoCloseable {
-
-    private static final int DEFAULT_STACK_SIZE   = /*Configuration.STACK_SIZE.get(64)*/ 64 * 1024;
-    private static final int DEFAULT_STACK_FRAMES = 8;
-
-    private static final ThreadLocal<MemoryStack> TLS = ThreadLocal.withInitial(MemoryStack::create);
-
-    static {
-        if (DEFAULT_STACK_SIZE < 0) {
-            throw new IllegalStateException("Invalid stack size.");
-        }
-    }
-
-    @SuppressWarnings({"FieldCanBeLocal", "unused"})
-    private final @Nullable ByteBuffer container;
-
-    private final int size;
-
-    private int pointer;
-
-    private   int[] frames;
-    protected int   frameIndex;
-
-    /**
-     * Creates a new {@code MemoryStack} backed by the specified memory region.
-     *
-     * <p>In the initial state, there is no active stack frame. The {@link #push} method must be used before any allocations.</p>
-     *
-     * @param container the backing memory buffer, may be null
-     * @param address   the backing memory address
-     * @param size      the backing memory size
-     */
-    protected MemoryStack(@Nullable ByteBuffer container, long address, int size) {
-        super(address);
-        this.container = container;
-
-        this.size = size;
-        this.pointer = size;
-
-        this.frames = new int[DEFAULT_STACK_FRAMES];
-    }
-
-    /**
-     * Creates a new {@code MemoryStack} with the default size.
-     *
-     * <p>In the initial state, there is no active stack frame. The {@link #push} method must be used before any allocations.</p>
-     */
-    public static MemoryStack create() {
-        return create(DEFAULT_STACK_SIZE);
-    }
-
-    /**
-     * Creates a new {@code MemoryStack} with the specified size.
-     *
-     * <p>In the initial state, there is no active stack frame. The {@link #push} method must be used before any allocations.</p>
-     *
-     * @param capacity the maximum number of bytes that may be allocated on the stack
-     */
-    public static MemoryStack create(int capacity) {
-        return create(BufferUtils.createByteBuffer(capacity));
-    }
-
-    /**
-     * Creates a new {@code MemoryStack} backed by the specified memory buffer.
-     *
-     * <p>In the initial state, there is no active stack frame. The {@link #push} method must be used before any allocations.</p>
-     *
-     * @param buffer the backing memory buffer
-     */
-    public static MemoryStack create(ByteBuffer buffer) {
-        long address = MemoryUtil.getAddress(buffer);
-        int  size    = buffer.remaining();
-        return new MemoryStack(buffer, address, size);
-    }
-
-    /**
-     * Creates a new {@code MemoryStack} backed by the specified memory region.
-     *
-     * <p>In the initial state, there is no active stack frame. The {@link #push} method must be used before any allocations.</p>
-     *
-     * @param address the backing memory address
-     * @param size    the backing memory size
-     */
-    public static MemoryStack ncreate(long address, int size) {
-        return new MemoryStack(null, address, size);
-    }
-
-    /**
-     * Stores the current stack pointer and pushes a new frame to the stack.
-     *
-     * <p>This method should be called when entering a method, before doing any stack allocations. When exiting a method, call the {@link #pop} method to
-     * restore the previous stack frame.</p>
-     *
-     * <p>Pairs of push/pop calls may be nested. Care must be taken to:</p>
-     * <ul>
-     * <li>match every push with a pop</li>
-     * <li>not call pop before push has been called at least once</li>
-     * <li>not nest push calls to more than the maximum supported depth</li>
-     * </ul>
-     *
-     * @return this stack
-     */
-    public MemoryStack push() {
-        if (frameIndex == frames.length) {
-            frameOverflow();
-        }
-
-        frames[frameIndex++] = pointer;
-        return this;
-    }
-
-    private void frameOverflow() {
-        if (/*DEBUG*/ false) {
-            AngelicaTweaker.LOGGER.warn("[WARNING] Out of frame stack space (" + frames.length + ") in thread: " + Thread.currentThread());
-        }
-        frames = Arrays.copyOf(frames, frames.length * 3 / 2);
-    }
-
-    /**
-     * Pops the current stack frame and moves the stack pointer to the end of the previous stack frame.
-     *
-     * @return this stack
-     */
-    public MemoryStack pop() {
-        pointer = frames[--frameIndex];
-        return this;
-    }
-
-    /**
-     * Calls {@link #pop} on this {@code MemoryStack}.
-     *
-     * <p>This method should not be used directly. It is called automatically when the {@code MemoryStack} is used as a resource in a try-with-resources
-     * statement.</p>
-     */
-    @Override
-    public void close() {
-        //noinspection resource
-        pop();
-    }
-
-    /**
-     * Returns the address of the backing off-heap memory.
-     *
-     * <p>The stack grows "downwards", so the bottom of the stack is at {@code address + size}, while the top is at {@code address}.</p>
-     */
-    public long getAddress() {
-        return address;
-    }
-
-    /**
-     * Returns the size of the backing off-heap memory.
-     *
-     * <p>This is the maximum number of bytes that may be allocated on the stack.</p>
-     */
-    public int getSize() {
-        return size;
-    }
-
-    /**
-     * Returns the current frame index.
-     *
-     * <p>This is the current number of nested {@link #push} calls.</p>
-     */
-    public int getFrameIndex() {
-        return frameIndex;
-    }
-
-    /** Returns the memory address at the current stack pointer. */
-    public long getPointerAddress() {
-        return address + (pointer & 0xFFFF_FFFFL);
-    }
-
-    /**
-     * Returns the current stack pointer.
-     *
-     * <p>The stack grows "downwards", so when the stack is empty {@code pointer} is equal to {@code size}. On every allocation {@code pointer} is reduced by
-     * the allocated size (after alignment) and {@code address + pointer} points to the first byte of the last allocation.</p>
-     *
-     * <p>Effectively, this methods returns how many more bytes may be allocated on the stack.</p>
-     */
-    public int getPointer() {
-        return pointer;
-    }
-
-    /**
-     * Sets the current stack pointer.
-     *
-     * <p>This method directly manipulates the stack pointer. Using it irresponsibly may break the internal state of the stack. It should only be used in rare
-     * cases or in auto-generated code.</p>
-     */
-    public void setPointer(int pointer) {
-        if (/*CHECKS*/ false) {
-            checkPointer(pointer);
-        }
-
-        this.pointer = pointer;
-    }
-
-    private void checkPointer(int pointer) {
-        if (pointer < 0 || size < pointer) {
-            throw new IndexOutOfBoundsException("Invalid stack pointer");
-        }
-    }
-
-    private static void checkAlignment(int alignment) {
-        if (Integer.bitCount(alignment) != 1) {
-            throw new IllegalArgumentException("Alignment must be a power-of-two value.");
-        }
-    }
-
-    /**
-     * Calls {@link #nmalloc(int, int)} with {@code alignment} equal to {@link Pointer#POINTER_SIZE POINTER_SIZE}.
-     *
-     * @param size the allocation size
-     *
-     * @return the memory address on the stack for the requested allocation
-     */
-    public long nmalloc(int size) {
-        return nmalloc(POINTER_SIZE, size);
-    }
-
-    /**
-     * Allocates a block of {@code size} bytes of memory on the stack. The content of the newly allocated block of memory is not initialized, remaining with
-     * indeterminate values.
-     *
-     * @param alignment the required alignment
-     * @param size      the allocation size
-     *
-     * @return the memory address on the stack for the requested allocation
-     */
-    public long nmalloc(int alignment, int size) {
-        // Align address to the specified alignment
-        long address = (this.address + pointer - size) & ~Integer.toUnsignedLong(alignment - 1);
-
-        pointer = (int)(address - this.address);
-        if (/*CHECKS*/ false && pointer < 0) {
-            throw new OutOfMemoryError("Out of stack space.");
-        }
-
-        return address;
-    }
-
-    /**
-     * Allocates a block of memory on the stack for an array of {@code num} elements, each of them {@code size} bytes long, and initializes all its bits to
-     * zero.
-     *
-     * @param alignment the required element alignment
-     * @param num       num  the number of elements to allocate
-     * @param size      the size of each element
-     *
-     * @return the memory address on the stack for the requested allocation
-     */
-    public long ncalloc(int alignment, int num, int size) {
-        int  bytes   = num * size;
-        long address = nmalloc(alignment, bytes);
-        memSet(address, 0, bytes);
-        return address;
-    }
-
-    // -------------------------------------------------
-
-    /** Unsafe version of {@link #shorts(short)}. */
-    public long nshort(short value) {
-        long a = nmalloc(2, 2);
-        memPutShort(a, value);
-        return a;
-    }
-
-    // -------------------------------------------------
-
-    /** Int version of {@link #malloc(int)}. */
-    public IntBuffer mallocInt(int size) { return wrapBufferInt(nmalloc(4, size << 2), size); }
-
-    /** Unsafe version of {@link #ints(int)}. */
-    public long nint(int value) {
-        long a = nmalloc(4, 4);
-        memPutInt(a, value);
-        return a;
-    }
-
-    // -------------------------------------------------
-
-    /** Unsafe version of {@link #longs(long)}. */
-    public long nlong(long value) {
-        long a = nmalloc(8, 8);
-        memPutLong(a, value);
-        return a;
-    }
-
-    // -------------------------------------------------
-
-    /** Float version of {@link #malloc(int)}. */
-    public FloatBuffer mallocFloat(int size) { return wrapBufferFloat(nmalloc(4, size << 2), size); }
-
-    /** Unsafe version of {@link #floats(float)}. */
-    public long nfloat(float value) {
-        long a = nmalloc(4, 4);
-        memPutFloat(a, value);
-        return a;
-    }
-
-    // -------------------------------------------------
-
-    /** Unsafe version of {@link #doubles(double)}. */
-    public long ndouble(double value) {
-        long a = nmalloc(8, 8);
-        memPutDouble(a, value);
-        return a;
-    }
-
-    // -------------------------------------------------
-    // -------------------------------------------------
-    // -------------------------------------------------
-
-
-    /** Returns the stack of the current thread. */
-    public static MemoryStack stackGet() {
-        return TLS.get();
-    }
-
-    /**
-     * Calls {@link #push} on the stack of the current thread.
-     *
-     * @return the stack of the current thread.
-     */
-    public static MemoryStack stackPush() {
-        return stackGet().push();
-    }
-
-    /**
-     * Calls {@link #pop} on the stack of the current thread.
-     *
-     * @return the stack of the current thread.
-     */
-    public static MemoryStack stackPop() {
-        return stackGet().pop();
-    }
-
-    /** Thread-local version of {@link #nmalloc(int)}. */
-    public static long nstackMalloc(int size) { return stackGet().nmalloc(size); }
-    /** Thread-local version of {@link #nmalloc(int, int)}. */
-    public static long nstackMalloc(int alignment, int size) { return stackGet().nmalloc(alignment, size); }
-    /** Thread-local version of {@link #ncalloc}. */
-    public static long nstackCalloc(int alignment, int num, int size) { return stackGet().ncalloc(alignment, num, size); }
-
-    // -------------------------------------------------
-
-}

src/main/java/com/gtnewhorizons/angelica/compat/lwjgl/Pointer.java

@@ -1,93 +0,0 @@
-/*
- * This class is backported from LWJGL3 under the BSD 3-clause "New" or "Revised" License
- */
-package com.gtnewhorizons.angelica.compat.lwjgl;
-
-
-import static com.gtnewhorizons.angelica.compat.lwjgl.CompatMemoryUtil.NULL;
-import static com.gtnewhorizons.angelica.compat.lwjgl.CompatMemoryUtil.UNSAFE;
-import static org.lwjgl.LWJGLUtil.CHECKS;
-
-import net.minecraft.util.Util;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Pointer interface.
- *
- * <p>LWJGL can run on both 32bit and 64bit architectures. Since LWJGL applications deal with native memory directly, this interface provides necessary
- * information about the underlying architecture of the running JVM process.</p>
- *
- * <p>When interacting with native functions, pointer values are mapped to Java {@code long}. LWJGL automatically converts long values to the correct pointer
- * addresses when used in native code. Native functions sometimes require arrays of pointer values; the {@link PointerBuffer} class may be used for that
- * purpose. It has an API similar to a {@link java.nio.LongBuffer} but handles pointer casts automatically.</p>
- */
-public interface Pointer {
-
-    /** The pointer size in bytes. Will be 4 on a 32bit JVM and 8 on a 64bit one. */
-    int POINTER_SIZE = UNSAFE.addressSize();
-
-    /** The pointer size power-of-two. Will be 2 on a 32bit JVM and 3 on a 64bit one. */
-    int POINTER_SHIFT = POINTER_SIZE == 8 ? 3 : 2;
-
-    /** The value of {@code sizeof(long)} for the current platform. */
-    int CLONG_SIZE  = POINTER_SIZE == 8 && Util.getOSType() == Util.EnumOS.WINDOWS ? 4 : POINTER_SIZE;
-
-    /** The value of {@code sizeof(long)} as a power-of-two. */
-    int CLONG_SHIFT = CLONG_SIZE == 8 ? 3 : 2;
-
-    /** Will be true on a 32bit JVM. */
-    boolean BITS32 = POINTER_SIZE * 8 == 32;
-
-    /** Will be true on a 64bit JVM. */
-    boolean BITS64 = POINTER_SIZE * 8 == 64;
-
-    /**
-     * Returns the raw pointer address as a {@code long} value.
-     *
-     * @return the pointer address
-     */
-    long address();
-
-    /** Default {@link Pointer} implementation. */
-    abstract class Default implements Pointer {
-
-        // Removed final due to JDK-8139758. TODO: Restore if the fix is backported to JDK 8.
-        protected long address;
-
-        protected Default(long address) {
-            if (CHECKS && address == NULL) {
-                throw new NullPointerException();
-            }
-            this.address = address;
-        }
-
-        @Override
-        public long address() {
-            return address;
-        }
-
-        public boolean equals(@Nullable Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (!(o instanceof Pointer)) {
-                return false;
-            }
-
-            Pointer that = (Pointer)o;
-
-            return address == that.address();
-        }
-
-        public int hashCode() {
-            return (int)(address ^ (address >>> 32));
-        }
-
-        @Override
-        public String toString() {
-            return String.format("%s pointer [0x%X]", getClass().getSimpleName(), address);
-        }
-
-    }
-
-}

src/main/java/com/gtnewhorizons/angelica/compat/mojang/AutoClosableAbstractTexture.java

@@ -1,15 +0,0 @@
-package com.gtnewhorizons.angelica.compat.mojang;
-
-import com.gtnewhorizons.angelica.glsm.GLStateManager;
-import net.minecraft.client.renderer.texture.AbstractTexture;
-import org.lwjgl.opengl.GL11;
-
-public abstract class AutoClosableAbstractTexture extends AbstractTexture implements AutoCloseable {
-    @Override
-    public void close() throws Exception {}
-
-    // TODO: Is this needed?
-    public void bind() {
-        GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, getGlTextureId());
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/mojang/ByteBufferBackedInputStream.java

@@ -1,35 +0,0 @@
-package com.gtnewhorizons.angelica.compat.mojang;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
-
-public class ByteBufferBackedInputStream extends InputStream {
-
-    ByteBuffer buf;
-
-    public ByteBufferBackedInputStream(ByteBuffer buf) {
-        this.buf = buf;
-    }
-
-    public int read() throws IOException {
-        if (!buf.hasRemaining()) {
-            return -1;
-        }
-        return buf.get() & 0xFF;
-    }
-
-    @Override
-    public int read(byte @NotNull [] bytes, int off, int len) throws IOException {
-        if (!buf.hasRemaining()) {
-            return -1;
-        }
-
-        len = Math.min(len, buf.remaining());
-        buf.get(bytes, off, len);
-        return len;
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/mojang/Camera.java

@@ -1,43 +0,0 @@
-package com.gtnewhorizons.angelica.compat.mojang;
-
-import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
-import com.gtnewhorizons.angelica.rendering.RenderingState;
-import lombok.Getter;
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.util.MathHelper;
-
-import org.joml.Matrix4f;
-import org.joml.Vector3d;
-import org.joml.Vector4f;
-
-@Getter
-public class Camera {
-    final Vector3d pos = new Vector3d();
-    final BlockPos blockPos = new BlockPos();
-    float pitch;
-    float yaw;
-    EntityLivingBase entity;
-    boolean thirdPerson;
-    final float partialTicks;
-
-    public Camera(EntityLivingBase entity, float partialTicks) {
-        this.partialTicks = partialTicks;
-        final Vector4f offset = new Vector4f(); // third person offset
-        final Matrix4f inverseModelView = new Matrix4f(RenderingState.INSTANCE.getModelViewMatrix()).invert();
-        inverseModelView.transform(offset);
-
-        final double camX = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * partialTicks + offset.x;
-        final double camY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * partialTicks + offset.y;
-        final double camZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * partialTicks + offset.z;
-        this.entity = entity;
-
-        pos.set(camX, camY, camZ);
-        blockPos.set(MathHelper.floor_double(camX), MathHelper.floor_double(camY), MathHelper.floor_double(camZ));
-        pitch = entity.cameraPitch;
-        yaw = entity.rotationYaw;
-        thirdPerson = Minecraft.getMinecraft().gameSettings.thirdPersonView == 1;
-
-    }
-
-}

src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkOcclusionData.java

@@ -1,39 +0,0 @@
-package com.gtnewhorizons.angelica.compat.mojang;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-import java.util.BitSet;
-import java.util.Set;
-
-public class ChunkOcclusionData {
-    private static final int DIRECTION_COUNT = ForgeDirection.values().length;
-    private final BitSet visibility;
-
-    public ChunkOcclusionData() {
-        this.visibility = new BitSet(DIRECTION_COUNT * DIRECTION_COUNT);
-    }
-
-    public void addOpenEdgeFaces(Set<ForgeDirection> faces) {
-        for (ForgeDirection dirFrom : faces) {
-            for (ForgeDirection dirTo : faces) {
-                this.setVisibleThrough(dirFrom, dirTo, true);
-            }
-        }
-
-        for (ForgeDirection direction : faces) {
-            this.visibility.set(direction.ordinal() * DIRECTION_COUNT + direction.ordinal());
-        }
-    }
-    public void setVisibleThrough(ForgeDirection from, ForgeDirection to, boolean visible) {
-        this.visibility.set(from.ordinal() + to.ordinal() * DIRECTION_COUNT, visible);
-        this.visibility.set(to.ordinal() + from.ordinal() * DIRECTION_COUNT, visible);
-    }
-
-    public boolean isVisibleThrough(ForgeDirection from, ForgeDirection to) {
-        return this.visibility.get(from.ordinal() + to.ordinal() * DIRECTION_COUNT);
-    }
-
-    public void fill(boolean visible) {
-        this.visibility.set(0, this.visibility.size(), visible);
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkOcclusionDataBuilder.java

@@ -1,155 +0,0 @@
-package com.gtnewhorizons.angelica.compat.mojang;
-
-import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
-import it.unimi.dsi.fastutil.ints.IntArrayFIFOQueue;
-import it.unimi.dsi.fastutil.ints.IntPriorityQueue;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import java.util.BitSet;
-import java.util.EnumSet;
-import java.util.Set;
-
-/**
- * WARNING: Minecraft 1.16 code rip!!
- */
-
-public class ChunkOcclusionDataBuilder {
-    private static final int STEP_X = (int)Math.pow(16.0, 0.0);
-    private static final int STEP_Z = (int)Math.pow(16.0, 1.0);
-    private static final int STEP_Y = (int)Math.pow(16.0, 2.0);
-    private static final ForgeDirection[] DIRECTIONS = ForgeDirection.VALID_DIRECTIONS;
-    private final BitSet closed = new BitSet(4096);
-    private static final int[] EDGE_POINTS = new int[1352];
-
-    static {
-        int k = 0;
-
-        for(int l = 0; l < 16; ++l) {
-            for(int m = 0; m < 16; ++m) {
-                for(int n = 0; n < 16; ++n) {
-                    if (l == 0 || l == 15 || m == 0 || m == 15 || n == 0 || n == 15) {
-                        EDGE_POINTS[k++] = pack(l, m, n);
-                    }
-                }
-            }
-        }
-    }
-    private int openCount = 4096;
-
-    public void markClosed(BlockPos pos) {
-        this.closed.set(pack(pos), true);
-        --this.openCount;
-    }
-
-    private static int pack(BlockPos pos) {
-        return pack(pos.getX() & 15, pos.getY() & 15, pos.getZ() & 15);
-    }
-
-    private static int pack(int x, int y, int z) {
-        return x << 0 | y << 8 | z << 4;
-    }
-
-    public ChunkOcclusionData build() {
-        final ChunkOcclusionData lv = new ChunkOcclusionData();
-        if (4096 - this.openCount < 256) {
-            lv.fill(true);
-        } else if (this.openCount == 0) {
-            lv.fill(false);
-        } else {
-            for(int i : EDGE_POINTS) {
-                if (!this.closed.get(i)) {
-                    lv.addOpenEdgeFaces(this.getOpenFaces(i));
-                }
-            }
-        }
-
-        return lv;
-    }
-
-    private Set<ForgeDirection> getOpenFaces(int pos) {
-        final Set<ForgeDirection> set = EnumSet.noneOf(ForgeDirection.class);
-        final IntPriorityQueue intPriorityQueue = new IntArrayFIFOQueue();
-        intPriorityQueue.enqueue(pos);
-        this.closed.set(pos, true);
-
-        while(!intPriorityQueue.isEmpty()) {
-            final int j = intPriorityQueue.dequeueInt();
-            this.addEdgeFaces(j, set);
-
-            for(ForgeDirection lv : DIRECTIONS) {
-                final int k = this.offset(j, lv);
-                if (k >= 0 && !this.closed.get(k)) {
-                    this.closed.set(k, true);
-                    intPriorityQueue.enqueue(k);
-                }
-            }
-        }
-
-        return set;
-    }
-
-    private void addEdgeFaces(int pos, Set<ForgeDirection> openFaces) {
-        final int j = pos >> 0 & 15;
-        if (j == 0) {
-            openFaces.add(ForgeDirection.WEST);
-        } else if (j == 15) {
-            openFaces.add(ForgeDirection.EAST);
-        }
-
-        final int k = pos >> 8 & 15;
-        if (k == 0) {
-            openFaces.add(ForgeDirection.DOWN);
-        } else if (k == 15) {
-            openFaces.add(ForgeDirection.UP);
-        }
-
-        final int l = pos >> 4 & 15;
-        if (l == 0) {
-            openFaces.add(ForgeDirection.NORTH);
-        } else if (l == 15) {
-            openFaces.add(ForgeDirection.SOUTH);
-        }
-    }
-
-    private int offset(int pos, ForgeDirection arg) {
-        return switch (arg) {
-            case DOWN -> {
-                if ((pos >> 8 & 15) == 0) {
-                    yield -1;
-                }
-                yield pos - STEP_Y;
-            }
-            case UP -> {
-                if ((pos >> 8 & 15) == 15) {
-                    yield -1;
-                }
-                yield pos + STEP_Y;
-            }
-            case NORTH -> {
-                if ((pos >> 4 & 15) == 0) {
-                    yield -1;
-                }
-                yield pos - STEP_Z;
-            }
-            case SOUTH -> {
-                if ((pos >> 4 & 15) == 15) {
-                    yield -1;
-                }
-                yield pos + STEP_Z;
-            }
-            case WEST -> {
-                if ((pos >> 0 & 15) == 0) {
-                    yield -1;
-                }
-                yield pos - STEP_X;
-            }
-            case EAST -> {
-                if ((pos >> 0 & 15) == 15) {
-                    yield -1;
-                }
-                yield pos + STEP_X;
-            }
-            default -> -1;
-        };
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkPos.java

@@ -1,59 +0,0 @@
-package com.gtnewhorizons.angelica.compat.mojang;
-
-import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
-
-// See if we can merge/mixin/extend ChunkCoordIntPair?
-public class ChunkPos {
-    public static long INT_MASK   = (1L << Integer.SIZE) - 1;
-
-    public final int x;
-    public final int z;
-
-    public ChunkPos(int x, int z) {
-        this.x = x;
-        this.z = z;
-    }
-
-    public ChunkPos(BlockPos pos) {
-        this.x = pos.getX() >> 4;
-        this.z = pos.getZ() >> 4;
-    }
-
-    public ChunkPos(long pos) {
-        this.x = (int)pos;
-        this.z = (int)(pos >> 32);
-    }
-
-    public static int getPackedX(long pos) {
-        return (int)(pos & INT_MASK);
-    }
-
-    public static int getPackedZ(long pos) {
-        return (int)(pos >>> 32 & INT_MASK);
-    }
-
-    public long toLong() {
-        return toLong(this.x, this.z);
-    }
-
-    public static long toLong(int x, int z) {
-        return (long)x & 4294967295L | ((long)z & 4294967295L) << 32;
-    }
-
-    public int hashCode()
-    {
-        final int i = 1664525 * this.x + 1013904223;
-        final int j = 1664525 * (this.z ^ -559038737) + 1013904223;
-        return i ^ j;
-    }
-
-    public boolean equals(Object object) {
-        if (this == object) {
-            return true;
-        }
-        if (object instanceof ChunkPos lv) {
-            return this.x == lv.x && this.z == lv.z;
-        }
-        return false;
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkSectionPos.java

@@ -1,89 +0,0 @@
-package com.gtnewhorizons.angelica.compat.mojang;
-
-import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
-import org.joml.Vector3i;
-
-// See if we can merge/mixin/extend ChunkPosition maybe?
-public class ChunkSectionPos extends Vector3i {
-
-    public static int getSectionCoord(int coord) {
-        return coord >> 4;
-    }
-    public static int getBlockCoord(int sectionCoord) {
-        return sectionCoord << 4;
-    }
-
-    private ChunkSectionPos(int x, int y, int z) {
-        super(x, y, z);
-    }
-    public static ChunkSectionPos from(int x, int y, int z) {
-        return new ChunkSectionPos(x, y, z);
-    }
-
-    public static ChunkSectionPos from(BlockPos pos) {
-        return new ChunkSectionPos(getSectionCoord(pos.getX()), getSectionCoord(pos.getY()), getSectionCoord(pos.getZ()));
-    }
-
-    public static long asLong(int x, int y, int z) {
-        long l = 0L;
-        l |= ((long)x & 4194303L) << 42;
-        l |= ((long)y & 1048575L) << 0;
-        l |= ((long)z & 4194303L) << 20;
-        return l;
-    }
-
-    public static int getLocalCoord(int coord) {
-        return coord & 15;
-    }
-
-    public static short packLocal(int x, int y, int z) {
-        final int i = getLocalCoord(x);
-        final int j = getLocalCoord(y);
-        final int k = getLocalCoord(z);
-        return (short)(i << 8 | k << 4 | j << 0);
-    }
-
-    public long asLong() {
-        return asLong(this.x, this.y, this.z);
-    }
-
-    public int getSectionX() {
-        return this.x;
-    }
-
-    public int getSectionY() {
-        return this.y;
-    }
-
-    public int getSectionZ() {
-        return this.z;
-    }
-
-    public int getMinX() {
-        return this.x << 4;
-    }
-
-    public int getMinY() {
-        return this.y << 4;
-    }
-
-    public int getMinZ() {
-        return this.z << 4;
-    }
-
-    public int getMaxX() {
-        return (this.x << 4) + 15;
-    }
-
-    public int getMaxY() {
-        return (this.y << 4) + 15;
-    }
-
-    public int getMaxZ() {
-        return (this.z << 4) + 15;
-    }
-
-    public ChunkPos toChunkPos() {
-        return new ChunkPos(this.getSectionX(), this.getSectionZ());
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/mojang/CompatMathHelper.java

@@ -1,27 +0,0 @@
-package com.gtnewhorizons.angelica.compat.mojang;
-
-public class CompatMathHelper {
-    public static int smallestEncompassingPowerOfTwo(int value) {
-        int j = value - 1;
-        j |= j >> 1;
-        j |= j >> 2;
-        j |= j >> 4;
-        j |= j >> 8;
-        j |= j >> 16;
-        return j + 1;
-    }
-    public static int roundUpToMultiple(int value, int divisor) {
-        if (divisor == 0) {
-            return 0;
-        } else if (value == 0) {
-            return divisor;
-        } else {
-            if (value < 0) {
-                divisor *= -1;
-            }
-
-            int k = value % divisor;
-            return k == 0 ? value : value + divisor - k;
-        }
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/mojang/Constants.java

@@ -1,5 +0,0 @@
-package com.gtnewhorizons.angelica.compat.mojang;
-
-public class Constants {
-    public static final float DEGREES_TO_RADIANS = (float)Math.PI / 180.0F;
-}

src/main/java/com/gtnewhorizons/angelica/compat/mojang/Drawable.java

@@ -1,5 +0,0 @@
-package com.gtnewhorizons.angelica.compat.mojang;
-
-public interface Drawable {
-    default void render(int mouseX, int mouseY, float delta) {}
-}

src/main/java/com/gtnewhorizons/angelica/compat/mojang/Element.java

@@ -1,29 +0,0 @@
-package com.gtnewhorizons.angelica.compat.mojang;
-
-public interface Element {
-    default boolean mouseClicked(double mouseX, double mouseY, int button) {
-        return false;
-    }
-
-    default boolean mouseDragged(double mouseX, double mouseY, int button) {
-        return false;
-    }
-
-    default boolean mouseReleased(double mouseX, double mouseY, int button) {
-        return false;
-    }
-
-    default boolean mouseScrolled(double mouseX, double mouseY, double amount) {
-        return false;
-    }
-
-    default boolean keyTyped(char typedChar, int keyCode) { return false; }
-
-    default boolean isMouseOver(double mouseX, double mouseY) {
-        return false;
-    }
-
-    default boolean changeFocus(boolean lookForwards) {
-        return false;
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/mojang/InteractionHand.java

@@ -1,10 +0,0 @@
-package com.gtnewhorizons.angelica.compat.mojang;
-
-
-public enum InteractionHand {
-    MAIN_HAND,
-    OFF_HAND;
-
-    InteractionHand() {
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/mojang/NativeImage.java

@@ -1,122 +0,0 @@
-package com.gtnewhorizons.angelica.compat.mojang;
-
-import com.gtnewhorizons.angelica.compat.lwjgl.MemoryStack;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-import javax.imageio.ImageIO;
-import lombok.Getter;
-import net.coderbot.iris.Iris;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
-// TBD
-public class NativeImage extends BufferedImage {
-    @Getter
-    private final Format format;
-    @Getter
-    private final int width;
-    @Getter
-    private final int height;
-    @Getter
-    private final int size;
-
-    public NativeImage(int width, int height, boolean useStb) {
-        this(NativeImage.Format.RGBA, width, height, useStb);
-    }
-
-    public NativeImage(Format format, int width, int height, boolean useStb) {
-        super(width, height, BufferedImage.TYPE_INT_ARGB);
-        this.format = format;
-        this.width = width;
-        this.height = height;
-        this.size = width * height * format.components;
-    }
-    public NativeImage(Format format, int width, int height, BufferedImage image) {
-        super(image.getColorModel(), image.getRaster(), image.isAlphaPremultiplied(), null);
-        this.format = format;
-        this.width = width;
-        this.height = height;
-        this.size = width * height * format.components;
-    }
-
-    public static NativeImage read(ByteBuffer buf) throws IOException {
-        return read(new ByteBufferBackedInputStream(buf));
-    }
-    public static NativeImage read(InputStream inputStream)  throws IOException {
-        BufferedImage image = ImageIO.read(inputStream);
-        return new NativeImage(Format.RGBA, image.getWidth(), image.getHeight(), image);
-    }
-
-    public void downloadTexture(int level, boolean bl) {
-//        this.checkAllocated();
-        GL11.glPixelStorei(GL11.GL_PACK_ALIGNMENT, format.components);
-//        GlStateManager._getTexImage(3553, level, format.glFormat, GL11.GL_UNSIGNED_BYTE, this.pixels);
-
-//        final int width = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, level, GL11.GL_TEXTURE_WIDTH);
-//        final int height = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, level, GL11.GL_TEXTURE_HEIGHT);
-        try (final MemoryStack stack = MemoryStack.stackPush()) {
-            final IntBuffer buffer = stack.mallocInt(size);
-            GL11.glGetTexImage(GL11.GL_TEXTURE_2D, level, format.glFormat, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, buffer);
-
-            int[] data = new int[size];
-            buffer.get(data);
-            setRGB(0, 0, width, height, data, 0, width);
-        }
-    }
-    public void writeToFile(File file) throws IOException{
-        try {
-            ImageIO.write(this, "png", file);
-        } catch(IOException ioexception) {
-            Iris.logger.info("[TextureDump] Unable to write: ", ioexception);
-        }
-    }
-    public static int combine(int i, int j, int k, int l) {
-        return (i & 255) << 24 | (j & 255) << 16 | (k & 255) << 8 | (l & 255);
-    }
-
-    public static int getA(int i) {
-        return i >> 24 & 255;
-    }
-
-    public static int getR(int i) {
-        return i >> 0 & 255;
-    }
-
-    public static int getG(int i) {
-        return i >> 8 & 255;
-    }
-
-    public static int getB(int i) {
-        return i >> 16 & 255;
-    }
-
-    public int getPixelRGBA(int x, int y) {
-        return getRGB(x, y);
-    }
-
-    public void setPixelRGBA(int x, int y, int rgb) {
-        setRGB(x, y, rgb);
-    }
-
-
-    public enum Format {
-        RGBA(4, GL11.GL_RGBA, BufferedImage.TYPE_INT_ARGB),
-        RGB(3, GL11.GL_RGB, BufferedImage.TYPE_INT_RGB);
-
-        private final int components;
-        private final int glFormat;
-        private final int imageType;
-
-
-        Format(int components, int glFormat, int imageType) {
-            this.components = components;
-            this.glFormat = glFormat;
-            this.imageType = imageType;
-        }
-    }
-
-}

src/main/java/com/gtnewhorizons/angelica/compat/mojang/ParentElement.java

@@ -1,97 +0,0 @@
-package com.gtnewhorizons.angelica.compat.mojang;
-
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Optional;
-import java.util.function.BooleanSupplier;
-import java.util.function.Supplier;
-
-public interface ParentElement extends Element {
-    List<? extends Element> children();
-
-    default Optional<Element> hoveredElement(double mouseX, double mouseY) {
-        for(Element element : this.children()) {
-            if (element.isMouseOver(mouseX, mouseY)) {
-                return Optional.of(element);
-            }
-        }
-        return Optional.empty();
-    }
-
-    default boolean mouseClicked(double mouseX, double mouseY, int button) {
-        for(Element element : this.children()) {
-            if (element.mouseClicked(mouseX, mouseY, button)) {
-                this.setFocused(element);
-                if (button == 0) {
-                    this.setDragging(true);
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    default boolean mouseReleased(double mouseX, double mouseY, int button) {
-        this.setDragging(false);
-        return this.hoveredElement(mouseX, mouseY).filter((element) -> element.mouseReleased(mouseX, mouseY, button)).isPresent();
-    }
-
-    default boolean mouseDragged(double mouseX, double mouseY, int button) {
-        return this.getFocused() != null && this.isDragging() && button == 0 && this.getFocused().mouseDragged(mouseX, mouseY, button);
-    }
-
-    boolean isDragging();
-
-    void setDragging(boolean dragging);
-
-    default boolean mouseScrolled(double mouseX, double mouseY, double amount) {
-        return this.hoveredElement(mouseX, mouseY).filter((element) -> element.mouseScrolled(mouseX, mouseY, amount)).isPresent();
-    }
-
-    default boolean keyTyped(char typedChar, int keyCode) {
-        return this.getFocused() != null && this.getFocused().keyTyped(typedChar, keyCode);
-    }
-
-    @Nullable
-    Element getFocused();
-
-    void setFocused(@Nullable Element focused);
-
-    default boolean changeFocus(boolean lookForwards) {
-        final Element element = this.getFocused();
-        if (element != null && element.changeFocus(lookForwards)) {
-            return true;
-        } else {
-            final List<? extends Element> list = this.children();
-            final int i = list.indexOf(element);
-            final int j;
-            if (element != null && i >= 0) {
-                j = i + (lookForwards ? 1 : 0);
-            } else if (lookForwards) {
-                j = 0;
-            } else {
-                j = list.size();
-            }
-
-
-            final ListIterator<? extends Element> listIterator = list.listIterator(j);
-            final BooleanSupplier booleanSupplier = lookForwards ? listIterator::hasNext : listIterator::hasPrevious;
-            final Supplier<? extends Element> supplier = lookForwards ? listIterator::next : listIterator::previous;
-
-            Element element2;
-            do {
-                if (!booleanSupplier.getAsBoolean()) {
-                    this.setFocused(null);
-                    return false;
-                }
-
-                element2 = supplier.get();
-            } while(!element2.changeFocus(lookForwards));
-
-            this.setFocused(element2);
-            return true;
-        }
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/nd/BufferWriter.java

@@ -1,63 +0,0 @@
-package com.gtnewhorizons.angelica.compat.nd;
-
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.ShortBuffer;
-
-public class BufferWriter {
-    // Adapted from Neodymium
-
-    private final ByteBuffer buf;
-
-    private final FloatBuffer floatBuffer;
-    private final ShortBuffer shortBuffer;
-    private final IntBuffer intBuffer;
-
-    public BufferWriter(ByteBuffer buf) {
-        this.buf = buf;
-        this.floatBuffer = buf.asFloatBuffer();
-        this.shortBuffer = buf.asShortBuffer();
-        this.intBuffer = buf.asIntBuffer();
-    }
-
-    private void incrementPosition(int add) {
-        buf.position(buf.position() + add);
-        floatBuffer.position(buf.position() / 4);
-        shortBuffer.position(buf.position() / 2);
-        intBuffer.position(buf.position() / 4);
-    }
-
-    public void writeFloat(float x) {
-        try {
-        floatBuffer.put(x);
-
-        incrementPosition(4);
-        } catch(Exception e){
-            e.printStackTrace();
-        }
-    }
-
-    public void writeInt(int x) {
-        intBuffer.put(x);
-
-        incrementPosition(4);
-    }
-
-    public void writeByte(byte x) {
-        buf.put(x); // this increments the buffer position by 1
-
-        incrementPosition(0);
-    }
-
-    public int position() {
-        return buf.position();
-    }
-
-    public void writeShort(short s) {
-        shortBuffer.put(s);
-
-        incrementPosition(2);
-    }
-
-}

src/main/java/com/gtnewhorizons/angelica/compat/nd/writers/ItemVBOQuadWriter.java

@@ -1,47 +0,0 @@
-package com.gtnewhorizons.angelica.compat.nd.writers;
-
-import com.gtnewhorizon.gtnhlib.client.renderer.quad.QuadView;
-import com.gtnewhorizon.gtnhlib.client.renderer.quad.writers.IWriteQuads;
-
-import java.nio.ByteBuffer;
-
-public class ItemVBOQuadWriter implements IWriteQuads {
-    private boolean direct;
-
-    public ItemVBOQuadWriter() {
-        init(false);
-    }
-
-    public void init(boolean direct) {
-        // This would need to be re-initialized if the direct vs indirect changes
-        this.direct = direct;
-    }
-    @Override
-    public void writeQuad(QuadView quad, ByteBuffer buf) {
-        if(direct) {
-            writeQuadDirect(quad, buf);
-        } else {
-            writeQuadIndirect(quad, buf);
-        }
-    }
-
-    protected  void writeQuadDirect(QuadView quad, ByteBuffer buf) {
-        throw new UnsupportedOperationException("Direct mode not supported yet");
-    }
-
-    protected void writeQuadIndirect(QuadView quad, ByteBuffer buf) {
-        for(int idx = 0; idx < 4; ++idx) {
-            // Position
-            buf.putFloat(quad.getX(idx));
-            buf.putFloat(quad.getY(idx));
-            buf.putFloat(quad.getZ(idx));
-
-            // Texture
-            buf.putFloat(quad.getTexU(idx));
-            buf.putFloat(quad.getTexV(idx));
-
-            // Normals + Padding
-            buf.putInt(quad.getNormal(idx));
-        }
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/nd/writers/PositionColorTextureQuadWriter.java

@@ -1,47 +0,0 @@
-package com.gtnewhorizons.angelica.compat.nd.writers;
-
-import com.gtnewhorizon.gtnhlib.client.renderer.quad.QuadView;
-import com.gtnewhorizon.gtnhlib.client.renderer.quad.writers.IWriteQuads;
-
-import java.nio.ByteBuffer;
-
-public class PositionColorTextureQuadWriter implements IWriteQuads {
-    private boolean direct;
-
-    public PositionColorTextureQuadWriter() {
-        init(false);
-    }
-
-    public void init(boolean direct) {
-        // This would need to be re-initialized if the direct vs indirect changes
-        this.direct = direct;
-    }
-    @Override
-    public void writeQuad(QuadView quad, ByteBuffer buf) {
-        if(direct) {
-            writeQuadDirect(quad, buf);
-        } else {
-            writeQuadIndirect(quad, buf);
-        }
-    }
-
-    protected  void writeQuadDirect(QuadView quad, ByteBuffer buf) {
-        throw new UnsupportedOperationException("Direct mode not supported yet");
-    }
-
-    protected void writeQuadIndirect(QuadView quad, ByteBuffer buf) {
-        for(int idx = 0; idx < 4; ++idx) {
-            // Position
-            buf.putFloat(quad.getX(idx));
-            buf.putFloat(quad.getY(idx));
-            buf.putFloat(quad.getZ(idx));
-
-            // Color
-            buf.putInt(quad.getColor(idx));
-
-            // Texture
-            buf.putFloat(quad.getTexU(idx));
-            buf.putFloat(quad.getTexV(idx));
-        }
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/nd/writers/PositionQuadWriter.java

@@ -1,40 +0,0 @@
-package com.gtnewhorizons.angelica.compat.nd.writers;
-
-import com.gtnewhorizon.gtnhlib.client.renderer.quad.QuadView;
-import com.gtnewhorizon.gtnhlib.client.renderer.quad.writers.IWriteQuads;
-
-import java.nio.ByteBuffer;
-
-public class PositionQuadWriter implements IWriteQuads {
-    private boolean direct;
-
-    public PositionQuadWriter() {
-        init(false);
-    }
-
-    public void init(boolean direct) {
-        // This would need to be re-initialized if the direct vs indirect changes
-        this.direct = direct;
-    }
-    @Override
-    public void writeQuad(QuadView quad, ByteBuffer buf) {
-        if(direct) {
-            writeQuadDirect(quad, buf);
-        } else {
-            writeQuadIndirect(quad, buf);
-        }
-    }
-
-    protected  void writeQuadDirect(QuadView quad, ByteBuffer buf) {
-        throw new UnsupportedOperationException("Direct mode not supported yet");
-    }
-
-    protected void writeQuadIndirect(QuadView quad, ByteBuffer buf) {
-        for(int idx = 0; idx < 4; ++idx) {
-            // Position
-            buf.putFloat(quad.getX(idx));
-            buf.putFloat(quad.getY(idx));
-            buf.putFloat(quad.getZ(idx));
-        }
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/nd/writers/PositionTextureColorQuadWriter.java

@@ -1,49 +0,0 @@
-package com.gtnewhorizons.angelica.compat.nd.writers;
-
-
-import com.gtnewhorizon.gtnhlib.client.renderer.quad.QuadView;
-import com.gtnewhorizon.gtnhlib.client.renderer.quad.writers.IWriteQuads;
-
-import java.nio.ByteBuffer;
-
-public class PositionTextureColorQuadWriter implements IWriteQuads {
-    private boolean direct;
-
-    public PositionTextureColorQuadWriter() {
-        init(false);
-    }
-
-    public void init(boolean direct) {
-        // This would need to be re-initialized if the direct vs indirect changes
-        this.direct = direct;
-    }
-    @Override
-    public void writeQuad(QuadView quad, ByteBuffer buf) {
-        if(direct) {
-            writeQuadDirect(quad, buf);
-        } else {
-            writeQuadIndirect(quad, buf);
-        }
-    }
-
-    protected  void writeQuadDirect(QuadView quad, ByteBuffer buf) {
-        throw new UnsupportedOperationException("Direct mode not supported yet");
-    }
-
-    protected void writeQuadIndirect(QuadView quad, ByteBuffer buf) {
-        for(int idx = 0; idx < 4; ++idx) {
-            // Position
-            buf.putFloat(quad.getX(idx));
-            buf.putFloat(quad.getY(idx));
-            buf.putFloat(quad.getZ(idx));
-
-            // Texture
-            buf.putFloat(quad.getTexU(idx));
-            buf.putFloat(quad.getTexV(idx));
-
-            // Color
-            buf.putInt(quad.getColor(idx));
-
-        }
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/nd/writers/PositionTextureQuadWriter.java

@@ -1,44 +0,0 @@
-package com.gtnewhorizons.angelica.compat.nd.writers;
-
-import com.gtnewhorizon.gtnhlib.client.renderer.quad.QuadView;
-import com.gtnewhorizon.gtnhlib.client.renderer.quad.writers.IWriteQuads;
-
-import java.nio.ByteBuffer;
-
-public class PositionTextureQuadWriter implements IWriteQuads {
-    private boolean direct;
-
-    public PositionTextureQuadWriter() {
-        init(false);
-    }
-
-    public void init(boolean direct) {
-        // This would need to be re-initialized if the direct vs indirect changes
-        this.direct = direct;
-    }
-    @Override
-    public void writeQuad(QuadView quad, ByteBuffer buf) {
-        if(direct) {
-            writeQuadDirect(quad, buf);
-        } else {
-            writeQuadIndirect(quad, buf);
-        }
-    }
-
-    protected  void writeQuadDirect(QuadView quad, ByteBuffer buf) {
-        throw new UnsupportedOperationException("Direct mode not supported yet");
-    }
-
-    protected void writeQuadIndirect(QuadView quad, ByteBuffer buf) {
-        for(int idx = 0; idx < 4; ++idx) {
-            // Position
-            buf.putFloat(quad.getX(idx));
-            buf.putFloat(quad.getY(idx));
-            buf.putFloat(quad.getZ(idx));
-
-            // Texture
-            buf.putFloat(quad.getTexU(idx));
-            buf.putFloat(quad.getTexV(idx));
-        }
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/toremove/MatrixStack.java

@@ -1,132 +0,0 @@
-package com.gtnewhorizons.angelica.compat.toremove;
-
-import com.google.common.collect.Queues;
-import org.joml.Matrix3f;
-import org.joml.Matrix4f;
-import org.joml.Quaternionf;
-
-import java.util.Deque;
-
-
-public class MatrixStack {
-    private final Deque<Entry> matrixStack;
-
-    public MatrixStack() {
-        this.matrixStack = Queues.newArrayDeque();
-        matrixStack.add(new Entry(new Matrix4f().identity(), new Matrix3f().identity()));
-    }
-
-    public MatrixStack(Matrix4f initial) {
-        this.matrixStack = Queues.newArrayDeque();
-        Matrix3f normal = new Matrix3f();
-        matrixStack.add(new Entry(initial, initial.normal(normal)));
-    }
-
-    public Entry peek() {
-        return (Entry)this.matrixStack.getLast();
-    }
-
-    public void push() {
-        final Entry lv = (Entry)this.matrixStack.getLast();
-        this.matrixStack.addLast(new Entry(new Matrix4f(lv.model), new Matrix3f(lv.normal)));
-    }
-
-    public void pop() {
-        this.matrixStack.removeLast();
-    }
-    public boolean clear() {
-        return this.matrixStack.size() == 1;
-    }
-
-    public void translate(double d, double e, double f) {
-        final Entry lv = (Entry)this.matrixStack.getLast();
-        lv.model.translate((float)d, (float)e, (float)f);
-    }
-    public void rotateX(float f) {
-        final Entry lv = (Entry)this.matrixStack.getLast();
-        lv.model.rotateX(f);
-        lv.normal.rotateX(f);
-    }
-
-    public void rotateY(float f) {
-        final Entry lv = (Entry)this.matrixStack.getLast();
-        lv.model.rotateY(f);
-        lv.normal.rotateY(f);
-    }
-
-    public void rotateZ(float f) {
-        final Entry lv = (Entry)this.matrixStack.getLast();
-        lv.model.rotateZ(f);
-        lv.normal.rotateZ(f);
-    }
-
-
-    public void scale(float f, float g, float h) {
-        final Entry lv = (Entry)this.matrixStack.getLast();
-        lv.model.scale(f, g, h);
-
-        if (f == g && g == h) {
-            if (f > 0.0F) {
-                return;
-            }
-
-            lv.normal.scale(-1.0F);
-        }
-        float i = 1.0F / f;
-        float j = 1.0F / g;
-        float k = 1.0F / h;
-        float l = invSqrt(i * j * k);
-        lv.normal.scale(l * i, l * j, l * k);
-
-    }
-
-    public void multiply(Quaternionf quaternion) {
-        MatrixStack.Entry entry = this.matrixStack.getLast();
-        entry.model.rotate(quaternion);
-        entry.normal.rotate(quaternion);
-    }
-
-    public void multiply(Quaternionf quaternion, float originX, float originY, float originZ) {
-        MatrixStack.Entry entry = this.matrixStack.getLast();
-        entry.model.rotateAround(quaternion, originX, originY, originZ);
-        entry.normal.rotate(quaternion);
-    }
-
-    public void loadIdentity() {
-        MatrixStack.Entry entry = this.matrixStack.getLast();
-        entry.model.identity();
-        entry.normal.identity();
-    }
-
-    public void multiplyPositionMatrix(Matrix4f matrix) {
-        this.matrixStack.getLast().model.mul(matrix);
-    }
-
-    private static float invSqrt(float x) {
-        float xhalf = 0.5f * x;
-        int i = Float.floatToIntBits(x);
-        i = 0x5f3759df - (i >> 1);
-        x = Float.intBitsToFloat(i);
-        x *= (1.5f - xhalf * x * x);
-        return x;
-    }
-
-    public static final class Entry {
-        private final Matrix4f model;
-        private final Matrix3f normal;
-
-        private Entry(Matrix4f model, Matrix3f normal) {
-            this.model = model;
-            this.normal = normal;
-        }
-
-        public Matrix4f getModel() {
-            return model;
-        }
-
-        public Matrix3f getNormal() {
-            return normal;
-        }
-    }
-
-}

src/main/java/com/gtnewhorizons/angelica/compat/toremove/RenderLayer.java

@@ -1,302 +0,0 @@
-package com.gtnewhorizons.angelica.compat.toremove;
-
-import com.google.common.collect.ImmutableList;
-
-import com.gtnewhorizon.gtnhlib.client.renderer.vertex.DefaultVertexFormat;
-
-import com.gtnewhorizon.gtnhlib.client.renderer.vertex.VertexFormat;
-import it.unimi.dsi.fastutil.Hash;
-import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet;
-import lombok.Getter;
-import net.minecraft.util.ResourceLocation;
-
-import javax.annotation.Nullable;
-import java.util.Objects;
-import java.util.Optional;
-
-public abstract class RenderLayer extends RenderPhase { // Aka: RenderType (Iris)
-    private static final RenderLayer SOLID = of("solid", DefaultVertexFormat.POSITION_COLOR_TEXTURE_LIGHT_NORMAL, 7, 2097152, true, false, RenderLayer.MultiPhaseParameters.builder().shadeModel(SMOOTH_SHADE_MODEL).lightmap(ENABLE_LIGHTMAP).texture(MIPMAP_BLOCK_ATLAS_TEXTURE).build(true));
-    private static final RenderLayer CUTOUT = of("cutout", DefaultVertexFormat.POSITION_COLOR_TEXTURE_LIGHT_NORMAL, 7, 131072, true, false, RenderLayer.MultiPhaseParameters.builder().shadeModel(SMOOTH_SHADE_MODEL).lightmap(ENABLE_LIGHTMAP).texture(BLOCK_ATLAS_TEXTURE).alpha(HALF_ALPHA).build(true));
-    private static final RenderLayer TRANSLUCENT = of("translucent", DefaultVertexFormat.POSITION_COLOR_TEXTURE_LIGHT_NORMAL, 7, 262144, true, true, createTranslucentPhaseData());
-
-    @Getter
-    private final VertexFormat vertexFormat;
-    @Getter
-    private final int drawMode;
-    @Getter
-    private final int expectedBufferSize;
-
-    public RenderLayer(String name, VertexFormat vertexFormat, int drawMode, int expectedBufferSize, Runnable startAction, Runnable endAction) {
-        super(name, startAction, endAction);
-        this.vertexFormat = vertexFormat;
-        this.drawMode = drawMode;
-        this.expectedBufferSize = expectedBufferSize;
-    }
-
-
-    public static MultiPhase of(String name, VertexFormat vertexFormat, int drawMode, int expectedBufferSize, MultiPhaseParameters phaseData) {
-        return of(name, vertexFormat, drawMode, expectedBufferSize, false, false, phaseData);
-    }
-
-    public static MultiPhase of(String name, VertexFormat vertexFormat, int drawMode, int expectedBufferSize, boolean hasCrumbling, boolean translucent, MultiPhaseParameters phases) {
-        return RenderLayer.MultiPhase.of(name, vertexFormat, drawMode, expectedBufferSize, hasCrumbling, translucent, phases);
-    }
-
-
-    public static RenderLayer solid() {
-        return SOLID;
-    }
-
-    public static RenderLayer cutout() {
-        return CUTOUT;
-    }
-
-    private static MultiPhaseParameters createTranslucentPhaseData() {
-        return RenderLayer.MultiPhaseParameters.builder().shadeModel(SMOOTH_SHADE_MODEL).lightmap(ENABLE_LIGHTMAP).texture(MIPMAP_BLOCK_ATLAS_TEXTURE).transparency(TRANSLUCENT_TRANSPARENCY).target(TRANSLUCENT_TARGET).build(true);
-    }
-
-    public static RenderLayer translucent() {
-        return TRANSLUCENT;
-    }
-
-    public static RenderLayer getOutline(ResourceLocation texture, RenderPhase.Cull cull) {
-        return of("outline", DefaultVertexFormat.POSITION_COLOR_TEXTURE, 7, 256, RenderLayer.MultiPhaseParameters.builder().texture(new RenderPhase.Texture(texture, false, false)).cull(cull).depthTest(ALWAYS_DEPTH_TEST).alpha(ONE_TENTH_ALPHA).fog(NO_FOG).target(OUTLINE_TARGET).build(RenderLayer.OutlineMode.IS_OUTLINE));
-    }
-
-    public int mode() {
-        return this.drawMode;
-    }
-
-    static final class MultiPhase extends RenderLayer {
-        private static final ObjectOpenCustomHashSet<MultiPhase> CACHE;
-        private final MultiPhaseParameters phases;
-        private final int hash;
-        private final Optional<RenderLayer> affectedOutline;
-        private final boolean outline;
-
-        private MultiPhase(String name, VertexFormat vertexFormat, int drawMode, int expectedBufferSize, boolean hasCrumbling, boolean translucent, MultiPhaseParameters phases) {
-            super(name, vertexFormat, drawMode, expectedBufferSize, () -> {
-                phases.phases.forEach(RenderPhase::startDrawing);
-            }, () -> {
-                phases.phases.forEach(RenderPhase::endDrawing);
-            });
-            this.phases = phases;
-            this.affectedOutline = phases.outlineMode == RenderLayer.OutlineMode.AFFECTS_OUTLINE ? phases.texture.getId().map((arg2) -> {
-                return getOutline(arg2, phases.cull);
-            }) : Optional.empty();
-            this.outline = phases.outlineMode == RenderLayer.OutlineMode.IS_OUTLINE;
-            this.hash = Objects.hash(new Object[]{super.hashCode(), phases});
-        }
-
-        public static MultiPhase of(String name, VertexFormat vertexFormat, int drawMode, int expectedBufferSize, boolean hasCrumbling, boolean translucent,
-            MultiPhaseParameters phases) {
-            return (MultiPhase)CACHE.addOrGet(new MultiPhase(name, vertexFormat, drawMode, expectedBufferSize, hasCrumbling, translucent, phases));
-        }
-
-        public Optional<RenderLayer> getAffectedOutline() {
-            return this.affectedOutline;
-        }
-
-        public boolean equals(@Nullable Object object) {
-            return this == object;
-        }
-
-        public int hashCode() {
-            return this.hash;
-        }
-
-        public String toString() {
-            return "RenderType[" + this.phases + ']';
-        }
-
-        static {
-            CACHE = new ObjectOpenCustomHashSet(RenderLayer.MultiPhase.HashStrategy.INSTANCE);
-        }
-
-        static enum HashStrategy implements Hash.Strategy<MultiPhase> {
-            INSTANCE;
-
-            private HashStrategy() {
-            }
-
-            public int hashCode(@Nullable MultiPhase arg) {
-                return arg == null ? 0 : arg.hash;
-            }
-
-            public boolean equals(@Nullable MultiPhase arg, @Nullable MultiPhase arg2) {
-                if (arg == arg2) {
-                    return true;
-                } else {
-                    return arg != null && arg2 != null ? Objects.equals(arg.phases, arg2.phases) : false;
-                }
-            }
-        }
-    }
-
-    public static final class MultiPhaseParameters {
-        private final RenderPhase.Texture texture;
-        private final RenderPhase.Transparency transparency;
-        private final RenderPhase.DiffuseLighting diffuseLighting;
-        private final RenderPhase.ShadeModel shadeModel;
-        private final RenderPhase.Alpha alpha;
-        private final RenderPhase.DepthTest depthTest;
-        private final RenderPhase.Cull cull;
-        private final RenderPhase.Lightmap lightmap;
-        private final RenderPhase.Fog fog;
-        private final RenderPhase.Layering layering;
-        private final RenderPhase.Target target;
-        private final RenderPhase.Texturing texturing;
-        private final RenderPhase.WriteMaskState writeMaskState;
-        private final OutlineMode outlineMode;
-        private final ImmutableList<RenderPhase> phases;
-
-        private MultiPhaseParameters(RenderPhase.Texture texture, RenderPhase.Transparency transparency, RenderPhase.DiffuseLighting diffuseLighting, RenderPhase.ShadeModel shadeModel, RenderPhase.Alpha alpha, RenderPhase.DepthTest depthTest, RenderPhase.Cull cull, RenderPhase.Lightmap lightmap, RenderPhase.Fog fog, RenderPhase.Layering layering, RenderPhase.Target target, RenderPhase.Texturing texturing, RenderPhase.WriteMaskState writeMaskState, OutlineMode outlineMode) {
-            this.texture = texture;
-            this.transparency = transparency;
-            this.diffuseLighting = diffuseLighting;
-            this.shadeModel = shadeModel;
-            this.alpha = alpha;
-            this.depthTest = depthTest;
-            this.cull = cull;
-            this.lightmap = lightmap;
-            this.fog = fog;
-            this.layering = layering;
-            this.target = target;
-            this.texturing = texturing;
-            this.writeMaskState = writeMaskState;
-            this.outlineMode = outlineMode;
-            this.phases = ImmutableList.of(this.texture, this.transparency, this.diffuseLighting, this.shadeModel, this.alpha, this.depthTest, this.cull, this.lightmap, this.fog, this.layering, this.target, this.texturing, this.writeMaskState);
-        }
-
-        public boolean equals(Object object) {
-            if (this == object) {
-                return true;
-            } else if (object != null && this.getClass() == object.getClass()) {
-                MultiPhaseParameters rendertype$state = (MultiPhaseParameters)object;
-                return this.outlineMode == rendertype$state.outlineMode && this.phases.equals(rendertype$state.phases);
-            } else {
-                return false;
-            }
-        }
-
-        public int hashCode() {
-            return Objects.hash(new Object[]{this.phases, this.outlineMode});
-        }
-
-        public String toString() {
-            return "CompositeState[" + this.phases + ", outlineProperty=" + this.outlineMode + ']';
-        }
-
-        public static Builder builder() {
-            return new Builder();
-        }
-
-        public static class Builder {
-            private RenderPhase.Texture texture;
-            private RenderPhase.Transparency transparency;
-            private RenderPhase.DiffuseLighting diffuseLighting;
-            private RenderPhase.ShadeModel shadeModel;
-            private RenderPhase.Alpha alpha;
-            private RenderPhase.DepthTest depthTest;
-            private RenderPhase.Cull cull;
-            private RenderPhase.Lightmap lightmap;
-            private RenderPhase.Fog fog;
-            private RenderPhase.Layering layering;
-            private RenderPhase.Target target;
-            private RenderPhase.Texturing texturing;
-            private RenderPhase.WriteMaskState writeMaskState;
-
-            private Builder() {
-                this.texture = RenderPhase.NO_TEXTURE ;
-                this.transparency = RenderPhase.NO_TRANSPARENCY;
-                this.diffuseLighting = RenderPhase.DISABLE_DIFFUSE_LIGHTING;
-                this.shadeModel = RenderPhase.SHADE_MODEL;
-                this.alpha = RenderPhase.ZERO_ALPHA;
-                this.depthTest = RenderPhase.LEQUAL_DEPTH_TEST;
-                this.cull = RenderPhase.ENABLE_CULLING;
-                this.lightmap = RenderPhase.DISABLE_LIGHTMAP;
-                this.fog = RenderPhase.FOG;
-                this.layering = RenderPhase.NO_LAYERING;
-                this.target = RenderPhase.MAIN_TARGET;
-                this.texturing = RenderPhase.DEFAULT_TEXTURING;
-                this.writeMaskState = RenderPhase.ALL_MASK;
-            }
-
-            public Builder texture(RenderPhase.Texture texture) {
-                this.texture = texture;
-                return this;
-            }
-
-            public Builder transparency(RenderPhase.Transparency transparency) {
-                this.transparency = transparency;
-                return this;
-            }
-
-            public Builder shadeModel(RenderPhase.ShadeModel shadeModel) {
-                this.shadeModel = shadeModel;
-                return this;
-            }
-
-            public Builder alpha(RenderPhase.Alpha alpha) {
-                this.alpha = alpha;
-                return this;
-            }
-
-            public Builder depthTest(RenderPhase.DepthTest depthTest) {
-                this.depthTest = depthTest;
-                return this;
-            }
-
-            public Builder cull(RenderPhase.Cull cull) {
-                this.cull = cull;
-                return this;
-            }
-
-            public Builder lightmap(RenderPhase.Lightmap lightmap) {
-                this.lightmap = lightmap;
-                return this;
-            }
-
-            public Builder fog(RenderPhase.Fog fog) {
-                this.fog = fog;
-                return this;
-            }
-
-            public Builder target(RenderPhase.Target target) {
-                this.target = target;
-                return this;
-            }
-
-            public Builder texturing(RenderPhase.Texturing texturing) {
-                this.texturing = texturing;
-                return this;
-            }
-
-            public MultiPhaseParameters build(boolean affectsOutline) {
-                return this.build(affectsOutline ? RenderLayer.OutlineMode.AFFECTS_OUTLINE : RenderLayer.OutlineMode.NONE);
-            }
-
-            public MultiPhaseParameters build(OutlineMode outlineMode) {
-                return new MultiPhaseParameters(this.texture, this.transparency, this.diffuseLighting, this.shadeModel, this.alpha, this.depthTest, this.cull, this.lightmap, this.fog, this.layering, this.target, this.texturing, this.writeMaskState, outlineMode);
-            }
-        }
-    }
-
-    enum OutlineMode {
-        NONE("none"),
-        IS_OUTLINE("is_outline"),
-        AFFECTS_OUTLINE("affects_outline");
-
-        private final String name;
-
-        OutlineMode(String name) {
-            this.name = name;
-        }
-
-        public String toString() {
-            return this.name;
-        }
-    }
-
-
-}

src/main/java/com/gtnewhorizons/angelica/compat/toremove/RenderPhase.java

@@ -1,543 +0,0 @@
-package com.gtnewhorizons.angelica.compat.toremove;
-
-import com.gtnewhorizons.angelica.glsm.GLStateManager;
-import me.jellysquid.mods.sodium.client.SodiumClientMod;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
-
-import javax.annotation.Nullable;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.OptionalDouble;
-
-
-public abstract class RenderPhase {
-    protected final String name;
-    protected Runnable beginAction;
-    private final Runnable endAction;
-    protected static final Transparency NO_TRANSPARENCY = new Transparency("no_transparency", GLStateManager::disableBlend, () -> {
-    });
-    protected static final Transparency ADDITIVE_TRANSPARENCY = new Transparency("additive_transparency", () -> {
-        GLStateManager.enableBlend();
-        GLStateManager.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE);
-    }, () -> {
-        GLStateManager.disableBlend();
-        GLStateManager.defaultBlendFunc();
-    });
-    protected static final Transparency LIGHTNING_TRANSPARENCY = new Transparency("lightning_transparency", () -> {
-        GLStateManager.enableBlend();
-        GLStateManager.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
-    }, () -> {
-        GLStateManager.disableBlend();
-        GLStateManager.defaultBlendFunc();
-    });
-    protected static final Transparency GLINT_TRANSPARENCY = new Transparency("glint_transparency", () -> {
-        GLStateManager.enableBlend();
-        GLStateManager.tryBlendFuncSeparate(GL11.GL_SRC_COLOR, GL11.GL_ONE,  GL11.GL_ZERO, GL11.GL_ONE);
-    }, () -> {
-        GLStateManager.disableBlend();
-        GLStateManager.defaultBlendFunc();
-    });
-    protected static final Transparency CRUMBLING_TRANSPARENCY = new Transparency("crumbling_transparency", () -> {
-        GLStateManager.enableBlend();
-        GLStateManager.tryBlendFuncSeparate(GL11.GL_DST_COLOR, GL11.GL_SRC_COLOR, GL11.GL_ONE, GL11.GL_ZERO);
-    }, () -> {
-        GLStateManager.disableBlend();
-        GLStateManager.defaultBlendFunc();
-    });
-    protected static final Transparency TRANSLUCENT_TRANSPARENCY = new Transparency("translucent_transparency", () -> {
-        GLStateManager.enableBlend();
-        GLStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
-    }, () -> {
-        GLStateManager.disableBlend();
-        GLStateManager.defaultBlendFunc();
-    });
-    protected static final Alpha ZERO_ALPHA = new Alpha(0.0F);
-    protected static final Alpha ONE_TENTH_ALPHA = new Alpha(0.003921569F);
-    protected static final Alpha HALF_ALPHA = new Alpha(0.5F);
-    protected static final ShadeModel SHADE_MODEL = new ShadeModel(false);
-    protected static final ShadeModel SMOOTH_SHADE_MODEL = new ShadeModel(true);
-    protected static final Texture MIPMAP_BLOCK_ATLAS_TEXTURE;
-    protected static final Texture BLOCK_ATLAS_TEXTURE;
-    protected static final Texture NO_TEXTURE;
-    protected static final Texturing DEFAULT_TEXTURING;
-    protected static final Lightmap ENABLE_LIGHTMAP;
-    protected static final Lightmap DISABLE_LIGHTMAP;
-    protected static final DiffuseLighting ENABLE_DIFFUSE_LIGHTING;
-    protected static final DiffuseLighting DISABLE_DIFFUSE_LIGHTING;
-    protected static final Cull ENABLE_CULLING;
-    protected static final Cull DISABLE_CULLING;
-    protected static final DepthTest ALWAYS_DEPTH_TEST;
-    protected static final DepthTest EQUAL_DEPTH_TEST;
-    protected static final DepthTest LEQUAL_DEPTH_TEST;
-    protected static final WriteMaskState ALL_MASK;
-    protected static final WriteMaskState COLOR_MASK;
-    protected static final WriteMaskState DEPTH_MASK;
-    protected static final Layering NO_LAYERING;
-    protected static final Fog NO_FOG;
-    protected static final Fog FOG;
-    protected static final Fog BLACK_FOG;
-    protected static final Target MAIN_TARGET;
-    protected static final Target OUTLINE_TARGET;
-    protected static final Target TRANSLUCENT_TARGET;
-
-    public RenderPhase(String name, Runnable beginAction, Runnable endAction) {
-        this.name = name;
-        this.beginAction = beginAction;
-        this.endAction = endAction;
-    }
-
-    public void startDrawing() {
-        this.beginAction.run();
-    }
-
-    public void endDrawing() {
-        this.endAction.run();
-    }
-
-    public boolean equals(@Nullable Object object) {
-        if (this == object) {
-            return true;
-        } else if (object != null && this.getClass() == object.getClass()) {
-            RenderPhase lv = (RenderPhase)object;
-            return this.name.equals(lv.name);
-        } else {
-            return false;
-        }
-    }
-
-    public int hashCode() {
-        return this.name.hashCode();
-    }
-
-    public String toString() {
-        return this.name;
-    }
-
-    private static ResourceLocation ATLAS = TextureMap.locationBlocksTexture;
-    static {
-        // TODO: Sodium - SpriteAtlasTexture
-        MIPMAP_BLOCK_ATLAS_TEXTURE = new Texture(ATLAS, false, true);
-        BLOCK_ATLAS_TEXTURE = new Texture(ATLAS, false, false);
-        NO_TEXTURE = new Texture();
-        DEFAULT_TEXTURING = new Texturing("default_texturing", () -> {
-        }, () -> {
-        });
-        ENABLE_LIGHTMAP = new Lightmap(true);
-        DISABLE_LIGHTMAP = new Lightmap(false);
-        ENABLE_DIFFUSE_LIGHTING = new DiffuseLighting(true);
-        DISABLE_DIFFUSE_LIGHTING = new DiffuseLighting(false);
-        ENABLE_CULLING = new Cull(true);
-        DISABLE_CULLING = new Cull(false);
-        ALWAYS_DEPTH_TEST = new DepthTest("always", GL11.GL_ALWAYS);
-        EQUAL_DEPTH_TEST = new DepthTest("==", GL11.GL_EQUAL);
-        LEQUAL_DEPTH_TEST = new DepthTest("<=", GL11.GL_LEQUAL);
-        ALL_MASK = new WriteMaskState(true, true);
-        COLOR_MASK = new WriteMaskState(true, false);
-        DEPTH_MASK = new WriteMaskState(false, true);
-        NO_LAYERING = new Layering("no_layering", () -> {}, () -> {});
-        NO_FOG = new Fog("no_fog", () -> {
-        }, () -> {
-        });
-        FOG = new Fog("fog", () -> {
-            // Unclear what this should do
-            // BackgroundRenderer.setFogBlack(), also levelFogColor()
-            SodiumClientMod.LOGGER.debug("Fog - Not setting level fog color");
-            GLStateManager.enableFog();
-        }, GLStateManager::disableFog);
-        BLACK_FOG = new Fog("black_fog", () -> {
-            GLStateManager.fogColor(0.0F, 0.0F, 0.0F, 1.0F);
-            GLStateManager.enableFog();
-        }, () -> {
-            // Unclear what this should do
-            // BackgroundRenderer.setFogBlack(), also levelFogColor()
-            SodiumClientMod.LOGGER.debug("Fog - Not setting level fog color");
-            GLStateManager.disableFog();
-        });
-        MAIN_TARGET = new Target("main_target", () -> {
-        }, () -> {
-        });
-        OUTLINE_TARGET = new Target("outline_target", () -> {
-            // TODO: Sodium
-            SodiumClientMod.LOGGER.debug("NOT enabling the entity outline framebuffer");
-            //MinecraftClient.getInstance().worldRenderer.getEntityOutlinesFramebuffer().beginWrite(false);
-        }, () -> {
-            Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(false);
-        });
-        TRANSLUCENT_TARGET = new Target("translucent_target", () -> {
-            if (Minecraft.isFancyGraphicsEnabled()) {
-                // TODO: Sodium
-                SodiumClientMod.LOGGER.debug("NOT enabling the translucent framebuffer");
-                // MinecraftClient.getInstance().worldRenderer.getTranslucentFramebuffer().beginWrite(false);
-            }
-
-        }, () -> {
-            if (Minecraft.isFancyGraphicsEnabled()) {
-                Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(false);
-            }
-
-        });
-    }
-
-
-    public static class Target extends RenderPhase {
-        public Target(String string, Runnable runnable, Runnable runnable2) {
-            super(string, runnable, runnable2);
-        }
-    }
-
-
-    public static class Fog extends RenderPhase {
-        public Fog(String string, Runnable runnable, Runnable runnable2) {
-            super(string, runnable, runnable2);
-        }
-    }
-
-
-    public static class Layering extends RenderPhase {
-        public Layering(String string, Runnable runnable, Runnable runnable2) {
-            super(string, runnable, runnable2);
-        }
-    }
-
-
-    public static class WriteMaskState extends RenderPhase {
-        private final boolean color;
-        private final boolean depth;
-
-        public WriteMaskState(boolean color, boolean depth) {
-            super("write_mask_state", () -> {
-                if (!depth) {
-                    GLStateManager.glDepthMask(depth);
-                }
-
-                if (!color) {
-                    GLStateManager.glColorMask(color, color, color, color);
-                }
-
-            }, () -> {
-                if (!depth) {
-                    GLStateManager.glDepthMask(true);
-                }
-
-                if (!color) {
-                    GLStateManager.glColorMask(true, true, true, true);
-                }
-
-            });
-            this.color = color;
-            this.depth = depth;
-        }
-
-        @Override
-        public boolean equals(Object object) {
-            if (this == object) {
-                return true;
-            } else if (object != null && this.getClass() == object.getClass()) {
-                WriteMaskState lv = (WriteMaskState)object;
-                return this.color == lv.color && this.depth == lv.depth;
-            } else {
-                return false;
-            }
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(this.color, this.depth);
-        }
-
-        @Override
-        public String toString() {
-            return this.name + "[writeColor=" + this.color + ", writeDepth=" + this.depth + ']';
-        }
-    }
-
-
-    public static class DepthTest extends RenderPhase {
-        private final String depthFunction;
-        private final int func;
-
-        public DepthTest(String string, int i) {
-            super("depth_test", () -> {
-                if (i != GL11.GL_ALWAYS) {
-                    GLStateManager.enableDepthTest();
-                    GLStateManager.glDepthFunc(i);
-                }
-
-            }, () -> {
-                if (i != GL11.GL_ALWAYS) {
-                    GLStateManager.disableDepthTest();
-                    GLStateManager.glDepthFunc(GL11.GL_LEQUAL);
-                }
-
-            });
-            this.depthFunction = string;
-            this.func = i;
-        }
-
-        @Override
-        public boolean equals(Object object) {
-            if (this == object) {
-                return true;
-            } else if (object != null && this.getClass() == object.getClass()) {
-                DepthTest lv = (DepthTest)object;
-                return this.func == lv.func;
-            } else {
-                return false;
-            }
-        }
-
-        @Override
-        public int hashCode() {
-            return Integer.hashCode(this.func);
-        }
-
-        @Override
-        public String toString() {
-            return this.name + '[' + this.depthFunction + ']';
-        }
-    }
-
-
-    public static class Cull extends Toggleable {
-        public Cull(boolean culling) {
-            super("cull", () -> {
-                if (!culling) {
-                    GLStateManager.disableCull();
-                }
-
-            }, () -> {
-                if (!culling) {
-                    GLStateManager.enableCull();
-                }
-
-            }, culling);
-        }
-    }
-
-
-    public static class DiffuseLighting extends Toggleable {
-        public DiffuseLighting(boolean guiLighting) {
-            super("diffuse_lighting", () -> {
-                if (guiLighting) {
-                    throw new RuntimeException("Not Implemented Yet");
-//                    net.minecraft.client.drawScreen.DiffuseLighting.enable();
-                }
-
-            }, () -> {
-                if (guiLighting) {
-                    throw new RuntimeException("Not Implemented Yet");
-//                    net.minecraft.client.drawScreen.DiffuseLighting.disable();
-                }
-
-            }, guiLighting);
-        }
-    }
-
-
-    public static class Lightmap extends Toggleable {
-        public Lightmap(boolean lightmap) {
-            super("lightmap", () -> {
-                if (lightmap) {
-                    // TODO: Sodium - LightmapTextureManager
-                    SodiumClientMod.LOGGER.debug("Lightmap - enable (not implemented)");
-//                    throw new RuntimeException("Not Implemented Yet");
-//                    MinecraftClient.getInstance().gameRenderer.getLightmapTextureManager().enable();
-
-                }
-
-            }, () -> {
-                if (lightmap) {
-                    // TODO: Sodium - LightmapTextureManager
-                    SodiumClientMod.LOGGER.debug("Lightmap - disable (not implemented)");
-//                    throw new RuntimeException("Not Implemented Yet");
-//                    MinecraftClient.getInstance().gameRenderer.getLightmapTextureManager().disable();
-                }
-
-            }, lightmap);
-        }
-    }
-
-
-    static class Toggleable extends RenderPhase {
-        private final boolean enabled;
-
-        public Toggleable(String string, Runnable runnable, Runnable runnable2, boolean bl) {
-            super(string, runnable, runnable2);
-            this.enabled = bl;
-        }
-
-        @Override
-        public boolean equals(Object object) {
-            if (this == object) {
-                return true;
-            } else if (object != null && this.getClass() == object.getClass()) {
-                Toggleable lv = (Toggleable)object;
-                return this.enabled == lv.enabled;
-            } else {
-                return false;
-            }
-        }
-
-        @Override
-        public int hashCode() {
-            return Boolean.hashCode(this.enabled);
-        }
-
-        @Override
-        public String toString() {
-            return this.name + '[' + this.enabled + ']';
-        }
-    }
-
-
-    public static class Texturing extends RenderPhase {
-        public Texturing(String string, Runnable runnable, Runnable runnable2) {
-            super(string, runnable, runnable2);
-        }
-    }
-
-
-    public static class Texture extends RenderPhase {
-        private final Optional<ResourceLocation> id;
-        protected boolean bilinear;
-        protected boolean mipmap;
-
-        public Texture(ResourceLocation id, boolean bilinear, boolean mipmap) {
-            super("texture", () -> {
-                GLStateManager.enableTexture();
-                TextureManager lv = Minecraft.getMinecraft().getTextureManager();
-                lv.bindTexture(id);
-                //GLStateManager.setFilter(bilinear, mipmap); // breaks textures. TODO find out why
-            }, () -> {
-            });
-            this.id = Optional.of(id);
-            this.bilinear = bilinear;
-            this.mipmap = mipmap;
-        }
-
-        public Texture() {
-            super("texture", GLStateManager::disableTexture, GLStateManager::enableTexture);
-            this.id = Optional.empty();
-            this.bilinear = false;
-            this.mipmap = false;
-        }
-
-        @Override
-        public boolean equals(Object object) {
-            if (this == object) {
-                return true;
-            } else if (object != null && this.getClass() == object.getClass()) {
-                Texture lv = (Texture)object;
-                return this.id.equals(lv.id) && this.bilinear == lv.bilinear && this.mipmap == lv.mipmap;
-            } else {
-                return false;
-            }
-        }
-
-        @Override
-        public int hashCode() {
-            return this.id.hashCode();
-        }
-
-        @Override
-        public String toString() {
-            return this.name + '[' + this.id + "(blur=" + this.bilinear + ", mipmap=" + this.mipmap + ")]";
-        }
-
-        protected Optional<ResourceLocation> getId() {
-            return this.id;
-        }
-    }
-
-
-    public static class ShadeModel extends RenderPhase {
-        private final boolean smooth;
-
-        public ShadeModel(boolean smooth) {
-            super("shade_model",
-                () -> GLStateManager.glShadeModel(smooth ? GL11.GL_SMOOTH : GL11.GL_FLAT),
-                () -> GLStateManager.glShadeModel(GL11.GL_FLAT));
-            this.smooth = smooth;
-        }
-
-        @Override
-        public boolean equals(Object object) {
-            if (this == object) {
-                return true;
-            } else if (object != null && this.getClass() == object.getClass()) {
-                ShadeModel lv = (ShadeModel)object;
-                return this.smooth == lv.smooth;
-            } else {
-                return false;
-            }
-        }
-
-        @Override
-        public int hashCode() {
-            return Boolean.hashCode(this.smooth);
-        }
-
-        @Override
-        public String toString() {
-            return this.name + '[' + (this.smooth ? "smooth" : "flat") + ']';
-        }
-    }
-
-
-    public static class Alpha extends RenderPhase {
-        private final float alpha;
-
-        public Alpha(float alpha) {
-            super("alpha", () -> {
-                if (alpha > 0.0F) {
-
-                    GLStateManager.enableAlphaTest();
-                    GLStateManager.glAlphaFunc(GL11.GL_GREATER, alpha);
-                } else {
-                    GLStateManager.disableAlphaTest();
-                }
-
-            }, () -> {
-                GLStateManager.disableAlphaTest();
-                GLStateManager.glAlphaFunc(GL11.GL_GREATER, 0.1F);
-            });
-            this.alpha = alpha;
-        }
-
-        @Override
-        public boolean equals(@Nullable Object object) {
-            if (this == object) {
-                return true;
-            } else if (object != null && this.getClass() == object.getClass()) {
-                if (!super.equals(object)) {
-                    return false;
-                } else {
-                    return this.alpha == ((Alpha)object).alpha;
-                }
-            } else {
-                return false;
-            }
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(super.hashCode(), this.alpha);
-        }
-
-        @Override
-        public String toString() {
-            return this.name + '[' + this.alpha + ']';
-        }
-    }
-
-
-    public static class Transparency extends RenderPhase {
-        public Transparency(String string, Runnable runnable, Runnable runnable2) {
-            super(string, runnable, runnable2);
-        }
-    }
-}

src/main/java/com/gtnewhorizons/angelica/compat/toremove/VertexConsumer.java

@@ -1,48 +0,0 @@
-package com.gtnewhorizons.angelica.compat.toremove;
-
-import javax.annotation.Nonnull;
-
-public interface VertexConsumer {
-
-    VertexConsumer vertex(double d, double e, double f);
-
-    @Nonnull
-    VertexConsumer color(int r, int g, int b, int a);
-
-    @Nonnull
-    VertexConsumer texture(float u, float v);
-
-    @Nonnull
-    VertexConsumer overlay(int u, int v);
-
-    @Nonnull
-    VertexConsumer light(int u, int v);
-
-    @Nonnull
-    VertexConsumer normal(float x, float y, float z);
-
-    void next();
-
-    default VertexConsumer overlay(int overlay) {
-        return this.overlay(overlay & 0xFFFF, overlay >> 16 & 0xFFFF);
-    }
-
-    default VertexConsumer light(int light) {
-        return this.light(light & 0xFFFF, light >> 16 & 0xFFFF);
-    }
-
-    default VertexConsumer color(float red, float green, float blue, float alpha) {
-        return this.color((int)(red * 255.0F), (int)(green * 255.0F), (int)(blue * 255.0F), (int)(alpha * 255.0F));
-    }
-
-    default void vertex(float x, float y, float z, float red, float green, float blue, float alpha, float u, float v, int overlay, int light, float normalX, float normalY, float normalZ) {
-        this.vertex((double)x, (double)y, (double)z);
-        this.color(red, green, blue, alpha);
-        this.texture(u, v);
-        this.overlay(overlay);
-        this.light(light);
-        this.normal(normalX, normalY, normalZ);
-        this.next();
-    }
-
-}

src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java

@@ -1,151 +0,0 @@
-package com.gtnewhorizons.angelica.config;
-
-import com.gtnewhorizon.gtnhlib.config.Config;
-
-@Config(modid = "angelica", filename = "angelica-modules")
-public class AngelicaConfig {
-    @Config.Comment("Enable Sodium rendering")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean enableSodium;
-
-    @Config.Comment("Enable NotFine Options")
-    @Config.DefaultBoolean(false)
-    public static boolean enableNotFineOptions;
-
-    @Config.Comment("Enable Reese's Sodium Options")
-    @Config.DefaultBoolean(true)
-    public static boolean enableReesesSodiumOptions;
-
-    @Config.Comment("Enable Sodium fluid rendering")
-    @Config.DefaultBoolean(false)
-    @Config.RequiresMcRestart
-    public static boolean enableSodiumFluidRendering;
-
-    @Config.Comment("Inject QuadProvider rendering into some vanilla blocks")
-    @Config.DefaultBoolean(false)
-    @Config.RequiresMcRestart
-    public static boolean injectQPRendering;
-
-    @Config.Comment("Enable Angelica's test blocks")
-    @Config.DefaultBoolean(false)
-    @Config.Ignore()
-    public static boolean enableTestBlocks;
-
-    @Config.Comment("Enable Iris Shaders [Requires Sodium]")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean enableIris;
-
-    @Config.Comment("Enable MCPatcherForge features, still in Alpha. Individual features are toggled in mcpatcher.json")
-    @Config.DefaultBoolean(false)
-    @Config.RequiresMcRestart
-    public static boolean enableMCPatcherForgeFeatures;
-
-    @Config.Comment("Replace some vanilla render paths with more optimized versions. Disable if you encounter mixin conflicts.")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean enableVBO;
-
-    @Config.Comment("Enable NotFine features")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean enableNotFineFeatures;
-
-    @Config.Comment("Tweak F3 screen to be closer to modern versions. [From ArchaicFix]")
-    @Config.DefaultBoolean(true)
-    public static boolean modernizeF3Screen;
-
-    @Config.Comment("Show block registry name and meta value in F3, similar to 1.8+. [From ArchaicFix]")
-    @Config.DefaultBoolean(true)
-    public static boolean showBlockDebugInfo;
-
-    @Config.DefaultBoolean(true)
-    @Config.Comment("Hide downloading terrain screen. [From ArchaicFix]")
-    public static boolean hideDownloadingTerrainScreen;
-
-    @Config.Comment("Show memory usage during game load. [From ArchaicFix]")
-    @Config.DefaultBoolean(true)
-    public static boolean showSplashMemoryBar;
-
-    @Config.Comment("Renders the HUD elements once per 20 frames (by default) and reuses the pixels to improve performance. [Experimental]")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean enableHudCaching;
-    @Config.Comment("Inject a conditional early return into all RenderGameOverlayEvent receivers; Requires enableHudCaching")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean enableHudCachingEventTransformer;
-
-    @Config.Comment("The amount of frames to wait before updating the HUD elements. [Experimental]")
-    @Config.DefaultInt(20)
-    @Config.RangeInt(min = 1, max = 60)
-    public static int hudCachingFPS = 20;
-
-    @Config.Comment("Batch drawScreen fonts [Experimental]")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean enableFontRenderer;
-
-    @Config.Comment("Enable Dynamic Lights")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean enableDynamicLights;
-
-    @Config.Comment("Optimize world update light. [From Hodgepodge]")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean optimizeWorldUpdateLight;
-
-    @Config.Comment("Speedup Animations. [From Hodgepodge]")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean speedupAnimations;
-
-    @Config.Comment("Optimize Texture Loading. [From Hodgepodge]")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean optimizeTextureLoading;
-
-    @Config.Comment("Fix RenderBlockFluid reading the block type from the world access multiple times")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean fixFluidRendererCheckingBlockAgain;
-
-    @Config.Comment("Dynamically modifies the render distance of dropped items entities to preserve performance."
-                  + " It starts reducing the render distance when exceeding the threshold set below.")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean dynamicItemRenderDistance;
-
-    @Config.Comment("Max amount of dropped item rendered")
-    @Config.DefaultInt(256)
-    @Config.RangeInt(min = 32, max = 2048)
-    public static int droppedItemLimit;
-
-    @Config.Comment("Use total world time instead of normal world time. Allows most shader animations to play when "
-                  + "doDaylightCycle is off, but causes shader animations to desync from time of day.")
-    @Config.DefaultBoolean(false)
-    public static boolean useTotalWorldTime;
-
-    @Config.Comment("Enable Debug Logging")
-    @Config.DefaultBoolean(false)
-    @Config.RequiresMcRestart
-    public static boolean enableDebugLogging;
-
-    @Config.Comment("Enable Zoom")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean enableZoom;
-
-    @Config.Comment("Optimizes in-world item rendering")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean optimizeInWorldItemRendering;
-
-    @Config.Comment("Max amount of display lists to cache for optimized item rendering. Higher number will use more VRAM")
-    @Config.DefaultInt(256)
-    @Config.RangeInt(min = 64, max = 1024)
-    public static int itemRendererDisplayListCacheSize;
-
-}

src/main/java/com/gtnewhorizons/angelica/config/AngelicaGuiConfig.java

@@ -1,11 +0,0 @@
-package com.gtnewhorizons.angelica.config;
-
-import com.gtnewhorizon.gtnhlib.config.ConfigException;
-import com.gtnewhorizon.gtnhlib.config.SimpleGuiConfig;
-import net.minecraft.client.gui.GuiScreen;
-
-public class AngelicaGuiConfig extends SimpleGuiConfig {
-    public AngelicaGuiConfig(GuiScreen parent) throws ConfigException {
-        super(parent, AngelicaConfig.class, "angelica", "Angelica");
-    }
-}

src/main/java/com/gtnewhorizons/angelica/config/AngelicaGuiConfigFactory.java

@@ -1,11 +0,0 @@
-package com.gtnewhorizons.angelica.config;
-
-import com.gtnewhorizon.gtnhlib.config.SimpleGuiFactory;
-import net.minecraft.client.gui.GuiScreen;
-
-public class AngelicaGuiConfigFactory implements SimpleGuiFactory {
-    @Override
-    public Class<? extends GuiScreen> mainConfigGuiClass() {
-        return AngelicaGuiConfig.class;
-    }
-}

src/main/java/com/gtnewhorizons/angelica/config/CompatConfig.java

@@ -1,42 +0,0 @@
-package com.gtnewhorizons.angelica.config;
-
-import com.gtnewhorizon.gtnhlib.config.Config;
-
-@Config(modid = "angelica", filename = "angelica-compat")
-public class CompatConfig {
-
-    @Config.Comment("Apply fixes to the LOTR mod")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean fixLotr;
-
-    @Config.Comment("Apply fixes to Extra Utilities")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean fixExtraUtils;
-
-    @Config.Comment("Apply fixes to Stacks on Stacks")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean fixStacksOnStacks;
-
-    @Config.Comment("Apply fixes to Minefactory Reloaded")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean fixMinefactoryReloaded;
-
-    @Config.Comment("Apply fixes to Thaumcraft")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean fixThaumcraft;
-
-    @Config.Comment("Apply fixes to ThaumicHorizons")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean fixThaumicHorizons;
-
-    @Config.Comment("Apply fixes to Immersive Engineering")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean fixImmersiveEngineering;
-}

src/main/java/com/gtnewhorizons/angelica/config/ConfigMigrator.java

@@ -1,35 +0,0 @@
-package com.gtnewhorizons.angelica.config;
-
-import net.minecraft.client.Minecraft;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-public class ConfigMigrator {
-    public static Logger LOGGER = LogManager.getLogger("Angelica");
-
-    /**
-     * Tries to migrate the equivalent config file from Rubidium to the Angelica name if possible.
-     */
-    public static Path handleConfigMigration(String fileName) {
-        final Path configDir = Minecraft.getMinecraft().mcDataDir.toPath().resolve("config");
-        final Path mainPath = configDir.resolve(fileName);
-        try {
-            if(Files.notExists(mainPath)) {
-                final String legacyName = fileName.replace("angelica", "rubidium");
-                final Path legacyPath = configDir.resolve(legacyName);
-                if(Files.exists(legacyPath)) {
-                    Files.move(legacyPath, mainPath);
-                    LOGGER.warn("Migrated {} config file to {}", legacyName, fileName);
-                }
-            }
-        } catch(IOException | RuntimeException e) {
-            LOGGER.error("Exception encountered while attempting config migration", e);
-        }
-
-        return mainPath;
-    }
-}

src/main/java/com/gtnewhorizons/angelica/debug/F3Direction.java

@@ -1,61 +0,0 @@
-package com.gtnewhorizons.angelica.debug;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.entity.Entity;
-import net.minecraftforge.client.event.RenderGameOverlayEvent;
-import org.lwjgl.opengl.GL11;
-
-public class F3Direction {
-    public static void renderWorldDirectionsEvent(Minecraft mc, RenderGameOverlayEvent.Pre event) {
-        if (mc.gameSettings.showDebugInfo && mc.gameSettings.thirdPersonView == 0) {
-            ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
-            int width = scaledresolution.getScaledWidth();
-            int height = scaledresolution.getScaledHeight();
-
-            GL11.glPushMatrix();
-
-            GL11.glTranslatef((float) (width / 2), (float) (height / 2), -90);
-
-            Entity entity = mc.renderViewEntity;
-            GL11.glRotatef(entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * event.partialTicks, -1.0F, 0.0F, 0.0F);
-            GL11.glRotatef(entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * event.partialTicks, 0.0F, 1.0F, 0.0F);
-
-            GL11.glScalef(-1.0F, -1.0F, -1.0F);
-
-            renderWorldDirections();
-
-            GL11.glPopMatrix();
-        }
-    }
-    public static void renderWorldDirections() {
-        GL11.glDisable(GL11.GL_TEXTURE_2D);
-        GL11.glDepthMask(false);
-        Tessellator tessellator = Tessellator.instance;
-
-        GL11.glLineWidth(2.0F);
-        tessellator.startDrawing(GL11.GL_LINES);
-
-        //X
-        tessellator.setColorRGBA_F(255, 0, 0, 1);
-        tessellator.addVertex(0.0D, 0.0D, 0.0D);
-        tessellator.addVertex(10, 0.0D, 0.0D);
-
-        //Z
-        tessellator.setColorRGBA_F(0, 0, 255, 1);
-        tessellator.addVertex(0.0D, 0.0D, 0.0D);
-        tessellator.addVertex(0.0D, 0.0D, 10);
-
-        //Y
-        tessellator.setColorRGBA_F(0, 255, 0, 1);
-        tessellator.addVertex(0.0D, 0.0D, 0.0D);
-        tessellator.addVertex(0.0D, 10, 0.0D);
-
-        tessellator.draw();
-
-        GL11.glLineWidth(1.0F);
-        GL11.glDepthMask(true);
-        GL11.glEnable(GL11.GL_TEXTURE_2D);
-    }
-}

src/main/java/com/gtnewhorizons/angelica/debug/F3Graph.java

@@ -1,273 +0,0 @@
-package com.gtnewhorizons.angelica.debug;
-
-import static org.lwjgl.opengl.GL11.GL_ALPHA_TEST;
-import static org.lwjgl.opengl.GL11.GL_BLEND;
-import static org.lwjgl.opengl.GL11.GL_CULL_FACE;
-import static org.lwjgl.opengl.GL11.GL_DEPTH_TEST;
-import static org.lwjgl.opengl.GL11.GL_FLOAT;
-import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA;
-import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA;
-import static org.lwjgl.opengl.GL11.GL_TEXTURE_2D;
-import static org.lwjgl.opengl.GL11.GL_TRIANGLE_STRIP;
-import static org.lwjgl.opengl.GL11.GL_VERTEX_ARRAY;
-import static org.lwjgl.opengl.GL11.glBlendFunc;
-import static org.lwjgl.opengl.GL11.glColor4f;
-import static org.lwjgl.opengl.GL11.glDisable;
-import static org.lwjgl.opengl.GL11.glDisableClientState;
-import static org.lwjgl.opengl.GL11.glDrawArrays;
-import static org.lwjgl.opengl.GL11.glEnable;
-import static org.lwjgl.opengl.GL11.glEnableClientState;
-import static org.lwjgl.opengl.GL15.GL_ARRAY_BUFFER;
-import static org.lwjgl.opengl.GL15.GL_STATIC_DRAW;
-import static org.lwjgl.opengl.GL15.glBindBuffer;
-import static org.lwjgl.opengl.GL15.glBufferData;
-import static org.lwjgl.opengl.GL15.glGenBuffers;
-import static org.lwjgl.opengl.GL20.glDisableVertexAttribArray;
-import static org.lwjgl.opengl.GL20.glEnableVertexAttribArray;
-import static org.lwjgl.opengl.GL20.glUniform1;
-import static org.lwjgl.opengl.GL20.glUniform1f;
-import static org.lwjgl.opengl.GL20.glUniform1i;
-import static org.lwjgl.opengl.GL20.glVertexAttribPointer;
-
-import com.gtnewhorizon.gtnhlib.client.renderer.shader.ShaderProgram;
-import com.gtnewhorizons.angelica.compat.lwjgl.MemoryStack;
-import java.nio.FloatBuffer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.BufferUtils;
-
-public abstract class F3Graph {
-    private static final int NUM_SAMPLES = 240;
-    // Two floats (x,y)
-    private static final int VERT_FLOATS = 2;
-    private static final int VERT_COUNT = 4;
-    private static final int BORDER = 1;
-    private static final int HEIGHT = 60;
-    private static final int WIDTH = NUM_SAMPLES;
-    private static final int FONT_COLOR = 0xFFE0E0E0;
-    // Due to GLSL 120 limitations, it's just easier to use floats
-    private final FloatBuffer sampleBuf = BufferUtils.createFloatBuffer(NUM_SAMPLES);
-    private final long[] samples = new long[NUM_SAMPLES]; // long version for calculations
-    // Circular buffer holding the last 240 samples, in nanoseconds
-    private int samplesHead = 0; // one ahead of the position of the last sample
-    private boolean initialized = false;
-    private ShaderProgram shader;
-    private int aPos;
-    private int uFBWidth;
-    private int uFBHeight;
-    private int uScaleFactor;
-    private int uHeadIdx;
-    private int uSamples;
-    private int vertBuf;
-    private final ResourceLocation texture;
-    private final float pxPerNs;
-    private final boolean left;
-    private long sum;
-
-    protected F3Graph(ResourceLocation texture, float pxPerNs, boolean left) {
-        this.texture = texture;
-        this.pxPerNs = pxPerNs;
-        this.left = left;
-    }
-
-    public void putSample(long time) {
-        // Manage running trackers
-        sum -= samples[samplesHead];
-        sum += time;
-        samples[samplesHead] = time;
-
-        sampleBuf.put(samplesHead, (float) time);
-        samplesHead = (samplesHead + 1) % NUM_SAMPLES;
-    }
-
-    private int getVertX(ScaledResolution sres, int idx) {
-        if (left) {
-            return switch (idx) {
-                case 0, 3 -> WIDTH + BORDER * 2;
-                case 1, 2 -> 0;
-                default -> throw new RuntimeException("Tried to get out-of-bounds vertex for graph!");
-            };
-        }
-
-        final int displayWidth = sres.getScaledWidth();
-        return switch (idx) {
-            case 0, 3 -> displayWidth;
-            case 1, 2 -> displayWidth - WIDTH - BORDER * 2;
-            default -> throw new RuntimeException("Tried to get out-of-bounds vertex for graph!");
-        };
-    }
-
-    private int getVertY(ScaledResolution sres, int idx) {
-        final int displayHeight = sres.getScaledHeight();
-        return switch (idx) {
-            case 0, 1 -> displayHeight - HEIGHT - BORDER * 2;
-            case 2, 3 -> displayHeight;
-            default -> throw new RuntimeException("Tried to get out-of-bounds vertex for graph!");
-        };
-    }
-
-    private void init() {
-        shader = new ShaderProgram(
-            "angelica",
-            "shaders/debug_graph.vert.glsl",
-            "shaders/debug_graph.frag.glsl");
-        shader.use();
-
-        // Register attributes
-        aPos = shader.getAttribLocation("pos");
-
-        // Register uniforms
-        uFBWidth = shader.getUniformLocation("fbWidth");
-        uFBHeight = shader.getUniformLocation("fbHeight");
-        uScaleFactor = shader.getUniformLocation("scaleFactor");
-        uSamples = shader.getUniformLocation("samples");
-        uHeadIdx = shader.getUniformLocation("headIdx");
-        final int uPxPerNs = shader.getUniformLocation("pxPerNs");
-        final int uLeft = shader.getUniformLocation("left");
-
-        // Load vertex buffer
-        vertBuf = glGenBuffers();
-        glBindBuffer(GL_ARRAY_BUFFER, vertBuf);
-        try (final MemoryStack stack = MemoryStack.stackPush()) {
-            final FloatBuffer vertices = stack.mallocFloat(VERT_COUNT * VERT_FLOATS);
-            // Since we use a triangle strip, we only need 4 vertices. The quad extends to the top of the screen so spikes
-            // don't get truncated. The max height is replaced in the vert shader, no need to be precise.
-            vertices.put(new float[]{
-                BORDER,         BORDER,
-                WIDTH + BORDER, BORDER,
-                BORDER,         Float.MAX_VALUE,
-                WIDTH + BORDER, Float.MAX_VALUE
-            });
-            vertices.rewind();
-
-            glBufferData(GL_ARRAY_BUFFER, vertices, GL_STATIC_DRAW);
-        }
-        glBindBuffer(GL_ARRAY_BUFFER, 0);
-
-        final Minecraft mc = Minecraft.getMinecraft();
-        final ScaledResolution sr = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
-
-        // Load initial value for uniforms
-        glUniform1f(uFBWidth, mc.displayWidth);
-        glUniform1f(uFBHeight, mc.displayHeight);
-        glUniform1f(uScaleFactor, sr.getScaleFactor());
-        glUniform1i(uHeadIdx, samplesHead);
-        glUniform1(uSamples, sampleBuf);
-        glUniform1f(uPxPerNs, pxPerNs);
-        glUniform1i(uLeft, left ? 1 : 0); // this is how you load bool uniforms
-
-        ShaderProgram.clear();
-    }
-
-    public void render() {
-        if (!initialized) {
-            init();
-            initialized = true;
-        }
-
-        /*
-         * We try to copy modern vanilla's tracker.
-         * It is 240 (FRAME_TIMES) wide by 60 tall, including the 1px borders.
-         * We instead make it 242x62 including borders to prevent the borders from overlapping the samples.
-         * The background is ARGB 90505050, the borders FFFFFFFF, and the text FFE0E0E0.
-         * First the background is rendered, then the samples, then the foreground texture and the text.
-         * The background is drawn via a 242x62 translucent rect.
-         * Next, the samples are rendered by a shader on a transparent 240x60 rect.
-         * Finally, the foreground texture and the text is rendered on top.
-         * The shader pipeline is only needed for the sample draw.
-         */
-
-        final Minecraft mc = Minecraft.getMinecraft();
-        final ScaledResolution sr = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
-
-        // Setup GL state
-        final Tessellator tess = Tessellator.instance;
-        glDisable(GL_DEPTH_TEST);
-        glEnable(GL_ALPHA_TEST);
-        glEnable(GL_BLEND);
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-        // Draw background
-        glDisable(GL_TEXTURE_2D);
-        glColor4f(0x50 / 255.0F, 0x50 / 255.0F, 0x50 / 255.0F, 0x90 / 255.0F);
-        tess.startDrawingQuads();
-        for (int i = 0; i < 4; ++i) {
-            tess.addVertex(getVertX(sr, i), getVertY(sr, i), 0);
-        }
-        tess.draw();
-        glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-        glEnable(GL_TEXTURE_2D);
-
-
-        // Draw samples
-        shader.use();
-
-        // Load uniforms
-        glUniform1f(uFBWidth, mc.displayWidth);
-        glUniform1f(uFBHeight, mc.displayHeight);
-        glUniform1f(uScaleFactor, sr.getScaleFactor());
-        glUniform1i(uHeadIdx, samplesHead);
-        glUniform1(uSamples, sampleBuf);
-
-        glBindBuffer(GL_ARRAY_BUFFER, vertBuf);
-        glEnableVertexAttribArray(aPos);
-        glVertexAttribPointer(aPos, VERT_FLOATS, GL_FLOAT, false, VERT_FLOATS * 4, 0);
-        glEnableClientState(GL_VERTEX_ARRAY);
-
-        // Left side graphs are inverted, so temporarily disable culling
-        if (!left) glDisable(GL_CULL_FACE);
-
-        glDrawArrays(GL_TRIANGLE_STRIP, 0, VERT_COUNT);
-
-        if (!left) glEnable(GL_CULL_FACE);
-
-        glDisableClientState(GL_VERTEX_ARRAY);
-        glDisableVertexAttribArray(aPos);
-        glBindBuffer(GL_ARRAY_BUFFER, 0);
-
-        ShaderProgram.clear();
-
-        // Draw foreground
-
-        mc.getTextureManager().bindTexture(texture);
-        tess.startDrawingQuads();
-        tess.addVertexWithUV(getVertX(sr, 0), getVertY(sr, 0), 0.0D, 1, 0);
-        tess.addVertexWithUV(getVertX(sr, 1), getVertY(sr, 1), 0.0D, 0, 0);
-        tess.addVertexWithUV(getVertX(sr, 2), getVertY(sr, 2), 0.0D, 0, 1);
-        tess.addVertexWithUV(getVertX(sr, 3), getVertY(sr, 3), 0.0D, 1, 1);
-        tess.draw();
-
-        // Reset GL state
-        glEnable(GL_DEPTH_TEST);
-        glDisable(GL_ALPHA_TEST);
-        glDisable(GL_BLEND);
-
-        // Draw text
-        // Ensure running counters are reset on first sample
-        long min = Long.MAX_VALUE;
-        long max = Long.MIN_VALUE;
-        for (int i = 0; i < NUM_SAMPLES; ++i) {
-            min = Math.min(min, samples[i]);
-            max = Math.max(max, samples[i]);
-        }
-        String minStr = String.format("%.1f ms min", min / 1_000_000D);
-        String avgStr = String.format("%.1f ms avg", sum / 1_000_000 / (double) NUM_SAMPLES);
-        String maxStr = String.format("%.1f ms max", max / 1_000_000D);
-        final FontRenderer fr = mc.fontRenderer;
-        final int top = sr.getScaledHeight() - HEIGHT - BORDER * 2 - fr.FONT_HEIGHT;
-        final int scaledWidth = sr.getScaledWidth();
-
-        if (left) {
-            fr.drawString(minStr, BORDER * 2, top, FONT_COLOR, true);
-            fr.drawString(avgStr, BORDER + WIDTH / 2 - fr.getStringWidth(avgStr) / 2, top, FONT_COLOR, true);
-            fr.drawString(maxStr, BORDER * 2 + WIDTH - fr.getStringWidth(maxStr), top, FONT_COLOR, true);
-        } else {
-            fr.drawString(minStr, scaledWidth - (BORDER * 2 + WIDTH), top, FONT_COLOR, true);
-            fr.drawString(avgStr, scaledWidth - (BORDER + WIDTH / 2 + fr.getStringWidth(avgStr) / 2), top, FONT_COLOR, true);
-            fr.drawString(maxStr, scaledWidth - (BORDER * 2 + fr.getStringWidth(maxStr)), top, FONT_COLOR, true);
-        }
-    }
-}

src/main/java/com/gtnewhorizons/angelica/debug/FrametimeGraph.java

@@ -1,14 +0,0 @@
-package com.gtnewhorizons.angelica.debug;
-
-import net.minecraft.util.ResourceLocation;
-
-public class FrametimeGraph extends F3Graph {
-    public FrametimeGraph() {
-        // At 1x scale, 30 FPS should be 60 px. 30 FPS = 33_333_333ns per frame, 60px/33_333_333ns = 0.0000018f px/ns
-        super(
-            new ResourceLocation("angelica:textures/frametimes_fg.png"),
-            0.0000018f,
-            true
-        );
-    }
-}