fix gra

Pixel-gaming · Dec 18, 2023 · b25ad37 · b25ad37
1 parent 998b712
commit b25ad37
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -45,10 +45,10 @@ ext {
         ]
     }
     MAPPING_CHANNEL = 'official'
-    MC_VERSION = '1.20.2-pre2'
+    MC_VERSION = '1.20.1'
     MAPPING_VERSION = MC_VERSION
     MC_NEXT_VERSION = '1.21'
-    MCP_VERSION = '20230911.115402'
+    MCP_VERSION = '20230612.114412'
     SNAPSHOT = false
 
     SPI_VERSION = '7.0.1'
@@ -1025,6 +1025,7 @@ project(':forge') {
     }
 
     genPatches {
+//        finalizedBy checkAndFixPatches
         autoHeader true
         lineEnding = '\n'
     }
@@ -1361,7 +1362,7 @@ project(':forge') {
         }
     }
 
-    task installerJar(type: InstallerJar, dependsOn: [genClientBinPatches, genServerBinPatches, installerJson, launcherJson, 'signUniversalJar']) {
+    task installerJar(type: InstallerJar, dependsOn: [genClientBinPatches, genServerBinPatches, 'signUniversalJar', launcherJson, installerJson]) {
         packedDependencies = PACKED_DEPS
         from(extraTxts)
         from(rootProject.file('/forge_installer_logo.png')) {
@@ -1475,10 +1476,6 @@ project(':forge') {
             rename { 'data/user_jvm_args.txt' }
         }
     }
-
-    tasks.register('devInstallerJar', DevInstallerJar) {
-        input = installerJar.archiveFile
-    }
 
     license {
         header = file("$rootDir/LICENSE-header.txt")
@@ -1490,15 +1487,29 @@ project(':forge') {
             main {
                 files.from files("$rootDir/src/main/java")
             }
+            test {
+                files.from files("$rootDir/src/test/java")
+            }
         }
     }
 
     tasks.register('genAllData') {
-        dependsOn 'forge_data'
+        dependsOn 'forge_data', 'forge_test_data'
     }
 
     tasks.eclipse.dependsOn('genEclipseRuns')
 
+    if (project.hasProperty('UPDATE_MAPPINGS')) {
+        extractRangeMap {
+            sources.from sourceSets.test.java.srcDirs
+            addDependencies compileTestJava.classpath
+        }
+        applyRangeMap {
+            sources.from sourceSets.test.java.srcDirs
+        }
+        sourceSets.test.java.srcDirs.each { extractMappedNew.addTarget it }
+    }
+
     tasks.named('javadoc', Javadoc).configure {
         description 'Generates the combined javadocs for the FML projects and the main Forge project'
         var includedProjects = [ ':fmlcore', ':fmlloader', ':javafmllanguage', ':mclanguage' ]
@@ -1582,7 +1593,6 @@ project(':forge') {
                 artifact universalJar
                 artifact installerJar
                 //TODO: installer-win
-                artifact makeMdk
                 artifact userdevJar
                 artifact sourcesJar
             }

diff --git a/settings.gradle b/settings.gradle
@@ -25,8 +25,15 @@ plugins {
 dependencyResolutionManagement {
     versionCatalogs {
         libs {
+            library('securemodules', 'net.minecraftforge:securemodules:2.2.3') // Needs unsafe
+            // Terminal Console Appender.. essentually make pretty colors in the console, but it's been a PITA
+            library('terminalconsoleappender', 'net.minecrell:terminalconsoleappender:1.2.0')
+            version('jline', '3.21.0')
+            library('jline-reader',   'org.jline', 'jline-reader'        ).versionRef('jline')
+            library('jline-terminal', 'org.jline', 'jline-terminal'      ).versionRef('jline')
+            bundle('terminalconsoleappender', ['terminalconsoleappender', 'jline-reader', 'jline-terminal'])
             //Ketting libs
-            library('jline-jansi', 'org.jline', 'jline-terminal-jansi').versionRef('jline')
+            library('jline-jansi', 'org.jline', 'jline-terminal-jansi').version('3.21.0')
             library('jansi', 'org.fusesource.jansi', 'jansi').version('1.18')
             library('jline', 'jline', 'jline').version('2.13')
             bundle('jline-extras', ['jline-jansi', 'jansi', 'jline']) //Apparently the order here is important, don't ask me why, magic.