From 15263e8b7468d2a6e913128770080fa6e6766e48 Mon Sep 17 00:00:00 2001
From: trafficlunar <hello@trafficlunar.net>
Date: Fri, 28 Feb 2025 21:46:29 +0000
Subject: [PATCH] fix: remove forge

architectury doesn't support forge anymore
---
 forge/build.gradle                            |  59 ------------------
 forge/gradle.properties                       |   1 -
 .../forge/OptionsProfilesModForge.java        |  11 ----
 forge/src/main/resources/META-INF/mods.toml   |  28 ---------
 forge/src/main/resources/icon.png             | Bin 3717 -> 0 bytes
 forge/src/main/resources/pack.mcmeta          |   6 --
 gradle.properties                             |  10 +--
 .../neoforge/OptionsProfilesModNeoForge.java  |   2 +-
 settings.gradle                               |   1 -
 9 files changed, 6 insertions(+), 112 deletions(-)
 delete mode 100644 forge/build.gradle
 delete mode 100644 forge/gradle.properties
 delete mode 100644 forge/src/main/java/com/axolotlmaid/optionsprofiles/forge/OptionsProfilesModForge.java
 delete mode 100644 forge/src/main/resources/META-INF/mods.toml
 delete mode 100644 forge/src/main/resources/icon.png
 delete mode 100644 forge/src/main/resources/pack.mcmeta

diff --git a/forge/build.gradle b/forge/build.gradle
deleted file mode 100644
index 11afcb3..0000000
--- a/forge/build.gradle
+++ /dev/null
@@ -1,59 +0,0 @@
-plugins {
-    id 'com.github.johnrengelman.shadow'
-}
-
-loom {
-    forge {
-        mixinConfig "optionsprofiles.mixins.json"
-    }
-}
-
-architectury {
-    platformSetupLoomIde()
-    forge()
-}
-
-configurations {
-    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"
-
-    common(project(path: ':common', configuration: 'namedElements')) { transitive false }
-    shadowBundle project(path: ':common', configuration: 'transformProductionForge')
-}
-
-processResources {
-    inputs.property 'version', project.version
-
-    filesMatching('META-INF/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/forge/gradle.properties b/forge/gradle.properties
deleted file mode 100644
index 37f3cc5..0000000
--- a/forge/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-loom.platform = forge
\ No newline at end of file
diff --git a/forge/src/main/java/com/axolotlmaid/optionsprofiles/forge/OptionsProfilesModForge.java b/forge/src/main/java/com/axolotlmaid/optionsprofiles/forge/OptionsProfilesModForge.java
deleted file mode 100644
index 19cd5af..0000000
--- a/forge/src/main/java/com/axolotlmaid/optionsprofiles/forge/OptionsProfilesModForge.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.axolotlmaid.optionsprofiles.forge;
-
-import com.axolotlmaid.optionsprofiles.OptionsProfilesMod;
-import net.minecraftforge.fml.common.Mod;
-
-@Mod(OptionsProfilesMod.MOD_ID)
-public class OptionsProfilesModForge {
-    public OptionsProfilesModForge() {
-        OptionsProfilesMod.init();
-    }
-}
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
deleted file mode 100644
index 5f7c376..0000000
--- a/forge/src/main/resources/META-INF/mods.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-modLoader = "javafml"
-loaderVersion = "[51,)"
-#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 = "forge"
-mandatory = true
-versionRange = "[51,)"
-ordering = "NONE"
-side = "BOTH"
-
-[[dependencies.optionsprofiles]]
-modId = "minecraft"
-mandatory = true
-versionRange = "[1.21,)"
-ordering = "NONE"
-side = "BOTH"
diff --git a/forge/src/main/resources/icon.png b/forge/src/main/resources/icon.png
deleted file mode 100644
index 8f00bdd8919c3adddcde1e4b48df667aaa117c64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3717
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

diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
deleted file mode 100644
index 874b010..0000000
--- a/forge/src/main/resources/pack.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "pack": {
-    "description": "Options Profiles",
-    "pack_format": 22
-  }
-}
diff --git a/gradle.properties b/gradle.properties
index a8187d7..82c50d4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,16 +4,16 @@ org.gradle.parallel=true
 # Fixes errors caused by Loom version differences
 loom.ignoreDependencyLoomVersionValidation=true
 
+# Mod properties
 mod_version=1.3.2
 maven_group=com.axolotlmaid.optionsprofiles
 archives_name=optionsprofiles
-enabled_platforms=fabric,forge,neoforge
+enabled_platforms=fabric,neoforge
 
+# Minecraft properties
 minecraft_version=1.21.4
 
+# Dependencies
 fabric_loader_version=0.16.9
 fabric_api_version=0.111.0+1.21.4
-
-forge_version=1.21.4-54.0.6
-
-neoforge_version=21.4.9-beta
+neoforge_version=21.4.9-beta
\ 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
index a2f4aad..29e1baf 100644
--- a/neoforge/src/main/java/com/axolotlmaid/optionsprofiles/neoforge/OptionsProfilesModNeoForge.java
+++ b/neoforge/src/main/java/com/axolotlmaid/optionsprofiles/neoforge/OptionsProfilesModNeoForge.java
@@ -1,4 +1,4 @@
-package com.axolotlmaid.optionsprofiles.forge;
+package com.axolotlmaid.optionsprofiles.neoforge;
 
 import com.axolotlmaid.optionsprofiles.OptionsProfilesMod;
 import net.neoforged.fml.common.Mod;
diff --git a/settings.gradle b/settings.gradle
index c12431d..580f439 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,7 +9,6 @@ pluginManagement {
 
 include("common")
 include("fabric")
-include("forge")
 include("neoforge")
 
 rootProject.name = "optionsprofiles-v1.3.2-1.21.4"