Merge pull request #49 from GTNewHorizons/feature/modular-ui

Migrate to ModularUI

1 files changed, 34 insertions, 34 deletions

diff --git a/build.gradle b/build.gradle
index 504a179750..89350b8a35 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1667597057
+//version: 1669411416
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -234,9 +234,9 @@ try {
 }
 catch (Exception ignored) {
     out.style(Style.Failure).text(
-            'This mod must be version controlled by Git AND the repository must provide at least one tag,\n' +
-                    'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' +
-            'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)'
+        'This mod must be version controlled by Git AND the repository must provide at least one tag,\n' +
+            'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' +
+        'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)'
     )
     versionOverride = 'NO-GIT-TAG-SET'
     identifiedVersion = versionOverride
@@ -262,13 +262,13 @@ def jvmArguments = []
 
 if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
     arguments += [
-            "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+        "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
     ]
     if (usesMixinDebug.toBoolean()) {
         jvmArguments += [
-                "-Dmixin.debug.countInjections=true",
-                "-Dmixin.debug.verbose=true",
-                "-Dmixin.debug.export=true"
+            "-Dmixin.debug.countInjections=true",
+            "-Dmixin.debug.verbose=true",
+            "-Dmixin.debug.export=true"
         ]
     }
 }
@@ -338,10 +338,10 @@ 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('org.spongepowered:mixin:0.8.5-GTNH:processor')
+        annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.1:processor')
     }
     if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
-        compile('com.gtnewhorizon:gtnhmixins:2.0.1')
+        compile('com.gtnewhorizon:gtnhmixins:2.1.1')
     }
 }
 
@@ -395,8 +395,8 @@ shadowJar {
 
     minimize()  // This will only allow shading for actually used classes
     configurations = [
-            project.configurations.shadowImplementation,
-            project.configurations.shadowCompile
+        project.configurations.shadowImplementation,
+        project.configurations.shadowCompile
     ]
     dependsOn(relocateShadowJar)
 }
@@ -428,12 +428,12 @@ 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"
+                "-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"
             ]
         }
     }
@@ -442,8 +442,8 @@ afterEvaluate {
 runClient {
     if (developmentEnvironmentUserName) {
         arguments += [
-                "--username",
-                developmentEnvironmentUserName
+            "--username",
+            developmentEnvironmentUserName
         ]
     }
 
@@ -458,9 +458,9 @@ runServer {
 
 tasks.withType(JavaExec).configureEach {
     javaLauncher.set(
-            javaToolchains.launcherFor {
-                languageVersion = projectJavaVersion
-            }
+        javaToolchains.launcherFor {
+            languageVersion = projectJavaVersion
+        }
     )
 }
 
@@ -476,9 +476,9 @@ processResources {
 
         // replace modVersion and minecraftVersion
         expand "minecraftVersion": project.minecraft.version,
-                "modVersion": modVersion,
-                "modId": modId,
-                "modName": modName
+            "modVersion": modVersion,
+            "modId": modId,
+            "modName": modName
     }
 
     if (usesMixins.toBoolean()) {
@@ -508,9 +508,9 @@ def getManifestAttributes() {
 
     if (usesMixins.toBoolean()) {
         manifestAttributes += [
-                "TweakClass"    : "org.spongepowered.asm.launch.MixinTweaker",
-                "MixinConfigs"  : "mixins." + modId + ".json",
-                "ForceLoadAsMod": !containsMixinsAndOrCoreModOnly.toBoolean()
+            "TweakClass"    : "org.spongepowered.asm.launch.MixinTweaker",
+            "MixinConfigs"  : "mixins." + modId + ".json",
+            "ForceLoadAsMod": !containsMixinsAndOrCoreModOnly.toBoolean()
         ]
     }
     return manifestAttributes
@@ -538,8 +538,8 @@ task shadowDevJar(type: ShadowJar) {
 
     minimize()  // This will only allow shading for actually used classes
     configurations = [
-            project.configurations.shadowImplementation,
-            project.configurations.shadowCompile
+        project.configurations.shadowImplementation,
+        project.configurations.shadowCompile
     ]
 }
 
@@ -633,8 +633,8 @@ publishing {
             pom.withXml {
                 def badArtifacts = [:].withDefault { [] as Set<String> }
                 for (configuration in [
-                        projectConfigs.minecraft,
-                        projectConfigs.minecraftDeps
+                    projectConfigs.minecraft,
+                    projectConfigs.minecraftDeps
                 ]) {
                     for (dependency in configuration.allDependencies) {
                         badArtifacts[dependency.group == null ? "" : dependency.group] += dependency.name
@@ -1100,4 +1100,4 @@ def getSecondaryArtifacts() {
     if (!noPublishedSources) secondaryArtifacts += [sourcesJar]
     if (apiPackage) secondaryArtifacts += [apiJar]
     return secondaryArtifacts
-}
\ No newline at end of file
+}