Merge pull request #57 from GTNewHorizons/UEV_Cap

Extremely Ultimate Capacitor

12 files changed, 647 insertions, 388 deletions

diff --git a/build.gradle b/build.gradle
index 2dc32c9f20..9027fe62de 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1673027205
+//version: 1675624371
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -6,24 +6,27 @@
  */
 
 
+import com.diffplug.blowdryer.Blowdryer
 import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import com.gtnewhorizons.retrofuturagradle.mcp.ReobfuscatedJar
 import com.matthewprenger.cursegradle.CurseArtifact
 import com.matthewprenger.cursegradle.CurseRelation
 import com.modrinth.minotaur.dependencies.ModDependency
 import com.modrinth.minotaur.dependencies.VersionDependency
 import org.gradle.internal.logging.text.StyledTextOutput.Style
 import org.gradle.internal.logging.text.StyledTextOutputFactory
+import org.jetbrains.gradle.ext.*
 
 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 {
+        mavenLocal()
         mavenCentral()
 
         maven {
@@ -31,9 +34,10 @@ buildscript {
             url 'https://maven.minecraftforge.net'
         }
         maven {
-            // GTNH ForgeGradle and ASM Fork
-            name = "GTNH Maven"
-            url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
+            // GTNH RetroFuturaGradle and ASM Fork
+            name "GTNH Maven"
+            url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
+            allowInsecureProtocol = true
         }
         maven {
             name 'sonatype'
@@ -44,76 +48,41 @@ buildscript {
             url 'https://repo1.maven.org/maven2/'
         }
     }
-    dependencies {
-        //Overwrite the current ASM version to fix shading newer than java 8 applicatations.
-        classpath 'org.ow2.asm:asm-debug-all-custom:5.0.3'
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.13'
-    }
 }
 plugins {
     id 'java-library'
-    id 'idea'
+    id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.7"
     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 'org.jetbrains.kotlin.jvm' version '1.8.0' apply false
+    id 'org.jetbrains.kotlin.kapt' version '1.8.0' apply false
+    id 'com.google.devtools.ksp' version '1.8.0-1.0.9' apply false
+    id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version ,unused, available for addon.gradle
+    id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
+    id 'com.palantir.git-version' version '0.13.0' apply false // 0.13.0 is the last jvm8 supporting version
+    id 'de.undercouch.download' version '5.3.0'
+    id 'com.github.gmazzo.buildconfig' version '3.1.0' apply false // Unused, available for addon.gradle
     id 'com.diffplug.spotless' version '6.7.2' apply false
     id 'com.modrinth.minotaur' version '2.+' apply false
     id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.1.4'
 }
 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")
@@ -121,10 +90,7 @@ checkPropertyExists("autoUpdateBuildScript")
 checkPropertyExists("minecraftVersion")
 checkPropertyExists("forgeVersion")
 checkPropertyExists("replaceGradleTokenInFile")
-checkPropertyExists("gradleTokenModId")
-checkPropertyExists("gradleTokenModName")
 checkPropertyExists("gradleTokenVersion")
-checkPropertyExists("gradleTokenGroupName")
 checkPropertyExists("apiPackage")
 checkPropertyExists("accessTransformersFile")
 checkPropertyExists("usesMixins")
@@ -135,6 +101,8 @@ checkPropertyExists("containsMixinsAndOrCoreModOnly")
 checkPropertyExists("usesShadowedDependencies")
 checkPropertyExists("developmentEnvironmentUserName")
 
+propertyDefaultIfUnset("generateGradleTokenClass", "")
+propertyDefaultIfUnset("includeWellKnownRepositories", true)
 propertyDefaultIfUnset("noPublishedSources", false)
 propertyDefaultIfUnset("usesMixinDebug", project.usesMixins)
 propertyDefaultIfUnset("forceEnableMixins", false)
@@ -144,14 +112,110 @@ propertyDefaultIfUnset("modrinthProjectId", "")
 propertyDefaultIfUnset("modrinthRelations", "")
 propertyDefaultIfUnset("curseForgeProjectId", "")
 propertyDefaultIfUnset("curseForgeRelations", "")
+propertyDefaultIfUnset("minimizeShadowedDependencies", true)
+propertyDefaultIfUnset("relocateShadowedDependencies", true)
+// Deprecated properties (kept for backwards compat)
+propertyDefaultIfUnset("gradleTokenModId", "")
+propertyDefaultIfUnset("gradleTokenModName", "")
+propertyDefaultIfUnset("gradleTokenGroupName", "")
+
+propertyDefaultIfUnset("enableModernJavaSyntax", false) // On by default for new projects only
+propertyDefaultIfUnset("enableGenericInjection", false) // On by default for new projects only
+
+project.extensions.add(Blowdryer, "Blowdryer", Blowdryer) // Make blowdryer available in "apply from:" scripts
+if (!disableSpotless) {
+    apply plugin: 'com.diffplug.spotless'
+    apply from: Blowdryer.file('spotless.gradle')
+}
 
 String javaSourceDir = "src/main/java/"
 String scalaSourceDir = "src/main/scala/"
 String kotlinSourceDir = "src/main/kotlin/"
 
+if (usesShadowedDependencies.toBoolean()) {
+    apply plugin: "com.github.johnrengelman.shadow"
+}
+
+java {
+    toolchain {
+        if (enableModernJavaSyntax.toBoolean()) {
+            languageVersion.set(JavaLanguageVersion.of(17))
+        } else {
+            languageVersion.set(projectJavaVersion)
+        }
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
+    if (!noPublishedSources) {
+        withSourcesJar()
+    }
+}
+
+pluginManager.withPlugin('org.jetbrains.kotlin.jvm') {
+    // If Kotlin is enabled in the project
+    kotlin {
+        jvmToolchain(8)
+    }
+    // Kotlin hacks our source sets, so we hack Kotlin's tasks
+    def disabledKotlinTaskList = [
+        "kaptGenerateStubsMcLauncherKotlin",
+        "kaptGenerateStubsPatchedMcKotlin",
+        "kaptGenerateStubsInjectedTagsKotlin",
+        "compileMcLauncherKotlin",
+        "compilePatchedMcKotlin",
+        "compileInjectedTagsKotlin",
+        "kaptMcLauncherKotlin",
+        "kaptPatchedMcKotlin",
+        "kaptInjectedTagsKotlin",
+        "kspMcLauncherKotlin",
+        "kspPatchedMcKotlin",
+        "kspInjectedTagsKotlin",
+    ]
+    tasks.configureEach { task ->
+        if (task.name in disabledKotlinTaskList) {
+            task.enabled = false
+        }
+    }
+}
+
+configurations {
+    create("runtimeOnlyNonPublishable") {
+        description = "Runtime only dependencies that are not published alongside the jar"
+        canBeConsumed = false
+        canBeResolved = false
+    }
+}
 
-final String modGroupPath = modGroup.toString().replaceAll("\\.", "/")
-final String apiPackagePath = apiPackage.toString().replaceAll("\\.", "/")
+if (enableModernJavaSyntax.toBoolean()) {
+    dependencies {
+        annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0'
+        compileOnly('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') {
+            transitive = false // We only care about the 1 annotation class
+        }
+    }
+
+    tasks.withType(JavaCompile).configureEach {
+        if (it.name in ["compileMcLauncherJava", "compilePatchedMcJava"]) {
+            return
+        }
+        sourceCompatibility = 17 // for the IDE support
+        options.release.set(8)
+
+        javaCompiler.set(javaToolchains.compilerFor {
+            languageVersion.set(JavaLanguageVersion.of(17))
+            vendor.set(JvmVendorSpec.ADOPTIUM)
+        })
+    }
+}
+
+eclipse {
+    classpath {
+        downloadSources = true
+        downloadJavadoc = true
+    }
+}
+
+final String modGroupPath = modGroup.toString().replace('.' as char, '/' as char)
+final String apiPackagePath = apiPackage.toString().replace('.' as char, '/' as char)
 
 String targetPackageJava = javaSourceDir + modGroupPath
 String targetPackageScala = scalaSourceDir + modGroupPath
@@ -174,6 +238,27 @@ if (accessTransformersFile) {
     if (!getFile(targetFile).exists()) {
         throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
     }
+    tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(targetFile)
+    tasks.srgifyBinpatchedJar.accessTransformerFiles.from(targetFile)
+} else {
+    boolean atsFound = false
+    for (File at : sourceSets.getByName("main").resources.files) {
+        if (at.name.toLowerCase().endsWith("_at.cfg")) {
+            atsFound = true
+            tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(at)
+            tasks.srgifyBinpatchedJar.accessTransformerFiles.from(at)
+        }
+    }
+    for (File at : sourceSets.getByName("api").resources.files) {
+        if (at.name.toLowerCase().endsWith("_at.cfg")) {
+            atsFound = true
+            tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(at)
+            tasks.srgifyBinpatchedJar.accessTransformerFiles.from(at)
+        }
+    }
+    if (atsFound) {
+        logger.warn("Found and added access transformers in the resources folder, please configure gradle.properties to explicitly mention them by name")
+    }
 }
 
 if (usesMixins.toBoolean()) {
@@ -212,7 +297,7 @@ if (coreModClass) {
     }
 }
 
-configurations.all {
+configurations.configureEach {
     resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS)
 
     // Make sure GregTech build won't time out
@@ -243,7 +328,7 @@ catch (Exception ignored) {
     versionOverride = 'NO-GIT-TAG-SET'
     identifiedVersion = versionOverride
 }
-version = minecraftVersion + '-' + identifiedVersion
+version = identifiedVersion
 ext {
     modVersion = identifiedVersion
 }
@@ -252,63 +337,79 @@ if (identifiedVersion == versionOverride) {
     out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
 }
 
-group = modGroup
+group = "com.github.GTNewHorizons"
 if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
     archivesBaseName = customArchiveBaseName
 } else {
     archivesBaseName = modId
 }
 
-def arguments = []
-def jvmArguments = []
-
-if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
-    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) {
         for (f in replaceGradleTokenInFile.split(',')) {
-            replaceIn f
-        }
-        if (gradleTokenModId) {
-            replace gradleTokenModId, modId
-        }
-        if (gradleTokenModName) {
-            replace gradleTokenModName, modName
+            tagReplacementFiles.add f
         }
-        if (gradleTokenVersion) {
-            replace gradleTokenVersion, modVersion
-        }
-        if (gradleTokenGroupName) {
-            replace gradleTokenGroupName, modGroup
+    }
+    if (gradleTokenModId) {
+        injectedTags.put gradleTokenModId, modId
+    }
+    if (gradleTokenModName) {
+        injectedTags.put gradleTokenModName, modName
+    }
+    if (gradleTokenVersion) {
+        injectedTags.put gradleTokenVersion, modVersion
+    }
+    if (gradleTokenGroupName) {
+        injectedTags.put gradleTokenGroupName, modGroup
+    }
+    if (enableGenericInjection.toBoolean()) {
+        injectMissingGenerics.set(true)
+    }
+
+    // Enable assertions in the current mod
+    extraRunJvmArguments.add("-ea:${modGroup}")
+
+    if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
+        extraTweakClasses.add("org.spongepowered.asm.launch.MixinTweaker")
+
+        if (usesMixinDebug.toBoolean()) {
+            extraRunJvmArguments.addAll([
+                "-Dmixin.debug.countInjections=true",
+                "-Dmixin.debug.verbose=true",
+                "-Dmixin.debug.export=true"
+            ])
         }
     }
 
-    clientIntellijRun {
-        args(arguments)
-        jvmArgs(jvmArguments)
+    // Blowdryer is present in some old mod builds, do not propagate it further as a dependency
+    // IC2 has no reobf jars in its Maven
+    groupsToExcludeFromAutoReobfMapping.addAll(["com.diffplug", "com.diffplug.durian", "net.industrial-craft"])
+}
+
+if (generateGradleTokenClass) {
+    tasks.injectTags.outputClassName.set(generateGradleTokenClass)
+}
 
-        if (developmentEnvironmentUserName) {
-            args("--username", developmentEnvironmentUserName)
+// Custom reobf auto-mappings
+configurations.configureEach {
+    dependencies.configureEach { dep ->
+        if (dep instanceof org.gradle.api.artifacts.ExternalModuleDependency) {
+            if (dep.group == "net.industrial-craft" && dep.name == "industrialcraft-2") {
+                // https://www.curseforge.com/minecraft/mc-mods/industrial-craft/files/2353971
+                project.dependencies.reobfJarConfiguration("curse.maven:ic2-242638:2353971")
+            }
         }
     }
+}
 
-    serverIntellijRun {
-        args(arguments)
-        jvmArgs(jvmArguments)
+// Ensure tests have access to minecraft classes
+sourceSets {
+    test {
+        java {
+            compileClasspath += sourceSets.patchedMc.output + sourceSets.mcLauncher.output
+            runtimeClasspath += sourceSets.patchedMc.output + sourceSets.mcLauncher.output
+        }
     }
 }
 
@@ -316,15 +417,49 @@ if (file('addon.gradle').exists()) {
     apply from: 'addon.gradle'
 }
 
+// Allow unsafe repos but warn
+repositories.configureEach { repo ->
+    if (repo instanceof org.gradle.api.artifacts.repositories.UrlArtifactRepository) {
+        if (repo.getUrl() != null && repo.getUrl().getScheme() == "http" && !repo.allowInsecureProtocol) {
+            logger.warn("Deprecated: Allowing insecure connections for repo '${repo.name}' - add 'allowInsecureProtocol = true'")
+            repo.allowInsecureProtocol = true
+        }
+    }
+}
+
 apply from: 'repositories.gradle'
 
 configurations {
-    // TODO: remove Compile after all uses are refactored to Implementation
-    for (config in [shadowImplementation, shadowCompile, shadeCompile]) {
-        compileClasspath.extendsFrom(config)
-        runtimeClasspath.extendsFrom(config)
-        testCompileClasspath.extendsFrom(config)
-        testRuntimeClasspath.extendsFrom(config)
+    for (config in [compileClasspath, runtimeClasspath, testCompileClasspath, testRuntimeClasspath]) {
+        config.extendsFrom(runtimeOnlyNonPublishable)
+        if (usesShadowedDependencies.toBoolean()) {
+            config.extendsFrom(shadowImplementation)
+            // TODO: remove Compile after all uses are refactored to Implementation
+            config.extendsFrom(shadeCompile)
+            config.extendsFrom(shadowCompile)
+        }
+    }
+    // A "bag-of-dependencies"-style configuration for backwards compatibility, gets put in "api"
+    create("compile") {
+        description = "Deprecated: use api or implementation instead, gets put in api"
+        canBeConsumed = false
+        canBeResolved = false
+        visible = false
+    }
+    create("testCompile") {
+        description = "Deprecated: use testImplementation instead"
+        canBeConsumed = false
+        canBeResolved = false
+        visible = false
+    }
+    api.extendsFrom(compile)
+    testImplementation.extendsFrom(testCompile)
+}
+
+afterEvaluate {
+    if (!configurations.compile.allDependencies.empty || !configurations.testCompile.allDependencies.empty) {
+        logger.warn("This project uses deprecated `compile` dependencies, please migrate to using `api` and `implementation`")
+        logger.warn("For more details, see https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/master/dependencies.gradle")
     }
 }
 
@@ -332,12 +467,16 @@ repositories {
     maven {
         name 'Overmind forge repo mirror'
         url 'https://gregtech.overminddl1.com/'
+        mavenContent {
+            excludeGroup("net.minecraftforge") // missing the `universal` artefact
+        }
+    }
+    maven {
+        name = "GTNH Maven"
+        url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
+        allowInsecureProtocol = true
     }
     if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
-        maven {
-            name = "GTNH Maven"
-            url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
-        }
         if (usesMixinDebug.toBoolean()) {
             maven {
                 name = "Fabric Maven"
@@ -345,6 +484,35 @@ repositories {
             }
         }
     }
+    if (includeWellKnownRepositories.toBoolean()) {
+        maven {
+            name "CurseMaven"
+            url "https://cursemaven.com"
+            content {
+                includeGroup "curse.maven"
+            }
+        }
+        maven {
+            name = "ic2"
+            url = "https://maven.ic2.player.to/"
+            metadataSources {
+                mavenPom()
+                artifact()
+            }
+        }
+        maven {
+            name = "ic2-mirror"
+            url = "https://maven2.ic2.player.to/"
+            metadataSources {
+                mavenPom()
+                artifact()
+            }
+        }
+        maven {
+            name "MMD Maven"
+            url "https://maven.mcmoddev.com/"
+        }
+    }
 }
 
 dependencies {
@@ -352,31 +520,42 @@ dependencies {
         annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
         annotationProcessor('com.google.guava:guava:24.1.1-jre')
         annotationProcessor('com.google.code.gson:gson:2.8.6')
-        annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.3:processor')
+        annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.12:processor')
         if (usesMixinDebug.toBoolean()) {
-            runtimeClasspath('org.jetbrains:intellij-fernflower:1.2.1.16')
-            testRuntimeClasspath('org.jetbrains:intellij-fernflower:1.2.1.16')
+            runtimeOnlyNonPublishable('org.jetbrains:intellij-fernflower:1.2.1.16')
         }
     }
     if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
-        compile('com.gtnewhorizon:gtnhmixins:2.1.3')
+        implementation('com.gtnewhorizon:gtnhmixins:2.1.12')
+    }
+}
+
+pluginManager.withPlugin('org.jetbrains.kotlin.kapt') {
+    if (usesMixins.toBoolean()) {
+        dependencies {
+            kapt('com.gtnewhorizon:gtnhmixins:2.1.12:processor')
+        }
     }
 }
 
 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 mixinTmpDir = buildDir.path + File.separator + 'tmp' + File.separator + 'mixins'
+def refMap = "${mixinTmpDir}" + File.separator + mixingConfigRefMap
+def mixinSrg = "${mixinTmpDir}" + File.separator + "mixins.srg"
+
+tasks.register('generateAssets') {
+    group = "GTNH Buildscript"
+    description = "Generates a mixin config file at /src/main/resources/mixins.modid.json if needed"
+    onlyIf { usesMixins.toBoolean() }
+    doLast {
         def mixinConfigFile = getFile("/src/main/resources/mixins." + modId + ".json")
         if (!mixinConfigFile.exists()) {
             def mixinPluginLine = ""
-            if(!mixinPlugin.isEmpty()) {
+            if (!mixinPlugin.isEmpty()) {
                 // We might not have a mixin plugin if we're using early/late mixins
-                mixinPluginLine +=   """\n  "plugin": "${modGroup}.${mixinPlugin}", """
+                mixinPluginLine += """\n  "plugin": "${modGroup}.${mixinPlugin}", """
             }
 
             mixinConfigFile.text = """{
@@ -395,105 +574,58 @@ task generateAssets {
     }
 }
 
-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/**'
-        }
+if (usesMixins.toBoolean()) {
+    tasks.named("reobfJar", ReobfuscatedJar).configure {
+        extraSrgFiles.from(mixinSrg)
     }
 
-    manifest {
-        attributes(getManifestAttributes())
+    tasks.named("processResources").configure {
+        dependsOn("generateAssets")
     }
 
-    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/**'
+    tasks.named("compileJava", JavaCompile).configure {
+        doFirst {
+            new File(mixinTmpDir).mkdirs()
         }
+        options.compilerArgs += [
+            "-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}",
+            "-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"
+        ]
     }
 
-    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"
-            ]
+    pluginManager.withPlugin('org.jetbrains.kotlin.kapt') {
+        kapt {
+            correctErrorTypes = true
+            javacOptions {
+                option("-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}")
+                option("-AoutSrgFile=$mixinSrg")
+                option("-AoutRefMapFile=$refMap")
+            }
+        }
+        tasks.configureEach { task ->
+            if (task.name == "kaptKotlin") {
+                task.doFirst {
+                    new File(mixinTmpDir).mkdirs()
+                }
+            }
         }
     }
-}
-
-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 {
+tasks.named("processResources", ProcessResources).configure {
     // this will ensure that this task is redone when the versions change.
     inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
+    inputs.property "mcversion", project.minecraft.mcVersion
     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,
+    // replace stuff in mcmod.info, nothing else. replaces ${key} with value in text
+    filesMatching("mcmod.info")  {
+        expand "minecraftVersion": project.minecraft.mcVersion,
             "modVersion": modVersion,
             "modId": modId,
             "modName": modName
@@ -501,12 +633,7 @@ processResources {
 
     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'
+        dependsOn("compileJava", "compileScala")
     }
 }
 
@@ -534,65 +661,61 @@ def getManifestAttributes() {
     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")
-
+tasks.named("jar", Jar).configure {
     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/**'
-        }
+if (usesShadowedDependencies.toBoolean()) {
+    tasks.register('relocateShadowJar', ConfigureShadowRelocation) {
+        target = tasks.shadowJar
+        prefix = modGroup + ".shadow"
+        enabled = minimizeShadowedDependencies.toBoolean()
     }
+    tasks.named("shadowJar", ShadowJar).configure {
+        manifest {
+            attributes(getManifestAttributes())
+        }
 
-    from sourceSets.main.output
-    getArchiveClassifier().set("dev")
-
-    manifest {
-        attributes(getManifestAttributes())
+        if (minimizeShadowedDependencies.toBoolean()) {
+            minimize()  // This will only allow shading for actually used classes
+        }
+        configurations = [
+            project.configurations.shadowImplementation,
+            project.configurations.shadowCompile,
+            project.configurations.shadeCompile
+        ]
+        archiveClassifier.set('dev')
+        if (minimizeShadowedDependencies.toBoolean()) {
+            dependsOn(relocateShadowJar)
+        }
     }
-
-    if (usesShadowedDependencies.toBoolean()) {
-        dependsOn(circularResolverJar)
+    configurations.runtimeElements.outgoing.artifacts.clear()
+    configurations.apiElements.outgoing.artifacts.clear()
+    configurations.runtimeElements.outgoing.artifact(tasks.named("shadowJar", ShadowJar))
+    configurations.apiElements.outgoing.artifact(tasks.named("shadowJar", ShadowJar))
+    tasks.named("jar", Jar) {
         enabled = false
+        finalizedBy(tasks.shadowJar)
+    }
+    tasks.named("reobfJar", ReobfuscatedJar) {
+        inputJar.set(tasks.named("shadowJar", ShadowJar).flatMap({it.archiveFile}))
+    }
+    AdhocComponentWithVariants javaComponent = (AdhocComponentWithVariants) project.components.findByName("java")
+    javaComponent.withVariantsFromConfiguration(configurations.shadowRuntimeElements) {
+        skip()
+    }
+    for (runTask in ["runClient", "runServer"]) {
+        tasks.named(runTask).configure {
+            dependsOn("shadowJar")
+        }
     }
 }
+ext.publishableDevJar = usesShadowedDependencies.toBoolean() ? tasks.shadowJar : tasks.jar
+ext.publishableObfJar = tasks.reobfJar
 
-task apiJar(type: Jar) {
+tasks.register('apiJar', Jar) {
     from(sourceSets.main.allSource) {
         include modGroupPath + "/" + apiPackagePath + '/**'
     }
@@ -610,18 +733,79 @@ task apiJar(type: Jar) {
 
 artifacts {
     if (!noPublishedSources) {
-        archives sourcesJar
+        archives tasks.named("sourcesJar")
     }
-    archives devJar
     if (apiPackage) {
-        archives apiJar
+        archives tasks.named("apiJar")
+    }
+}
+
+idea {
+    module {
+        downloadJavadoc = true
+        downloadSources = true
+        inheritOutputDirs = true
+    }
+    project {
+        settings {
+            runConfigurations {
+                "1. Run Client"(Gradle) {
+                    taskNames = ["runClient"]
+                }
+                "2. Run Server"(Gradle) {
+                    taskNames = ["runServer"]
+                }
+                "3. Run Obfuscated Client"(Gradle) {
+                    taskNames = ["runObfClient"]
+                }
+                "4. Run Obfuscated Server"(Gradle) {
+                    taskNames = ["runObfServer"]
+                }
+                if (!disableSpotless) {
+                    "5. Apply spotless"(Gradle) {
+                        taskNames = ["spotlessApply"]
+                    }
+                }
+                def coreModArgs = ""
+                if (coreModClass) {
+                    coreModArgs = ' "-Dfml.coreMods.load=' + modGroup + '.' + coreModClass + '"'
+                }
+                "Run Client (IJ Native)"(Application) {
+                    mainClass = "GradleStart"
+                    moduleName = project.name + ".main"
+                    afterEvaluate {
+                        workingDirectory = tasks.runClient.workingDir.absolutePath
+                        programParameters = tasks.runClient.calculateArgs(project).collect { '"' + it + '"' }.join(' ')
+                        jvmArgs = tasks.runClient.calculateJvmArgs(project).collect { '"' + it + '"' }.join(' ') +
+                            ' ' + tasks.runClient.systemProperties.collect { '"-D' + it.key + '=' + it.value.toString() + '"' }.join(' ') +
+                            coreModArgs
+                    }
+                }
+                "Run Server (IJ Native)"(Application) {
+                    mainClass = "GradleStartServer"
+                    moduleName = project.name + ".main"
+                    afterEvaluate {
+                        workingDirectory = tasks.runServer.workingDir.absolutePath
+                        programParameters = tasks.runServer.calculateArgs(project).collect { '"' + it + '"' }.join(' ')
+                        jvmArgs = tasks.runServer.calculateJvmArgs(project).collect { '"' + it + '"' }.join(' ') +
+                            ' ' + tasks.runServer.systemProperties.collect { '"-D' + it.key + '=' + it.value.toString() + '"' }.join(' ') +
+                            coreModArgs
+                    }
+                }
+            }
+            compiler.javac {
+                afterEvaluate {
+                    moduleJavacAdditionalOptions = [
+                        (project.name + ".main"): tasks.compileJava.options.compilerArgs.collect { '"' + it + '"' }.join(' ')
+                    ]
+                }
+            }
+        }
     }
 }
 
-// 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
+tasks.named("processIdeaSettings").configure {
+    dependsOn("injectTags")
 }
 
 // workaround variable hiding in pom processing
@@ -629,51 +813,24 @@ def projectConfigs = project.configurations
 
 publishing {
     publications {
-        maven(MavenPublication) {
+        create("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"
+                artifact apiJar
             }
 
-            groupId = System.getenv("ARTIFACT_GROUP_ID") ?: "com.github.GTNewHorizons"
+            groupId = System.getenv("ARTIFACT_GROUP_ID") ?: project.group
             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"
+            allowInsecureProtocol = true
             credentials {
                 username = System.getenv("MAVEN_USER") ?: "NONE"
                 password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
@@ -693,7 +850,7 @@ if (modrinthProjectId.size() != 0 && System.getenv("MODRINTH_TOKEN") != null) {
         versionNumber = identifiedVersion
         versionType = identifiedVersion.endsWith("-pre") ? "beta" : "release"
         changelog = changelogFile.exists() ? changelogFile.getText("UTF-8") : ""
-        uploadFile = jar
+        uploadFile = publishableObfJar
         additionalFiles = getSecondaryArtifacts()
         gameVersions = [minecraftVersion]
         loaders = ["forge"]
@@ -734,7 +891,7 @@ if (curseForgeProjectId.size() != 0 && System.getenv("CURSEFORGE_TOKEN") != null
             releaseType = identifiedVersion.endsWith("-pre") ? "beta" : "release"
             addGameVersion minecraftVersion
             addGameVersion "Forge"
-            mainArtifact jar
+            mainArtifact publishableObfJar
             for (artifact in getSecondaryArtifacts()) addArtifact artifact
         }
 
@@ -762,7 +919,7 @@ if (curseForgeProjectId.size() != 0 && System.getenv("CURSEFORGE_TOKEN") != null
     tasks.publish.dependsOn(tasks.curseforge)
 }
 
-def addModrinthDep(scope, type, name) {
+def addModrinthDep(String scope, String type, String name) {
     com.modrinth.minotaur.dependencies.Dependency dep;
     if (!(scope in ["required", "optional", "incompatible", "embedded"])) {
         throw new Exception("Invalid modrinth dependency scope: " + scope)
@@ -780,7 +937,7 @@ def addModrinthDep(scope, type, name) {
     project.modrinth.dependencies.add(dep)
 }
 
-def addCurseForgeRelation(type, name) {
+def addCurseForgeRelation(String type, String name) {
     if (!(type in ["requiredDependency", "embeddedLibrary", "optionalDependency", "tool", "incompatible"])) {
         throw new Exception("Invalid CurseForge relation type: " + type)
     }
@@ -790,17 +947,20 @@ def addCurseForgeRelation(type, name) {
 }
 
 // Updating
-task updateBuildScript {
+tasks.register('updateBuildScript') {
+    group = 'GTNH Buildscript'
+    description = 'Updates the build script to the latest version'
+
     doLast {
-        if (performBuildScriptUpdate(projectDir.toString())) return
+        if (performBuildScriptUpdate()) return
 
         print("Build script already up-to-date!")
     }
 }
 
-if (!project.getGradle().startParameter.isOffline() && isNewBuildScriptVersionAvailable(projectDir.toString())) {
+if (!project.getGradle().startParameter.isOffline() && !Boolean.getBoolean('DISABLE_BUILDSCRIPT_UPDATE_CHECK') && isNewBuildScriptVersionAvailable()) {
     if (autoUpdateBuildScript.toBoolean()) {
-        performBuildScriptUpdate(projectDir.toString())
+        performBuildScriptUpdate()
     } else {
         out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'")
     }
@@ -843,10 +1003,11 @@ boolean verifySettingsGradle() {
     return false
 }
 
-boolean performBuildScriptUpdate(String projectDir) {
-    if (isNewBuildScriptVersionAvailable(projectDir)) {
+boolean performBuildScriptUpdate() {
+    if (isNewBuildScriptVersionAvailable()) {
         def buildscriptFile = getFile("build.gradle")
         availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
+        def out = services.get(StyledTextOutputFactory).create('buildscript-update-output')
         out.style(Style.Success).print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
         boolean settingsupdated = verifySettingsGradle()
         settingsupdated = verifyGitAttributes() || settingsupdated
@@ -857,7 +1018,7 @@ boolean performBuildScriptUpdate(String projectDir) {
     return false
 }
 
-boolean isNewBuildScriptVersionAvailable(String projectDir) {
+boolean isNewBuildScriptVersionAvailable() {
     Map parameters = ["connectTimeout": 2000, "readTimeout": 2000]
 
     String currentBuildScript = getFile("build.gradle").getText()
@@ -877,15 +1038,12 @@ static String getVersionHash(String buildScriptContent) {
     return ""
 }
 
-configure(updateBuildScript) {
-    group = 'forgegradle'
-    description = 'Updates the build script to the latest version'
-}
-
 // Parameter Deobfuscation
 
-task deobfParams {
-    doLast {
+tasks.register('deobfParams') {
+    group = 'GTNH Buildscript'
+    description = 'Rename all obfuscated parameter names inherited from Minecraft classes'
+    doLast { // TODO
 
         String mcpDir = "$project.gradle.gradleUserHomeDir/caches/minecraft/de/oceanlabs/mcp/mcp_$channel/$mappingsVersion"
         String mcpZIP = "$mcpDir/mcp_$channel-$mappingsVersion-${minecraftVersion}.zip"
@@ -899,7 +1057,10 @@ task deobfParams {
 
         if (!file(paramsCSV).exists()) {
             println("Extracting MCP archive ...")
-            unzip(mcpZIP, mcpDir)
+            copy {
+                from(zipTree(mcpZIP))
+                into(mcpDir)
+            }
         }
 
         println("Parsing params.csv ...")
@@ -942,42 +1103,6 @@ static int replaceParams(File file, Map<String, String> params) {
     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) {
@@ -1004,11 +1129,29 @@ def deobf(String sourceURL) {
         hostName = String.join(".", parts)
 
         return deobf(sourceURL, "$hostName/$fileName")
-    } catch (Exception e) {
+    } catch (Exception ignored) {
         return deobf(sourceURL, "deobf/${sourceURL.hashCode()}")
     }
 }
 
+def deobfMaven(String repoURL, String mavenDep) {
+    if (!repoURL.endsWith("/")) {
+        repoURL += "/"
+    }
+    String[] parts = mavenDep.split(":")
+    parts[0] = parts[0].replace('.', '/')
+    def jarURL = repoURL + parts[0] + "/" + parts[1] + "/" + parts[2] + "/" + parts[1] + "-" + parts[2] + ".jar"
+    return deobf(jarURL)
+}
+
+def deobfCurse(String curseDep) {
+    try {
+        return deobfMaven("https://www.cursemaven.com/", "curse.maven:$curseDep")
+    } catch (Exception ignored) {
+        out.style(Style.Failure).println("Failed to get $curseDep from cursemaven.")
+    }
+}
+
 // 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"
@@ -1114,7 +1257,7 @@ def getFile(String relativePath) {
 def getSecondaryArtifacts() {
     // Because noPublishedSources from the beginning of the script is somehow not visible here...
     boolean noPublishedSources = project.hasProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
-    def secondaryArtifacts = [devJar]
+    def secondaryArtifacts = [publishableDevJar]
     if (!noPublishedSources) secondaryArtifacts += [sourcesJar]
     if (apiPackage) secondaryArtifacts += [apiJar]
     return secondaryArtifacts
diff --git a/dependencies.gradle b/dependencies.gradle
index 511a159cfa..02092427be 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,14 +1,14 @@
 // Add your dependencies here
 
 dependencies {
-    compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.41.158:dev'
-    compile 'com.github.GTNewHorizons:TecTech:5.0.52:dev'
-    compile 'com.github.GTNewHorizons:bartworks:0.5.119:dev'
-    compile 'com.github.GTNewHorizons:StructureLib:1.1.12:dev'
-    compile 'com.github.GTNewHorizons:ThaumicTinkerer:2.6.4:dev'
+    compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.41.266:dev'
+    compile 'com.github.GTNewHorizons:TecTech:5.0.89:dev'
+    compile 'com.github.GTNewHorizons:bartworks:0.5.151:dev'
+    compile 'com.github.GTNewHorizons:StructureLib:1.2.1:dev'
+    compile 'com.github.GTNewHorizons:ThaumicTinkerer:2.6.11:dev'
 
     compile 'thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev'
     compileOnly 'org.joml:joml:1.10.2'
 
-    runtime 'com.github.GTNewHorizons:Baubles:1.0.1.14:dev'
+    runtimeOnly 'com.github.GTNewHorizons:Baubles:1.0.1.15:dev'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3ab0b725ef..f398c33c4b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 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-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/repositories.gradle b/repositories.gradle
index 374400bd12..6d164c8f44 100644
--- a/repositories.gradle
+++ b/repositories.gradle
@@ -21,7 +21,4 @@ repositories {
             includeGroup 'curse.maven'
         }
     }
-    maven {
-        url = 'https://jitpack.io'
-    }
 }
diff --git a/settings.gradle b/settings.gradle
index 93c852a12c..e591722cda 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,21 @@
+
+pluginManagement {
+    repositories {
+        maven {
+            // RetroFuturaGradle
+            name "GTNH Maven"
+            url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
+            allowInsecureProtocol = true
+            mavenContent {
+                includeGroup("com.gtnewhorizons.retrofuturagradle")
+            }
+        }
+        gradlePluginPortal()
+        mavenCentral()
+        mavenLocal()
+    }
+}
+
 plugins {
     id 'com.diffplug.blowdryerSetup' version '1.6.0'
 }
diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java
index 19977d37c3..12225b8580 100644
--- a/src/main/java/common/Recipes.java
+++ b/src/main/java/common/Recipes.java
@@ -7,10 +7,7 @@ import common.items.ErrorItem;
 import common.items.MetaItem_CraftingComponent;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.*;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
@@ -924,43 +921,96 @@ public class Recipes {
                 6400,
                 BW_Util.getMachineVoltageFromTier(8));
 
+        // Extremely Ultimate Capacitor (UEV)
+        TT_recipeAdder.addResearchableAssemblylineRecipe(
+                new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5),
+                1200000,
+                128,
+                8000000,
+                16,
+                new Object[] {
+                    GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 4),
+                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 24),
+                    GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.InfinityCatalyst, 32L),
+                    GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.InfinityCatalyst, 32L),
+                    new Object[] {OrePrefixes.circuit.get(Materials.Optical), 1},
+                    new Object[] {OrePrefixes.circuit.get(Materials.Optical), 1},
+                    new Object[] {OrePrefixes.circuit.get(Materials.Optical), 1},
+                    new Object[] {OrePrefixes.circuit.get(Materials.Optical), 1},
+                    ItemList.ZPM3.get(8L),
+                    ItemList.Field_Generator_UEV.get(4),
+                    ItemList.Circuit_Wafer_PPIC.get(64),
+                    ItemList.Circuit_Wafer_PPIC.get(64),
+                    ItemList.Circuit_Wafer_SoC2.get(64),
+                    ItemList.Circuit_Parts_DiodeXSMD.get(64),
+                    GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUEV, 64)
+                },
+                new FluidStack[] {
+                    new FluidStack(solderUEV, 9216),
+                    Materials.Quantium.getMolten(18432),
+                    Materials.Naquadria.getMolten(18432),
+                    Materials.SuperCoolant.getFluid(64000)
+                },
+                new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8),
+                250 * 20,
+                (int) TierEU.RECIPE_UEV);
+
+        // UEV Capacitor alt recipe
+        GT_Values.RA.addAssemblerRecipe(
+                new ItemStack[] {
+                    ItemList.ZPM4.get(1),
+                    GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 4),
+                    GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 24),
+                    GT_Utility.getIntegratedCircuit(6)
+                },
+                null,
+                new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8),
+                640 * 20,
+                (int) TierEU.RECIPE_UHV);
+
         // Capacitor recycling
         GT_Values.RA.addUnboxingRecipe(
                 new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 7),
                 GT_ModHandler.getIC2Item("lapotronCrystal", 1L, 26),
                 new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6),
                 1200,
-                32);
+                (int) TierEU.RECIPE_LV);
         GT_Values.RA.addUnboxingRecipe(
                 new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1),
                 ItemList.Energy_LapotronicOrb.get(1L),
                 new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6),
                 1200,
-                32);
+                (int) TierEU.RECIPE_LV);
         GT_Values.RA.addUnboxingRecipe(
                 new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2),
                 ItemList.Energy_LapotronicOrb2.get(1L),
                 GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmiridium, 24),
                 1200,
-                32);
+                (int) TierEU.RECIPE_LV);
         GT_Values.RA.addUnboxingRecipe(
                 new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3),
                 ItemList.Energy_Module.get(1L),
                 GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24),
                 1200,
-                32);
+                (int) TierEU.RECIPE_LV);
         GT_Values.RA.addUnboxingRecipe(
                 new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4),
                 ItemList.Energy_Cluster.get(1L),
                 GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24),
                 1200,
-                32);
+                (int) TierEU.RECIPE_LV);
         GT_Values.RA.addUnboxingRecipe(
                 new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5),
                 ItemList.ZPM3.get(1L),
                 GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24),
                 1200,
-                32);
+                (int) TierEU.RECIPE_LV);
+        GT_Values.RA.addUnboxingRecipe(
+                new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8),
+                ItemList.ZPM4.get(1L),
+                GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 24),
+                1200,
+                (int) TierEU.RECIPE_LV);
     }
 
     /*private static void registerRecipes_SpaceElevator() {
diff --git a/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java b/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java
index b9c930d545..ff7e273a7b 100644
--- a/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java
+++ b/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java
@@ -64,6 +64,8 @@ public class Block_LapotronicEnergyUnit extends BaseGTUpdateableBlock {
     private IIcon iconLapoUVTop;
     private IIcon iconUltimateSide;
     private IIcon iconUltimateTop;
+    private IIcon iconUltimateExtremeSide;
+    private IIcon iconUltimateExtremeTop;
 
     private Block_LapotronicEnergyUnit() {
         super(Material.iron);
@@ -100,6 +102,8 @@ public class Block_LapotronicEnergyUnit extends BaseGTUpdateableBlock {
 
         iconUltimateSide = ir.registerIcon("kekztech:UltimateEnergyUnit_side");
         iconUltimateTop = ir.registerIcon("kekztech:UltimateEnergyUnit_top");
+        iconUltimateExtremeSide = ir.registerIcon("kekztech:ReallyUltimateEnergyUnit_side");
+        iconUltimateExtremeTop = ir.registerIcon("kekztech:ReallyUltimateEnergyUnit_top");
     }
 
     @Override
@@ -117,6 +121,8 @@ public class Block_LapotronicEnergyUnit extends BaseGTUpdateableBlock {
         par3List.add(new ItemStack(par1, 1, 4));
         // Ultimate battery
         par3List.add(new ItemStack(par1, 1, 5));
+        // UEV Cap
+        par3List.add(new ItemStack(par1, 1, 8));
     }
 
     @Override
@@ -138,6 +144,8 @@ public class Block_LapotronicEnergyUnit extends BaseGTUpdateableBlock {
                 return (side < 2) ? iconLapoEmptyTop : iconLapoEmptySide;
             case 7:
                 return (side < 2) ? iconLapoEVTop : iconLapoEVSide;
+            case 8:
+                return (side < 2) ? iconUltimateExtremeTop : iconUltimateExtremeSide;
             default:
                 return iconUltimateTop;
         }
diff --git a/src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java b/src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java
index 370dfb0a11..8414b34006 100644
--- a/src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java
+++ b/src/main/java/common/itemBlocks/IB_LapotronicEnergyUnit.java
@@ -44,12 +44,20 @@ public class IB_LapotronicEnergyUnit extends ItemBlock {
     private static BigInteger UHV_cap_eu_per_tick =
             LSC_wireless_eu_cap.divide(BigInteger.valueOf(LSC_time_between_wireless_rebalance_in_ticks));
 
+    // 6 Quadrillion EU.
+    public static BigInteger UEV_wireless_eu_cap = BigInteger.valueOf(100 * 60 * pow(10, 12));
+
+    // 1 Trillion EU/t
+    private static BigInteger UEV_cap_eu_per_tick =
+            UEV_wireless_eu_cap.divide(BigInteger.valueOf(LSC_time_between_wireless_rebalance_in_ticks));
+
     public static long EV_cap_storage = 60_000_000L;
     public static long IV_cap_storage = 600_000_000L;
     public static long LuV_cap_storage = 6_000_000_000L;
     public static long ZPM_cap_storage = 60_000_000_000L;
     public static long UV_cap_storage = 600_000_000_000L;
     public static long UHV_cap_storage = Long.MAX_VALUE;
+    public static long UEV_cap_storage = Long.MAX_VALUE;
 
     @SuppressWarnings("unchecked")
     @Override
@@ -86,6 +94,13 @@ public class IB_LapotronicEnergyUnit extends ItemBlock {
                 lines.add("Capacity: " + EnumChatFormatting.RED + GT_Utility.formatNumbers(EV_cap_storage)
                         + EnumChatFormatting.GRAY + " EU");
                 break;
+            case 8:
+                lines.add("Capacity: " + EnumChatFormatting.RED + GT_Utility.formatNumbers(UEV_cap_storage)
+                        + EnumChatFormatting.GRAY + "EU");
+                lines.add("Supports up to " + EnumChatFormatting.RED + GT_Utility.formatNumbers(UEV_cap_eu_per_tick)
+                        + EnumChatFormatting.GRAY + "EU/t of wireless transfer per " + GT_Values.TIER_COLORS[10]
+                        + GT_Values.VN[10] + EnumChatFormatting.GRAY + " capacitor.");
+                break;
         }
     }
 }
diff --git a/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java b/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java
index a020502bad..bd7788b768 100644
--- a/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java
+++ b/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java
@@ -5,7 +5,6 @@ import static common.itemBlocks.IB_LapotronicEnergyUnit.*;
 import static gregtech.api.enums.GT_HatchElement.Maintenance;
 import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
 import static gregtech.api.util.GT_StructureUtility.filterByMTEClass;
-import static java.lang.Math.max;
 import static java.lang.Math.min;
 
 import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass;
@@ -70,6 +69,7 @@ public class GTMTE_LapotronicSuperCapacitor
     private final Queue<Long> energyOutputValues = new LinkedList<>();
 
     private long max_passive_drain_eu_per_tick_per_uhv_cap = 1_000_000;
+    private long max_passive_drain_eu_per_tick_per_uev_cap = 100_000_000;
 
     private enum Capacitor {
         IV(2, BigInteger.valueOf(IV_cap_storage)),
@@ -78,7 +78,9 @@ public class GTMTE_LapotronicSuperCapacitor
         UV(5, BigInteger.valueOf(UV_cap_storage)),
         UHV(6, MAX_LONG),
         None(0, BigInteger.ZERO),
-        EV(1, BigInteger.valueOf(EV_cap_storage));
+        EV(1, BigInteger.valueOf(EV_cap_storage)),
+        UEV(7, MAX_LONG),
+        ;
 
         private final int minimalGlassTier;
         private final BigInteger providedCapacity;
@@ -300,7 +302,7 @@ public class GTMTE_LapotronicSuperCapacitor
      * Count the amount of capacitors of each tier in each slot.
      * Index = meta - 1
      */
-    private final int[] capacitors = new int[7];
+    private final int[] capacitors = new int[8];
 
     private BigInteger capacity = BigInteger.ZERO;
     private BigInteger stored = BigInteger.ZERO;
@@ -396,15 +398,22 @@ public class GTMTE_LapotronicSuperCapacitor
         return capacitors[4];
     }
 
+    private int getUEVCapacitorCount() {
+        return capacitors[7];
+    }
+
     @Override
     protected GT_Multiblock_Tooltip_Builder createTooltip() {
         final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
         tt.addMachineType("Energy Storage")
-                .addInfo("Loses energy equal to 1% of the total capacity every 24 hours. Capped")
-                .addInfo("at " + EnumChatFormatting.RED
+                .addInfo("Loses energy equal to 1% of the total capacity every 24 hours.")
+                .addInfo("Capped at " + EnumChatFormatting.RED
                         + GT_Utility.formatNumbers(max_passive_drain_eu_per_tick_per_uhv_cap) + EnumChatFormatting.GRAY
-                        + "EU/t passive loss per " + GT_Values.TIER_COLORS[9] + GT_Values.VN[9]
-                        + EnumChatFormatting.GRAY + " capacitor.")
+                        + " EU/t passive loss per " + GT_Values.TIER_COLORS[9] + GT_Values.VN[9]
+                        + EnumChatFormatting.GRAY + " capacitor and ")
+                .addInfo(EnumChatFormatting.RED + GT_Utility.formatNumbers(max_passive_drain_eu_per_tick_per_uev_cap)
+                        + EnumChatFormatting.GRAY + " EU/t passive loss per " + GT_Values.TIER_COLORS[10]
+                        + GT_Values.VN[10] + EnumChatFormatting.GRAY + " capacitor.")
                 .addInfo("Passive loss is multiplied by the number of maintenance issues present.")
                 .addSeparator()
                 .addInfo("Glass shell has to be Tier - 3 of the highest capacitor tier.")
@@ -415,12 +424,18 @@ public class GTMTE_LapotronicSuperCapacitor
                 .addSeparator()
                 .addInfo("Wireless mode can be enabled by right clicking with a screwdriver.")
                 .addInfo("This mode can only be enabled if you have a " + GT_Values.TIER_COLORS[9] + GT_Values.VN[9]
+                        + EnumChatFormatting.GRAY + " or " + GT_Values.TIER_COLORS[10] + GT_Values.VN[10]
                         + EnumChatFormatting.GRAY + " capacitor in the multiblock.")
                 .addInfo("When enabled every " + EnumChatFormatting.BLUE
                         + GT_Utility.formatNumbers(LSC_time_between_wireless_rebalance_in_ticks)
                         + EnumChatFormatting.GRAY + " ticks the LSC will attempt to re-balance against your")
-                .addInfo("wireless EU network. If there is less than " + EnumChatFormatting.RED
-                        + GT_Utility.formatNumbers(LSC_wireless_eu_cap) + EnumChatFormatting.GRAY + "EU in the LSC")
+                .addInfo("wireless EU network.")
+                .addInfo("If there is less than " + EnumChatFormatting.RED
+                        + GT_Utility.formatNumbers(LSC_wireless_eu_cap) + EnumChatFormatting.GRAY + "("
+                        + GT_Values.TIER_COLORS[9] + GT_Values.VN[9] + EnumChatFormatting.GRAY + ")" + " or "
+                        + EnumChatFormatting.RED + GT_Utility.formatNumbers(UEV_wireless_eu_cap)
+                        + EnumChatFormatting.GRAY + "(" + GT_Values.TIER_COLORS[10] + GT_Values.VN[10]
+                        + EnumChatFormatting.GRAY + ")" + " EU in the LSC")
                 .addInfo("it will withdraw from the network and add to the LSC. If there is more it will add")
                 .addInfo("the EU to the network and remove it from the LSC.")
                 .addSeparator()
@@ -432,6 +447,7 @@ public class GTMTE_LapotronicSuperCapacitor
                         "Lapotronic Capacitor (" + GT_Values.TIER_COLORS[4] + GT_Values.VN[4] + EnumChatFormatting.GRAY
                                 + "-" + GT_Values.TIER_COLORS[8] + GT_Values.VN[8] + EnumChatFormatting.GRAY
                                 + "), Ultimate Capacitor (" + GT_Values.TIER_COLORS[9] + GT_Values.VN[9]
+                                + EnumChatFormatting.GRAY + "-" + GT_Values.TIER_COLORS[10] + GT_Values.VN[10]
                                 + EnumChatFormatting.GRAY + ")",
                         "Center 3x(1-47)x3 above base (9-423 blocks)")
                 .addStructureInfo(
@@ -551,13 +567,14 @@ public class GTMTE_LapotronicSuperCapacitor
         }
 
         // Check if enough (more than 50%) non-empty caps
-        if (capacitors[5]
+        if (capacitors[6]
                 > capacitors[0]
                         + capacitors[1]
                         + capacitors[2]
                         + capacitors[3]
                         + getUHVCapacitorCount()
-                        + capacitors[6]) return false;
+                        + capacitors[6]
+                        + getUEVCapacitorCount()) return false;
 
         // Calculate total capacity
         capacity = BigInteger.ZERO;
@@ -684,7 +701,7 @@ public class GTMTE_LapotronicSuperCapacitor
             }
         }
 
-        if (getUHVCapacitorCount() <= 0) {
+        if (getUHVCapacitorCount() <= 0 && getUEVCapacitorCount() <= 0) {
             wireless_mode = false;
         }
 
@@ -697,7 +714,8 @@ public class GTMTE_LapotronicSuperCapacitor
 
             // Find difference.
             BigInteger transferred_eu =
-                    stored.subtract(LSC_wireless_eu_cap.multiply(BigInteger.valueOf(getUHVCapacitorCount())));
+                    stored.subtract((LSC_wireless_eu_cap.multiply(BigInteger.valueOf(getUHVCapacitorCount())))
+                            .add(UEV_wireless_eu_cap.multiply(BigInteger.valueOf(getUEVCapacitorCount()))));
 
             if (transferred_eu.signum() == 1) {
                 inputLastTick += transferred_eu.longValue();
@@ -708,7 +726,8 @@ public class GTMTE_LapotronicSuperCapacitor
             // If that difference can be added then do so.
             if (addEUToGlobalEnergyMap(global_energy_user_uuid, transferred_eu)) {
                 // If it succeeds there was sufficient energy so set the internal capacity as such.
-                stored = LSC_wireless_eu_cap.multiply(BigInteger.valueOf(getUHVCapacitorCount()));
+                stored = LSC_wireless_eu_cap.multiply(BigInteger.valueOf(getUHVCapacitorCount()))
+                        .add(UEV_wireless_eu_cap.multiply(BigInteger.valueOf(getUEVCapacitorCount())));
             }
         }
 
@@ -758,13 +777,15 @@ public class GTMTE_LapotronicSuperCapacitor
         long temp_capacity_divided =
                 capacity.divide(BigInteger.valueOf(100L * 86400L * 20L)).longValue();
 
-        // Passive loss is multiplied by number of UHV caps. Minimum of 1 otherwise loss is 0 for non-UHV caps
+        // Passive loss is multiplied by number of UHV/UEV caps. Minimum of 1 otherwise loss is 0 for non-UHV/UEV caps
         // calculations.
-        long uhv_cap_multiplier =
-                min(temp_capacity_divided, max_passive_drain_eu_per_tick_per_uhv_cap * max(1, getUHVCapacitorCount()));
+        if (getUHVCapacitorCount() != 0 || getUEVCapacitorCount() != 0) {
+            temp_capacity_divided = getUHVCapacitorCount() * max_passive_drain_eu_per_tick_per_uhv_cap
+                    + getUEVCapacitorCount() * max_passive_drain_eu_per_tick_per_uev_cap;
+        }
 
         // Passive loss is multiplied by number of maintenance issues.
-        long total_passive_loss = uhv_cap_multiplier * (getIdealStatus() - repairStatus + 1);
+        long total_passive_loss = temp_capacity_divided * (getIdealStatus() - repairStatus + 1);
 
         // Maximum of 100,000 EU/t drained per UHV cell. The logic is 1% of EU capacity should be drained every 86400
         // seconds (1 day).
@@ -834,6 +855,8 @@ public class GTMTE_LapotronicSuperCapacitor
                         : EnumChatFormatting.RED + "disabled" + EnumChatFormatting.RESET));
         ll.add(GT_Values.TIER_COLORS[9] + GT_Values.VN[9] + EnumChatFormatting.RESET + " Capacitors detected: "
                 + getUHVCapacitorCount());
+        ll.add(GT_Values.TIER_COLORS[10] + GT_Values.VN[10] + EnumChatFormatting.RESET + " Capacitors detected: "
+                + getUEVCapacitorCount());
         ll.add("Total wireless EU: " + EnumChatFormatting.RED
                 + GT_Utility.formatNumbers(getUserEU(global_energy_user_uuid)));
         ll.add("---------------------------------------------");
@@ -936,13 +959,14 @@ public class GTMTE_LapotronicSuperCapacitor
 
     @Override
     public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
-        if (getUHVCapacitorCount() != 0) {
+        if (getUHVCapacitorCount() != 0 || getUEVCapacitorCount() != 0) {
             wireless_mode = !wireless_mode;
             GT_Utility.sendChatToPlayer(aPlayer, "Wireless network mode " + (wireless_mode ? "enabled." : "disabled."));
         } else {
             GT_Utility.sendChatToPlayer(
                     aPlayer,
                     "Wireless mode cannot be enabled without at least 1 " + GT_Values.TIER_COLORS[9] + GT_Values.VN[9]
+                            + EnumChatFormatting.RESET + " or " + GT_Values.TIER_COLORS[10] + GT_Values.VN[10]
                             + EnumChatFormatting.RESET + " capacitor.");
             wireless_mode = false;
         }
diff --git a/src/main/resources/assets/kekztech/lang/en_US.lang b/src/main/resources/assets/kekztech/lang/en_US.lang
index 0e0245ae8e..bd7639fb73 100644
--- a/src/main/resources/assets/kekztech/lang/en_US.lang
+++ b/src/main/resources/assets/kekztech/lang/en_US.lang
@@ -143,6 +143,7 @@ tile.kekztech_lapotronicenergyunit_block.4.name=Lapotronic Capacitor (UV)
 tile.kekztech_lapotronicenergyunit_block.5.name=Ultimate Capacitor (UHV)
 tile.kekztech_lapotronicenergyunit_block.6.name=Empty Capacitor (-)
 tile.kekztech_lapotronicenergyunit_block.7.name=Lapotron Capacitor (EV)
+tile.kekztech_lapotronicenergyunit_block.8.name=Extremely Ultimate Capacitor (UEV)
 tile.kekztech_lapotronicenergyunit_block.desc=Part of the Lapotronic Super Capacitor
 
 # -------- Thaumium Reinforced Jar: Block
@@ -190,3 +191,5 @@ achievement.tile.kekztech_lapotronicenergyunit_block.4.desc=Pickup this item to
 achievement.tile.kekztech_lapotronicenergyunit_block.4=Lapotronic Capacitor (UV)
 achievement.tile.kekztech_lapotronicenergyunit_block.5.desc=Pickup this item to see the recipe in NEI
 achievement.tile.kekztech_lapotronicenergyunit_block.5=Ultimate Capacitor (UHV)
+achievement.tile.kekztech_lapotronicenergyunit_block.8.desc=Beyond the ranks of Gods
+achievement.tile.kekztech_lapotronicenergyunit_block.8=Ultimate Capacitor (UEV)
diff --git a/src/main/resources/assets/kekztech/textures/blocks/ReallyUltimateEnergyUnit_side.png b/src/main/resources/assets/kekztech/textures/blocks/ReallyUltimateEnergyUnit_side.png
index 15a89994a1..ae861e1d8a 100644
--- a/src/main/resources/assets/kekztech/textures/blocks/ReallyUltimateEnergyUnit_side.png
+++ b/src/main/resources/assets/kekztech/textures/blocks/ReallyUltimateEnergyUnit_side.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/ReallyUltimateEnergyUnit_top.png b/src/main/resources/assets/kekztech/textures/blocks/ReallyUltimateEnergyUnit_top.png
index ff2f1e826d..61ecab2e40 100644
--- a/src/main/resources/assets/kekztech/textures/blocks/ReallyUltimateEnergyUnit_top.png
+++ b/src/main/resources/assets/kekztech/textures/blocks/ReallyUltimateEnergyUnit_top.png