From 2690515316b01da98b91bccbb585297ba303704b Mon Sep 17 00:00:00 2001
From: axolotlmaid <124442837+axolotlmaid@users.noreply.github.com>
Date: Sun, 2 Jun 2024 17:27:15 +0100
Subject: [PATCH] Add Neoforge and upgrade template

Forge is not working but I can't really do anything about it
---
 build.gradle                                  |  76 ++++++++------
 common/build.gradle                           |  29 +-----
 .../main/resources/architectury.common.json   |   3 -
 .../resources/optionsprofiles.accesswidener   |   1 -
 ...ixins.json => optionsprofiles.mixins.json} |   2 +-
 fabric/build.gradle                           |  73 +++++---------
 fabric/src/main/resources/fabric.mod.json     |   9 +-
 .../resources/optionsprofiles.mixins.json     |  13 ---
 forge/build.gradle                            |  93 ++++++------------
 forge/gradle.properties                       |   2 +-
 forge/src/main/resources/META-INF/mods.toml   |   6 +-
 .../resources/optionsprofiles.mixins.json     |  13 ---
 forge/src/main/resources/pack.mcmeta          |   2 +-
 gradle.properties                             |  15 +--
 neoforge/build.gradle                         |  56 +++++++++++
 neoforge/gradle.properties                    |   1 +
 .../neoforge/OptionsProfilesModNeoForge.java  |  11 +++
 .../resources/META-INF/neoforge.mods.toml     |  31 ++++++
 neoforge/src/main/resources/icon.png          | Bin 0 -> 3717 bytes
 settings.gradle                               |   3 +-
 20 files changed, 227 insertions(+), 212 deletions(-)
 delete mode 100644 common/src/main/resources/architectury.common.json
 delete mode 100644 common/src/main/resources/optionsprofiles.accesswidener
 rename common/src/main/resources/{optionsprofiles-common.mixins.json => optionsprofiles.mixins.json} (85%)
 delete mode 100644 fabric/src/main/resources/optionsprofiles.mixins.json
 delete mode 100644 forge/src/main/resources/optionsprofiles.mixins.json
 create mode 100644 neoforge/build.gradle
 create mode 100644 neoforge/gradle.properties
 create mode 100644 neoforge/src/main/java/com/axolotlmaid/optionsprofiles/neoforge/OptionsProfilesModNeoForge.java
 create mode 100644 neoforge/src/main/resources/META-INF/neoforge.mods.toml
 create mode 100644 neoforge/src/main/resources/icon.png

