From ea003d643eed8c57406313b816fa71662bf223be Mon Sep 17 00:00:00 2001
From: chochem <40274384+chochem@users.noreply.github.com>
Date: Sun, 10 Sep 2023 10:38:31 +0100
Subject: [PATCH 1/3] update bs

---
 build.gradle                             | 685 +++++++++++++++++------
 gradle/wrapper/gradle-wrapper.jar        | Bin 61608 -> 61574 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   4 +-
 4 files changed, 510 insertions(+), 181 deletions(-)

diff --git a/build.gradle b/build.gradle
index fe8a2e7..b894d64 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1675110695
+//version: 1692122114
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -6,27 +6,28 @@
  */
 
 
-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.ObfuscationAttribute
 import com.gtnewhorizons.retrofuturagradle.mcp.ReobfuscatedJar
+import com.gtnewhorizons.retrofuturagradle.minecraft.RunMinecraftTask
+import com.gtnewhorizons.retrofuturagradle.util.Distribution
 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 org.gradle.internal.xml.XmlTransformer
+import org.jetbrains.gradle.ext.Application
+import org.jetbrains.gradle.ext.Gradle
 
+import javax.inject.Inject
 import java.nio.file.Files
 import java.nio.file.Paths
 import java.util.concurrent.TimeUnit
-import java.util.zip.ZipEntry
-import java.util.zip.ZipOutputStream
 
 buildscript {
     repositories {
-        mavenLocal()
         mavenCentral()
 
         maven {
@@ -47,6 +48,8 @@ buildscript {
             name 'Scala CI dependencies'
             url 'https://repo1.maven.org/maven2/'
         }
+
+        mavenLocal()
     }
 }
 plugins {
@@ -58,22 +61,26 @@ plugins {
     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 '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 '8.1.1' apply false
+    id 'com.palantir.git-version' version '3.0.0' apply false
+    id 'de.undercouch.download' version '5.4.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.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
     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.2'
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.24'
 }
+
+print("You might want to check out './gradlew :faq' if your build fails.\n")
+
 boolean settingsupdated = verifySettingsGradle()
 settingsupdated = verifyGitAttributes() || settingsupdated
 if (settingsupdated)
     throw new GradleException("Settings has been updated, please re-run task.")
 
-if (project.file('.git/HEAD').isFile()) {
+// In submodules, .git is a file pointing to the real git dir
+if (project.file('.git/HEAD').isFile() || project.file('.git').isFile()) {
     apply plugin: 'com.palantir.git-version'
 }
 
@@ -108,6 +115,8 @@ propertyDefaultIfUnset("usesMixinDebug", project.usesMixins)
 propertyDefaultIfUnset("forceEnableMixins", false)
 propertyDefaultIfUnset("channel", "stable")
 propertyDefaultIfUnset("mappingsVersion", "12")
+propertyDefaultIfUnset("usesMavenPublishing", true)
+propertyDefaultIfUnset("mavenPublishUrl", "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases")
 propertyDefaultIfUnset("modrinthProjectId", "")
 propertyDefaultIfUnset("modrinthRelations", "")
 propertyDefaultIfUnset("curseForgeProjectId", "")
@@ -122,7 +131,10 @@ 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
+// this is meant to be set using the user wide property file. by default we do nothing.
+propertyDefaultIfUnset("ideaOverrideBuildType", "") // Can be nothing, "gradle" or "idea"
+
+project.extensions.add(com.diffplug.blowdryer.Blowdryer, "Blowdryer", com.diffplug.blowdryer.Blowdryer) // Make blowdryer available in "apply from:" scripts
 if (!disableSpotless) {
     apply plugin: 'com.diffplug.spotless'
     apply from: Blowdryer.file('spotless.gradle')
@@ -143,13 +155,21 @@ java {
         } else {
             languageVersion.set(projectJavaVersion)
         }
-        vendor.set(JvmVendorSpec.ADOPTIUM)
+        vendor.set(JvmVendorSpec.AZUL)
     }
     if (!noPublishedSources) {
         withSourcesJar()
     }
 }
 
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = "UTF-8"
+}
+
+tasks.withType(ScalaCompile).configureEach {
+    options.encoding = "UTF-8"
+}
+
 pluginManager.withPlugin('org.jetbrains.kotlin.jvm') {
     // If Kotlin is enabled in the project
     kotlin {
@@ -183,14 +203,34 @@ configurations {
         canBeConsumed = false
         canBeResolved = false
     }
+
+    create("devOnlyNonPublishable") {
+        description = "Runtime and compiletime dependencies that are not published alongside the jar (compileOnly + runtimeOnlyNonPublishable)"
+        canBeConsumed = false
+        canBeResolved = false
+    }
+    compileOnly.extendsFrom(devOnlyNonPublishable)
+    runtimeOnlyNonPublishable.extendsFrom(devOnlyNonPublishable)
 }
 
 if (enableModernJavaSyntax.toBoolean()) {
+    repositories {
+        mavenCentral {
+            mavenContent {
+                includeGroup("me.eigenraven.java8unsupported")
+            }
+        }
+    }
+
     dependencies {
         annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0'
+        // workaround for https://github.com/bsideup/jabel/issues/174
+        annotationProcessor 'net.java.dev.jna:jna-platform:5.13.0'
         compileOnly('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') {
             transitive = false // We only care about the 1 annotation class
         }
+        // Allow using jdk.unsupported classes like sun.misc.Unsafe in the compiled code, working around JDK-8206937.
+        patchedMinecraft('me.eigenraven.java8unsupported:java-8-unsupported-shim:1.0.0')
     }
 
     tasks.withType(JavaCompile).configureEach {
@@ -202,7 +242,7 @@ if (enableModernJavaSyntax.toBoolean()) {
 
         javaCompiler.set(javaToolchains.compilerFor {
             languageVersion.set(JavaLanguageVersion.of(17))
-            vendor.set(JvmVendorSpec.ADOPTIUM)
+            vendor.set(JvmVendorSpec.AZUL)
         })
     }
 }
@@ -234,12 +274,14 @@ if (apiPackage) {
 }
 
 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)
+    for (atFile in accessTransformersFile.split(",")) {
+        String targetFile = "src/main/resources/META-INF/" + atFile.trim()
+        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)
     }
-    tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(targetFile)
-    tasks.srgifyBinpatchedJar.accessTransformerFiles.from(targetFile)
 } else {
     boolean atsFound = false
     for (File at : sourceSets.getByName("main").resources.files) {
@@ -317,7 +359,27 @@ catch (Exception ignored) {
 String identifiedVersion
 String versionOverride = System.getenv("VERSION") ?: null
 try {
-    identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
+    // Produce a version based on the tag, or for branches something like 0.2.2-configurable-maven-and-extras.38+43090270b6-dirty
+    if (versionOverride == null) {
+        def gitDetails = versionDetails()
+        def isDirty = gitVersion().endsWith(".dirty") // No public API for this, isCleanTag has a different meaning
+        String branchName = gitDetails.branchName ?: (System.getenv('GIT_BRANCH') ?: 'git')
+        if (branchName.startsWith('origin/')) {
+            branchName = branchName.minus('origin/')
+        }
+        branchName = branchName.replaceAll("[^a-zA-Z0-9-]+", "-") // sanitize branch names for semver
+        identifiedVersion = gitDetails.lastTag ?: '${gitDetails.gitHash}'
+        if (gitDetails.commitDistance > 0) {
+            identifiedVersion += "-${branchName}.${gitDetails.commitDistance}+${gitDetails.gitHash}"
+            if (isDirty) {
+                identifiedVersion += "-dirty"
+            }
+        } else if (isDirty) {
+            identifiedVersion += "-${branchName}+${gitDetails.gitHash}-dirty"
+        }
+    } else {
+        identifiedVersion = versionOverride
+    }
 }
 catch (Exception ignored) {
     out.style(Style.Failure).text(
@@ -339,9 +401,13 @@ if (identifiedVersion == versionOverride) {
 
 group = "com.github.GTNewHorizons"
 if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
-    archivesBaseName = customArchiveBaseName
+    base {
+        archivesName = customArchiveBaseName
+    }
 } else {
-    archivesBaseName = modId
+    base {
+        archivesName = modId
+    }
 }
 
 
@@ -367,12 +433,14 @@ minecraft {
         injectMissingGenerics.set(true)
     }
 
+    username = developmentEnvironmentUserName.toString()
+
+    lwjgl3Version = "3.3.2"
+
     // 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",
@@ -401,6 +469,16 @@ configurations.configureEach {
             }
         }
     }
+    def obfuscationAttr = it.attributes.getAttribute(ObfuscationAttribute.OBFUSCATION_ATTRIBUTE)
+    if (obfuscationAttr != null && obfuscationAttr.name == ObfuscationAttribute.SRG) {
+        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+            // Remap CoFH core cursemaven dev jar to the obfuscated version for runObfClient/Server
+            if (details.requested.group == 'curse.maven' && details.requested.name.endsWith('-69162') && details.requested.version == '2388751') {
+                details.useVersion '2388750'
+                details.because 'Pick obfuscated jar'
+            }
+        }
+    }
 }
 
 // Ensure tests have access to minecraft classes
@@ -413,10 +491,19 @@ sourceSets {
     }
 }
 
