From 12dcc706ce2ffaaf5223b18f51f4ef4ba05891f9 Mon Sep 17 00:00:00 2001 From: Norbiros Date: Mon, 24 Jun 2024 12:03:37 +0200 Subject: [PATCH] feat: Dropped Forge support :3 - NeoForge is just better - Cloth Config API doesn't publish maven releases for new versions - There are some problems with new forge versions in Architectury --- .github/workflows/build.yml | 6 -- .gitignore | 2 +- build.gradle | 1 - forge/build.gradle | 85 ------------------- forge/gradle.properties | 1 - .../forge/ConfigDirPlatformImpl.java | 15 ---- .../emojitype/forge/EmojitypeForge.java | 20 ----- forge/src/main/resources/META-INF/mods.toml | 36 -------- forge/src/main/resources/pack.mcmeta | 7 -- gradle.properties | 6 +- settings.gradle | 3 +- 11 files changed, 4 insertions(+), 178 deletions(-) delete mode 100644 forge/build.gradle delete mode 100644 forge/gradle.properties delete mode 100644 forge/src/main/java/dev/norbiros/emojitype/forge/ConfigDirPlatformImpl.java delete mode 100644 forge/src/main/java/dev/norbiros/emojitype/forge/EmojitypeForge.java delete mode 100644 forge/src/main/resources/META-INF/mods.toml delete mode 100644 forge/src/main/resources/pack.mcmeta diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3029e66..6776a04 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,12 +34,6 @@ jobs: name: fabric-artifacts path: fabric/build/libs/ - - name: Upload Forge Artifacts - uses: actions/upload-artifact@v3 - with: - name: forge-artifacts - path: forge/build/libs/ - - name: Upload NeoForge Artifacts uses: actions/upload-artifact@v3 with: diff --git a/.gitignore b/.gitignore index fa1a19b..99c7723 100644 --- a/.gitignore +++ b/.gitignore @@ -114,7 +114,7 @@ gradle-app.setting # Common working directory run/ fabric/run/ -forge/run/ +neoforge/run/ # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) !gradle-wrapper.jar diff --git a/build.gradle b/build.gradle index f2489d1..12b0c73 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,6 @@ subprojects { mappings loom.layered { it.mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - it.mappings "dev.architectury:yarn-mappings-patch-forge:${project.forge_yarn_mappings_patch}" it.mappings "dev.architectury:yarn-mappings-patch-neoforge:${project.neoforge_yarn_mappings_patch}" } } diff --git a/forge/build.gradle b/forge/build.gradle deleted file mode 100644 index 1fd9c31..0000000 --- a/forge/build.gradle +++ /dev/null @@ -1,85 +0,0 @@ -plugins { - id "com.github.johnrengelman.shadow" version "7.1.2" -} - -architectury { - platformSetupLoomIde() - forge() -} - -configurations { - common - shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this. - compileClasspath.extendsFrom common - runtimeClasspath.extendsFrom common - developmentForge.extendsFrom common -} - -dependencies { - forge "net.minecraftforge:forge:${project.forge_version}" - - implementation "me.shedaniel.cloth:cloth-config-forge:13.0.121" - - common(project(path: ":common", configuration: "namedElements")) { transitive false } - shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } -} - -processResources { - inputs.property "version", project.version - - filesMatching("META-INF/mods.toml") { - expand "version": project.version, - "minecraft_version_range": minecraft_version_range - } -} - -shadowJar { - exclude "fabric.mod.json" - exclude "architectury.common.json" - - configurations = [project.configurations.shadowCommon] - archiveClassifier.set("dev-shadow") -} - -loom { - forge { - mixinConfig 'emojitype-common.mixins.json' - } -} - -remapJar { - enabled = false - inputFile.set shadowJar.archiveFile - dependsOn shadowJar - archiveClassifier.set("forge") -} - -jar { - archiveClassifier.set("dev") -} - -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 + "-forge" - 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 deleted file mode 100644 index 32f842a..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/dev/norbiros/emojitype/forge/ConfigDirPlatformImpl.java b/forge/src/main/java/dev/norbiros/emojitype/forge/ConfigDirPlatformImpl.java deleted file mode 100644 index 47daa25..0000000 --- a/forge/src/main/java/dev/norbiros/emojitype/forge/ConfigDirPlatformImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package dev.norbiros.emojitype.forge; - -import dev.norbiros.emojitype.ConfigDirPlatform; -import net.minecraftforge.fml.loading.FMLPaths; - -import java.nio.file.Path; - -public class ConfigDirPlatformImpl { - /** - * This is our actual method to {@link ConfigDirPlatform#getConfigDirectory()}. - */ - public static Path getConfigDirectory() { - return FMLPaths.CONFIGDIR.get(); - } -} \ No newline at end of file diff --git a/forge/src/main/java/dev/norbiros/emojitype/forge/EmojitypeForge.java b/forge/src/main/java/dev/norbiros/emojitype/forge/EmojitypeForge.java deleted file mode 100644 index eff55ba..0000000 --- a/forge/src/main/java/dev/norbiros/emojitype/forge/EmojitypeForge.java +++ /dev/null @@ -1,20 +0,0 @@ -package dev.norbiros.emojitype.forge; - -import dev.norbiros.emojitype.EmojiType; -import dev.norbiros.emojitype.config.EmojiTypeConfig; -import net.minecraftforge.client.ConfigScreenHandler.ConfigScreenFactory; -import net.minecraftforge.fml.ModList; -import net.minecraftforge.fml.ModLoadingContext; -import net.minecraftforge.fml.common.Mod; - -@Mod(EmojiType.MOD_ID) -public class EmojitypeForge { - public EmojitypeForge() { - EmojiType.init(); - - if (ModList.get().isLoaded("cloth_config")) { - ModLoadingContext.get().registerExtensionPoint(ConfigScreenFactory.class, - () -> new ConfigScreenFactory((client, parent) -> EmojiTypeConfig.createConfigScreen(parent))); - } - } -} \ 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 deleted file mode 100644 index b92da17..0000000 --- a/forge/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,36 +0,0 @@ -modLoader = "javafml" -loaderVersion = "[38,)" -license = "GPL-3.0" -issueTrackerURL = "https://github.com/Norbiros/emojitype/issues" -displayURL = "https://modrinth.com/mod/emoji-type" -#updateJSONURL="https://api.modrinth.com/updates/emoji-type/forge_updates.json" -logoFile = "logo.png" -authors = "Cyborgcabbage,Norbiros" - -[[mods]] -modId = "emojitype" -version = "${version}" -displayName = "Emoji Type" -description=''' -A mod that lets you type minecraft emojis easier! -''' -credits="Thanks to cyborgcabbage for original mod!" - -[[dependencies.emojitype]] - modId="forge" - mandatory=true - versionRange="[38,)" - ordering="NONE" - side="BOTH" -[[dependencies.emojitype]] - modId="minecraft" - mandatory=true - versionRange="${minecraft_version_range}" - ordering="NONE" - side="BOTH" -[[dependencies.emojitype]] - modId = "cloth_config" - mandatory = false - versionRange = "[13.0.0,)" - ordering = "NONE" - side = "BOTH" diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta deleted file mode 100644 index 5161b45..0000000 --- a/forge/src/main/resources/pack.mcmeta +++ /dev/null @@ -1,7 +0,0 @@ -{ - "pack": { - "description": "emojitype resources", - "pack_format": 15, - "forge:server_data_pack_format": 12 - } -} diff --git a/gradle.properties b/gradle.properties index ddc17f1..b7bc303 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,15 +8,13 @@ maven_group=dev.norbiros minecraft_version=1.21 minecraft_version_range=1.21 -forge_version=1.21-51.0.17 + fabric_loader_version=0.15.11 yarn_mappings=1.21+build.2 neoforge_version=21.0.30-beta - -forge_yarn_mappings_patch=1.20.4+build.4 neoforge_yarn_mappings_patch=1.21+build.4 -enabled_platforms=fabric,forge,neoforge +enabled_platforms=fabric,neoforge architectury_version=13.0.1 cloth_config_version=15.0.127 diff --git a/settings.gradle b/settings.gradle index 6ee69d6..1b38677 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,14 +2,13 @@ pluginManagement { repositories { maven { url "https://maven.fabricmc.net/" } maven { url "https://maven.architectury.dev/" } - maven { url "https://maven.minecraftforge.net/" } + maven { url "https://maven.neoforged.net/" } gradlePluginPortal() } } include("common") include("fabric") -include("forge") include("neoforge") rootProject.name = "emojitype" \ No newline at end of file