diff --git a/build.gradle b/build.gradle
index f985231..b8bc563 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,40 +1,28 @@
 plugins {
-    id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
+    id 'dev.architectury.loom' version '1.6-SNAPSHOT' apply false
+    id 'architectury-plugin' version '3.4-SNAPSHOT'
+    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }
 
 architectury {
-    minecraft = rootProject.minecraft_version
-}
-
-subprojects {
-    apply plugin: "dev.architectury.loom"
-
-    loom {
-        silentMojangMappingsLicense()
-    }
-
-    dependencies {
-        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        // The following line declares the mojmap mappings, you may use other mappings as well
-        mappings loom.officialMojangMappings()
-        // The following line declares the yarn mappings you may select this one as well.
-        // mappings "net.fabricmc:yarn:1.20.1+build.10:v2"
-    }
+    minecraft = project.minecraft_version
 }
 
 allprojects {
-    apply plugin: "java"
-    apply plugin: "architectury-plugin"
-    apply plugin: "maven-publish"
+    group = rootProject.maven_group
+    version = rootProject.mod_version
+}
+
+subprojects {
+    apply plugin: 'dev.architectury.loom'
+    apply plugin: 'architectury-plugin'
+    apply plugin: 'maven-publish'
 
     base {
-        archivesName = rootProject.archives_base_name
+        // Set up a suffixed format for the mod jar names, e.g. `example-fabric`.
+        archivesName = "$rootProject.archives_name-$project.name"
     }
 
-    version = rootProject.mod_version
-    group = rootProject.maven_group
-
     repositories {
         // Add repositories to retrieve artifacts from in here.
         // You should only use this when depending on other mods because
@@ -43,12 +31,40 @@ allprojects {
         // for more information about repositories.
     }
 
-    tasks.withType(JavaCompile) {
-        options.encoding = "UTF-8"
-        options.release = 17
+    dependencies {
+        minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
+        mappings loom.officialMojangMappings()
     }
 
     java {
+        // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+        // if it is present.
+        // If you remove this line, sources will not be generated.
         withSourcesJar()
+
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
-}
+
+    tasks.withType(JavaCompile).configureEach {
+        it.options.release = 21
+    }
+
+    // Configure Maven publishing.
+    publishing {
+        publications {
+            mavenJava(MavenPublication) {
+                artifactId = base.archivesName.get()
+                from components.java
+            }
+        }
+
+        // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+        repositories {
+            // Add repositories to publish to here.
+            // Notice: This block does NOT have the same function as the block in the top level.
+            // The repositories here will be used for publishing your artifact, not for
+            // retrieving dependencies.
+        }
+    }
+}
\ No newline at end of file
diff --git a/common/build.gradle b/common/build.gradle
index a5180a9..ae043a0 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -1,9 +1,5 @@
 architectury {
-    common(rootProject.enabled_platforms.split(","))
-}
-
-loom {
-    accessWidenerPath = file("src/main/resources/optionsprofiles.accesswidener")
+    common rootProject.enabled_platforms.split(',')
 }
 
 repositories {
@@ -21,27 +17,12 @@ repositories {
 }
 
 dependencies {
-    // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
-    // Do NOT use other classes from fabric loader
+    // We depend on Fabric Loader here to use the Fabric @Environment annotations,
+    // which get remapped to the correct annotations on each platform.
+    // Do NOT use other classes from Fabric Loader.
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    // Remove the next line if you don't want to depend on the API
-    // modApi "dev.architectury:architectury:${rootProject.architectury_version}"
 
     // Mod implementations
     modImplementation "maven.modrinth:sodium:mc1.20.6-0.5.8"
     modImplementation "maven.modrinth:sodium-extra:mc1.20.6-0.5.5"
-}
-
-publishing {
-    publications {
-        mavenCommon(MavenPublication) {
-            artifactId = rootProject.archives_base_name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}
+}
\ No newline at end of file
diff --git a/common/src/main/resources/architectury.common.json b/common/src/main/resources/architectury.common.json
deleted file mode 100644
index 675ac01..0000000
--- a/common/src/main/resources/architectury.common.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "accessWidener": "optionsprofiles.accesswidener"
-}
\ No newline at end of file
diff --git a/common/src/main/resources/optionsprofiles.accesswidener b/common/src/main/resources/optionsprofiles.accesswidener
deleted file mode 100644
index 13268c3..0000000
--- a/common/src/main/resources/optionsprofiles.accesswidener
+++ /dev/null
@@ -1 +0,0 @@
-accessWidener   v2  named
\ No newline at end of file
diff --git a/common/src/main/resources/optionsprofiles-common.mixins.json b/common/src/main/resources/optionsprofiles.mixins.json
similarity index 85%
rename from common/src/main/resources/optionsprofiles-common.mixins.json
rename to common/src/main/resources/optionsprofiles.mixins.json
index dc1f6b2..3ba6a96 100644
--- a/common/src/main/resources/optionsprofiles-common.mixins.json
+++ b/common/src/main/resources/optionsprofiles.mixins.json
@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "com.axolotlmaid.optionsprofiles.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "minVersion": "0.8",
   "client": [
     "MixinOptionsScreen"
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 77a03d1..33b06d8 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id 'com.github.johnrengelman.shadow'
 }
 
 architectury {
@@ -7,71 +7,46 @@ architectury {
     fabric()
 }
 
-loom {
-    accessWidenerPath = project(":common").loom.accessWidenerPath
-}
-
 configurations {
-    common
-    shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
+    common {
+        canBeResolved = true
+        canBeConsumed = false
+    }
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentFabric.extendsFrom common
+
+    // Files in this configuration will be bundled into your mod using the Shadow plugin.
+    // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
+    shadowBundle {
+        canBeResolved = true
+        canBeConsumed = false
+    }
 }
 
 dependencies {
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
-    // Remove the next line if you don't want to depend on the API
-    // modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}"
+    modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
 
-    common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
+    // Fabric API. This is technically optional, but you probably want it anyway.
+    modImplementation "net.fabricmc.fabric-api:fabric-api:$rootProject.fabric_api_version"
+
+    common(project(path: ':common', configuration: 'namedElements')) { transitive false }
+    shadowBundle project(path: ':common', configuration: 'transformProductionFabric')
 }
 
 processResources {
-    inputs.property "version", project.version
+    inputs.property 'version', project.version
 
-    filesMatching("fabric.mod.json") {
-        expand "version": project.version
+    filesMatching('fabric.mod.json') {
+        expand version: project.version
     }
 }
 
 shadowJar {
-    exclude "architectury.common.json"
-
-    configurations = [project.configurations.shadowCommon]
-    archiveClassifier = "dev-shadow"
+    configurations = [project.configurations.shadowBundle]
+    archiveClassifier = 'dev-shadow'
 }
 
 remapJar {
-    injectAccessWidener = true
     input.set shadowJar.archiveFile
-    dependsOn shadowJar
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-publishing {
-    publications {
-        mavenFabric(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}
+}
\ No newline at end of file
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index dff0d90..49139b3 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -21,11 +21,12 @@
     ]
   },
   "mixins": [
-    "optionsprofiles.mixins.json",
-    "optionsprofiles-common.mixins.json"
+    "optionsprofiles.mixins.json"
   ],
   "depends": {
-    "fabric": "*",
-    "minecraft": ">=1.20.4"
+    "fabricloader": ">=0.15.11",
+    "minecraft": "~1.20.6",
+    "java": ">=21",
+    "fabric-api": "*"
   }
 }
\ No newline at end of file
diff --git a/fabric/src/main/resources/optionsprofiles.mixins.json b/fabric/src/main/resources/optionsprofiles.mixins.json
deleted file mode 100644
index b6eaa9d..0000000
--- a/fabric/src/main/resources/optionsprofiles.mixins.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "required": true,
-  "package": "com.axolotlmaid.optionsprofiles.mixin.fabric",
-  "compatibilityLevel": "JAVA_17",
-  "minVersion": "0.8",
-  "client": [
-  ],
-  "mixins": [
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}
\ No newline at end of file
diff --git a/forge/build.gradle b/forge/build.gradle
index 3993a4d..11afcb3 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -1,5 +1,11 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id 'com.github.johnrengelman.shadow'
+}
+
+loom {
+    forge {
+        mixinConfig "optionsprofiles.mixins.json"
+    }
 }
 
 architectury {
@@ -7,84 +13,47 @@ architectury {
     forge()
 }
 
-loom {
-    accessWidenerPath = project(":common").loom.accessWidenerPath
-
-    forge {
-        convertAccessWideners = true
-        extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
-
-        mixinConfig "optionsprofiles-common.mixins.json"
-        mixinConfig "optionsprofiles.mixins.json"
-    }
-
-    mods {
-        register("forge") {
-            sourceSet("main", project(":forge"))
-        }
-    }
-}
-
 configurations {
-    common
-    shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
+    common {
+        canBeResolved = true
+        canBeConsumed = false
+    }
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentForge.extendsFrom common
+
+    // Files in this configuration will be bundled into your mod using the Shadow plugin.
+    // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
+    shadowBundle {
+        canBeResolved = true
+        canBeConsumed = false
+    }
+}
+
+configurations.all {
+    resolutionStrategy.force("net.sf.jopt-simple:jopt-simple:5.0.4")
 }
 
 dependencies {
-    forge "net.minecraftforge:forge:${rootProject.forge_version}"
-    // Remove the next line if you don't want to depend on the API
-    // modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}"
+    forge "net.minecraftforge:forge:$rootProject.forge_version"
 
-    common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
+    common(project(path: ':common', configuration: 'namedElements')) { transitive false }
+    shadowBundle project(path: ':common', configuration: 'transformProductionForge')
 }
 
 processResources {
-    inputs.property "version", project.version
+    inputs.property 'version', project.version
 
-    filesMatching("META-INF/mods.toml") {
-        expand "version": project.version
+    filesMatching('META-INF/mods.toml') {
+        expand version: project.version
     }
 }
 
 shadowJar {
-    exclude "fabric.mod.json"
-    exclude "architectury.common.json"
-
-    configurations = [project.configurations.shadowCommon]
-    archiveClassifier = "dev-shadow"
+    configurations = [project.configurations.shadowBundle]
+    archiveClassifier = 'dev-shadow'
 }
 
 remapJar {
     input.set shadowJar.archiveFile
-    dependsOn shadowJar
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-publishing {
-    publications {
-        mavenForge(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}
+}
\ No newline at end of file
diff --git a/forge/gradle.properties b/forge/gradle.properties
index 32f842a..37f3cc5 100644
--- a/forge/gradle.properties
+++ b/forge/gradle.properties
@@ -1 +1 @@
-loom.platform=forge
\ No newline at end of file
+loom.platform = forge
\ No newline at end of file
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index 3f3cf9c..940e003 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[49,)"
+loaderVersion = "[50,)"
 #issueTrackerURL = ""
 license = "GNU GPL 3.0"
 
@@ -16,13 +16,13 @@ logoFile = "icon.png"
 [[dependencies.optionsprofiles]]
 modId = "forge"
 mandatory = true
-versionRange = "[49,)"
+versionRange = "[50,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.optionsprofiles]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.20.4,)"
+versionRange = "[1.20.6,)"
 ordering = "NONE"
 side = "BOTH"
\ No newline at end of file
diff --git a/forge/src/main/resources/optionsprofiles.mixins.json b/forge/src/main/resources/optionsprofiles.mixins.json
deleted file mode 100644
index 5a28846..0000000
--- a/forge/src/main/resources/optionsprofiles.mixins.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "required": true,
-  "package": "com.axolotlmaid.optionsprofiles.mixin.forge",
-  "compatibilityLevel": "JAVA_17",
-  "minVersion": "0.8",
-  "client": [
-  ],
-  "mixins": [
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}
\ No newline at end of file
diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
index 4efb538..874b010 100644
--- a/forge/src/main/resources/pack.mcmeta
+++ b/forge/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "Options Profiles",
-    "pack_format": 15
+    "pack_format": 22
   }
 }
diff --git a/gradle.properties b/gradle.properties
index 1e08888..6bbb34c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,15 +1,18 @@
 org.gradle.jvmargs=-Xmx6G
+org.gradle.parallel=true
 
-minecraft_version=1.20.6
-enabled_platforms=fabric,forge
-
-archives_base_name=optionsprofiles
 mod_version=1.2.1
 maven_group=com.axolotlmaid.optionsprofiles
+archives_name=optionsprofiles
+enabled_platforms=fabric,forge,neoforge
 
-architectury_version=12.1.3
+minecraft_version=1.20.6
+yarn_mappings=1.20.6+build.1
 
 fabric_loader_version=0.15.11
 fabric_api_version=0.99.4+1.20.6
 
-forge_version=1.20.6-50.0.31
\ No newline at end of file
+forge_version=1.20.6-50.0.13
+
+neoforge_version=20.6.75-beta
+yarn_mappings_patch_neoforge_version=1.20.5+build.3
\ No newline at end of file
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
new file mode 100644
index 0000000..a6f520b
--- /dev/null
+++ b/neoforge/build.gradle
@@ -0,0 +1,56 @@
+plugins {
+    id 'com.github.johnrengelman.shadow'
+}
+
+architectury {
+    platformSetupLoomIde()
+    neoForge()
+}
+
+configurations {
+    common {
+        canBeResolved = true
+        canBeConsumed = false
+    }
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentNeoForge.extendsFrom common
+
+    // Files in this configuration will be bundled into your mod using the Shadow plugin.
+    // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
+    shadowBundle {
+        canBeResolved = true
+        canBeConsumed = false
+    }
+}
+
+repositories {
+    maven {
+        name = 'NeoForged'
+        url = 'https://maven.neoforged.net/releases'
+    }
+}
+
+dependencies {
+    neoForge "net.neoforged:neoforge:$rootProject.neoforge_version"
+
+    common(project(path: ':common', configuration: 'namedElements')) { transitive false }
+    shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge')
+}
+
+processResources {
+    inputs.property 'version', project.version
+
+    filesMatching('META-INF/neoforge.mods.toml') {
+        expand version: project.version
+    }
+}
+
+shadowJar {
+    configurations = [project.configurations.shadowBundle]
+    archiveClassifier = 'dev-shadow'
+}
+
+remapJar {
+    input.set shadowJar.archiveFile
+}
\ No newline at end of file
diff --git a/neoforge/gradle.properties b/neoforge/gradle.properties
new file mode 100644
index 0000000..4f8c488
--- /dev/null
+++ b/neoforge/gradle.properties
@@ -0,0 +1 @@
+loom.platform = neoforge
\ No newline at end of file
diff --git a/neoforge/src/main/java/com/axolotlmaid/optionsprofiles/neoforge/OptionsProfilesModNeoForge.java b/neoforge/src/main/java/com/axolotlmaid/optionsprofiles/neoforge/OptionsProfilesModNeoForge.java
new file mode 100644
index 0000000..a2f4aad
--- /dev/null
+++ b/neoforge/src/main/java/com/axolotlmaid/optionsprofiles/neoforge/OptionsProfilesModNeoForge.java
@@ -0,0 +1,11 @@
+package com.axolotlmaid.optionsprofiles.forge;
+
+import com.axolotlmaid.optionsprofiles.OptionsProfilesMod;
+import net.neoforged.fml.common.Mod;
+
+@Mod(OptionsProfilesMod.MOD_ID)
+public class OptionsProfilesModNeoForge {
+    public OptionsProfilesModNeoForge() {
+        OptionsProfilesMod.init();
+    }
+}
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
new file mode 100644
index 0000000..19e9642
--- /dev/null
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -0,0 +1,31 @@
+modLoader = "javafml"
+loaderVersion = "[2,)"
+#issueTrackerURL = ""
+license = "GNU GPL 3.0"
+
+[[mods]]
+modId = "optionsprofiles"
+version = "${version}"
+displayName = "Options Profiles"
+authors = "AxolotlMaid"
+description = '''
+Load and save your options from in-game.
+'''
+logoFile = "icon.png"
+
+[[dependencies.optionsprofiles]]
+modId = "neoforge"
+type = "required"
+versionRange = "[20.6,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.optionsprofiles]]
+modId = "minecraft"
+type = "required"
+versionRange = "[1.20.6,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[mixins]]
+config = "optionsprofiles.mixins.json"
diff --git a/neoforge/src/main/resources/icon.png b/neoforge/src/main/resources/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f00bdd8919c3adddcde1e4b48df667aaa117c64
GIT binary patch
literal 3717
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

literal 0
HcmV?d00001

diff --git a/settings.gradle b/settings.gradle
index bf569b5..3f9b831 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,7 +2,7 @@ pluginManagement {
     repositories {
         maven { url "https://maven.fabricmc.net/" }
         maven { url "https://maven.architectury.dev/" }
-        maven { url "https://maven.minecraftforge.net/" }
+        maven { url "https://files.minecraftforge.net/maven/" }
         gradlePluginPortal()
     }
 }
@@ -10,5 +10,6 @@ pluginManagement {
 include("common")
 include("fabric")
 include("forge")
+include("neoforge")
 
 rootProject.name = "optionsprofiles-v1.2.1-1.20.6"