-if (file('addon.gradle').exists()) {
+if (file('addon.gradle.kts').exists()) {
+    apply from: 'addon.gradle.kts'
+} else if (file('addon.gradle').exists()) {
     apply from: 'addon.gradle'
 }
 
+// File for local tweaks not commited to Git
+if (file('addon.local.gradle.kts').exists()) {
+    apply from: 'addon.local.gradle.kts'
+} else if (file('addon.local.gradle').exists()) {
+    apply from: 'addon.local.gradle'
+}
+
 // Allow unsafe repos but warn
 repositories.configureEach { repo ->
     if (repo instanceof org.gradle.api.artifacts.repositories.UrlArtifactRepository) {
@@ -427,11 +514,19 @@ repositories.configureEach { repo ->
     }
 }
 
-apply from: 'repositories.gradle'
+if (file('repositories.gradle.kts').exists()) {
+    apply from: 'repositories.gradle.kts'
+} else if (file('repositories.gradle').exists()) {
+    apply from: 'repositories.gradle'
+} else {
+    logger.error("Neither repositories.gradle.kts nor repositories.gradle was found, make sure you extracted the full ExampleMod template.")
+    throw new RuntimeException("Missing repositories.gradle[.kts]")
+}
 
 configurations {
+    runtimeClasspath.extendsFrom(runtimeOnlyNonPublishable)
+    testRuntimeClasspath.extendsFrom(runtimeOnlyNonPublishable)
     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
@@ -467,31 +562,42 @@ 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()) {
-        if (usesMixinDebug.toBoolean()) {
-            maven {
-                name = "Fabric Maven"
-                url = "https://maven.fabricmc.net/"
-            }
+    maven {
+        name 'sonatype'
+        url 'https://oss.sonatype.org/content/repositories/snapshots/'
+        content {
+            includeGroup "org.lwjgl"
         }
     }
     if (includeWellKnownRepositories.toBoolean()) {
-        maven {
-            name "CurseMaven"
-            url "https://cursemaven.com"
-            content {
+        exclusiveContent {
+            forRepository {
+                maven {
+                    name "CurseMaven"
+                    url "https://cursemaven.com"
+                }
+            }
+            filter {
                 includeGroup "curse.maven"
             }
         }
+        exclusiveContent {
+            forRepository {
+                maven {
+                    name = "Modrinth"
+                    url = "https://api.modrinth.com/maven"
+                }
+            }
+            filter {
+                includeGroup "maven.modrinth"
+            }
+        }
         maven {
             name = "ic2"
             url = "https://maven.ic2.player.to/"
@@ -515,35 +621,78 @@ repositories {
     }
 }
 
+def mixinProviderGroup = "io.github.legacymoddingmc"
+def mixinProviderModule = "unimixins"
+def mixinProviderVersion = "0.1.7.1"
+def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}"
+def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
+ext.mixinProviderSpec = mixinProviderSpec
+
+def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
+
 dependencies {
     if (usesMixins.toBoolean()) {
         annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
         annotationProcessor('com.google.guava:guava:24.1.1-jre')
         annotationProcessor('com.google.code.gson:gson:2.8.6')
-        annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.10:processor')
+        annotationProcessor(mixinProviderSpec)
         if (usesMixinDebug.toBoolean()) {
             runtimeOnlyNonPublishable('org.jetbrains:intellij-fernflower:1.2.1.16')
         }
     }
-    if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
-        implementation('com.gtnewhorizon:gtnhmixins:2.1.10')
+    if (usesMixins.toBoolean()) {
+        implementation(modUtils.enableMixins(mixinProviderSpec, mixingConfigRefMap))
+    } else if (forceEnableMixins.toBoolean()) {
+        runtimeOnlyNonPublishable(mixinProviderSpec)
     }
 }
 
 pluginManager.withPlugin('org.jetbrains.kotlin.kapt') {
     if (usesMixins.toBoolean()) {
         dependencies {
-            kapt('com.gtnewhorizon:gtnhmixins:2.1.10:processor')
+            kapt(mixinProviderSpec)
         }
     }
 }
 
-apply from: 'dependencies.gradle'
+// Replace old mixin mods with unimixins
+// https://docs.gradle.org/8.0.2/userguide/resolution_rules.html#sec:substitution_with_classifier
+configurations.all {
+    resolutionStrategy.dependencySubstitution {
+        substitute module('com.gtnewhorizon:gtnhmixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
+        substitute module('com.github.GTNewHorizons:Mixingasm') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
+        substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
+        substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
+        substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier")
+    }
+}
 
-def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
-def mixinTmpDir = buildDir.path + File.separator + 'tmp' + File.separator + 'mixins'
-def refMap = "${mixinTmpDir}" + File.separator + mixingConfigRefMap
-def mixinSrg = "${mixinTmpDir}" + File.separator + "mixins.srg"
+dependencies {
+    constraints {
+        def minGtnhLibVersion = "0.0.13"
+        implementation("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") {
+            because("fixes duplicate mod errors in java 17 configurations using old gtnhlib")
+        }
+        runtimeOnly("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") {
+            because("fixes duplicate mod errors in java 17 configurations using old gtnhlib")
+        }
+        devOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") {
+            because("fixes duplicate mod errors in java 17 configurations using old gtnhlib")
+        }
+        runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") {
+            because("fixes duplicate mod errors in java 17 configurations using old gtnhlib")
+        }
+    }
+}
+
+if (file('dependencies.gradle.kts').exists()) {
+    apply from: 'dependencies.gradle.kts'
+} else if (file('dependencies.gradle').exists()) {
+    apply from: 'dependencies.gradle'
+} else {
+    logger.error("Neither dependencies.gradle.kts nor dependencies.gradle was found, make sure you extracted the full ExampleMod template.")
+    throw new RuntimeException("Missing dependencies.gradle[.kts]")
+}
 
 tasks.register('generateAssets') {
     group = "GTNH Buildscript"
@@ -575,46 +724,17 @@ tasks.register('generateAssets') {
 }
 
 if (usesMixins.toBoolean()) {
-    tasks.named("reobfJar", ReobfuscatedJar).configure {
-        extraSrgFiles.from(mixinSrg)
-    }
-
     tasks.named("processResources").configure {
         dependsOn("generateAssets")
     }
 
     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"
         ]
     }
-
-    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()
-                }
-            }
-        }
-    }
-
 }
 
 tasks.named("processResources", ProcessResources).configure {
@@ -632,10 +752,158 @@ tasks.named("processResources", ProcessResources).configure {
     }
 
     if (usesMixins.toBoolean()) {
-        from refMap
+        dependsOn("compileJava", "compileScala")
     }
 }
 
