Fix IC2 universal cell rendering w/offhand (#876)

* Fix PBR textures not loading

- Stack was being overfilled by MemoryStack
- Added tons of logging for ignored important exceptions
- Added missing interface on mixin (should it be moved to gtnhlib?)

* Move PBR debug to angelica config

* Free malloc'd memory

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Ignore spotlessApply reformat
+f64f7f366af8fc32dddfe9c9acd1259eb7d65787

.gitattributes

@@ -1,35 +1,44 @@
 * text eol=lf
 
-*.jar      binary
+*.[jJ][aA][rR]          binary
 
-*.png      binary
-*.jpg      binary
-*.jpeg     binary
-*.gif      binary
-*.tif      binary
-*.tiff     binary
-*.ico      binary
-*.svg      text
-*.eps      binary
+*.[pP][nN][gG]          binary
+*.[jJ][pP][gG]          binary
+*.[jJ][pP][eE][gG]      binary
+*.[gG][iI][fF]          binary
+*.[tT][iI][fF]          binary
+*.[tT][iI][fF][fF]      binary
+*.[iI][cC][oO]          binary
+*.[sS][vV][gG]          text
+*.[eE][pP][sS]          binary
+*.[xX][cC][fF]          binary
 
-*.kar      binary
-*.m4a      binary
-*.mid      binary
-*.midi     binary
-*.mp3      binary
-*.ogg      binary
-*.ra       binary
+*.[kK][aA][rR]          binary
+*.[mM]4[aA]             binary
+*.[mM][iI][dD]          binary
+*.[mM][iI][dD][iI]      binary
+*.[mM][pP]3             binary
+*.[oO][gG][gG]          binary
+*.[rR][aA]              binary
 
-*.7z       binary
-*.gz       binary
-*.tar      binary
-*.tgz      binary
-*.zip      binary
+*.7[zZ]                 binary
+*.[gG][zZ]              binary
+*.[tT][aA][rR]          binary
+*.[tT][gG][zZ]          binary
+*.[zZ][iI][pP]          binary
 
-*.patch    -text
+*.[tT][cC][nN]          binary
+*.[sS][oO]              binary
+*.[dD][lL][lL]          binary
+*.[dD][yY][lL][iI][bB]  binary
+*.[pP][sS][dD]          binary
+*.[tT][tT][fF]          binary
+*.[oO][tT][fF]          binary
 
-*.bat      text eol=crlf
-*.cmd      text eol=crlf
-*.ps1      text eol=crlf
+*.[pP][aA][tT][cC][hH]  -text
 
-*autogenerated binary
+*.[bB][aA][tT]          text eol=crlf
+*.[cC][mM][dD]          text eol=crlf
+*.[pP][sS]1             text eol=crlf
+
+*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary

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

@@ -0,0 +1,101 @@
+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

@@ -0,0 +1,33 @@
+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

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

.gitignore

@@ -1,6 +1,7 @@
 .gradle
 .settings
 /.idea/
+/.vs/
 /.vscode/
 /run/
 /build/
@@ -26,7 +27,12 @@ whitelist.json
 *.iml
 *.ipr
 *.iws
-src/main/resources/mixins.*.json
+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

README.MD

@@ -1,19 +1,84 @@
-# Angelica
-the little angle that supports shaders while saving your fps from a certain death - boubou
+# Angelica<img src="img/logo-readme.png" align="right">
 
-Not yet in an usable state
+<sup>**[CurseForge](https://www.curseforge.com/minecraft/mc-mods/angelica) | [Modrinth](https://modrinth.com/mod/angelica)**</sup>
 
-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.
-```
+* 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 - Beta
+   * 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.19
+* [GTNHLib](https://github.com/GTNewHorizons/GTNHLib/releases) >= 0.5.20
+* 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

addon.gradle

@@ -1,21 +0,0 @@
-
-configurations {
-    compileStubs
-}
-
-sourceSets {
-    compileStubsStubs
-    compileStubs {
-        compileClasspath += configurations.compileStubs
-    }
-}
-
-jar {
-    manifest {
-        attributes([
-            "Manifest-Version" : 1.0,
-            "TweakClass" : "com.gtnewhorizons.angelica.loading.ATweaker",
-            "TweakOrder" : 1100,
-        ])
-    }
-}

build.gradle

@@ -1,968 +0,0 @@
-//version: 1661114848
-/*
- DO NOT CHANGE THIS FILE!
- Also, you may replace this file at any time if there is an update available.
- Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
- */
-
-
-import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.gradle.internal.logging.text.StyledTextOutput.Style
-import org.gradle.internal.logging.text.StyledTextOutputFactory
-
-import java.nio.file.Files
-import java.nio.file.Paths
-import java.util.concurrent.TimeUnit
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
-import java.util.zip.ZipOutputStream
-
-buildscript {
-    repositories {
-        mavenCentral()
-
-        maven {
-            name 'forge'
-            url 'https://maven.minecraftforge.net'
-        }
-        maven {
-            // GTNH ForgeGradle Fork
-            name = "GTNH Maven"
-            url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
-        }
-        maven {
-            name 'sonatype'
-            url 'https://oss.sonatype.org/content/repositories/snapshots/'
-        }
-        maven {
-            name 'Scala CI dependencies'
-            url 'https://repo1.maven.org/maven2/'
-        }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.9'
-    }
-}
-plugins {
-    id 'java-library'
-    id 'idea'
-    id 'eclipse'
-    id 'scala'
-    id 'maven-publish'
-    id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
-    id 'org.jetbrains.kotlin.kapt' version '1.5.30' apply false
-    id 'com.google.devtools.ksp' version '1.5.30-1.0.0' apply false
-    id 'org.ajoberstar.grgit' version '4.1.1'
-    id 'com.github.johnrengelman.shadow' version '4.0.4'
-    id 'com.palantir.git-version' version '0.13.0' apply false
-    id 'de.undercouch.download' version '5.0.1'
-    id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false
-    id 'com.diffplug.spotless' version '6.7.2' apply false
-}
-boolean settingsupdated = verifySettingsGradle()
-settingsupdated = verifyGitAttributes() || settingsupdated
-if (settingsupdated)
-    throw new GradleException("Settings has been updated, please re-run task.")
-
-dependencies {
-    implementation 'com.diffplug:blowdryer:1.6.0'
-}
-
-apply plugin: 'com.diffplug.blowdryer'
-
-if (project.file('.git/HEAD').isFile()) {
-    apply plugin: 'com.palantir.git-version'
-}
-
-def out = services.get(StyledTextOutputFactory).create('an-output')
-
-apply plugin: 'forge'
-
-def projectJavaVersion = JavaLanguageVersion.of(8)
-
-java {
-    toolchain {
-        languageVersion.set(projectJavaVersion)
-    }
-}
-
-idea {
-    module {
-        inheritOutputDirs = true
-        downloadJavadoc = true
-        downloadSources = true
-    }
-}
-
-boolean disableSpotless = project.hasProperty("disableSpotless") ? project.disableSpotless.toBoolean() : false
-
-if (!disableSpotless) {
-    apply plugin: 'com.diffplug.spotless'
-    apply from: Blowdryer.file('spotless.gradle')
-}
-
-if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
-    throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
-}
-
-checkPropertyExists("modName")
-checkPropertyExists("modId")
-checkPropertyExists("modGroup")
-checkPropertyExists("autoUpdateBuildScript")
-checkPropertyExists("minecraftVersion")
-checkPropertyExists("forgeVersion")
-checkPropertyExists("replaceGradleTokenInFile")
-checkPropertyExists("gradleTokenModId")
-checkPropertyExists("gradleTokenModName")
-checkPropertyExists("gradleTokenVersion")
-checkPropertyExists("gradleTokenGroupName")
-checkPropertyExists("apiPackage")
-checkPropertyExists("accessTransformersFile")
-checkPropertyExists("usesMixins")
-checkPropertyExists("mixinPlugin")
-checkPropertyExists("mixinsPackage")
-checkPropertyExists("coreModClass")
-checkPropertyExists("containsMixinsAndOrCoreModOnly")
-checkPropertyExists("usesShadowedDependencies")
-checkPropertyExists("developmentEnvironmentUserName")
-
-boolean noPublishedSources = project.hasProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
-boolean usesMixinDebug = project.hasProperty('usesMixinDebug') ?: project.usesMixins.toBoolean()
-boolean forceEnableMixins = project.hasProperty('forceEnableMixins') ? project.forceEnableMixins.toBoolean() : false
-String channel = project.hasProperty('channel') ? project.channel : 'stable'
-String mappingsVersion = project.hasProperty('mappingsVersion') ? project.mappingsVersion : '12'
-String javaSourceDir = "src/main/java/"
-String scalaSourceDir = "src/main/scala/"
-String kotlinSourceDir = "src/main/kotlin/"
-
-String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
-String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
-String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/")
-if (!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
-    throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
-}
-
-if (apiPackage) {
-    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    if (!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
-        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
-    }
-}
-
-if (accessTransformersFile) {
-    String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
-    if (!getFile(targetFile).exists()) {
-        throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
-    }
-}
-
-if (usesMixins.toBoolean()) {
-    if (mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
-        throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
-    }
-
-    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    if (!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
-        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
-    }
-
-    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
-    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala"
-    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
-    String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".kt"
-    if (!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
-        throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
-    }
-}
-
-if (coreModClass) {
-    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
-    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala"
-    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
-    String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".kt"
-    if (!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
-        throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
-    }
-}
-
-configurations.all {
-    resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS)
-
-    // Make sure GregTech build won't time out
-    System.setProperty("org.gradle.internal.http.connectionTimeout", 120000 as String)
-    System.setProperty("org.gradle.internal.http.socketTimeout", 120000 as String)
-}
-
-// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
-try {
-    'git config core.fileMode false'.execute()
-}
-catch (Exception ignored) {
-    out.style(Style.Failure).println("git isn't installed at all")
-}
-
-// Pulls version first from the VERSION env and then git tag
-String identifiedVersion
-String versionOverride = System.getenv("VERSION") ?: null
-try {
-    identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
-}
-catch (Exception ignored) {
-    out.style(Style.Failure).text(
-        'This mod must be version controlled by Git AND the repository must provide at least one tag,\n' +
-            'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' +
-        'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)'
-    )
-    versionOverride = 'NO-GIT-TAG-SET'
-    identifiedVersion = versionOverride
-}
-version = minecraftVersion + '-' + identifiedVersion
-ext {
-    modVersion = identifiedVersion
-}
-
-if (identifiedVersion == versionOverride) {
-    out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
-}
-
-group = modGroup
-if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
-    archivesBaseName = customArchiveBaseName
-} else {
-    archivesBaseName = modId
-}
-
-def arguments = []
-def jvmArguments = []
-
-if (usesMixins.toBoolean() || forceEnableMixins) {
-    arguments += [
-        "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
-    ]
-    if (usesMixinDebug.toBoolean()) {
-        jvmArguments += [
-            "-Dmixin.debug.countInjections=true",
-            "-Dmixin.debug.verbose=true",
-            "-Dmixin.debug.export=true"
-        ]
-    }
-}
-
-minecraft {
-    version = minecraftVersion + '-' + forgeVersion + '-' + minecraftVersion
-    runDir = 'run'
-
-    if (replaceGradleTokenInFile) {
-        replaceIn replaceGradleTokenInFile
-        if (gradleTokenModId) {
-            replace gradleTokenModId, modId
-        }
-        if (gradleTokenModName) {
-            replace gradleTokenModName, modName
-        }
-        if (gradleTokenVersion) {
-            replace gradleTokenVersion, modVersion
-        }
-        if (gradleTokenGroupName) {
-            replace gradleTokenGroupName, modGroup
-        }
-    }
-
-    clientIntellijRun {
-        args(arguments)
-        jvmArgs(jvmArguments)
-
-        if (developmentEnvironmentUserName) {
-            args("--username", developmentEnvironmentUserName)
-        }
-    }
-
-    serverIntellijRun {
-        args(arguments)
-        jvmArgs(jvmArguments)
-    }
-}
-
-if (file('addon.gradle').exists()) {
-    apply from: 'addon.gradle'
-}
-
-apply from: 'repositories.gradle'
-
-configurations {
-    implementation.extendsFrom(shadowImplementation)  // TODO: remove after all uses are refactored
-    implementation.extendsFrom(shadowCompile)
-    implementation.extendsFrom(shadeCompile)
-}
-
-repositories {
-    maven {
-        name 'Overmind forge repo mirror'
-        url 'https://gregtech.overminddl1.com/'
-    }
-    if (usesMixins.toBoolean() || forceEnableMixins) {
-        maven {
-            name 'sponge'
-            url 'https://repo.spongepowered.org/repository/maven-public'
-        }
-        maven {
-            url 'https://jitpack.io'
-        }
-    }
-}
-
-dependencies {
-    if (usesMixins.toBoolean()) {
-        annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
-        annotationProcessor('com.google.guava:guava:24.1.1-jre')
-        annotationProcessor('com.google.code.gson:gson:2.8.6')
-        annotationProcessor('org.spongepowered:mixin:0.8-SNAPSHOT')
-    }
-    if (usesMixins.toBoolean() || forceEnableMixins) {
-        // using 0.8 to workaround a issue in 0.7 which fails mixin application
-        compile('com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH') {
-            // Mixin includes a lot of dependencies that are too up-to-date
-            exclude module: 'launchwrapper'
-            exclude module: 'guava'
-            exclude module: 'gson'
-            exclude module: 'commons-io'
-            exclude module: 'log4j-core'
-        }
-        compile('com.github.GTNewHorizons:SpongeMixins:1.5.0')
-    }
-}
-
-apply from: 'dependencies.gradle'
-
-def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
-def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
-def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
-
-task generateAssets {
-    if (usesMixins.toBoolean()) {
-        def mixinConfigFile = getFile("/src/main/resources/mixins." + modId + ".json");
-        if (!mixinConfigFile.exists()) {
-            mixinConfigFile.text = """{
-  "required": true,
-  "minVersion": "0.7.11",
-  "package": "${modGroup}.${mixinsPackage}",
-  "plugin": "${modGroup}.${mixinPlugin}",
-  "refmap": "${mixingConfigRefMap}",
-  "target": "@env(DEFAULT)",
-  "compatibilityLevel": "JAVA_8",
-  "mixins": [],
-  "client": [],
-  "server": []
-}
-"""
-        }
-    }
-}
-
-task relocateShadowJar(type: ConfigureShadowRelocation) {
-    target = tasks.shadowJar
-    prefix = modGroup + ".shadow"
-}
-
-shadowJar {
-    project.configurations.shadeCompile.each { dep ->
-        from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    minimize()  // This will only allow shading for actually used classes
-    configurations = [
-        project.configurations.shadowImplementation,
-        project.configurations.shadowCompile
-    ]
-    dependsOn(relocateShadowJar)
-}
-
-jar {
-    project.configurations.shadeCompile.each { dep ->
-        from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    if (usesShadowedDependencies.toBoolean()) {
-        dependsOn(shadowJar)
-        enabled = false
-    }
-}
-
-reobf {
-    if (usesMixins.toBoolean()) {
-        addExtraSrgFile mixinSrg
-    }
-}
-
-afterEvaluate {
-    if (usesMixins.toBoolean()) {
-        tasks.compileJava {
-            options.compilerArgs += [
-                "-AreobfSrgFile=${tasks.reobf.srg}",
-                "-AoutSrgFile=${mixinSrg}",
-                "-AoutRefMapFile=${refMap}",
-                // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
-                "-XDenableSunApiLintControl",
-                "-XDignore.symbol.file"
-            ]
-        }
-    }
-}
-
-runClient {
-    if (developmentEnvironmentUserName) {
-        arguments += [
-            "--username",
-            developmentEnvironmentUserName
-        ]
-    }
-
-    args(arguments)
-    jvmArgs(jvmArguments)
-}
-
-runServer {
-    args(arguments)
-    jvmArgs(jvmArguments)
-}
-
-tasks.withType(JavaExec).configureEach {
-    javaLauncher.set(
-        javaToolchains.launcherFor {
-            languageVersion = projectJavaVersion
-        }
-    )
-}
-
-processResources {
-    // this will ensure that this task is redone when the versions change.
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
-    exclude("spotless.gradle")
-
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-
-        // replace modVersion and minecraftVersion
-        expand "minecraftVersion": project.minecraft.version,
-            "modVersion": modVersion,
-            "modId": modId,
-            "modName": modName
-    }
-
-    if (usesMixins.toBoolean()) {
-        from refMap
-    }
-
-    // copy everything else that's not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-        exclude 'spotless.gradle'
-    }
-}
-
-def getManifestAttributes() {
-    def manifestAttributes = [:]
-    if (!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) {
-        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
-    }
-
-    if (accessTransformersFile) {
-        manifestAttributes += ["FMLAT": accessTransformersFile.toString()]
-    }
-
-    if (coreModClass) {
-        manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
-    }
-
-    if (usesMixins.toBoolean()) {
-        manifestAttributes += [
-            "TweakClass"    : "org.spongepowered.asm.launch.MixinTweaker",
-            "MixinConfigs"  : "mixins." + modId + ".json",
-            "ForceLoadAsMod": !containsMixinsAndOrCoreModOnly.toBoolean()
-        ]
-    }
-    return manifestAttributes
-}
-
-task sourcesJar(type: Jar) {
-    from(sourceSets.main.allSource)
-    from(file("$projectDir/LICENSE"))
-    getArchiveClassifier().set('sources')
-}
-
-task shadowDevJar(type: ShadowJar) {
-    project.configurations.shadeCompile.each { dep ->
-        from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-
-    from sourceSets.main.output
-    getArchiveClassifier().set("dev")
-
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    minimize()  // This will only allow shading for actually used classes
-    configurations = [
-        project.configurations.shadowImplementation,
-        project.configurations.shadowCompile
-    ]
-}
-
-task relocateShadowDevJar(type: ConfigureShadowRelocation) {
-    target = tasks.shadowDevJar
-    prefix = modGroup + ".shadow"
-}
-
-task circularResolverJar(type: Jar) {
-    dependsOn(relocateShadowDevJar)
-    dependsOn(shadowDevJar)
-    enabled = false
-}
-
-task devJar(type: Jar) {
-    project.configurations.shadeCompile.each { dep ->
-        from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-
-    from sourceSets.main.output
-    getArchiveClassifier().set("dev")
-
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    if (usesShadowedDependencies.toBoolean()) {
-        dependsOn(circularResolverJar)
-        enabled = false
-    }
-}
-
-task apiJar(type: Jar) {
-    from(sourceSets.main.allSource) {
-        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
-    }
-
-    from(sourceSets.main.output) {
-        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
-    }
-
-    from(sourceSets.main.resources.srcDirs) {
-        include("LICENSE")
-    }
-
-    getArchiveClassifier().set('api')
-}
-
-artifacts {
-    if (!noPublishedSources) {
-        archives sourcesJar
-    }
-    archives devJar
-    if (apiPackage) {
-        archives apiJar
-    }
-}
-
-// The gradle metadata includes all of the additional deps that we disabled from POM generation (including forgeBin with no groupID),
-// and isn't strictly needed with the POM so just disable it.
-tasks.withType(GenerateModuleMetadata) {
-    enabled = false
-}
-
-// workaround variable hiding in pom processing
-def projectConfigs = project.configurations
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-            if (usesShadowedDependencies.toBoolean()) {
-                artifact source: shadowJar, classifier: ""
-            }
-            if (!noPublishedSources) {
-                artifact source: sourcesJar, classifier: "sources"
-            }
-            artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
-            if (apiPackage) {
-                artifact source: apiJar, classifier: "api"
-            }
-
-            groupId = System.getenv("ARTIFACT_GROUP_ID") ?: "com.github.GTNewHorizons"
-            artifactId = System.getenv("ARTIFACT_ID") ?: project.name
-            // Using the identified version, not project.version as it has the prepended 1.7.10
-            version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
-
-            // remove extra garbage from minecraft and minecraftDeps configuration
-            pom.withXml {
-                def badArtifacts = [:].withDefault { [] as Set<String> }
-                for (configuration in [
-                    projectConfigs.minecraft,
-                    projectConfigs.minecraftDeps
-                ]) {
-                    for (dependency in configuration.allDependencies) {
-                        badArtifacts[dependency.group == null ? "" : dependency.group] += dependency.name
-                    }
-                }
-                // example for specifying extra stuff to ignore
-                // badArtifacts["org.example.group"] += "artifactName"
-
-                Node pomNode = asNode()
-                pomNode.dependencies.'*'.findAll() {
-                    badArtifacts[it.groupId.text()].contains(it.artifactId.text())
-                }.each() {
-                    it.parent().remove(it)
-                }
-            }
-        }
-    }
-
-    repositories {
-        maven {
-            url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases"
-            credentials {
-                username = System.getenv("MAVEN_USER") ?: "NONE"
-                password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
-            }
-        }
-    }
-}
-
-// Updating
-task updateBuildScript {
-    doLast {
-        if (performBuildScriptUpdate(projectDir.toString())) return
-
-        print("Build script already up-to-date!")
-    }
-}
-
-if (!project.getGradle().startParameter.isOffline() && isNewBuildScriptVersionAvailable(projectDir.toString())) {
-    if (autoUpdateBuildScript.toBoolean()) {
-        performBuildScriptUpdate(projectDir.toString())
-    } else {
-        out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'")
-    }
-}
-
-static URL availableBuildScriptUrl() {
-    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/master/build.gradle")
-}
-
-static URL exampleSettingsGradleUrl() {
-    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/master/settings.gradle.example")
-}
-
-static URL exampleGitAttributesUrl() {
-    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/master/.gitattributes")
-}
-
-
-boolean verifyGitAttributes() {
-    def gitattributesFile = getFile(".gitattributes")
-    if (!gitattributesFile.exists()) {
-        println("Downloading default .gitattributes")
-        exampleGitAttributesUrl().withInputStream { i -> gitattributesFile.withOutputStream { it << i } }
-        exec {
-            workingDir '.'
-            commandLine 'git', 'add', '--renormalize', '.'
-        }
-        return true
-    }
-    return false
-}
-
-boolean verifySettingsGradle() {
-    def settingsFile = getFile("settings.gradle")
-    if (!settingsFile.exists()) {
-        println("Downloading default settings.gradle")
-        exampleSettingsGradleUrl().withInputStream { i -> settingsFile.withOutputStream { it << i } }
-        return true
-    }
-    return false
-}
-
-boolean performBuildScriptUpdate(String projectDir) {
-    if (isNewBuildScriptVersionAvailable(projectDir)) {
-        def buildscriptFile = getFile("build.gradle")
-        availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
-        out.style(Style.Success).print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
-        boolean settingsupdated = verifySettingsGradle()
-        settingsupdated = verifyGitAttributes() || settingsupdated
-        if (settingsupdated)
-            throw new GradleException("Settings has been updated, please re-run task.")
-        return true
-    }
-    return false
-}
-
-boolean isNewBuildScriptVersionAvailable(String projectDir) {
-    Map parameters = ["connectTimeout": 2000, "readTimeout": 2000]
-
-    String currentBuildScript = getFile("build.gradle").getText()
-    String currentBuildScriptHash = getVersionHash(currentBuildScript)
-    String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
-    String availableBuildScriptHash = getVersionHash(availableBuildScript)
-
-    boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
-    return !isUpToDate
-}
-
-static String getVersionHash(String buildScriptContent) {
-    String versionLine = buildScriptContent.find("^//version: [a-z0-9]*")
-    if (versionLine != null) {
-        return versionLine.split(": ").last()
-    }
-    return ""
-}
-
-configure(updateBuildScript) {
-    group = 'forgegradle'
-    description = 'Updates the build script to the latest version'
-}
-
-// Parameter Deobfuscation
-
-task deobfParams {
-    doLast {
-
-        String mcpDir = "$project.gradle.gradleUserHomeDir/caches/minecraft/de/oceanlabs/mcp/mcp_$channel/$mappingsVersion"
-        String mcpZIP = "$mcpDir/mcp_$channel-$mappingsVersion-${minecraftVersion}.zip"
-        String paramsCSV = "$mcpDir/params.csv"
-
-        download.run {
-            src "https://maven.minecraftforge.net/de/oceanlabs/mcp/mcp_$channel/$mappingsVersion-$minecraftVersion/mcp_$channel-$mappingsVersion-${minecraftVersion}.zip"
-            dest mcpZIP
-            overwrite false
-        }
-
-        if (!file(paramsCSV).exists()) {
-            println("Extracting MCP archive ...")
-            unzip(mcpZIP, mcpDir)
-        }
-
-        println("Parsing params.csv ...")
-        Map<String, String> params = new HashMap<>()
-        Files.lines(Paths.get(paramsCSV)).forEach { line ->
-            String[] cells = line.split(",")
-            if (cells.length > 2 && cells[0].matches("p_i?\\d+_\\d+_")) {
-                params.put(cells[0], cells[1])
-            }
-        }
-
-        out.style(Style.Success).println("Modified ${replaceParams(file("$projectDir/src/main/java"), params)} files!")
-        out.style(Style.Failure).println("Don't forget to verify that the code still works as before!\n It could be broken due to duplicate variables existing now\n or parameters taking priority over other variables.")
-    }
-}
-
-static int replaceParams(File file, Map<String, String> params) {
-    int fileCount = 0
-
-    if (file.isDirectory()) {
-        for (File f : file.listFiles()) {
-            fileCount += replaceParams(f, params)
-        }
-        return fileCount
-    }
-    println("Visiting ${file.getName()} ...")
-    try {
-        String content = new String(Files.readAllBytes(file.toPath()))
-        int hash = content.hashCode()
-        params.forEach { key, value ->
-            content = content.replaceAll(key, value)
-        }
-        if (hash != content.hashCode()) {
-            Files.write(file.toPath(), content.getBytes("UTF-8"))
-            return 1
-        }
-    } catch (Exception e) {
-        e.printStackTrace()
-    }
-    return 0
-}
-
-// Credit: bitsnaps (https://gist.github.com/bitsnaps/00947f2dce66f4bbdabc67d7e7b33681)
-static unzip(String zipFileName, String outputDir) {
-    byte[] buffer = new byte[16384]
-    ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFileName))
-    ZipEntry zipEntry = zis.getNextEntry()
-    while (zipEntry != null) {
-        File newFile = new File(outputDir + File.separator, zipEntry.name)
-        if (zipEntry.isDirectory()) {
-            if (!newFile.isDirectory() && !newFile.mkdirs()) {
-                throw new IOException("Failed to create directory $newFile")
-            }
-        } else {
-            // fix for Windows-created archives
-            File parent = newFile.parentFile
-            if (!parent.isDirectory() && !parent.mkdirs()) {
-                throw new IOException("Failed to create directory $parent")
-            }
-            // write file content
-            FileOutputStream fos = new FileOutputStream(newFile)
-            int len = 0
-            while ((len = zis.read(buffer)) > 0) {
-                fos.write(buffer, 0, len)
-            }
-            fos.close()
-        }
-        zipEntry = zis.getNextEntry()
-    }
-    zis.closeEntry()
-    zis.close()
-}
-
-configure(deobfParams) {
-    group = 'forgegradle'
-    description = 'Rename all obfuscated parameter names inherited from Minecraft classes'
-}
-
-// Dependency Deobfuscation
-
-def deobf(String sourceURL) {
-    try {
-        URL url = new URL(sourceURL)
-        String fileName = url.getFile()
-
-        //get rid of directories:
-        int lastSlash = fileName.lastIndexOf("/")
-        if (lastSlash > 0) {
-            fileName = fileName.substring(lastSlash + 1)
-        }
-        //get rid of extension:
-        if (fileName.endsWith(".jar") || fileName.endsWith(".litemod")) {
-            fileName = fileName.substring(0, fileName.lastIndexOf("."))
-        }
-
-        String hostName = url.getHost()
-        if (hostName.startsWith("www.")) {
-            hostName = hostName.substring(4)
-        }
-        List parts = Arrays.asList(hostName.split("\\."))
-        Collections.reverse(parts)
-        hostName = String.join(".", parts)
-
-        return deobf(sourceURL, "$hostName/$fileName")
-    } catch (Exception e) {
-        return deobf(sourceURL, "deobf/${sourceURL.hashCode()}")
-    }
-}
-
-// The method above is to be preferred. Use this method if the filename is not at the end of the URL.
-def deobf(String sourceURL, String rawFileName) {
-    String bon2Version = "2.5.1"
-    String fileName = URLDecoder.decode(rawFileName, "UTF-8")
-    String cacheDir = "$project.gradle.gradleUserHomeDir/caches"
-    String bon2Dir = "$cacheDir/forge_gradle/deobf"
-    String bon2File = "$bon2Dir/BON2-${bon2Version}.jar"
-    String obfFile = "$cacheDir/modules-2/files-2.1/${fileName}.jar"
-    String deobfFile = "$cacheDir/modules-2/files-2.1/${fileName}-deobf.jar"
-
-    if (file(deobfFile).exists()) {
-        return files(deobfFile)
-    }
-
-    String mappingsVer
-    String remoteMappings = project.hasProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/'
-    if (remoteMappings) {
-        String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion"
-        String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip"
-
-        zipMappings(mappingsZIP, remoteMappings, bon2Dir)
-
-        mappingsVer = "snapshot_$id"
-    } else {
-        mappingsVer = "${channel}_$mappingsVersion"
-    }
-
-    download.run {
-        src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar"
-        dest bon2File
-        quiet true
-        overwrite false
-    }
-
-    download.run {
-        src sourceURL
-        dest obfFile
-        quiet true
-        overwrite false
-    }
-
-    exec {
-        commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch'
-        workingDir bon2Dir
-        standardOutput = new FileOutputStream("${deobfFile}.log")
-    }
-
-    return files(deobfFile)
-}
-
-def zipMappings(String zipPath, String url, String bon2Dir) {
-    File zipFile = new File(zipPath)
-    if (zipFile.exists()) {
-        return
-    }
-
-    String fieldsCache = "$bon2Dir/data/fields.csv"
-    String methodsCache = "$bon2Dir/data/methods.csv"
-
-    download.run {
-        src "${url}fields.csv"
-        dest fieldsCache
-        quiet true
-    }
-    download.run {
-        src "${url}methods.csv"
-        dest methodsCache
-        quiet true
-    }
-
-    zipFile.getParentFile().mkdirs()
-    ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile))
-
-    zos.putNextEntry(new ZipEntry("fields.csv"))
-    Files.copy(Paths.get(fieldsCache), zos)
-    zos.closeEntry()
-
-    zos.putNextEntry(new ZipEntry("methods.csv"))
-    Files.copy(Paths.get(methodsCache), zos)
-    zos.closeEntry()
-
-    zos.close()
-}
-
-// Helper methods
-
-def checkPropertyExists(String propertyName) {
-    if (!project.hasProperty(propertyName)) {
-        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties")
-    }
-}
-
-def getFile(String relativePath) {
-    return new File(projectDir, relativePath)
-}

build.gradle.kts

@@ -0,0 +1,33 @@
+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,5 +1,118 @@
+/*
+ * 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(sourceSets.compileStubs.output)
-    compileStubs(sourceSets.compileStubsStubs.output)
+    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.23")
+
+    compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:1.0.7") { transitive = false }
+
+    compileOnly("org.projectlombok:lombok:1.18.34") { transitive = false }
+    annotationProcessor("org.projectlombok:lombok:1.18.34")
+
+    // Use modern models+textures to inject QuadProviders
+    devOnlyNonPublishable('com.github.GTNewHorizons:TX-Loader:1.8.0:dev')
+
+    // Iris Shaders
+    compileOnly('org.jetbrains:annotations:26.0.2')
+    api("com.github.GTNewHorizons:GTNHLib:0.6.8: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.7.27-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:1.4.1: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.7.4:dev") { transitive = false }
+    compileOnly(rfg.deobf('curse.maven:witchery-69673:2234410'))
+    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.8-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Natura:2.8.2:dev")
+
+    compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.7.1:dev")
+
+    compileOnly("com.github.GTNewHorizons:Battlegear2:1.4.2:dev") { transitive = false }
+    compileOnly('com.github.GTNewHorizons:Backhand:1.6.9') { 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.5.0-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.11.4'))
+    testImplementation('org.junit.jupiter:junit-jupiter')
+    testImplementation("org.mockito:mockito-core:3.+")
+    testImplementation("org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209")
 }

docs/model-spec.md

@@ -0,0 +1,34 @@
+# 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,65 +1,109 @@
+# 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
 
-# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+# Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation.
+# Conventionally lowercase.
 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
 
-# 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/
+# 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
 
-# Will update your build.gradle automatically whenever an update is available
+# Updates your build.gradle and settings.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 a MCP channel and mappings version for dependency deobfuscation and the deobfParams task.
+# Specify an MCP channel for dependency deobfuscation and the deobfParams task.
 channel = stable
+
+# Specify an MCP mappings version for dependency deobfuscation and the deobfParams task.
 mappingsVersion = 12
 
-# Define other MCP mappings for dependency deobfuscation
-remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
+# Defines other MCP mappings for dependency deobfuscation.
+remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
 
-# 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
+# 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.
 developmentEnvironmentUserName = Developer
 
-# Define a source file of your project with:
+# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting 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.
+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
 # 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 = Tags.java
-gradleTokenModId = GRADLETOKEN_MODID
-gradleTokenModName = GRADLETOKEN_MODNAME
-gradleTokenVersion = GRADLETOKEN_VERSION
-gradleTokenGroupName = GRADLETOKEN_GROUPNAME
+# 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 =
+# Example value: (apiPackage = api) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.api
+apiPackage = api
 
 # Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
-# Example value: mymodid_at.cfg
-accessTransformersFile =
+# 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
 
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
-usesMixins = false
-# Adds some debug arguments like verbose output and export
+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
+
 # 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 =
+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
-coreModClass =
+# 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
@@ -67,18 +111,93 @@ 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 in your jar. It is your
-# responsibility check the licence and request permission for distribution, if required.
-usesShadowedDependencies = 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
 
-# Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
+# If disabled, won't remove unused classes from shadowed 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.
+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 =
+
+# 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
+
+# The project's relations on Modrinth. You can use this to refer to other projects on Modrinth.
+# Syntax: scope1-type1:name1;scope2-type2:name2;...
+# Where scope can be one of [required, optional, incompatible, embedded],
+#       type can be one of [project, version],
+#       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
+
+# 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
+
+# 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
+
+# Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older
 # projects. New projects should not use this parameter.
-#customArchiveBaseName =
+# customArchiveBaseName =
 
-# Optional parameter to prevent the source code from being published
-# noPublishedSources =
+# 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 =
 
-# Uncomment this to disable spotless checks
+# Uncomment to prevent the source code from being published.
+# noPublishedSources = true
+
+# 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"
+# (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.
+# 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,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,80 +15,116 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       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
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# 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"'
+# 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
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,92 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    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.
 
 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.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+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
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 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.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -13,8 +13,10 @@
 @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
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,10 +27,14 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
-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.
+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
 
 goto fail
 
@@ -51,48 +57,36 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
-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.
+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
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

img/logo-readme.png.generate.sh

@@ -0,0 +1,2 @@
+#!/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,5 +1,36 @@
 // 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,10 +1,20 @@
+pluginManagement {
+    repositories {
+        maven {
+            // RetroFuturaGradle
+            name "GTNH Maven"
+            url "https://nexus.gtnewhorizons.com/repository/public/"
+            mavenContent {
+                includeGroup("com.gtnewhorizons")
+                includeGroupByRegex("com\\.gtnewhorizons\\..+")
+            }
+        }
+        gradlePluginPortal()
+        mavenCentral()
+        mavenLocal()
+    }
+}
+
 plugins {
-    id 'com.diffplug.blowdryerSetup' version '1.6.0'
-}
-
-apply plugin: 'com.diffplug.blowdryerSetup'
-
-blowdryerSetup {
-    github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.1.5')
-    //devLocal '.' // Use this when testing config updates locally
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.32'
 }

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

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

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

@@ -1,10 +0,0 @@
-package net.minecraft.client.model;
-
-import java.util.List;
-
-public class ModelRenderer {
-
-    public List childModels;
-
-    public void resetDisplayList() {}
-}

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

@@ -1,14 +0,0 @@
-package net.minecraft.client.renderer;
-
-public class EntityRenderer {
-
-    public static int anaglyphField;
-    public static boolean anaglyphEnable;
-
-    /**
-     * Render player hand
-     */
-    public void renderHand(float p_78476_1_, int p_78476_2_) {}
-
-    public void renderWorld(float f, long l) {}
-}

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

@@ -1,8 +0,0 @@
-package net.minecraft.client.renderer;
-
-public class RenderGlobal {
-
-    public WorldRenderer[] worldRenderers;
-
-    public void loadRenderers() {}
-}

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

@@ -1,180 +0,0 @@
-package net.minecraft.client.renderer;
-
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.ShortBuffer;
-import net.minecraft.client.shader.TesselatorVertexState;
-
-public class Tessellator {
-    private static int nativeBufferSize;
-    private static int trivertsInBuffer;
-    public static boolean renderingWorldRenderer;
-    public boolean defaultTexture;
-    private int rawBufferSize;
-    public int textureID;
-
-    /** The byte buffer used for GL allocation. */
-    public ByteBuffer byteBuffer;
-    /** The same memory as byteBuffer, but referenced as an integer buffer. */
-    public IntBuffer intBuffer;
-    /** The same memory as byteBuffer, but referenced as an float buffer. */
-    public FloatBuffer floatBuffer;
-    /** The same memory as byteBuffer, but referenced as an short buffer. */
-    public ShortBuffer shortBuffer;
-    /** Raw integer array. */
-    public int[] rawBuffer;
-    /** The number of vertices to be drawn in the next draw call. Reset to 0 between draw calls. */
-    public int vertexCount;
-    /** The first coordinate to be used for the texture. */
-    public double textureU;
-    /** The second coordinate to be used for the texture. */
-    public double textureV;
-
-    public int brightness;
-    /** The color (RGBA) value to be used for the following draw call. */
-    public int color;
-    /** Whether the current draw object for this tessellator has color values. */
-    public boolean hasColor;
-    /** Whether the current draw object for this tessellator has texture coordinates. */
-    public boolean hasTexture;
-
-    public boolean hasBrightness;
-    /** Whether the current draw object for this tessellator has normal values. */
-    public boolean hasNormals;
-    /** The index into the raw buffer to be used for the next data. */
-    public int rawBufferIndex;
-    /**
-     * The number of vertices manually added to the given draw call. This differs from vertexCount because it adds extra
-     * vertices when converting quads to triangles.
-     */
-    public int addedVertices;
-    /** Disables all color information for the following draw call. */
-    public boolean isColorDisabled;
-    /** The draw mode currently being used by the tessellator. */
-    public int drawMode;
-    /** An offset to be applied along the x-axis for all vertices in this draw call. */
-    public double xOffset;
-    /** An offset to be applied along the y-axis for all vertices in this draw call. */
-    public double yOffset;
-    /** An offset to be applied along the z-axis for all vertices in this draw call. */
-    public double zOffset;
-    /** The normal to be applied to the face being drawn. */
-    public int normal;
-    /** The static instance of the Tessellator. */
-    public static final Tessellator instance = new Tessellator();
-    /** Whether this tessellator is currently in draw mode. */
-    public boolean isDrawing;
-    /** The size of the buffers used (in integers). */
-    public int bufferSize;
-
-    public float midTextureU;
-    public float midTextureV;
-    public float normalX;
-    public float normalY;
-    public float normalZ;
-    public float[] vertexPos = new float[16];
-
-    private Tessellator(int p_i1250_1_) {}
-
-    public Tessellator() {}
-
-    /**
-     * Draws the data set up in this tessellator and resets the state to prepare for new drawing.
-     */
-    public int draw() {
-        return 0;
-    }
-
-    public TesselatorVertexState getVertexState(float p_147564_1_, float p_147564_2_, float p_147564_3_) {
-        return null;
-    }
-
-    public void setVertexState(TesselatorVertexState p_147565_1_) {}
-
-    /**
-     * Clears the tessellator state in preparation for new drawing.
-     */
-    public void reset() {}
-
-    /**
-     * Sets draw mode in the tessellator to draw quads.
-     */
-    public void startDrawingQuads() {}
-
-    /**
-     * Resets tessellator state and prepares for drawing (with the specified draw mode).
-     */
-    public void startDrawing(int p_78371_1_) {}
-
-    /**
-     * Sets the texture coordinates.
-     */
-    public void setTextureUV(double p_78385_1_, double p_78385_3_) {}
-
-    public void setBrightness(int p_78380_1_) {}
-
-    /**
-     * Sets the RGB values as specified, converting from floats between 0 and 1 to integers from 0-255.
-     */
-    public void setColorOpaque_F(float p_78386_1_, float p_78386_2_, float p_78386_3_) {}
-
-    /**
-     * Sets the RGBA values for the color, converting from floats between 0 and 1 to integers from 0-255.
-     */
-    public void setColorRGBA_F(float p_78369_1_, float p_78369_2_, float p_78369_3_, float p_78369_4_) {}
-
-    /**
-     * Sets the RGB values as specified, and sets alpha to opaque.
-     */
-    public void setColorOpaque(int p_78376_1_, int p_78376_2_, int p_78376_3_) {}
-
-    /**
-     * Sets the RGBA values for the color. Also clamps them to 0-255.
-     */
-    public void setColorRGBA(int p_78370_1_, int p_78370_2_, int p_78370_3_, int p_78370_4_) {}
-
-    public void func_154352_a(byte p_154352_1_, byte p_154352_2_, byte p_154352_3_) {}
-
-    /**
-     * Adds a vertex specifying both x,y,z and the texture u,v for it.
-     */
-    public void addVertexWithUV(
-            double p_78374_1_, double p_78374_3_, double p_78374_5_, double p_78374_7_, double p_78374_9_) {}
-
-    /**
-     * Adds a vertex with the specified x,y,z to the current draw call. It will trigger a draw() if the buffer gets
-     * full.
-     */
-    public void addVertex(double p_78377_1_, double p_78377_3_, double p_78377_5_) {}
-
-    /**
-     * Sets the color to the given opaque value (stored as byte values packed in an integer).
-     */
-    public void setColorOpaque_I(int p_78378_1_) {}
-
-    /**
-     * Sets the color to the given color (packed as bytes in integer) and alpha values.
-     */
-    public void setColorRGBA_I(int p_78384_1_, int p_78384_2_) {}
-
-    /**
-     * Disables colors for the current draw call.
-     */
-    public void disableColor() {}
-
-    /**
-     * Sets the normal for the current draw call.
-     */
-    public void setNormal(float p_78375_1_, float p_78375_2_, float p_78375_3_) {}
-
-    /**
-     * Sets the translation for all vertices in the current draw call.
-     */
-    public void setTranslation(double p_78373_1_, double p_78373_3_, double p_78373_5_) {}
-
-    /**
-     * Offsets the translation for all vertices in the current draw call.
-     */
-    public void addTranslation(float p_78372_1_, float p_78372_2_, float p_78372_3_) {}
-}

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

@@ -1,13 +0,0 @@
-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

@@ -1,6 +0,0 @@
-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

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

src/compileStubs/java/net/minecraft/client/renderer/entity/Render.java

@@ -1,3 +0,0 @@
-package net.minecraft.client.renderer.entity;
-
-public abstract class Render {}

src/compileStubs/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java

@@ -1,10 +0,0 @@
-package net.minecraft.client.renderer.entity;
-
-import net.minecraft.client.model.ModelBase;
-
-public abstract class RendererLivingEntity extends Render {
-
-    public ModelBase mainModel;
-    /** The model to be used during the render passes. */
-    public ModelBase renderPassModel;
-}

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

@@ -1,17 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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

@@ -1,8 +0,0 @@
-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

@@ -1,18 +0,0 @@
-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

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

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

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

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

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

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

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

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

@@ -0,0 +1,22 @@
+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

@@ -0,0 +1,49 @@
+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.6.6,);",
+        acceptedMinecraftVersions = "[1.7.10]",
+        acceptableRemoteVersions = "*",
+        guiFactory = "com.gtnewhorizons.angelica.config.AngelicaGuiConfigFactory")
+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/Tags.java

@@ -1,12 +0,0 @@
-package com.gtnewhorizons.angelica;
-
-// Use this class for Strings only. Do not import any classes here. It will lead to issues with Mixins if in use!
-
-public class Tags {
-
-    // GRADLETOKEN_* will be replaced by your configuration values at build time
-    public static final String MODID = "GRADLETOKEN_MODID";
-    public static final String MODNAME = "GRADLETOKEN_MODNAME";
-    public static final String VERSION = "GRADLETOKEN_VERSION";
-    public static final String GROUPNAME = "GRADLETOKEN_GROUPNAME";
-}

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

@@ -0,0 +1,8 @@
+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/TextureServices.java

@@ -0,0 +1,27 @@
+package com.gtnewhorizons.angelica.api;
+
+import com.gtnewhorizons.angelica.mixins.interfaces.IPatchedTextureAtlasSprite;
+import com.gtnewhorizons.angelica.mixins.interfaces.ITexturesCache;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.util.IIcon;
+
+/**
+ * Exposes a method to the API that allow mods to add texture update compat
+ */
+@SuppressWarnings("unused")
+public class TextureServices {
+
+    @SuppressWarnings("unused")
+    public static void updateBlockTextureAnimation(IIcon icon, RenderBlocks renderBlocks) {
+        if (renderBlocks instanceof ITexturesCache texturesCache) {
+            texturesCache.getRenderedTextures().add(icon);
+        }
+    }
+
+    @SuppressWarnings("unused")
+    public static void updateTextureAnimation(IIcon icon) {
+        if(icon instanceof IPatchedTextureAtlasSprite patchedSprite) {
+            patchedSprite.markNeedsAnimationUpdate();
+        }
+    }
+}

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

@@ -0,0 +1,35 @@
+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

@@ -0,0 +1,22 @@
+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

@@ -1,16 +0,0 @@
-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

@@ -1,354 +0,0 @@
-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

@@ -1,75 +0,0 @@
-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

@@ -1,76 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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

@@ -1,30 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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

@@ -1,48 +0,0 @@
-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

@@ -1,87 +0,0 @@
-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;
-
-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");
-        if (!Shaders.isShadowPass) {
-            WorldRenderer[] worldRenderers = renderGlobal.worldRenderers;
-            for (int i = 0; i < worldRenderers.length; ++i) {
-                if (!worldRenderers[i].skipAllRenderPasses()) {
-                    worldRenderers[i].updateInFrustum(frustrum);
-                }
-            }
-        } else {
-            WorldRenderer[] worldRenderers = renderGlobal.worldRenderers;
-            for (int i = 0; i < worldRenderers.length; ++i) {
-                if (!worldRenderers[i].skipAllRenderPasses()) {
-                    worldRenderers[i].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

@@ -1,243 +0,0 @@
-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 com.gtnewhorizons.angelica.transform.ALog;
-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;
-
-public class ShadersTess {
-
-    public static final int vertexStride = 16;
-
-    public static int draw(Tessellator 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, tess.byteBuffer.capacity() / (vertexStride * 4));
-                if (realDrawMode == GL11.GL_QUADS) vcount = vcount / 4 * 4;
-                tess.floatBuffer.clear();
-                tess.shortBuffer.clear();
-                tess.intBuffer.clear();
-                tess.intBuffer.put(tess.rawBuffer, voffset * vertexStride, vcount * vertexStride);
-                tess.byteBuffer.position(0);
-                tess.byteBuffer.limit(vcount * (vertexStride * 4));
-                voffset += vcount;
-
-                if (tess.hasTexture) {
-                    tess.floatBuffer.position(3);
-                    GL11.glTexCoordPointer(2, (vertexStride * 4), tess.floatBuffer);
-                    GL11.glEnableClientState(GL11.GL_TEXTURE_COORD_ARRAY);
-                }
-                if (tess.hasBrightness) {
-                    OpenGlHelper.setClientActiveTexture(OpenGlHelper.lightmapTexUnit);
-                    tess.shortBuffer.position(6 * 2);
-                    GL11.glTexCoordPointer(2, (vertexStride * 4), tess.shortBuffer);
-                    GL11.glEnableClientState(GL11.GL_TEXTURE_COORD_ARRAY);
-                    OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit);
-                }
-                if (tess.hasColor) {
-                    tess.byteBuffer.position(5 * 4);
-                    GL11.glColorPointer(4, true, (vertexStride * 4), tess.byteBuffer);
-                    GL11.glEnableClientState(GL11.GL_COLOR_ARRAY);
-                }
-                if (tess.hasNormals) {
-                    tess.floatBuffer.position(9);
-                    GL11.glNormalPointer((vertexStride * 4), tess.floatBuffer);
-                    GL11.glEnableClientState(GL11.GL_NORMAL_ARRAY);
-                }
-                tess.floatBuffer.position(0);
-                GL11.glVertexPointer(3, (vertexStride * 4), tess.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) {
-        // Shaders.checkGLError("preDrawArray");
-        if (Shaders.useMultiTexCoord3Attrib && tess.hasTexture) {
-            GL13.glClientActiveTexture(GL13.GL_TEXTURE3);
-            GL11.glTexCoordPointer(2, (vertexStride * 4), (FloatBuffer) tess.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) tess.floatBuffer.position(12));
-            glEnableVertexAttribArrayARB(Shaders.midTexCoordAttrib);
-        }
-        if (Shaders.useEntityAttrib) {
-            glVertexAttribPointerARB(Shaders.entityAttrib, 3, false, false, vertexStride * 4, (ShortBuffer)
-                    tess.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) {
-        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 = tess.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;
-                rawBuffer[rbi + (9 - vertexStride * 3)] = rawBuffer[rbi + (9 - vertexStride * 2)] =
-                        rawBuffer[rbi + (9 - vertexStride * 1)] = Float.floatToRawIntBits(tess.normalX = vnx * mult);
-                rawBuffer[rbi + (10 - vertexStride * 3)] = rawBuffer[rbi + (10 - vertexStride * 2)] =
-                        rawBuffer[rbi + (10 - vertexStride * 1)] = Float.floatToRawIntBits(tess.normalY = vny * mult);
-                rawBuffer[rbi + (11 - vertexStride * 3)] = rawBuffer[rbi + (11 - vertexStride * 2)] =
-                        rawBuffer[rbi + (11 - vertexStride * 1)] = Float.floatToRawIntBits(tess.normalZ = vnz * mult);
-                tess.hasNormals = true;
-                // mid UV
-                tess.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;
-                tess.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(tess.midTextureU);
-                rawBuffer[rbi + (13 - vertexStride * 3)] = rawBuffer[rbi + (13 - vertexStride * 2)] =
-                        rawBuffer[rbi + (13 - vertexStride * 1)] = Float.floatToRawIntBits(tess.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) tess.normalX);
-        rawBuffer[rbi + 10] = Float.floatToRawIntBits((float) tess.normalY);
-        rawBuffer[rbi + 11] = Float.floatToRawIntBits((float) tess.normalZ);
-        rawBuffer[rbi + 12] = Float.floatToRawIntBits((float) tess.midTextureU);
-        rawBuffer[rbi + 13] = Float.floatToRawIntBits((float) tess.midTextureV);
-
-        tess.rawBufferIndex = rbi += vertexStride;
-        ++tess.vertexCount;
-    }
-}

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

@@ -1,988 +0,0 @@
-package com.gtnewhorizons.angelica.client;
-
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import javax.imageio.ImageIO;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.texture.AbstractTexture;
-import net.minecraft.client.renderer.texture.DynamicTexture;
-import net.minecraft.client.renderer.texture.ITextureObject;
-import net.minecraft.client.renderer.texture.LayeredTexture;
-import net.minecraft.client.renderer.texture.Stitcher;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.client.renderer.texture.TextureUtil;
-import net.minecraft.client.resources.IResource;
-import net.minecraft.client.resources.IResourceManager;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.BufferUtils;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-import org.lwjgl.opengl.GL13;
-import org.lwjgl.opengl.GL30.*;
-
-public class ShadersTex {
-    public static final int initialBufferSize = 1048576;
-    public static ByteBuffer byteBuffer = BufferUtils.createByteBuffer(initialBufferSize * 4);
-    public static IntBuffer intBuffer = byteBuffer.asIntBuffer();
-    public static int[] intArray = new int[initialBufferSize];
-    public static final int defBaseTexColor = 0x00000000;
-    public static final int defNormTexColor = 0xFF7F7FFF;
-    public static final int defSpecTexColor = 0x00000000;
-    public static Map<Integer, MultiTexID> multiTexMap = new HashMap();
-    public static TextureMap updatingTextureMap = null;
-    public static TextureAtlasSprite updatingSprite = null;
-    public static MultiTexID updatingTex = null;
-    public static MultiTexID boundTex = null;
-    public static int updatingPage = 0;
-    public static String iconName = null;
-
-    public static IntBuffer getIntBuffer(int size) {
-        if (intBuffer.capacity() < size) {
-            int bufferSize = roundUpPOT(size);
-            byteBuffer = BufferUtils.createByteBuffer(bufferSize * 4);
-            intBuffer = byteBuffer.asIntBuffer();
-        }
-        return intBuffer;
-    }
-
-    public static int[] getIntArray(int size) {
-        if (intArray.length < size) {
-            intArray = null;
-            intArray = new int[roundUpPOT(size)];
-        }
-        return intArray;
-    }
-
-    public static int roundUpPOT(int x) {
-        int i = x - 1;
-        i |= (i >> 1);
-        i |= (i >> 2);
-        i |= (i >> 4);
-        i |= (i >> 8);
-        i |= (i >> 16);
-        return i + 1;
-    }
-
-    public static IntBuffer fillIntBuffer(int size, int value) {
-        int[] aint = getIntArray(size);
-        IntBuffer intBuf = getIntBuffer(size);
-        Arrays.fill(intArray, 0, size, value);
-        intBuffer.put(intArray, 0, size);
-        return intBuffer;
-    }
-
-    public static int[] createAIntImage(int size) {
-        int[] aint = new int[size * 3];
-        Arrays.fill(aint, 0, size, defBaseTexColor);
-        Arrays.fill(aint, size, size * 2, defNormTexColor);
-        Arrays.fill(aint, size * 2, size * 3, defSpecTexColor);
-        return aint;
-    }
-
-    public static int[] createAIntImage(int size, int color) {
-        int[] aint = new int[size * 3];
-        Arrays.fill(aint, 0, size, color);
-        Arrays.fill(aint, size, size * 2, defNormTexColor);
-        Arrays.fill(aint, size * 2, size * 3, defSpecTexColor);
-        return aint;
-    }
-
-    public static MultiTexID getMultiTexID(AbstractTexture tex) {
-        MultiTexID multiTex = tex.multiTex;
-        if (multiTex == null) {
-            int baseTex = tex.getGlTextureId();
-            multiTex = multiTexMap.get(Integer.valueOf(baseTex));
-            if (multiTex == null) {
-                multiTex = new MultiTexID(baseTex, GL11.glGenTextures(), GL11.glGenTextures());
-                multiTexMap.put(baseTex, multiTex);
-            }
-            tex.multiTex = multiTex;
-        }
-        return multiTex;
-    }
-
-    public static void deleteTextures(AbstractTexture atex) {
-        int texid = atex.glTextureId;
-        if (texid != -1) {
-            GL11.glDeleteTextures(texid);
-            atex.glTextureId = -1;
-        }
-        MultiTexID multiTex = atex.multiTex;
-        if (multiTex != null) {
-            atex.multiTex = null;
-            multiTexMap.remove(Integer.valueOf(multiTex.base));
-            GL11.glDeleteTextures(multiTex.norm);
-            GL11.glDeleteTextures(multiTex.spec);
-            if (multiTex.base != texid) {
-                System.err.println("Error : MultiTexID.base mismatch.");
-                GL11.glDeleteTextures(multiTex.base);
-            }
-        }
-    }
-
-    /** Remove MultiTexID object reference and delete textures */
-    public static int deleteMultiTex(ITextureObject tex) {
-        if (tex instanceof AbstractTexture) {
-            deleteTextures((AbstractTexture) tex);
-        } else {
-            GL11.glDeleteTextures(tex.getGlTextureId());
-        }
-        return 0;
-    }
-
-    public static void bindNSTextures(int normTex, int specTex) {
-        // Shaders.checkGLError("pre bindNSTextures");
-        if (Shaders.isRenderingWorld && Shaders.activeTexUnit == GL13.GL_TEXTURE0) {
-            GL13.glActiveTexture(GL13.GL_TEXTURE2);
-            GL11.glBindTexture(GL11.GL_TEXTURE_2D, normTex);
-            GL13.glActiveTexture(GL13.GL_TEXTURE3);
-            GL11.glBindTexture(GL11.GL_TEXTURE_2D, specTex);
-            GL13.glActiveTexture(GL13.GL_TEXTURE0);
-        }
-        // Shaders.checkGLError("bindNSTextures");
-    }
-
-    public static void bindNSTextures(MultiTexID multiTex) {
-        bindNSTextures(multiTex.norm, multiTex.spec);
-    }
-
-    public static void bindTextures(int baseTex, int normTex, int specTex) {
-        // Shaders.checkGLError("pre bindTextures");
-        if (Shaders.isRenderingWorld && Shaders.activeTexUnit == GL13.GL_TEXTURE0) {
-            GL13.glActiveTexture(GL13.GL_TEXTURE2);
-            GL11.glBindTexture(GL11.GL_TEXTURE_2D, normTex);
-            GL13.glActiveTexture(GL13.GL_TEXTURE3);
-            GL11.glBindTexture(GL11.GL_TEXTURE_2D, specTex);
-            GL13.glActiveTexture(GL13.GL_TEXTURE0);
-        }
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, baseTex);
-        // Shaders.checkGLError("bindTextures");
-    }
-
-    public static void bindTextures(MultiTexID multiTex) {
-        boundTex = multiTex;
-        if (Shaders.isRenderingWorld && Shaders.activeTexUnit == GL13.GL_TEXTURE0) {
-            if (Shaders.configNormalMap) {
-                GL13.glActiveTexture(GL13.GL_TEXTURE2);
-                GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.norm);
-            }
-            if (Shaders.configSpecularMap) {
-                GL13.glActiveTexture(GL13.GL_TEXTURE3);
-                GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.spec);
-            }
-            GL13.glActiveTexture(GL13.GL_TEXTURE0);
-        }
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.base);
-    }
-
-    public static void bindTexture(ITextureObject tex) {
-        if (tex instanceof TextureMap) {
-            Shaders.atlasSizeX = ((TextureMap) tex).atlasWidth;
-            Shaders.atlasSizeY = ((TextureMap) tex).atlasHeight;
-        } else {
-            Shaders.atlasSizeX = 0;
-            Shaders.atlasSizeY = 0;
-        }
-        bindTextures(tex.getMultiTexID());
-    }
-
-    /** not used */
-    public static void bindTextures(int baseTex) {
-        MultiTexID multiTex = multiTexMap.get(Integer.valueOf(baseTex));
-        bindTextures(multiTex);
-    }
-
-    public static void allocTexStorage(int width, int height, int maxLevel) {
-        Shaders.checkGLError("pre allocTexStorage");
-        int level;
-        for (level = 0; (width >> level) > 0 && (height >> level) > 0 /*&& level<=maxLevel*/; ++level) {
-            GL11.glTexImage2D(
-                    GL11.GL_TEXTURE_2D,
-                    level,
-                    GL11.GL_RGBA,
-                    (width >> level),
-                    (height >> level),
-                    0,
-                    GL12.GL_BGRA,
-                    GL12.GL_UNSIGNED_INT_8_8_8_8_REV,
-                    (IntBuffer) null);
-        }
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL12.GL_TEXTURE_MAX_LEVEL, level - 1);
-        Shaders.checkGLError("allocTexStorage");
-        // clear unused level otherwise glTexSubImage2D will crash on AMD when reallocation texture of different size.
-        // for ( ; level < 16 ; ++level) {
-        //	GL11.glTexImage2D(GL11.GL_TEXTURE_2D, level, GL11.GL_RGBA, 0, 0, 0, GL12.GL_BGRA,
-        // GL12.GL_UNSIGNED_INT_8_8_8_8_REV, (IntBuffer)null);
-        // }
-        GL11.glGetError(); // It usually returns error 0x0501 Invalid value for width 0 height 0. Ignore it.
-    }
-
-    // for Dynamic Texture
-    public static void initDynamicTexture(int texID, int width, int height, DynamicTexture tex) {
-        MultiTexID multiTex = tex.getMultiTexID();
-        int[] aint = tex.getTextureData();
-        int size = width * height;
-        Arrays.fill(aint, size, size * 2, defNormTexColor);
-        Arrays.fill(aint, size * 2, size * 3, defSpecTexColor);
-        // base texture
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.base);
-        allocTexStorage(width, height, 0);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST);
-        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, GL12.GL_TEXTURE_MAX_LEVEL, 0);
-
-        // norm texture
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.norm);
-        allocTexStorage(width, height, 0);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST);
-        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, GL12.GL_TEXTURE_MAX_LEVEL, 0);
-
-        // spec texture
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.spec);
-        allocTexStorage(width, height, 0);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST);
-        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, GL12.GL_TEXTURE_MAX_LEVEL, 0);
-
-        // base texture
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.base);
-    }
-
-    public static ITextureObject createDefaultTexture() {
-        DynamicTexture tex = new DynamicTexture(1, 1);
-        tex.getTextureData()[0] = 0xffffffff;
-        tex.updateDynamicTexture();
-        return tex;
-    }
-
-    // for TextureMap
-    public static void allocateTextureMap(
-            int texID, int mipmapLevels, int width, int height, float anisotropy, Stitcher stitcher, TextureMap tex) {
-        System.out.println("allocateTextureMap " + tex.getTextureType() + " " + mipmapLevels + " " + width + " "
-                + height + " " + anisotropy + " ");
-        updatingTextureMap = tex;
-        tex.atlasWidth = width;
-        tex.atlasHeight = height;
-        MultiTexID multiTex = getMultiTexID(tex);
-        updatingTex = multiTex;
-        TextureUtil.allocateTextureImpl(multiTex.base, mipmapLevels, width, height, anisotropy);
-        if (Shaders.configNormalMap)
-            TextureUtil.allocateTextureImpl(multiTex.norm, mipmapLevels, width, height, anisotropy);
-        if (Shaders.configSpecularMap)
-            TextureUtil.allocateTextureImpl(multiTex.spec, mipmapLevels, width, height, anisotropy);
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, texID);
-    }
-
-    public static TextureAtlasSprite setSprite(TextureAtlasSprite tas) {
-        return updatingSprite = tas;
-    }
-
-    public static String setIconName(String name) {
-        return iconName = name;
-    }
-
-    public static void uploadTexSubForLoadAtlas(
-            int[][] data, int width, int height, int xoffset, int yoffset, boolean linear, boolean clamp) {
-        TextureUtil.uploadTextureMipmap(data, width, height, xoffset, yoffset, linear, clamp);
-        boolean border = updatingSprite.useAnisotropicFiltering;
-        int[][] aaint;
-        //
-        if (Shaders.configNormalMap) {
-            aaint = readImageAndMipmaps(iconName + "_n", width, height, data.length, border, defNormTexColor);
-            GL11.glBindTexture(GL11.GL_TEXTURE_2D, updatingTex.norm);
-            TextureUtil.uploadTextureMipmap(aaint, width, height, xoffset, yoffset, linear, clamp);
-        }
-        //
-        if (Shaders.configSpecularMap) {
-            aaint = readImageAndMipmaps(iconName + "_s", width, height, data.length, border, defSpecTexColor);
-            GL11.glBindTexture(GL11.GL_TEXTURE_2D, updatingTex.spec);
-            TextureUtil.uploadTextureMipmap(aaint, width, height, xoffset, yoffset, linear, clamp);
-        }
-        //
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, updatingTex.base);
-    }
-
-    public static int[][] readImageAndMipmaps(
-            String name, int width, int height, int numLevels, boolean border, int defColor) {
-        int[][] aaint = new int[numLevels][];
-        int[] aint;
-        aaint[0] = aint = new int[width * height];
-        boolean goodImage = false;
-        BufferedImage image = readImage(updatingTextureMap.completeResourceLocation(new ResourceLocation(name), 0));
-        if (image != null) {
-            int imageWidth = image.getWidth();
-            int imageHeight = image.getHeight();
-            if (imageWidth + (border ? 16 : 0) == width) {
-                goodImage = true;
-                image.getRGB(0, 0, imageWidth, imageWidth, aint, 0, imageWidth);
-                if (border) TextureUtil.prepareAnisotropicData(aint, imageWidth, imageWidth, 8);
-            }
-        }
-        if (!goodImage) {
-            Arrays.fill(aint, defColor);
-        }
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, updatingTex.spec);
-        aaint = genMipmapsSimple(aaint.length - 1, width, aaint);
-        return aaint;
-    }
-
-    public static BufferedImage readImage(ResourceLocation resLoc) {
-        BufferedImage image = null;
-        InputStream istr = null;
-        if (resManager != null) {
-            try {
-                istr = resManager.getResource(resLoc).getInputStream();
-                image = ImageIO.read(istr);
-            } catch (IOException e) {
-            }
-            if (istr != null) {
-                try {
-                    istr.close();
-                } catch (IOException e) {
-                }
-                istr = null;
-            }
-        }
-        return image;
-    }
-
-    public static int[][] genMipmapsSimple(int maxLevel, int width, int[][] data) {
-        int level;
-        for (level = 1; level <= maxLevel; ++level) {
-            if (data[level] == null) {
-                int cw = width >> level;
-                int pw = cw * 2;
-                int[] aintp = data[level - 1];
-                int[] aintc = data[level] = new int[cw * cw];
-                int x, y;
-                for (y = 0; y < cw; ++y) {
-                    for (x = 0; x < cw; ++x) {
-                        int ppos = y * 2 * pw + x * 2;
-                        aintc[y * cw + x] =
-                                blend4Simple(aintp[ppos], aintp[ppos + 1], aintp[ppos + pw], aintp[ppos + pw + 1]);
-                    }
-                }
-            }
-        }
-        return data;
-    }
-
-    public static void uploadTexSub(
-            int[][] data, int width, int height, int xoffset, int yoffset, boolean linear, boolean clamp) {
-        TextureUtil.uploadTextureMipmap(data, width, height, xoffset, yoffset, linear, clamp);
-    }
-
-    public static int blend4Alpha(int c0, int c1, int c2, int c3) {
-        int a0 = (c0 >>> 24) & 255;
-        int a1 = (c1 >>> 24) & 255;
-        int a2 = (c2 >>> 24) & 255;
-        int a3 = (c3 >>> 24) & 255;
-        int as = a0 + a1 + a2 + a3;
-        int an = (as + 2) / 4;
-        // int an = Math.min(Math.min(Math.min(a0,a1),a2),a3);
-        int dv;
-        if (as != 0) {
-            dv = as;
-        } else {
-            dv = 4;
-            a3 = a2 = a1 = a0 = 1;
-        }
-        int frac = (dv + 1) / 2;
-        // return  (((Math.min(Math.min(Math.min(a0,a1),a2),a3)/ 4) << 24) |
-        int color = (an << 24)
-                | (((((c0 >>> 16) & 255) * a0
-                                        + ((c1 >>> 16) & 255) * a1
-                                        + ((c2 >>> 16) & 255) * a2
-                                        + ((c3 >>> 16) & 255) * a3
-                                        + frac)
-                                / dv)
-                        << 16)
-                | (((((c0 >>> 8) & 255) * a0
-                                        + ((c1 >>> 8) & 255) * a1
-                                        + ((c2 >>> 8) & 255) * a2
-                                        + ((c3 >>> 8) & 255) * a3
-                                        + frac)
-                                / dv)
-                        << 8)
-                | (((((c0 >>> 0) & 255) * a0
-                                        + ((c1 >>> 0) & 255) * a1
-                                        + ((c2 >>> 0) & 255) * a2
-                                        + ((c3 >>> 0) & 255) * a3
-                                        + frac)
-                                / dv)
-                        << 0);
-        return color;
-    }
-
-    public static int blend4Simple(int c0, int c1, int c2, int c3) {
-        int color = (((((c0 >>> 24) & 255) + ((c1 >>> 24) & 255) + ((c2 >>> 24) & 255) + ((c3 >>> 24) & 255) + 2) / 4)
-                        << 24)
-                | (((((c0 >>> 16) & 255) + ((c1 >>> 16) & 255) + ((c2 >>> 16) & 255) + ((c3 >>> 16) & 255) + 2) / 4)
-                        << 16)
-                | (((((c0 >>> 8) & 255) + ((c1 >>> 8) & 255) + ((c2 >>> 8) & 255) + ((c3 >>> 8) & 255) + 2) / 4) << 8)
-                | (((((c0 >>> 0) & 255) + ((c1 >>> 0) & 255) + ((c2 >>> 0) & 255) + ((c3 >>> 0) & 255) + 2) / 4) << 0);
-        return color;
-    }
-
-    public static void genMipmapAlpha(int[] aint, int offset, int width, int height) {
-        int minwh = Math.min(width, height);
-        int level;
-        int w1, w2, h1, h2, o1, o2;
-        w1 = w2 = width;
-        h1 = h2 = height;
-        o1 = o2 = offset;
-        // generate mipmap from big to small
-        o2 = offset;
-        w2 = width;
-        h2 = height;
-        o1 = 0;
-        w1 = 0;
-        h1 = 0;
-        for (level = 0; w2 > 1 && h2 > 1; ++level, w2 = w1, h2 = h1, o2 = o1) {
-            o1 = o2 + w2 * h2;
-            w1 = w2 / 2;
-            h1 = h2 / 2;
-            for (int y = 0; y < h1; ++y) {
-                int p1 = o1 + y * w1;
-                int p2 = o2 + y * 2 * w2;
-                for (int x = 0; x < w1; ++x) {
-                    aint[p1 + x] = blend4Alpha(
-                            aint[p2 + (x * 2)],
-                            aint[p2 + (x * 2 + 1)],
-                            aint[p2 + w2 + (x * 2)],
-                            aint[p2 + w2 + (x * 2 + 1)]);
-                }
-            }
-        }
-        // fix black pixels from small to big
-        while (level > 0) {
-            --level;
-            w2 = width >> level;
-            h2 = height >> level;
-            o2 = o1 - w2 * h2;
-            int p2 = o2;
-            for (int y = 0; y < h2; ++y) {
-                for (int x = 0; x < w2; ++x) {
-                    // p2 = o2 + y*w2 + x;
-                    if (aint[p2] == 0) {
-                        aint[p2] = aint[o1 + (y / 2) * w1 + (x / 2)] & 0x00ffffff;
-                    }
-                    ++p2;
-                }
-            }
-            o1 = o2;
-            w1 = w2;
-            h1 = h2;
-        }
-    }
-
-    public static void genMipmapSimple(int[] aint, int offset, int width, int height) {
-        int minwh = Math.min(width, height);
-        int level;
-        int w1, w2, h1, h2, o1, o2;
-        w1 = w2 = width;
-        h1 = h2 = height;
-        o1 = o2 = offset;
-        // generate mipmap from big to small
-        o2 = offset;
-        w2 = width;
-        h2 = height;
-        o1 = 0;
-        w1 = 0;
-        h1 = 0;
-        for (level = 0; w2 > 1 && h2 > 1; ++level, w2 = w1, h2 = h1, o2 = o1) {
-            o1 = o2 + w2 * h2;
-            w1 = w2 / 2;
-            h1 = h2 / 2;
-            for (int y = 0; y < h1; ++y) {
-                int p1 = o1 + y * w1;
-                int p2 = o2 + y * 2 * w2;
-                for (int x = 0; x < w1; ++x) {
-                    aint[p1 + x] = blend4Simple(
-                            aint[p2 + (x * 2)],
-                            aint[p2 + (x * 2 + 1)],
-                            aint[p2 + w2 + (x * 2)],
-                            aint[p2 + w2 + (x * 2 + 1)]);
-                }
-            }
-        }
-        // fix black pixels from small to big
-        while (level > 0) {
-            --level;
-            w2 = width >> level;
-            h2 = height >> level;
-            o2 = o1 - w2 * h2;
-            int p2 = o2;
-            for (int y = 0; y < h2; ++y) {
-                for (int x = 0; x < w2; ++x) {
-                    // p2 = o2 + y*w2 + x;
-                    if (aint[p2] == 0) {
-                        aint[p2] = aint[o1 + (y / 2) * w1 + (x / 2)] & 0x00ffffff;
-                    }
-                    ++p2;
-                }
-            }
-            o1 = o2;
-            w1 = w2;
-            h1 = h2;
-        }
-    }
-
-    public static boolean isSemiTransparent(int[] aint, int width, int height) {
-        int size = width * height;
-        // grass side texture ?;
-        if (aint[0] >>> 24 == 255 && aint[size - 1] == 0) return true;
-        for (int i = 0; i < size; ++i) {
-            int alpha = aint[i] >>> 24;
-            if (alpha != 0 && alpha != 255) return true;
-        }
-        return false;
-    }
-
-    public static void updateSubImage1(int[] src, int width, int height, int posX, int posY, int page, int color) {
-        int size = width * height;
-        IntBuffer intBuf = getIntBuffer(size);
-        int[] aint = getIntArray((size * 4 + 2) / 3);
-        if (src.length >= size * (page + 1)) {
-            System.arraycopy(src, size * page, aint, 0, size);
-        } else {
-            Arrays.fill(aint, color);
-        }
-        //
-        //		if (page == 0)
-        genMipmapAlpha(aint, 0, width, height);
-        //		else
-        //			genMipmapSimple(aint,0,width,height);
-        //
-        for (int level = 0, offset = 0, lw = width, lh = height, px = posX, py = posY; lw > 0 && lh > 0; ++level) {
-            int lsize = lw * lh;
-            intBuf.clear();
-            intBuf.put(aint, offset, lsize).position(0).limit(lsize);
-            GL11.glTexSubImage2D(
-                    GL11.GL_TEXTURE_2D, level, px, py, lw, lh, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, intBuf);
-            offset += lsize;
-            lw /= 2;
-            lh /= 2;
-            px /= 2;
-            py /= 2;
-        }
-        intBuf.clear();
-    }
-
-    public static void updateSubTex1(int[] src, int width, int height, int posX, int posY) {
-        int level;
-        int cw;
-        int ch;
-        int cx;
-        int cy;
-        for (level = 0, cw = width, ch = height, cx = posX, cy = posY;
-                cw > 0 && ch > 0;
-                ++level, cw /= 2, ch /= 2, cx /= 2, cy /= 2) {
-            GL11.glCopyTexSubImage2D(GL11.GL_TEXTURE_2D, level, cx, cy, 0, 0, cw, ch);
-        }
-    }
-
-    /* updateSubImage for single Texture with mipmap */
-    public static void updateSubImage1(int[][] src, int width, int height, int posX, int posY, int page, int color) {
-        int size = width * height;
-        IntBuffer intBuf = getIntBuffer(size);
-        int numLevel = src.length;
-        for (int level = 0, // offset=0,
-                        lw = width,
-                        lh = height,
-                        px = posX,
-                        py = posY;
-                lw > 0 && lh > 0 && level < numLevel;
-                ++level) {
-            int lsize = lw * lh;
-            intBuf.clear();
-            intBuf.put(src[level], 0 /*offset*/, lsize).position(0).limit(lsize);
-            GL11.glTexSubImage2D(
-                    GL11.GL_TEXTURE_2D, level, px, py, lw, lh, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, intBuf);
-            // offset += lsize;
-            lw /= 2;
-            lh /= 2;
-            px /= 2;
-            py /= 2;
-        }
-        intBuf.clear();
-    }
-
-    public static void setupTextureMipmap(TextureMap tex) {
-        /*
-          	MultiTexID multiTex = tex.getMultiTexID();
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.norm);
-        GL30.glGenerateMipmap(GL11.GL_TEXTURE_2D);
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.spec);
-        GL30.glGenerateMipmap(GL11.GL_TEXTURE_2D);
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.base);
-        GL30.glGenerateMipmap(GL11.GL_TEXTURE_2D);
-        */
-    }
-
-    public static void updateDynamicTexture(int texID, int[] src, int width, int height, DynamicTexture tex) {
-        MultiTexID multiTex = tex.getMultiTexID();
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.norm);
-        updateSubImage1(src, width, height, 0, 0, 1, defNormTexColor);
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.spec);
-        updateSubImage1(src, width, height, 0, 0, 2, defSpecTexColor);
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.base);
-        updateSubImage1(src, width, height, 0, 0, 0, defBaseTexColor);
-    }
-
-    public static void updateSubImage(
-            int[] src, int width, int height, int posX, int posY, boolean linear, boolean clamp) {
-        if (updatingTex != null) {
-            GL11.glBindTexture(GL11.GL_TEXTURE_2D, updatingTex.norm);
-            updateSubImage1(src, width, height, posX, posY, 1, defNormTexColor);
-            GL11.glBindTexture(GL11.GL_TEXTURE_2D, updatingTex.spec);
-            updateSubImage1(src, width, height, posX, posY, 2, defSpecTexColor);
-            GL11.glBindTexture(GL11.GL_TEXTURE_2D, updatingTex.base);
-        }
-        updateSubImage1(src, width, height, posX, posY, 0, defBaseTexColor);
-    }
-
-    // not used
-    public static void updateAnimationTextureMap(TextureMap tex, List tasList) {
-        Iterator<TextureAtlasSprite> iterator;
-        MultiTexID multiTex = tex.getMultiTexID();
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.norm);
-        for (iterator = tasList.iterator(); iterator.hasNext(); ) {
-            TextureAtlasSprite tas = iterator.next();
-            tas.updateAnimation();
-        }
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.norm);
-        for (iterator = tasList.iterator(); iterator.hasNext(); ) {
-            TextureAtlasSprite tas = iterator.next();
-            tas.updateAnimation();
-        }
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.norm);
-        for (iterator = tasList.iterator(); iterator.hasNext(); ) {
-            TextureAtlasSprite tas = iterator.next();
-            tas.updateAnimation();
-        }
-    }
-
-    public static void setupTexture(
-            MultiTexID multiTex, int[] src, int width, int height, boolean linear, boolean clamp) {
-        int mmfilter = linear ? GL11.GL_LINEAR : GL11.GL_NEAREST;
-        int wraptype = clamp ? GL11.GL_CLAMP : GL11.GL_REPEAT;
-        int size = width * height;
-        IntBuffer intBuf = getIntBuffer(size);
-        //
-        intBuf.clear();
-        intBuf.put(src, 0, size).position(0).limit(size);
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.base);
-        GL11.glTexImage2D(
-                GL11.GL_TEXTURE_2D,
-                0,
-                GL11.GL_RGBA,
-                width,
-                height,
-                0,
-                GL12.GL_BGRA,
-                GL12.GL_UNSIGNED_INT_8_8_8_8_REV,
-                intBuf);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, mmfilter);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, mmfilter);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, wraptype);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, wraptype);
-        //
-        intBuf.put(src, size, size).position(0).limit(size);
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.norm);
-        GL11.glTexImage2D(
-                GL11.GL_TEXTURE_2D,
-                0,
-                GL11.GL_RGBA,
-                width,
-                height,
-                0,
-                GL12.GL_BGRA,
-                GL12.GL_UNSIGNED_INT_8_8_8_8_REV,
-                intBuf);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, mmfilter);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, mmfilter);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, wraptype);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, wraptype);
-        //
-        intBuf.put(src, size * 2, size).position(0).limit(size);
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.spec);
-        GL11.glTexImage2D(
-                GL11.GL_TEXTURE_2D,
-                0,
-                GL11.GL_RGBA,
-                width,
-                height,
-                0,
-                GL12.GL_BGRA,
-                GL12.GL_UNSIGNED_INT_8_8_8_8_REV,
-                intBuf);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, mmfilter);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, mmfilter);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, wraptype);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, wraptype);
-        //
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.base);
-    }
-
-    /* currently not used */
-    public static void updateSubImage(
-            MultiTexID multiTex, int[] src, int width, int height, int posX, int posY, boolean linear, boolean clamp) {
-        int size = width * height;
-        IntBuffer intBuf = getIntBuffer(size);
-        //
-        intBuf.clear();
-        intBuf.put(src, 0, size);
-        intBuf.position(0).limit(size);
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.base);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST);
-        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.glTexSubImage2D(
-                GL11.GL_TEXTURE_2D,
-                0,
-                posX,
-                posY,
-                width,
-                height,
-                GL12.GL_BGRA,
-                GL12.GL_UNSIGNED_INT_8_8_8_8_REV,
-                intBuf);
-        if (src.length == size * 3) {
-            intBuf.clear();
-            intBuf.put(src, size, size).position(0);
-            intBuf.position(0).limit(size);
-        }
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.norm);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST);
-        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.glTexSubImage2D(
-                GL11.GL_TEXTURE_2D,
-                0,
-                posX,
-                posY,
-                width,
-                height,
-                GL12.GL_BGRA,
-                GL12.GL_UNSIGNED_INT_8_8_8_8_REV,
-                intBuf);
-        if (src.length == size * 3) {
-            intBuf.clear();
-            intBuf.put(src, size * 2, size);
-            intBuf.position(0).limit(size);
-        }
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.spec);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST);
-        GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST);
-        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.glTexSubImage2D(
-                GL11.GL_TEXTURE_2D,
-                0,
-                posX,
-                posY,
-                width,
-                height,
-                GL12.GL_BGRA,
-                GL12.GL_UNSIGNED_INT_8_8_8_8_REV,
-                intBuf);
-        GL13.glActiveTexture(GL13.GL_TEXTURE0);
-    }
-
-    public static ResourceLocation getNSMapLocation(ResourceLocation location, String mapName) {
-        String basename = location.getResourcePath();
-        String[] basenameParts = basename.split(".png");
-        String basenameNoFileType = basenameParts[0];
-        return new ResourceLocation(location.getResourceDomain(), basenameNoFileType + "_" + mapName + ".png");
-    }
-
-    public static void loadNSMap(
-            IResourceManager manager, ResourceLocation location, int width, int height, int[] aint) {
-        if (Shaders.configNormalMap)
-            ShadersTex.loadNSMap1(
-                    manager, getNSMapLocation(location, "n"), width, height, aint, width * height, defNormTexColor);
-        if (Shaders.configSpecularMap)
-            ShadersTex.loadNSMap1(
-                    manager, getNSMapLocation(location, "s"), width, height, aint, width * height * 2, defSpecTexColor);
-    }
-
-    public static void loadNSMap1(
-            IResourceManager manager,
-            ResourceLocation location,
-            int width,
-            int height,
-            int[] aint,
-            int offset,
-            int defaultColor) {
-        boolean good = false;
-        try {
-            IResource res = manager.getResource(location);
-            BufferedImage bufferedimage = ImageIO.read(res.getInputStream());
-            if (bufferedimage.getWidth() == width && bufferedimage.getHeight() == height) {
-                bufferedimage.getRGB(0, 0, width, height, aint, offset, width);
-                good = true;
-            }
-        } catch (IOException ex) {
-        }
-        if (!good) {
-            java.util.Arrays.fill(aint, offset, offset + width * height, defaultColor);
-        }
-    }
-
-    /** init and upload from BufferedImage */
-    /* Replacement for TextureUtil.func_110989_a call in SimpleTexture.func_110551_a.
-    Keep par0...par5 the same as func_110989_a for easy patching.
-    More parameters added for reading N-S-Map. */
-    public static int loadSimpleTexture(
-            int textureID,
-            BufferedImage bufferedimage,
-            boolean linear,
-            boolean clamp,
-            IResourceManager resourceManager,
-            ResourceLocation location,
-            MultiTexID multiTex) {
-        int width = bufferedimage.getWidth();
-        int height = bufferedimage.getHeight();
-        int size = width * height;
-        int[] aint = getIntArray(size * 3);
-        bufferedimage.getRGB(0, 0, width, height, aint, 0, width);
-        loadNSMap(resourceManager, location, width, height, aint);
-        setupTexture(multiTex, aint, width, height, linear, clamp);
-        return textureID;
-    }
-
-    public static void mergeImage(int[] aint, int dstoff, int srcoff, int size) {}
-
-    public static int blendColor(int color1, int color2, int factor1) {
-        int factor2 = 255 - factor1;
-        return (((((color1 >>> 24) & 255) * factor1 + ((color2 >>> 24) & 255) * factor2) / 255) << 24)
-                | (((((color1 >>> 16) & 255) * factor1 + ((color2 >>> 16) & 255) * factor2) / 255) << 16)
-                | (((((color1 >>> 8) & 255) * factor1 + ((color2 >>> 8) & 255) * factor2) / 255) << 8)
-                | (((((color1 >>> 0) & 255) * factor1 + ((color2 >>> 0) & 255) * factor2) / 255) << 0);
-    }
-
-    public static void loadLayeredTexture(LayeredTexture tex, IResourceManager manager, List list) {
-        int width = 0;
-        int height = 0;
-        int size = 0;
-        int[] image = null;
-        Iterator<String> iterator;
-        for (iterator = list.iterator(); iterator.hasNext(); ) {
-            String s = iterator.next();
-            if (s != null) {
-                try {
-                    ResourceLocation location = new ResourceLocation(s);
-                    InputStream inputstream = manager.getResource(location).getInputStream();
-                    BufferedImage bufimg = ImageIO.read(inputstream);
-
-                    if (size == 0) {
-                        width = bufimg.getWidth();
-                        height = bufimg.getHeight();
-                        size = width * height;
-                        image = createAIntImage(size, 0x00000000);
-                    }
-                    int[] aint = getIntArray(size * 3);
-                    bufimg.getRGB(0, 0, width, height, aint, 0, width);
-                    loadNSMap(manager, location, width, height, aint);
-                    // merge
-                    for (int i = 0; i < size; ++i) {
-                        int alpha = (aint[i] >>> 24) & 255;
-                        image[size * 0 + i] = blendColor(aint[size * 0 + i], image[size * 0 + i], alpha);
-                        image[size * 1 + i] = blendColor(aint[size * 1 + i], image[size * 1 + i], alpha);
-                        image[size * 2 + i] = blendColor(aint[size * 2 + i], image[size * 2 + i], alpha);
-                    }
-                } catch (IOException ex) {
-                    ex.printStackTrace();
-                }
-            }
-        }
-        // init and upload
-        setupTexture(tex.getMultiTexID(), image, width, height, false, false);
-    }
-
-    /* update block texture filter +/- items texture */
-    static void updateTextureMinMagFilter() {
-        TextureManager texman = Minecraft.getMinecraft().getTextureManager();
-        ITextureObject texObj = texman.getTexture(TextureMap.locationBlocksTexture);
-        if (texObj != null) {
-            MultiTexID multiTex = texObj.getMultiTexID();
-            // base texture
-            GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.base);
-            GL11.glTexParameteri(
-                    GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, Shaders.texMinFilValue[Shaders.configTexMinFilB]);
-            GL11.glTexParameteri(
-                    GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, Shaders.texMagFilValue[Shaders.configTexMagFilB]);
-            // norm texture
-            GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.norm);
-            GL11.glTexParameteri(
-                    GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, Shaders.texMinFilValue[Shaders.configTexMinFilN]);
-            GL11.glTexParameteri(
-                    GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, Shaders.texMagFilValue[Shaders.configTexMagFilN]);
-
-            // spec texture
-            GL11.glBindTexture(GL11.GL_TEXTURE_2D, multiTex.spec);
-            GL11.glTexParameteri(
-                    GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, Shaders.texMinFilValue[Shaders.configTexMinFilS]);
-            GL11.glTexParameteri(
-                    GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, Shaders.texMagFilValue[Shaders.configTexMagFilS]);
-
-            GL11.glBindTexture(GL11.GL_TEXTURE_2D, 0);
-        }
-    }
-
-    static IResourceManager resManager = null;
-    static ResourceLocation resLocation = null;
-    static int imageSize = 0;
-
-    public static IResource loadResource(IResourceManager manager, ResourceLocation location) throws IOException {
-        resManager = manager;
-        resLocation = location;
-        return manager.getResource(location);
-    }
-
-    public static int[] loadAtlasSprite(
-            BufferedImage bufferedimage, int startX, int startY, int w, int h, int[] aint, int offset, int scansize) {
-        imageSize = w * h;
-        bufferedimage.getRGB(startX, startY, w, h, aint, offset, scansize);
-        loadNSMap(resManager, resLocation, w, h, aint);
-        return aint;
-    }
-
-    public static int[] extractFrame(int[] src, int width, int height, int frameIndex) {
-        int srcSize = imageSize;
-        int frameSize = width * height;
-        int[] dst = new int[frameSize * 3];
-        int srcPos = frameSize * frameIndex;
-        int dstPos = 0;
-        System.arraycopy(src, srcPos, dst, dstPos, frameSize);
-        srcPos += srcSize;
-        dstPos += frameSize;
-        System.arraycopy(src, srcPos, dst, dstPos, frameSize);
-        srcPos += srcSize;
-        dstPos += frameSize;
-        System.arraycopy(src, srcPos, dst, dstPos, frameSize);
-        return dst;
-    }
-
-    public static void fixTransparentColor(TextureAtlasSprite tas, int[] aint) {}
-}

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

@@ -0,0 +1,590 @@
+package com.gtnewhorizons.angelica.client.font;
+
+import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.*;
+
+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.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 = memAllocFloat(INITIAL_BATCH_SIZE * 2);
+    private ByteBuffer batchVtxColors = memAlloc(INITIAL_BATCH_SIZE * 4);
+    private FloatBuffer batchVtxTexCoords = memAllocFloat(INITIAL_BATCH_SIZE * 2);
+    private IntBuffer batchIndices = memAllocInt(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 = memRealloc(batchVtxPositions, newCap * 2);
+            batchVtxColors = memRealloc(batchVtxColors, newCap * 4);
+            batchVtxTexCoords = memRealloc(batchVtxTexCoords, newCap * 2);
+            final int oldIdxCap = batchIndices.capacity();
+            final int newIdxCap = oldIdxCap * 2;
+            batchIndices = memRealloc(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);
+                }
+
+                // 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 float shadowOffset;
+                final ResourceLocation texture;
+
+                if (lutIndex == -1 || unicodeFlag) {
+                    if (glyphWidth[chr] == 0) {
+                        continue;
+                    }
+                    // Draw unicode char
+                    shadowOffset = 0.5F;
+                    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
+                    shadowOffset = 1.0F;
+                    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

@@ -0,0 +1,29 @@
+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

@@ -0,0 +1,48 @@
+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

@@ -0,0 +1,60 @@
+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

@@ -0,0 +1,82 @@
+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

@@ -0,0 +1,80 @@
+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.6.9")
+                .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

@@ -0,0 +1,34 @@
+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

@@ -0,0 +1,37 @@
+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/mojang/AutoClosableAbstractTexture.java

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,35 @@
+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

@@ -0,0 +1,43 @@
+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

@@ -0,0 +1,39 @@
+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

@@ -0,0 +1,155 @@
+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

@@ -0,0 +1,59 @@
+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

@@ -0,0 +1,89 @@
+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

@@ -0,0 +1,27 @@
+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

@@ -0,0 +1,5 @@
+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

@@ -0,0 +1,5 @@
+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

@@ -0,0 +1,29 @@
+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

@@ -0,0 +1,24 @@
+package com.gtnewhorizons.angelica.compat.mojang;
+
+
+import com.gtnewhorizons.angelica.compat.ModStatus;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import xonin.backhand.api.core.BackhandUtils;
+
+public enum InteractionHand {
+    MAIN_HAND,
+    OFF_HAND;
+
+    InteractionHand() {
+    }
+
+    public ItemStack getItemInHand(EntityPlayer player){
+        if (ModStatus.isBackhandLoaded && this == InteractionHand.OFF_HAND){ // off hand (requires backhand)
+            return BackhandUtils.getOffhandItem(player);
+        }
+        else { // main hand
+            return player.getHeldItem();
+        }
+    }
+}

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

@@ -0,0 +1,131 @@
+package com.gtnewhorizons.angelica.compat.mojang;
+
+import static com.gtnewhorizon.gtnhlib.bytebuf.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 com.gtnewhorizon.gtnhlib.bytebuf.MemoryStack;
+import com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities;
+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);
+
+        final IntBuffer buffer = MemoryUtilities.memAllocInt(size);
+
+        try {
+            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);
+        } finally {
+            MemoryUtilities.memFree(buffer);
+        }
+    }
+
+    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

@@ -0,0 +1,97 @@
+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

@@ -0,0 +1,63 @@
+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

@@ -0,0 +1,47 @@
+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

@@ -0,0 +1,47 @@
+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

@@ -0,0 +1,40 @@
+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

@@ -0,0 +1,49 @@
+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

@@ -0,0 +1,44 @@
+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

@@ -0,0 +1,132 @@
+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

@@ -0,0 +1,302 @@
+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

@@ -0,0 +1,543 @@
+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

@@ -0,0 +1,48 @@
+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

@@ -0,0 +1,169 @@
+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("Enables PBR atlas dumping")
+    @Config.DefaultBoolean(false)
+    @Config.Name("Enable PBR Debug")
+    public static boolean enablePBRDebug;
+
+    @Config.Comment("Enable Zoom")
+    @Config.DefaultBoolean(true)
+    @Config.RequiresMcRestart
+    public static boolean enableZoom;
+
+    @Config.Comment("Optimizes in-world item rendering [Experimental]")
+    @Config.DefaultBoolean(false)
+    @Config.RequiresMcRestart
+    public static boolean optimizeInWorldItemRendering_WIP;
+
+    @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;
+
+    @Config.Comment("Render distance for the spinning mob inside mod spawners")
+    @Config.DefaultDouble(16D)
+    @Config.RangeDouble(min = 16D, max = 64D)
+    public static double mobSpawnerRenderDistance;
+
+    @Config.Comment("Switches to an alternate FPS limiter that gives more stable frametimes, in exchange for slightly " +
+        "more latency. Will never introduce more than one frame of latency, and has a lower impact at higher framerates.")
+    @Config.DefaultBoolean(false)
+    public static boolean sleepBeforeSwap;
+
+    @Config.Comment("Allows unicode languages to use an odd gui scale")
+    @Config.DefaultBoolean(true)
+    public static boolean removeUnicodeEvenScaling;
+}

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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,42 @@
+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;
+}