Revert "Using NeoForge Installer instead of Forge, update correct icon (

#121)"

This reverts commit a245727.

README.md

@@ -35,7 +35,6 @@
 - For regular launcher (official launcher, AT launcher, FTB, HMCL), download the installer jar from release. You could use the installer like the Forge one.
 - **Remember to install Fugue!**
 - **And Scalar!**
-- **Do not generate a fat-installer as this is not supported.**
 
 ## Build Instructions:
 

build.gradle

@@ -10,10 +10,6 @@ buildscript {
             name "Outlands"
             url "https://maven.outlands.top/releases/"
         }
-        maven {
-            name "NeoForge"
-            url = 'https://maven.neoforged.net/releases/'
-        }
     }
     dependencies {
         classpath "net.minecraftforge.gradle:ForgeGradle:6.0.+"
@@ -98,10 +94,6 @@ project(':mcp') {
             name 'MinecraftForge'
             url 'https://maven.minecraftforge.net/'
         }
-        maven {
-            name "NeoForge"
-            url = 'https://maven.neoforged.net/releases/'
-        }
 
     }
     mcp {
@@ -127,10 +119,6 @@ project(':minecraft') {
             name 'MinecraftForge'
             url 'https://maven.minecraftforge.net/'
         }
-        maven {
-            name "NeoForge"
-            url = 'https://maven.neoforged.net/releases/'
-        }
 
     }
     dependencies {
@@ -247,10 +235,6 @@ project(':cleanroom') {
         maven {
             url "https://maven.outlands.top/releases/"
         }
-        maven {
-            name "NeoForge"
-            url = 'https://maven.neoforged.net/releases/'
-        }
     }
 
     ext {
@@ -653,8 +637,8 @@ project(':cleanroom') {
 
     // TODO: Include?
     def extra_files = [
-            rootProject.file('FORGE-CREDITS.txt'),
-            rootProject.file('LICENSE'),
+            rootProject.file('CREDITS.txt'),
+            rootProject.file('LICENSE.txt'),
             rootProject.file('LICENSE-Paulscode IBXM Library.txt'),
             rootProject.file('LICENSE-Paulscode SoundSystem CodecIBXM.txt')
     ]
@@ -886,7 +870,7 @@ project(':cleanroom') {
                             artifact: [
                                 path: "${project.group.replace('.', '/')}/${project.name}/${project.version}/${project.name}-${project.version}.jar",
                                 // Do not include the URL so that the installer/launcher won't grab it. This is also why we don't have the universal classifier
-                                url: ' ',
+                                url: '',
                                 sha1: Util.sha1(universalJar.archivePath),
                                 size: universalJar.archivePath.length()
                             ]
@@ -909,7 +893,7 @@ project(':cleanroom') {
     task installerJson(dependsOn: [launcherJson, genClientBinPatches/*, createClientSRG, createServerSRG*/]) {
         ext {
             output = file('build/install_profile.json')
-            installer_tools = "net.neoforged.installertools:installertools:$props.installer_tools_version"
+            installer_tools = "net.minecraftforge:installertools:$props.installer_tools_version"
         }
         inputs.file universalJar.archivePath
         inputs.file genClientBinPatches.toolJar
@@ -923,7 +907,7 @@ project(':cleanroom') {
                         artifact: [
                                 path: "${project.group.replace('.', '/')}/${project.name}/${project.version}/${project.name}-${project.version}.jar",
                                 // Do not include the URL so that the installer/launcher won't grab it. This is also why we don't have the universal classifier
-                                url: ' ',
+                                url: '',
                                 sha1: Util.sha1(universalJar.archivePath),
                                 size: universalJar.archivePath.length()
                         ]
@@ -933,9 +917,9 @@ project(':cleanroom') {
             def json = [
                 _comment_: launcherJson.comment,
                 spec: 0,
-                profile: project.name.capitalize(),
+                profile: project.name,
                 version: launcherJson.id,
-                icon: 'null',
+                icon: 'data:image/png;base64,' + new String(Base64.getEncoder().encode(Files.readAllBytes(rootProject.file('icon.ico').toPath()))),
                 json: '/version.json',
                 path: "${project.group}:${project.name}:${project.version}",
                 logo: '/big_logo.png',
@@ -1019,7 +1003,7 @@ project(':cleanroom') {
     }
 
     task downloadInstaller(type: DownloadMavenArtifact) {
-        artifact = 'net.neoforged:legacyinstaller:3.0.+:shrunk'
+        artifact = 'net.minecraftforge:installer:2.2.+:fatjar'
         changing = true
     }
 
@@ -1028,7 +1012,10 @@ project(':cleanroom') {
         archiveExtension = 'jar' //Needs to be Zip task to not override Manifest, so set extension
         destinationDirectory = file('build/libs')
         from(extra_files)
-        from(rootProject.file('src/main/resources/url.png'))
+        from(rootProject.file('/src/main/resources/forge_logo.png')) {
+            rename { 'big_logo.png' }
+        }
+        from(rootProject.file('/src/main/resources/url.png'))
         from(universalJar) {
             into("/maven/${project.group.replace('.', '/')}/${project.name}/${project.version}/")
             rename { "${project.name }-${project.version }.jar" }
@@ -1037,24 +1024,6 @@ project(':cleanroom') {
         from(launcherJson.output)
         from(zipTree(downloadInstaller.output)) {
             duplicatesStrategy = 'exclude'
-            exclude(
-                [
-                    "icons/**",
-                    "big_logo.png"
-                ])
-        }
-        from(rootProject.file('logos/cleanroom-logo_64.png')) {
-            rename { "big_logo.png" }
-        }
-        // TODO : get from https://raw.githubusercontent.com/CleanroomMC/Resources/refs/heads/master/Art/cleanroom-logo.png and make the sizes automatic.
-        from(rootProject.file('logos/cleanroom-logo_16.png')) {
-            rename { "icons/neoforged_background_16x16.png" }
-        }
-        from(rootProject.file('logos/cleanroom-logo_32.png')) {
-            rename { "icons/neoforged_background_32x32.png" }
-        }
-        from(rootProject.file('logos/cleanroom-logo_128.png')) {
-            rename { "icons/neoforged_background_128x128.png" }
         }
     }
 

buildSrc/src/main/groovy/com/cleanroommc/gradle/helpers/tasks/Util.groovy

@@ -151,8 +151,7 @@ class Util {
 				"https://maven.minecraftforge.net/",
 				"https://repo.maven.apache.org/maven2/",
 				"https://libraries.minecraft.net/",
-				"https://maven.outlands.top/releases/",
-				"https://maven.neoforged.net/releases/"
+				"https://maven.outlands.top/releases/"
 		]
 		try {
 			return urlList.stream().map(original -> original + path)

gradle.properties

@@ -14,7 +14,7 @@ mcp_version = 20240102.171137
 special_source = net.md-5:SpecialSource:1.9.0
 special_source_mcp = net.md-5:SpecialSource:1.8.5
 binary_patcher = net.minecraftforge:binarypatcher:1.1.1:fatjar
-installer_tools_version = 2.1.7
+installer_tools_version = 1.4.1
 
 # Libraries
 asm_version = 9.6