+ext.java17Toolchain = (JavaToolchainSpec spec) -> {
+    spec.languageVersion.set(JavaLanguageVersion.of(17))
+    spec.vendor.set(JvmVendorSpec.matching("jetbrains"))
+}
+
+ext.java17DependenciesCfg = configurations.create("java17Dependencies") {
+    extendsFrom(configurations.getByName("runtimeClasspath")) // Ensure consistent transitive dependency resolution
+    canBeConsumed = false
+}
+ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies") {
+    canBeConsumed = false
+}
+
+dependencies {
+    def lwjgl3ifyVersion = '1.4.0'
+    def asmVersion = '9.4'
+    if (modId != 'lwjgl3ify') {
+        java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
+    }
+    if (modId != 'hodgepodge') {
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.26')
+    }
+
+    java17PatchDependencies('net.minecraft:launchwrapper:1.17.2') {transitive = false}
+    java17PatchDependencies("org.ow2.asm:asm:${asmVersion}")
+    java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}")
+    java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}")
+    java17PatchDependencies("org.ow2.asm:asm-analysis:${asmVersion}")
+    java17PatchDependencies("org.ow2.asm:asm-util:${asmVersion}")
+    java17PatchDependencies('org.ow2.asm:asm-deprecated:7.1')
+    java17PatchDependencies("org.apache.commons:commons-lang3:3.12.0")
+    java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
+}
+
+ext.java17JvmArgs = [
+    // Java 9+ support
+    "--illegal-access=warn",
+    "-Djava.security.manager=allow",
+    "-Dfile.encoding=UTF-8",
+    "--add-opens", "java.base/jdk.internal.loader=ALL-UNNAMED",
+    "--add-opens", "java.base/java.net=ALL-UNNAMED",
+    "--add-opens", "java.base/java.nio=ALL-UNNAMED",
+    "--add-opens", "java.base/java.io=ALL-UNNAMED",
+    "--add-opens", "java.base/java.lang=ALL-UNNAMED",
+    "--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED",
+    "--add-opens", "java.base/java.text=ALL-UNNAMED",
+    "--add-opens", "java.base/java.util=ALL-UNNAMED",
+    "--add-opens", "java.base/jdk.internal.reflect=ALL-UNNAMED",
+    "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED",
+    "--add-opens", "jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED,java.naming",
+    "--add-opens", "java.desktop/sun.awt.image=ALL-UNNAMED",
+    "--add-modules", "jdk.dynalink",
+    "--add-opens", "jdk.dynalink/jdk.dynalink.beans=ALL-UNNAMED",
+    "--add-modules", "java.sql.rowset",
+    "--add-opens", "java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED"
+]
+
+ext.hotswapJvmArgs = [
+    // DCEVM advanced hot reload
+    "-XX:+AllowEnhancedClassRedefinition",
+    "-XX:HotswapAgent=fatjar"
+]
+
+ext.setupHotswapAgentTask = tasks.register("setupHotswapAgent") {
+    group = "GTNH Buildscript"
+    description = "Installs a recent version of HotSwapAgent into the Java 17 JetBrains runtime directory"
+    def hsaUrl = 'https://github.com/HotswapProjects/HotswapAgent/releases/download/1.4.2-SNAPSHOT/hotswap-agent-1.4.2-SNAPSHOT.jar'
+    def targetFolderProvider = javaToolchains.launcherFor(java17Toolchain).map {it.metadata.installationPath.dir("lib/hotswap")}
+    def targetFilename = "hotswap-agent.jar"
+    onlyIf {
+        !targetFolderProvider.get().file(targetFilename).asFile.exists()
+    }
+    doLast {
+        def targetFolder = targetFolderProvider.get()
+        targetFolder.asFile.mkdirs()
+        download.run {
+            src hsaUrl
+            dest targetFolder.file(targetFilename).asFile
+            overwrite false
+            tempAndMove true
+        }
+    }
+}
+
+public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask {
+    // IntelliJ doesn't seem to allow commandline arguments so we also support an env variable
+    private boolean enableHotswap = Boolean.valueOf(System.getenv("HOTSWAP"));
+
+    @Input
+    public boolean getEnableHotswap() { return enableHotswap }
+    @Option(option = "hotswap", description = "Enables HotSwapAgent for enhanced class reloading under a debugger")
+    public boolean setEnableHotswap(boolean enable) { enableHotswap = enable }
+
+    @Inject
+    public RunHotswappableMinecraftTask(Distribution side, String superTask, org.gradle.api.invocation.Gradle gradle) {
+        super(side, gradle)
+
+        this.lwjglVersion = 3
+        this.javaLauncher = project.javaToolchains.launcherFor(project.java17Toolchain)
+        this.extraJvmArgs.addAll(project.java17JvmArgs)
+        this.extraJvmArgs.addAll(project.provider(() -> enableHotswap ? project.hotswapJvmArgs : []))
+
+        this.classpath(project.java17PatchDependenciesCfg)
+        if (side == Distribution.CLIENT) {
+            this.classpath(project.minecraftTasks.lwjgl3Configuration)
+        }
+        // Use a raw provider instead of map to not create a dependency on the task
+        this.classpath(project.provider(() -> project.tasks.named(superTask, RunMinecraftTask).get().classpath))
+        this.classpath.filter { file ->
+            !file.path.contains("2.9.4-nightly-20150209") // Remove lwjgl2
+        }
+        this.classpath(project.java17DependenciesCfg)
+    }
+
+    public void setup(Project project) {
+        super.setup(project)
+        if (project.usesMixins.toBoolean()) {
+            this.extraJvmArgs.addAll(project.provider(() -> {
+                def mixinCfg = project.configurations.detachedConfiguration(project.dependencies.create(project.mixinProviderSpec))
+                mixinCfg.canBeConsumed = false
+                mixinCfg.transitive = false
+                enableHotswap ? ["-javaagent:" + mixinCfg.singleFile.absolutePath] : []
+            }))
+        }
+    }
+}
+
+def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Distribution.CLIENT, "runClient")
+runClient17Task.configure {
+    setup(project)
+    group = "Modded Minecraft"
+    description = "Runs the modded client using Java 17, lwjgl3ify and Hodgepodge"
+    dependsOn(setupHotswapAgentTask, mcpTasks.launcherSources.classesTaskName, minecraftTasks.taskDownloadVanillaAssets, mcpTasks.taskPackagePatchedMc, 'jar')
+    mainClass = "GradleStart"
+    username = minecraft.username
+    userUUID = minecraft.userUUID
+}
+
+def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Distribution.DEDICATED_SERVER, "runServer")
+runServer17Task.configure {
+    setup(project)
+    group = "Modded Minecraft"
+    description = "Runs the modded server using Java 17, lwjgl3ify and Hodgepodge"
+    dependsOn(setupHotswapAgentTask, mcpTasks.launcherSources.classesTaskName, minecraftTasks.taskDownloadVanillaAssets, mcpTasks.taskPackagePatchedMc, 'jar')
+    mainClass = "GradleStartServer"
+    extraArgs.add("nogui")
+}
+
 def getManifestAttributes() {
     def manifestAttributes = [:]
     if (!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) {
@@ -667,11 +935,6 @@ tasks.named("jar", Jar).configure {
 }
 
 if (usesShadowedDependencies.toBoolean()) {
-    tasks.register('relocateShadowJar', ConfigureShadowRelocation) {
-        target = tasks.shadowJar
-        prefix = modGroup + ".shadow"
-        enabled = minimizeShadowedDependencies.toBoolean()
-    }
     tasks.named("shadowJar", ShadowJar).configure {
         manifest {
             attributes(getManifestAttributes())
@@ -686,8 +949,9 @@ if (usesShadowedDependencies.toBoolean()) {
             project.configurations.shadeCompile
         ]
         archiveClassifier.set('dev')
-        if (minimizeShadowedDependencies.toBoolean()) {
-            dependsOn(relocateShadowJar)
+        if (relocateShadowedDependencies.toBoolean()) {
+            relocationPrefix = modGroup + ".shadow"
+            enableRelocation = true
         }
     }
     configurations.runtimeElements.outgoing.artifacts.clear()
@@ -705,7 +969,7 @@ if (usesShadowedDependencies.toBoolean()) {
     javaComponent.withVariantsFromConfiguration(configurations.shadowRuntimeElements) {
         skip()
     }
-    for (runTask in ["runClient", "runServer"]) {
+    for (runTask in ["runClient", "runServer", "runClient17", "runServer17"]) {
         tasks.named(runTask).configure {
             dependsOn("shadowJar")
         }
@@ -743,16 +1007,47 @@ idea {
     module {
         downloadJavadoc = true
         downloadSources = true
+        inheritOutputDirs = true
     }
     project {
         settings {
+            if (ideaOverrideBuildType != "") {
+                delegateActions {
+                    if ("gradle".equalsIgnoreCase(ideaOverrideBuildType)) {
+                        delegateBuildRunToGradle = true
+                        testRunner = org.jetbrains.gradle.ext.ActionDelegationConfig.TestRunner.GRADLE
+                    } else if ("idea".equalsIgnoreCase(ideaOverrideBuildType)) {
+                        delegateBuildRunToGradle = false
+                        testRunner = org.jetbrains.gradle.ext.ActionDelegationConfig.TestRunner.PLATFORM
+                    } else {
+                        throw GradleScriptException('Accepted value for ideaOverrideBuildType is one of gradle or idea.')
+                    }
+                }
+            }
             runConfigurations {
+                "0. Build and Test"(Gradle) {
+                    taskNames = ["build"]
+                }
                 "1. Run Client"(Gradle) {
                     taskNames = ["runClient"]
                 }
                 "2. Run Server"(Gradle) {
                     taskNames = ["runServer"]
                 }
+                "1a. Run Client (Java 17)"(Gradle) {
+                    taskNames = ["runClient17"]
+                }
+                "2a. Run Server (Java 17)"(Gradle) {
+                    taskNames = ["runServer17"]
+                }
+                "1b. Run Client (Java 17, Hotswap)"(Gradle) {
+                    taskNames = ["runClient17"]
+                    envs = ["HOTSWAP": "true"]
+                }
+                "2b. Run Server (Java 17, Hotswap)"(Gradle) {
+                    taskNames = ["runServer17"]
+                    envs = ["HOTSWAP": "true"]
+                }
                 "3. Run Obfuscated Client"(Gradle) {
                     taskNames = ["runObfClient"]
                 }
@@ -770,7 +1065,7 @@ idea {
                 }
                 "Run Client (IJ Native)"(Application) {
                     mainClass = "GradleStart"
-                    moduleName = project.name + ".main"
+                    moduleName = project.name + ".ideVirtualMain"
                     afterEvaluate {
                         workingDirectory = tasks.runClient.workingDir.absolutePath
                         programParameters = tasks.runClient.calculateArgs(project).collect { '"' + it + '"' }.join(' ')
@@ -781,7 +1076,7 @@ idea {
                 }
                 "Run Server (IJ Native)"(Application) {
                     mainClass = "GradleStartServer"
-                    moduleName = project.name + ".main"
+                    moduleName = project.name + ".ideVirtualMain"
                     afterEvaluate {
                         workingDirectory = tasks.runServer.workingDir.absolutePath
                         programParameters = tasks.runServer.calculateArgs(project).collect { '"' + it + '"' }.join(' ')
@@ -793,11 +1088,57 @@ idea {
             }
             compiler.javac {
                 afterEvaluate {
+                    javacAdditionalOptions = "-encoding utf8"
                     moduleJavacAdditionalOptions = [
                         (project.name + ".main"): tasks.compileJava.options.compilerArgs.collect { '"' + it + '"' }.join(' ')
                     ]
                 }
             }
+            withIDEADir { File ideaDir ->
+                if (!ideaDir.path.contains(".idea")) {
+                    // If an .ipr file exists, the project root directory is passed here instead of the .idea subdirectory
+                    ideaDir = new File(ideaDir, ".idea")
+                }
+                if (ideaDir.isDirectory()) {
+                    def miscFile = new File(ideaDir, "misc.xml")
+                    if (miscFile.isFile()) {
+                        boolean dirty = false
+                        def miscTransformer = new XmlTransformer()
+                        miscTransformer.addAction { root ->
+                            Node rootNode = root.asNode()
+                            def rootManager = rootNode
+                                .component.find { it.@name == 'ProjectRootManager' }
+                            if (!rootManager) {
+                                rootManager = rootNode.appendNode('component', ['name': 'ProjectRootManager', 'version': '2'])
+                                dirty = true
+                            }
+                            def output = rootManager.output
+                            if (!output) {
+                                output = rootManager.appendNode('output')
+                                dirty = true
+                            }
+                            if (!output.@url) {
+                                // Only modify the output url if it doesn't yet have one, or if the existing one is blank somehow.
+                                // This is a sensible default for most setups
+                                output.@url = 'file://$PROJECT_DIR$/build/ideaBuild'
+                                dirty = true
+                            }
+                        }
+                        def result = miscTransformer.transform(miscFile.text)
+                        if (dirty) {
+                            miscFile.write(result)
+                        }
+                    } else {
+                        miscFile.text = """<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2">
+    <output url="file://\$PROJECT_DIR\$/out" />
+  </component>
+</project>
+"""
+                    }
+                }
+            }
         }
     }
 }
@@ -806,6 +1147,14 @@ tasks.named("processIdeaSettings").configure {
     dependsOn("injectTags")
 }
 
+tasks.named("ideVirtualMainClasses").configure {
+    // Make IntelliJ "Build project" build the mod jars
+    dependsOn("jar", "reobfJar")
+    if (!disableSpotless) {
+        dependsOn("spotlessCheck")
+    }
+}
+
 // workaround variable hiding in pom processing
 def projectConfigs = project.configurations
 
@@ -826,12 +1175,14 @@ publishing {
     }
 
     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"
+        if (usesMavenPublishing.toBoolean()) {
+            maven {
+                url = mavenPublishUrl
+                allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven
+                credentials {
+                    username = System.getenv("MAVEN_USER") ?: "NONE"
+                    password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
+                }
             }
         }
     }
@@ -867,7 +1218,7 @@ if (modrinthProjectId.size() != 0 && System.getenv("MODRINTH_TOKEN") != null) {
         }
     }
     if (usesMixins.toBoolean()) {
-        addModrinthDep("required", "project", "gtnhmixins")
+        addModrinthDep("required", "project", "unimixins")
     }
     tasks.modrinth.dependsOn(build)
     tasks.publish.dependsOn(tasks.modrinth)
@@ -911,7 +1262,7 @@ if (curseForgeProjectId.size() != 0 && System.getenv("CURSEFORGE_TOKEN") != null
         }
     }
     if (usesMixins.toBoolean()) {
-        addCurseForgeRelation("requiredDependency", "gtnhmixins")
+        addCurseForgeRelation("requiredDependency", "unimixins")
     }
     tasks.curseforge.dependsOn(build)
     tasks.publish.dependsOn(tasks.curseforge)
@@ -945,10 +1296,21 @@ def addCurseForgeRelation(String type, String name) {
 }
 
 // Updating
+
+def buildscriptGradleVersion = "8.2.1"
+
+tasks.named('wrapper', Wrapper).configure {
+    gradleVersion = buildscriptGradleVersion
+}
+
 tasks.register('updateBuildScript') {
     group = 'GTNH Buildscript'
     description = 'Updates the build script to the latest version'
 
+    if (gradle.gradleVersion != buildscriptGradleVersion && !Boolean.getBoolean('DISABLE_BUILDSCRIPT_GRADLE_UPDATE')) {
+        dependsOn('wrapper')
+    }
+
     doLast {
         if (performBuildScriptUpdate()) return
 
@@ -961,6 +1323,26 @@ if (!project.getGradle().startParameter.isOffline() && !Boolean.getBoolean('DISA
         performBuildScriptUpdate()
     } else {
         out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'")
+        if (gradle.gradleVersion != buildscriptGradleVersion) {
+            out.style(Style.SuccessHeader).println("updateBuildScript can update gradle from ${gradle.gradleVersion} to ${buildscriptGradleVersion}\n")
+        }
+    }
+}
+
+// If you want to add more cases to this task, implement them as arguments if total amount to print gets too large
+tasks.register('faq') {
+    group = 'GTNH Buildscript'
+    description = 'Prints frequently asked questions about building a project'
+
+    doLast {
+        print("If your build fails to fetch dependencies, run './gradlew updateDependencies'. " +
+            "Or you can manually check if the versions are still on the distributing sites - " +
+            "the links can be found in repositories.gradle and build.gradle:repositories, " +
+            "but not build.gradle:buildscript.repositories - those ones are for gradle plugin metadata.\n\n" +
+            "If your build fails to recognize the syntax of new Java versions, enable Jabel in your " +
+            "gradle.properties. See how it's done in GTNH ExampleMod/gradle.properties. " +
+            "However, keep in mind that Jabel enables only syntax features, but not APIs that were introduced in " +
+            "Java 9 or later.")
     }
 }
 
@@ -1021,8 +1403,14 @@ boolean isNewBuildScriptVersionAvailable() {
 
     String currentBuildScript = getFile("build.gradle").getText()
     String currentBuildScriptHash = getVersionHash(currentBuildScript)
-    String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
-    String availableBuildScriptHash = getVersionHash(availableBuildScript)
+    String availableBuildScriptHash
+    try {
+        String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
+        availableBuildScriptHash = getVersionHash(availableBuildScript)
+    } catch (IOException e) {
+        logger.warn("Could not check for buildscript update availability: {}", e.message)
+        return false
+    }
 
     boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
     return !isUpToDate
@@ -1101,7 +1489,7 @@ static int replaceParams(File file, Map<String, String> params) {
     return 0
 }
 
-// Dependency Deobfuscation
+// Dependency Deobfuscation (Deprecated, use the new RFG API documented in dependencies.gradle)
 
 def deobf(String sourceURL) {
     try {
@@ -1143,11 +1531,7 @@ def deobfMaven(String repoURL, String mavenDep) {
 }
 
 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.")
-    }
+    return dependencies.rfg.deobf("curse.maven:$curseDep")
 }
 
 // The method above is to be preferred. Use this method if the filename is not at the end of the URL.
@@ -1155,34 +1539,7 @@ 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
@@ -1190,50 +1547,8 @@ def deobf(String sourceURL, String rawFileName) {
         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()
+    return dependencies.rfg.deobf(files(obfFile))
 }
-
 // Helper methods
 
 def checkPropertyExists(String propertyName) {
@@ -1260,3 +1575,17 @@ def getSecondaryArtifacts() {
     if (apiPackage) secondaryArtifacts += [apiJar]
     return secondaryArtifacts
 }
+
+// For easier scripting of things that require variables defined earlier in the buildscript
+if (file('addon.late.gradle.kts').exists()) {
+    apply from: 'addon.late.gradle.kts'
+} else if (file('addon.late.gradle').exists()) {
+    apply from: 'addon.late.gradle'
+}
+
+// File for local tweaks not commited to Git
+if (file('addon.late.local.gradle.kts').exists()) {
+    apply from: 'addon.late.local.gradle.kts'
+} else if (file('addon.late.local.gradle').exists()) {
+    apply from: 'addon.late.local.gradle'
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ccebba7710deaf9f98673a68957ea02138b60d0a..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644
GIT binary patch
delta 5107
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
I6Xdi10eY*&F8}}l

delta 5094
zcmZu#c|6qH|DG9RA4`noBZNWrC2N)tSqjO%%aX0^O4dPAB*iC6_9R<`apl^#h-_oY
z)(k_0v8Fxp{fyi9-uwN%e)GpU&v~BrS>~KG^PF=MNmQjIDr&QHR7f-kM{%U_u*1=5
zGC}ae5(^Rrg9QY8$x^}oiJ0d2O9YW{J~$dD1ovlvh&0B4L)!4S=z;<uF&veQfHEXY
zH4@@u<^kLgdlVdk1PFR?=tB@!!Fh%TVs?1fpp-}gaG&{-sUSX9@FS&eh_E$O7uPRV
zh2TQNV03iQkaS=gC5-17XkoDHM_@2b(3OJ^WZ|a;hZcFUgSM+-Xe-WxmZxJAWoXuT
z58)Iu3Bf{KTD4feM+#hIgx)vjq8^aEDI~sP`Ko*kne(b6x(Ap9kd}I90y~b3BdH8X
zITw2EG-GzOws{X|SPYt9mPef9Q6qsa#K^021mYI)=O+2rR~D~R)FX*Oz?*6leRNx9
zwUfShT`=~^`n=$fZai)7t=s`M0arPMZl??|>Hac>K{#9q9cKq;>>BtKo1!+gw`yqE
zSK8x^jC|B!qmSW#uyb@T^CkB9qRd{N3V-rEi}AEgoU_J27lw_0X`}c0&m9JhxM;RK
z54_gdZ(u?R5`B3}NeVal2NTHqlktM`2eTF28%6BZCWW$-shf0l-BOVSm)hU58MTPy
zDcY-5777j;ccU!Yba8wH=X6OdPJ8O5Kp^3gUNo>!b=xb6T2F&LiC2eBJj8KuLPW!4
zw3V^NnAKZm^D?tmliCvzi>UtoDH%V#%SM0d*NS+m%4}qO<)M1E{OpQ(v&ZNc`vdi|
zEGlVi$Dgxy1p6+<ch};IJ}c-|s+zxw%bF%V{7j#qR*B5@XU2Vcns{yH3t=Wz_(Hjx
zwd1)jKJ^`QaQXMlJV>k0qGLQt(JwxZxLCZ4>wJ=sb0v%Ki?*+!ic_2exumn{%Co||
z-axdK#RUC;P|vqbe?L`K!j;sUo=uuR_#ZkRvBf%Txo6{OL&I(?dz?47Z(DcX3KTw>
zGY%A=kX;fBkq$F^sX|-)1Qkg##+n-Ci{qJVPj@P?<z;N=v_I6^&ygG=tSw#Y%UjZ@
z`#93m#lUYJ%x9`g1t(rEUT=uW?ue_*>l_<cEx0Hh)6uny*sYx)xX#Wv%LEZ4bUN<Z
z7GVqE(hQkJR)ue{H{&xJbUH-4kvuXRrfT$Wx01*@mNv*)6QdcMeFyW(imPkm3B~H=
zK7W>1Y`nD^v>fZ3HMX%(4p-TlD(>yWwJij!6Jw}l7h>CIm@Ou5B@$Wy`Ky*8<F2zj
z@@x^O2|m-ldu-3LMR+X(>14%Mdi1GfG1zDG9NogaoVHHr4gannv4?w6g&10!j=lKM
zFW;@=Z0}vAPAxA=R4)|`J??*$|Fh`5=ks*V7TapX`+=4n*{aXxRhh-EGX_Xrzjb4r
zn0vO7Cc~wtyeM_8{**~9y7>+}1JV8Buhg%*hy|PUc#!vw#W(HFTL|BpM)U0>JxG6S
zLnqn1!0++RyyJ>5VU<4mDv8>Q#{EtgS3mj7Hx}Zkr<T_0m+h5XsFNofwF!#;ng`~E
zO^<ryUPTxdRfL<wiQ<%$|9o4zg<j#?WmFQg&Kn<uhmGJS&TI%A;I%!Z(;f-uD(m_^
zNp3VSIN@{GlZWoALto(A5FZ!i%DoT<?3LVWj1B1ySxvKzSN7>0tz1}h8Kn6q`MiwC
z{Y#;D!-ndlImS<Z-?liBM7)gjSIe*GpflUKrcylTQcfOqcrDNGk&QHR*-m(VwkYlA
z?dN^niqZ5--O6qr!7Xa%Rh_7wYV(Zq#-!gj8q5Bu!!mkH=e%(37W2&kqQ65KNg7L2
zviMG8qeYEzpdWMpb|s4)CM)@Qi{sSj_0KxRE;1K>T(C@(*i5f0U(jD29G7g#nkiPX
zki6M$QYX_fNH=E4_eg9*FFZ3wF9YAKC}CP89Kl(<Uvh*;*RIYLMe<(ce(F8OErh4m
zlhRsR{U&nvjsSdt<3Z9xGjV43*6SQtr3E_9JCkOT&b`vzxY5ZJ=1>GNS(Ag994)<L
zz3x}`(haLy*Tzhy+Dg68vAmX)s(UKorq>0$OL4-fj_1EdR}ARB#-vP_$bWF`Qk58+
z4Jq*-YkcmCuo9U%oxGeYe7Be=?n}pX+x>ob(8oPLDUPiIryT8v*N4@0{s_<v!N&8y
zOPuX{$yCQ&=&>VYALi;lzj19ivLJKaXt7~UfU|mu9zjbhPnIhG2`uI34urWWA9IO{
z_1zJ)lwSs{qt3*UnD}3qB^kcRZ?``>IDn>qp8L96bRaZH)Zl`!neewt(wjSk1i#zf
zb8_{x_{WRBm9+0CF4+nE)NRe6K8d|wOWN)&-3jCDiK5mj>77=s+TonlH5j`nb@rB5
z5NX?Z1dk`E#$BF{`(D>zI<HZ+<>SrMo4&}^wmUIyYL-$PWmEEfEn-U0tx_vy$H6|+
zi{ytv2@JXBsot|%I5s74>W1K{-cvj0BYdNiRJz*&jrV9>ZXYZhEMULcM=fCmxkN&l
zEoi=)b)Vazc5TQC&Q$oEZETy@!`Gnj`qoXl7mcwdY@3a-!SpS2Mau|uK#++@>H8QC
zr2ld8;<_8We%@E?S=E?=e9c$BL^9X?bj*4W;<+B&OOe+3{<`6~*fC(=`TO>o^A(Y!
zA`Qc1ky?*6xjVfR?ugE~oY`Gt<vaLJTCo1nnmu8oFGg@mi9K)$+WByQ5A&CS?<@ki
z_7m?RV+9@F1GrWtGR0%dRaqd%1tpgN(1U~L&`Rf&XmCH&n<-wMwglitH0LRSHQHO0
ztWejI(n8BJfMd}YpqRCs(Gxa^iTMEF)*W_fA!gnkLupfL1;FunHByXz%6pX39CXS6
z+kJU{qitUdgko0#ob=^Vs((3rTlHvJBOC?;s9-Qza3qowWM1P1`2(1-+7A6i3H2kw
z_wB2h+;psj?=#*hkYUYE(lmJ%+=IW4(0Y}~WGM9wc8VcrT@P`Z%W2?UZ%)Y7&6eHW
z$*;#?d2U+mC;TfHuEnZ1klkl{HIJFZWq8eae|0Q)>zhw^{Z@E6vZ`mMRAp>Odpa!m
zzWmtjT|Lj^qiZMfj%%un-o$Eu>*v12qF{$kCKai^?DF=$^tfyV%m9;W@pm-BZn_6b
z{jsX<lUo~kJ_0QO>Y3!U`%9hzk6n7YyHY%48NhjI6jjuUn?Xfxe0`ARD_Q+T_QBZ{
zUK@!63_Wr`%9q_rh`N4=J=m;v>T{Y=ZL<K`_RkA>KN^m?(KZQ2J%|3`hV0iogMHJ}
zY6&-nXirq$Yhh*CHY<oG^-!;2AGGr2lqIlFeQPSK6|{ds{YBRHp>&Qf*b@@>LPTMf
z(cMorwW?M11RN{H#~ApKT)F!;R#fBHahZGhmy>Sox`rk>>q&Y)RG$-QwH$_TWk^hS
zTq2TC+D-cB21|$g4D=@T`-ATtJ?C=aXS4Q}^`~XjiIRszCB^cvW0OHe5;e~9D%D10
zl4yP4O=s-~HbL7*4>#W52e<y<<I(igFc=El3{=KC*s$B6e=!?9l0!KQG3dnE76`K%
z;%BT2Eboeq6l97ikIpdn38t8Oj%LxH4*23PI~=`TsnyYnw71@HXtKsy*w}o{G7_fW
zL0rzwnvTqGY1`kxeeKga*#E`dF1{y>iG7*^Hi)?@-#*7C^X5@kGwK+paI>_a2qxtW
zU=xV7>QQROWQqVfPcJ$4GSx`Y23Z&qnS?N;%mjHL*EVg3pBT{V7bQUI60jtBTS?i~
zycZ4xqJ<*3FSC6_^*6f)N|sgB5Bep(^%)$=0cczl>j&n~KR!7WC|3;Zoh_^GuOzRP
zo2Hxf50w9?_4Qe368fZ0=J|fR*jO_EwFB1I^g~i)roB|KWKf49-)!N%Ggb<tslF%Q
zJ$9p;TF7vfYfNt}@-L-#Qu>%w=kB8)(+_%kE~G!(73aF=yCmM3Cfb9l<q95>V$G!b
zoDIxqY{dH>`SILGHEJwq%rwh46_i`wkZS-NY95qdNE)O*y^+k#JlTEij8NT(Y_J!W
zFd+YFoZB|a<b&OD((3Dvwwgf>uOz~A@A{V*c)o7E(a=wHvb@8g5PnVJ&7D+Fp8ABV
z5`&LD-<$jPy{-y*V^SqM)9!#_Pj2-x{m$z+9Z*o|JTBGgXYYVM;g|VbitDUfnVn$o
zO)6?CZcDklDoODzj+ti@i#WcqPoZ!|IPB98LW!$-p+a4xBVM@%GEGZKmNjQMhh)zv
z7D){Gpe-Dv=~>c9f|1vANF&boD=Nb1Dv>4~eD636Lldh?#zD5{6JlcR_b*C_Enw&~
z5l2(w(`{+01xb1FCRfD2ap$u(h1U1B6e&8tQrnC}Cy0GR=i^Uue26Rc6Dx}!4#K*0
zaxt`a+px7-Z!^(U1WN2#kdN#OeR|2z+C@b@w+L67VEi&ZpAdg+8`HJT=wIMJqibhT
ztb3PFzsq&7jzQuod3xp7uL?h-7rYao&0MiT_Bux;U*N#ebGv92o(jM2?`1!N2W_M*
zeo9$%hEtIy;=`8z1c|kL&ZPn0y`N)i$Y1R9>K!el{moiy)<VnmBl>014448YC#9=K
zwO3weN|8!`5bU_#f(+ZrVd*9`7Uw?!q?yo&7sk&DJ;#-^tcCtqt5*A(V;&LdHq7Hg
zI6sC@!ly9p$^@v&XDsgIuv;9#w^!C1n5+10-tEw~ZdO1kqMDYyDl!5__o}f3hYe2M
zCeO)~m&&=JZn%cVH3HzPlcE`9^@``2u+!Y}Remn)DLMHc-h5A9AT<F^D$MM~w$XEp
z&d>gs;7F7=u2=vBlDRbjeYvyNby=TvpI{5nb2@J_YTEEEj4q<@zaGSC_i&xxD!6)d
zG{1??({Ma<=Wd4JL%b<NaY`!IkN451t@(>nE<J_STA>XoBOU_0bbNy3p%mFrMW>#c
zzPEvryBevZVUvT^2P&Zobk#9j>vSIW_t?AHy>(^x-Bx<hLWbr;;>~(mvNYb_%$<TG
zLWL(;LPZ33IC~#ud(ba-8#0DVEO12ZrsW$Mj|>ZFg(s5~oka+Kp(GU68I$h(Vq|fZ
zC_u1FM|S)=ldt#5q>&p4r%%p)*7<!{co)ArAk&$ZW;U#xTB83(b%*uFr<Lg2M7-0d
zOZ9jceGmCxTxtvV_S>|Rf0}B#-FwHDTo*|P6HB_rz%R;{==hpl#xTt@VLdSrrf~g^
z`IA8ZV1b`UazYpnkn28h&U)$(gdZ*f{n`&kH%Oy54&Z;ebjlh4x?JmnjFAALu}EG}
zfGmQ$5vEMJMH`a=+*src#dWK&N1^LFxK9Sa#q_rja$JWra09we<2oL9Q9Sx)?kZFW
z$jhOFGE~VcihYlkaZv8?uA7v$*}?2h6i%Qmgc4n~3E(O_`YCRGy~}`N<L&({)KE4u
ze38<j{Fo5svQM#aAA%s|r2qh*62yK}3k2TZ2u-B8Iwj16C<&o(q79VdiDri^0IJVv
z{?=3Hjzg$^&KXKM=DndbW}box^VU#W!3lsSBsB=_@B&~VNdrPe5+y2D5CAVO7(l3W
z!3Rp&7DL$opXUMa(V{J+?kr*u(<eZZ7zRA~9vU}v_`x71mB0>Faj@(?Wz;<o@lF*Y
zPJ-A)%6o+55(crZ4&v3-z_#}kA`K!|H4m$3FVir|xL<J%2{AhdN1&<DV2w5aGA=V9
z7PWr|P}(fi1sI{%io?&-xG^wpSsh|qmN5u1{ll@y>GS_?T+RqU{S)eD1j$1Gr;C^m
z7zDK=xaJ^6``=#Y-2ssNfdRqh0ntJrutGV5Nv&WI%3k1wmD5n+0aRe{0k^!>LFReN
zx1g*E>nbyx03KU~UT6->+rG%(owLF=beJxK&a0F;ie1GZ^eKg-VEZb&=s&ajKS#6w
zjvC6J#?b|U_(%@uq$c#Q@V_me0S1%)pKz9--{EKwyM}_gOj*Og-NEWLDF_oFtPjG;
zXCZ7%#=s}RKr&_5RFN@=H(015AGl4XRN9Bc51`;WWt%vzQvzexDI2BZ@xP~^2$I&7
zA(ndsgLsmA*su8p<!2C(_wT7s$vc#OmC=G_8_bZ5D*3l8Uh=oBRl@%FLa=XQ5L;!x
zC8ob=SBR!=JEXHWDQi;&5j7o$M0<zG-*M<I3?ifJH_Ze(Y*D^ed;h;XCiEZ5>-~IS
q+ZJUZM}`4#Zi@l2F-#HCw*??ha2ta#9s8?H3%YId(*zJG6aF78h1yF1

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f398c33..17a8ddc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 79a61d4..65dcd68 100755
--- a/gradlew
+++ b/gradlew
@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

From 410f3ba47b80ed2f14ed9775475932148189e4c7 Mon Sep 17 00:00:00 2001
From: chochem <40274384+chochem@users.noreply.github.com>
Date: Sun, 10 Sep 2023 10:38:47 +0100
Subject: [PATCH 2/3] update deps

---
 dependencies.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 141c66e..1e534f7 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    compile("com.github.GTNewHorizons:TinkersConstruct:1.9.0.10-GTNH:dev")
-    compile("com.github.GTNewHorizons:Mantle:0.3.4:dev")
+    compile("com.github.GTNewHorizons:TinkersConstruct:1.10.1-GTNH:dev")
+    compile("com.github.GTNewHorizons:Mantle:0.3.7:dev")
 
 }

From 236c5ca5a5749c07b1537129fc7a684a774bc473 Mon Sep 17 00:00:00 2001
From: chochem <40274384+chochem@users.noreply.github.com>
Date: Sun, 10 Sep 2023 10:39:02 +0100
Subject: [PATCH 3/3] spotless

---
 src/main/java/tmechworks/TMechworks.java      | 20 +++++++++----------
 .../java/tmechworks/blocks/FilterBlock.java   |  7 +++----
 .../tmechworks/blocks/RedstoneMachine.java    | 17 ++++++++--------
 .../java/tmechworks/blocks/SignalBus.java     |  7 +++----
 .../tmechworks/blocks/SignalTerminal.java     |  4 ++--
 .../component/SignalBusMasterLogic.java       |  3 +--
 .../blocks/logic/AdvancedDrawbridgeLogic.java | 11 +++++-----
 .../blocks/logic/DrawbridgeLogic.java         | 13 ++++++------
 .../tmechworks/blocks/logic/FilterLogic.java  |  3 +--
 .../blocks/logic/FirestarterLogic.java        |  7 +++----
 .../blocks/logic/SignalBusLogic.java          |  3 +--
 .../blocks/logic/SignalTerminalLogic.java     |  3 +--
 .../java/tmechworks/client/ClientProxy.java   |  4 ++--
 .../SignalTetherWorldOverlayRenderer.java     |  7 +++----
 .../client/block/DynamoSpecialRender.java     |  4 ++--
 .../tmechworks/client/block/FilterRender.java |  5 ++---
 .../client/block/MachineRender.java           |  5 ++---
 .../client/block/SignalBusRender.java         |  4 ++--
 .../client/block/SignalTerminalRender.java    |  2 +-
 .../client/item/DynamoItemRender.java         |  2 +-
 .../java/tmechworks/common/CommonProxy.java   |  7 +++----
 .../java/tmechworks/common/MechContent.java   |  5 ++---
 .../tmechworks/inventory/DrawbridgeSlot.java  |  3 +--
 .../inventory/SlotOpaqueBlocksOnly.java       |  4 ++--
 .../java/tmechworks/items/LengthWire.java     |  2 +-
 .../java/tmechworks/items/SpoolOfWire.java    |  4 ++--
 .../items/blocks/SignalBusItem.java           |  4 ++--
 .../items/blocks/SignalTerminalItem.java      |  2 +-
 .../tmechworks/lib/TMechworksRegistry.java    |  6 +++---
 .../lib/multiblock/IMultiblockMember.java     |  4 ++--
 .../lib/multiblock/MultiblockBaseLogic.java   |  4 ++--
 .../multiblock/MultiblockMasterBaseLogic.java |  4 ++--
 .../lib/signal/ISignalTransceiver.java        |  4 ++--
 .../network/packet/PacketDrawbridge.java      |  7 +++----
 .../network/packet/PacketPipeline.java        |  3 +--
 35 files changed, 88 insertions(+), 106 deletions(-)

diff --git a/src/main/java/tmechworks/TMechworks.java b/src/main/java/tmechworks/TMechworks.java
index cf8babc..d071c75 100644
--- a/src/main/java/tmechworks/TMechworks.java
+++ b/src/main/java/tmechworks/TMechworks.java
@@ -5,6 +5,16 @@
 
 import org.apache.logging.log4j.Logger;
 
+import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.Mod.EventHandler;
+import cpw.mods.fml.common.Mod.Instance;
+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;
+import cpw.mods.fml.common.event.FMLServerStartingEvent;
+import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.relauncher.Side;
 import tmechworks.client.SignalTetherWorldOverlayRenderer;
 import tmechworks.command.BlockInfoCommand;
 import tmechworks.common.CommonProxy;
@@ -16,16 +26,6 @@
 import tmechworks.lib.multiblock.MultiblockServerTickHandler;
 import tmechworks.lib.util.TabTools;
 import tmechworks.network.packet.PacketPipeline;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.Mod.Instance;
-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;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.relauncher.Side;
 
 @Mod(modid = Repo.modId, name = Repo.modName, version = Repo.modVer, dependencies = Repo.modDeps)
 public class TMechworks {
diff --git a/src/main/java/tmechworks/blocks/FilterBlock.java b/src/main/java/tmechworks/blocks/FilterBlock.java
index f8686cb..697ba95 100644
--- a/src/main/java/tmechworks/blocks/FilterBlock.java
+++ b/src/main/java/tmechworks/blocks/FilterBlock.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import mantle.world.CoordTuple;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -22,12 +20,13 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.FakePlayer;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import mantle.world.CoordTuple;
 import tmechworks.blocks.logic.SubFilter;
 import tmechworks.client.block.FilterRender;
 import tmechworks.lib.TMechworksRegistry;
 import tmechworks.lib.blocks.IBlockWithMetadata;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class FilterBlock extends Block implements IBlockWithMetadata {
 
diff --git a/src/main/java/tmechworks/blocks/RedstoneMachine.java b/src/main/java/tmechworks/blocks/RedstoneMachine.java
index a647aab..2739fee 100644
--- a/src/main/java/tmechworks/blocks/RedstoneMachine.java
+++ b/src/main/java/tmechworks/blocks/RedstoneMachine.java
@@ -3,13 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import mantle.blocks.abstracts.InventoryBlock;
-import mantle.blocks.abstracts.InventoryLogic;
-import mantle.blocks.iface.IActiveLogic;
-import mantle.blocks.iface.IFacingLogic;
-import mantle.common.ComparisonHelper;
-import mantle.world.CoordTuple;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -28,6 +21,14 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import mantle.blocks.abstracts.InventoryBlock;
+import mantle.blocks.abstracts.InventoryLogic;
+import mantle.blocks.iface.IActiveLogic;
+import mantle.blocks.iface.IFacingLogic;
+import mantle.common.ComparisonHelper;
+import mantle.world.CoordTuple;
 import tmechworks.TMechworks;
 import tmechworks.blocks.logic.AdvancedDrawbridgeLogic;
 import tmechworks.blocks.logic.DrawbridgeLogic;
@@ -35,8 +36,6 @@
 import tmechworks.client.block.MachineRender;
 import tmechworks.lib.TMechworksRegistry;
 import tmechworks.lib.blocks.IDrawbridgeLogicBase;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class RedstoneMachine extends InventoryBlock {
 
diff --git a/src/main/java/tmechworks/blocks/SignalBus.java b/src/main/java/tmechworks/blocks/SignalBus.java
index 22cd3f5..566f7ac 100644
--- a/src/main/java/tmechworks/blocks/SignalBus.java
+++ b/src/main/java/tmechworks/blocks/SignalBus.java
@@ -11,8 +11,6 @@
 import java.util.List;
 import java.util.Random;
 
-import mantle.world.WorldHelper;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.material.Material;
@@ -33,13 +31,14 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import mantle.world.WorldHelper;
 import tmechworks.TMechworks;
 import tmechworks.blocks.logic.SignalBusLogic;
 import tmechworks.client.block.SignalBusRender;
 import tmechworks.lib.TMechworksRegistry;
 import tmechworks.lib.multiblock.IMultiblockMember;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class SignalBus extends Block implements ITileEntityProvider {
 
diff --git a/src/main/java/tmechworks/blocks/SignalTerminal.java b/src/main/java/tmechworks/blocks/SignalTerminal.java
index 5c2dc20..55bfead 100644
--- a/src/main/java/tmechworks/blocks/SignalTerminal.java
+++ b/src/main/java/tmechworks/blocks/SignalTerminal.java
@@ -23,12 +23,12 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import tmechworks.TMechworks;
 import tmechworks.blocks.logic.SignalTerminalLogic;
 import tmechworks.client.block.SignalTerminalRender;
 import tmechworks.lib.TMechworksRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class SignalTerminal extends Block implements ITileEntityProvider {
 
diff --git a/src/main/java/tmechworks/blocks/component/SignalBusMasterLogic.java b/src/main/java/tmechworks/blocks/component/SignalBusMasterLogic.java
index 6fb81c1..f796b96 100644
--- a/src/main/java/tmechworks/blocks/component/SignalBusMasterLogic.java
+++ b/src/main/java/tmechworks/blocks/component/SignalBusMasterLogic.java
@@ -4,12 +4,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import mantle.world.CoordTuple;
-
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import mantle.world.CoordTuple;
 import tmechworks.blocks.logic.SignalBusLogic;
 import tmechworks.lib.multiblock.IMultiblockMember;
 import tmechworks.lib.multiblock.MultiblockMasterBaseLogic;
diff --git a/src/main/java/tmechworks/blocks/logic/AdvancedDrawbridgeLogic.java b/src/main/java/tmechworks/blocks/logic/AdvancedDrawbridgeLogic.java
index a409a9c..2cf8e12 100644
--- a/src/main/java/tmechworks/blocks/logic/AdvancedDrawbridgeLogic.java
+++ b/src/main/java/tmechworks/blocks/logic/AdvancedDrawbridgeLogic.java
@@ -4,10 +4,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import mantle.blocks.abstracts.InventoryLogic;
-import mantle.blocks.iface.IActiveLogic;
-import mantle.blocks.iface.IFacingLogic;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -32,13 +28,16 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import com.mojang.authlib.GameProfile;
+
+import mantle.blocks.abstracts.InventoryLogic;
+import mantle.blocks.iface.IActiveLogic;
+import mantle.blocks.iface.IFacingLogic;
 import tmechworks.inventory.AdvancedDrawbridgeContainer;
 import tmechworks.lib.TMechworksRegistry;
 import tmechworks.lib.blocks.IDrawbridgeLogicBase;
 import tmechworks.lib.player.FakePlayerLogic;
 
-import com.mojang.authlib.GameProfile;
-
 public class AdvancedDrawbridgeLogic extends InventoryLogic
         implements IFacingLogic, IActiveLogic, IDrawbridgeLogicBase {
 
diff --git a/src/main/java/tmechworks/blocks/logic/DrawbridgeLogic.java b/src/main/java/tmechworks/blocks/logic/DrawbridgeLogic.java
index 399e650..89cc401 100644
--- a/src/main/java/tmechworks/blocks/logic/DrawbridgeLogic.java
+++ b/src/main/java/tmechworks/blocks/logic/DrawbridgeLogic.java
@@ -4,11 +4,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import mantle.blocks.BlockUtils;
-import mantle.blocks.abstracts.InventoryLogic;
-import mantle.blocks.iface.IActiveLogic;
-import mantle.blocks.iface.IFacingLogic;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -32,13 +27,17 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import com.mojang.authlib.GameProfile;
+
+import mantle.blocks.BlockUtils;
+import mantle.blocks.abstracts.InventoryLogic;
+import mantle.blocks.iface.IActiveLogic;
+import mantle.blocks.iface.IFacingLogic;
 import tmechworks.inventory.DrawbridgeContainer;
 import tmechworks.lib.TMechworksRegistry;
 import tmechworks.lib.blocks.IDrawbridgeLogicBase;
 import tmechworks.lib.player.FakePlayerLogic;
 
-import com.mojang.authlib.GameProfile;
-
 public class DrawbridgeLogic extends InventoryLogic implements IFacingLogic, IActiveLogic, IDrawbridgeLogicBase {
 
     boolean active;
diff --git a/src/main/java/tmechworks/blocks/logic/FilterLogic.java b/src/main/java/tmechworks/blocks/logic/FilterLogic.java
index ef44888..4d8a72f 100644
--- a/src/main/java/tmechworks/blocks/logic/FilterLogic.java
+++ b/src/main/java/tmechworks/blocks/logic/FilterLogic.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import mantle.world.CoordTuple;
-
 import net.minecraft.command.IEntitySelector;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
@@ -15,6 +13,7 @@
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
 
+import mantle.world.CoordTuple;
 import tmechworks.blocks.FilterBlock;
 
 /*---------------- DEPRECATED, KEPT FOR REFERENCE ----------------*/
diff --git a/src/main/java/tmechworks/blocks/logic/FirestarterLogic.java b/src/main/java/tmechworks/blocks/logic/FirestarterLogic.java
index 9adcd26..093c934 100644
--- a/src/main/java/tmechworks/blocks/logic/FirestarterLogic.java
+++ b/src/main/java/tmechworks/blocks/logic/FirestarterLogic.java
@@ -1,9 +1,5 @@
 package tmechworks.blocks.logic;
 
-import mantle.blocks.iface.IActiveLogic;
-import mantle.blocks.iface.IFacingLogic;
-import mantle.world.WorldHelper;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.init.Blocks;
@@ -15,6 +11,9 @@
 import net.minecraft.util.MathHelper;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import mantle.blocks.iface.IActiveLogic;
+import mantle.blocks.iface.IFacingLogic;
+import mantle.world.WorldHelper;
 import tconstruct.library.tools.AbilityHelper;
 
 public class FirestarterLogic extends TileEntity implements IFacingLogic, IActiveLogic {
diff --git a/src/main/java/tmechworks/blocks/logic/SignalBusLogic.java b/src/main/java/tmechworks/blocks/logic/SignalBusLogic.java
index bba832c..63f8d28 100644
--- a/src/main/java/tmechworks/blocks/logic/SignalBusLogic.java
+++ b/src/main/java/tmechworks/blocks/logic/SignalBusLogic.java
@@ -7,8 +7,6 @@
 import java.util.Map;
 import java.util.Random;
 
-import mantle.world.CoordTuple;
-
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -19,6 +17,7 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import mantle.world.CoordTuple;
 import tmechworks.TMechworks;
 import tmechworks.blocks.component.SignalBusMasterLogic;
 import tmechworks.lib.multiblock.IMultiblockMember;
diff --git a/src/main/java/tmechworks/blocks/logic/SignalTerminalLogic.java b/src/main/java/tmechworks/blocks/logic/SignalTerminalLogic.java
index d8cfb96..0d9c2b4 100644
--- a/src/main/java/tmechworks/blocks/logic/SignalTerminalLogic.java
+++ b/src/main/java/tmechworks/blocks/logic/SignalTerminalLogic.java
@@ -2,8 +2,6 @@
 
 import java.util.Arrays;
 
-import mantle.world.CoordTuple;
-
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.nbt.NBTTagCompound;
@@ -16,6 +14,7 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import mantle.world.CoordTuple;
 import tmechworks.TMechworks;
 import tmechworks.blocks.SignalTerminal;
 import tmechworks.common.MechContent;
diff --git a/src/main/java/tmechworks/client/ClientProxy.java b/src/main/java/tmechworks/client/ClientProxy.java
index 99157c4..d10adc9 100644
--- a/src/main/java/tmechworks/client/ClientProxy.java
+++ b/src/main/java/tmechworks/client/ClientProxy.java
@@ -5,6 +5,8 @@
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 
+import cpw.mods.fml.client.registry.ClientRegistry;
+import cpw.mods.fml.client.registry.RenderingRegistry;
 import tmechworks.blocks.logic.AdvancedDrawbridgeLogic;
 import tmechworks.blocks.logic.DrawbridgeLogic;
 import tmechworks.blocks.logic.DynamoLogic;
@@ -18,8 +20,6 @@
 import tmechworks.client.item.DynamoItemRender;
 import tmechworks.common.CommonProxy;
 import tmechworks.common.MechContent;
-import cpw.mods.fml.client.registry.ClientRegistry;
-import cpw.mods.fml.client.registry.RenderingRegistry;
 
 public class ClientProxy extends CommonProxy {
 
diff --git a/src/main/java/tmechworks/client/SignalTetherWorldOverlayRenderer.java b/src/main/java/tmechworks/client/SignalTetherWorldOverlayRenderer.java
index 741606d..30341bd 100644
--- a/src/main/java/tmechworks/client/SignalTetherWorldOverlayRenderer.java
+++ b/src/main/java/tmechworks/client/SignalTetherWorldOverlayRenderer.java
@@ -2,9 +2,6 @@
 
 import java.util.ArrayDeque;
 
-import mantle.world.CoordTuple;
-import mantle.world.CoordTuplePair;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
 import net.minecraft.tileentity.TileEntity;
@@ -14,9 +11,11 @@
 
 import org.lwjgl.opengl.GL11;
 
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import mantle.world.CoordTuple;
+import mantle.world.CoordTuplePair;
 import tmechworks.TMechworks;
 import tmechworks.lib.signal.ISignalTransceiver;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
 public class SignalTetherWorldOverlayRenderer {
 
diff --git a/src/main/java/tmechworks/client/block/DynamoSpecialRender.java b/src/main/java/tmechworks/client/block/DynamoSpecialRender.java
index 094d9bb..184dbdc 100644
--- a/src/main/java/tmechworks/client/block/DynamoSpecialRender.java
+++ b/src/main/java/tmechworks/client/block/DynamoSpecialRender.java
@@ -8,10 +8,10 @@
 
 import org.lwjgl.opengl.GL11;
 
-import tmechworks.blocks.logic.DynamoLogic;
-import tmechworks.client.model.DynamoModel;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tmechworks.blocks.logic.DynamoLogic;
+import tmechworks.client.model.DynamoModel;
 
 @SideOnly(Side.CLIENT)
 public class DynamoSpecialRender extends TileEntitySpecialRenderer {
diff --git a/src/main/java/tmechworks/client/block/FilterRender.java b/src/main/java/tmechworks/client/block/FilterRender.java
index 79aa03e..bff12bb 100644
--- a/src/main/java/tmechworks/client/block/FilterRender.java
+++ b/src/main/java/tmechworks/client/block/FilterRender.java
@@ -1,7 +1,5 @@
 package tmechworks.client.block;
 
-import mantle.world.CoordTuple;
-
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
@@ -9,9 +7,10 @@
 
 import org.lwjgl.opengl.GL11;
 
-import tmechworks.blocks.FilterBlock;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
+import mantle.world.CoordTuple;
+import tmechworks.blocks.FilterBlock;
 
 public class FilterRender implements ISimpleBlockRenderingHandler {
 
diff --git a/src/main/java/tmechworks/client/block/MachineRender.java b/src/main/java/tmechworks/client/block/MachineRender.java
index 568974a..9ebd02a 100644
--- a/src/main/java/tmechworks/client/block/MachineRender.java
+++ b/src/main/java/tmechworks/client/block/MachineRender.java
@@ -1,14 +1,13 @@
 package tmechworks.client.block;
 
-import mantle.blocks.iface.IFacingLogic;
-
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
 
-import tconstruct.util.ItemHelper;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
+import mantle.blocks.iface.IFacingLogic;
+import tconstruct.util.ItemHelper;
 
 public class MachineRender implements ISimpleBlockRenderingHandler {
 
diff --git a/src/main/java/tmechworks/client/block/SignalBusRender.java b/src/main/java/tmechworks/client/block/SignalBusRender.java
index ab90165..f98ccae 100644
--- a/src/main/java/tmechworks/client/block/SignalBusRender.java
+++ b/src/main/java/tmechworks/client/block/SignalBusRender.java
@@ -8,10 +8,10 @@
 
 import org.lwjgl.opengl.GL11;
 
-import tmechworks.blocks.SignalBus.BusGeometry;
-import tmechworks.blocks.logic.SignalBusLogic;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
+import tmechworks.blocks.SignalBus.BusGeometry;
+import tmechworks.blocks.logic.SignalBusLogic;
 
 public class SignalBusRender implements ISimpleBlockRenderingHandler {
 
diff --git a/src/main/java/tmechworks/client/block/SignalTerminalRender.java b/src/main/java/tmechworks/client/block/SignalTerminalRender.java
index 45c0efa..526e0c2 100644
--- a/src/main/java/tmechworks/client/block/SignalTerminalRender.java
+++ b/src/main/java/tmechworks/client/block/SignalTerminalRender.java
@@ -25,9 +25,9 @@
 
 import org.lwjgl.opengl.GL11;
 
-import tmechworks.blocks.logic.SignalTerminalLogic;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
+import tmechworks.blocks.logic.SignalTerminalLogic;
 
 public class SignalTerminalRender implements ISimpleBlockRenderingHandler {
 
diff --git a/src/main/java/tmechworks/client/item/DynamoItemRender.java b/src/main/java/tmechworks/client/item/DynamoItemRender.java
index a8a9952..3830c5d 100644
--- a/src/main/java/tmechworks/client/item/DynamoItemRender.java
+++ b/src/main/java/tmechworks/client/item/DynamoItemRender.java
@@ -7,9 +7,9 @@
 
 import org.lwjgl.opengl.GL11;
 
+import cpw.mods.fml.client.FMLClientHandler;
 import tmechworks.client.model.DynamoModel;
 import tmechworks.common.MechContent;
-import cpw.mods.fml.client.FMLClientHandler;
 
 public class DynamoItemRender implements IItemRenderer {
 
diff --git a/src/main/java/tmechworks/common/CommonProxy.java b/src/main/java/tmechworks/common/CommonProxy.java
index f6af3e6..f3d3feb 100644
--- a/src/main/java/tmechworks/common/CommonProxy.java
+++ b/src/main/java/tmechworks/common/CommonProxy.java
@@ -1,17 +1,16 @@
 package tmechworks.common;
 
-import mantle.blocks.abstracts.InventoryLogic;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.network.IGuiHandler;
+import mantle.blocks.abstracts.InventoryLogic;
 import tconstruct.smeltery.TinkerSmeltery;
 import tmechworks.lib.ConfigCore;
 import tmechworks.lib.TMechworksRegistry;
 import tmechworks.lib.multiblock.MultiblockServerTickHandler;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.network.IGuiHandler;
 
 public class CommonProxy implements IGuiHandler {
 
diff --git a/src/main/java/tmechworks/common/MechContent.java b/src/main/java/tmechworks/common/MechContent.java
index 1ed8853..6904b69 100644
--- a/src/main/java/tmechworks/common/MechContent.java
+++ b/src/main/java/tmechworks/common/MechContent.java
@@ -1,7 +1,5 @@
 package tmechworks.common;
 
-import mantle.lib.client.MantleClientRegistry;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
@@ -11,6 +9,8 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
+import cpw.mods.fml.common.registry.GameRegistry;
+import mantle.lib.client.MantleClientRegistry;
 import tconstruct.library.TConstructRegistry;
 import tmechworks.blocks.DynamoBlock;
 import tmechworks.blocks.FilterBlock;
@@ -34,7 +34,6 @@
 import tmechworks.items.blocks.SignalBusItem;
 import tmechworks.items.blocks.SignalTerminalItem;
 import tmechworks.lib.TMechworksRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
 
 public class MechContent {
 
diff --git a/src/main/java/tmechworks/inventory/DrawbridgeSlot.java b/src/main/java/tmechworks/inventory/DrawbridgeSlot.java
index ed26c9f..0532a31 100644
--- a/src/main/java/tmechworks/inventory/DrawbridgeSlot.java
+++ b/src/main/java/tmechworks/inventory/DrawbridgeSlot.java
@@ -1,13 +1,12 @@
 package tmechworks.inventory;
 
-import mantle.blocks.BlockUtils;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
+import mantle.blocks.BlockUtils;
 import tmechworks.lib.TMechworksRegistry;
 import tmechworks.lib.blocks.IDrawbridgeLogicBase;
 
diff --git a/src/main/java/tmechworks/inventory/SlotOpaqueBlocksOnly.java b/src/main/java/tmechworks/inventory/SlotOpaqueBlocksOnly.java
index 65d3923..ef37cb0 100644
--- a/src/main/java/tmechworks/inventory/SlotOpaqueBlocksOnly.java
+++ b/src/main/java/tmechworks/inventory/SlotOpaqueBlocksOnly.java
@@ -1,11 +1,11 @@
 package tmechworks.inventory;
 
-import mantle.blocks.BlockUtils;
-
 import net.minecraft.block.Block;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 
+import mantle.blocks.BlockUtils;
+
 /**
  * 
  * @author fuj1n
diff --git a/src/main/java/tmechworks/items/LengthWire.java b/src/main/java/tmechworks/items/LengthWire.java
index 305385c..55f8b3b 100644
--- a/src/main/java/tmechworks/items/LengthWire.java
+++ b/src/main/java/tmechworks/items/LengthWire.java
@@ -9,9 +9,9 @@
 import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 
-import tmechworks.lib.TMechworksRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tmechworks.lib.TMechworksRegistry;
 
 public class LengthWire extends Item {
 
diff --git a/src/main/java/tmechworks/items/SpoolOfWire.java b/src/main/java/tmechworks/items/SpoolOfWire.java
index c6b0cb0..18abb61 100644
--- a/src/main/java/tmechworks/items/SpoolOfWire.java
+++ b/src/main/java/tmechworks/items/SpoolOfWire.java
@@ -13,11 +13,11 @@
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import tmechworks.blocks.logic.SignalBusLogic;
 import tmechworks.blocks.logic.SignalTerminalLogic;
 import tmechworks.lib.TMechworksRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class SpoolOfWire extends Item {
 
diff --git a/src/main/java/tmechworks/items/blocks/SignalBusItem.java b/src/main/java/tmechworks/items/blocks/SignalBusItem.java
index 3e3db90..bc19857 100644
--- a/src/main/java/tmechworks/items/blocks/SignalBusItem.java
+++ b/src/main/java/tmechworks/items/blocks/SignalBusItem.java
@@ -11,10 +11,10 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import tmechworks.TMechworks;
-import tmechworks.blocks.logic.SignalBusLogic;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tmechworks.TMechworks;
+import tmechworks.blocks.logic.SignalBusLogic;
 
 public class SignalBusItem extends ItemBlock {
 
diff --git a/src/main/java/tmechworks/items/blocks/SignalTerminalItem.java b/src/main/java/tmechworks/items/blocks/SignalTerminalItem.java
index 8b3e136..4ed742a 100644
--- a/src/main/java/tmechworks/items/blocks/SignalTerminalItem.java
+++ b/src/main/java/tmechworks/items/blocks/SignalTerminalItem.java
@@ -10,9 +10,9 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import tmechworks.blocks.logic.SignalTerminalLogic;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import tmechworks.blocks.logic.SignalTerminalLogic;
 
 public class SignalTerminalItem extends ItemBlock {
 
diff --git a/src/main/java/tmechworks/lib/TMechworksRegistry.java b/src/main/java/tmechworks/lib/TMechworksRegistry.java
index 26e4a52..46bae06 100644
--- a/src/main/java/tmechworks/lib/TMechworksRegistry.java
+++ b/src/main/java/tmechworks/lib/TMechworksRegistry.java
@@ -14,14 +14,14 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import com.google.common.collect.HashBiMap;
+
+import cpw.mods.fml.common.registry.GameRegistry;
 import tconstruct.world.TinkerWorld;
 import tmechworks.TMechworks;
 import tmechworks.lib.blocks.PlacementType;
 import tmechworks.lib.util.TabTools;
 
-import com.google.common.collect.HashBiMap;
-import cpw.mods.fml.common.registry.GameRegistry;
-
 public class TMechworksRegistry {
 
     public static TMechworksRegistry instance = new TMechworksRegistry();
diff --git a/src/main/java/tmechworks/lib/multiblock/IMultiblockMember.java b/src/main/java/tmechworks/lib/multiblock/IMultiblockMember.java
index 1e42344..be52e17 100644
--- a/src/main/java/tmechworks/lib/multiblock/IMultiblockMember.java
+++ b/src/main/java/tmechworks/lib/multiblock/IMultiblockMember.java
@@ -1,9 +1,9 @@
 package tmechworks.lib.multiblock;
 
-import mantle.world.CoordTuple;
-
 import net.minecraft.world.World;
 
+import mantle.world.CoordTuple;
+
 public interface IMultiblockMember {
 
     public boolean isCompatible(Object other);
diff --git a/src/main/java/tmechworks/lib/multiblock/MultiblockBaseLogic.java b/src/main/java/tmechworks/lib/multiblock/MultiblockBaseLogic.java
index 44aaeff..f52f596 100644
--- a/src/main/java/tmechworks/lib/multiblock/MultiblockBaseLogic.java
+++ b/src/main/java/tmechworks/lib/multiblock/MultiblockBaseLogic.java
@@ -4,13 +4,13 @@
 import java.util.List;
 import java.util.Queue;
 
-import mantle.world.CoordTuple;
-
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.World;
 
+import mantle.world.CoordTuple;
+
 public abstract class MultiblockBaseLogic extends TileEntity implements IMultiblockMember {
 
     private MultiblockMasterBaseLogic master;
diff --git a/src/main/java/tmechworks/lib/multiblock/MultiblockMasterBaseLogic.java b/src/main/java/tmechworks/lib/multiblock/MultiblockMasterBaseLogic.java
index e83bc64..cd92294 100644
--- a/src/main/java/tmechworks/lib/multiblock/MultiblockMasterBaseLogic.java
+++ b/src/main/java/tmechworks/lib/multiblock/MultiblockMasterBaseLogic.java
@@ -6,12 +6,12 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import mantle.world.CoordTuple;
-
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import mantle.world.CoordTuple;
+
 public abstract class MultiblockMasterBaseLogic {
 
     protected World worldObj;
diff --git a/src/main/java/tmechworks/lib/signal/ISignalTransceiver.java b/src/main/java/tmechworks/lib/signal/ISignalTransceiver.java
index 34fcca2..a401d04 100644
--- a/src/main/java/tmechworks/lib/signal/ISignalTransceiver.java
+++ b/src/main/java/tmechworks/lib/signal/ISignalTransceiver.java
@@ -1,9 +1,9 @@
 package tmechworks.lib.signal;
 
-import mantle.world.CoordTuple;
-
 import net.minecraft.world.World;
 
+import mantle.world.CoordTuple;
+
 public interface ISignalTransceiver {
 
     void setBusCoords(World world, int xCoord, int yCoord, int zCoord);
diff --git a/src/main/java/tmechworks/network/packet/PacketDrawbridge.java b/src/main/java/tmechworks/network/packet/PacketDrawbridge.java
index 7d332ff..405239b 100644
--- a/src/main/java/tmechworks/network/packet/PacketDrawbridge.java
+++ b/src/main/java/tmechworks/network/packet/PacketDrawbridge.java
@@ -1,15 +1,14 @@
 package tmechworks.network.packet;
 
-import mantle.common.network.AbstractPacket;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
-import tmechworks.blocks.logic.AdvancedDrawbridgeLogic;
-import tmechworks.blocks.logic.DrawbridgeLogic;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
+import mantle.common.network.AbstractPacket;
+import tmechworks.blocks.logic.AdvancedDrawbridgeLogic;
+import tmechworks.blocks.logic.DrawbridgeLogic;
 
 public class PacketDrawbridge extends AbstractPacket {
 
diff --git a/src/main/java/tmechworks/network/packet/PacketPipeline.java b/src/main/java/tmechworks/network/packet/PacketPipeline.java
index 72b8c9b..f499fa9 100644
--- a/src/main/java/tmechworks/network/packet/PacketPipeline.java
+++ b/src/main/java/tmechworks/network/packet/PacketPipeline.java
@@ -6,8 +6,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import mantle.common.network.AbstractPacket;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -26,6 +24,7 @@
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageCodec;
+import mantle.common.network.AbstractPacket;
 
 /**
  * Packet pipeline class. Directs all registered packet data to be handled by the packets themselves.