From 33efa704318876839727d901be72b3b1e6d63608 Mon Sep 17 00:00:00 2001 From: Eivind Norling Date: Thu, 20 Jul 2023 20:57:34 +0200 Subject: [PATCH] Renamed some constants and docs to use names and locations that reference NeoForge (#2) --- .gitignore | 5 +---- build.gradle | 10 +++++----- gradle.properties | 14 +++++++------- settings.gradle | 2 +- src/main/resources/META-INF/mods.toml | 4 ++-- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 12f8644..322e5e1 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,4 @@ build # other eclipse -run - -# Files from Forge MDK -forge*changelog.txt +run \ No newline at end of file diff --git a/build.gradle b/build.gradle index e027ba3..71a84e9 100644 --- a/build.gradle +++ b/build.gradle @@ -129,7 +129,7 @@ dependencies { // The "userdev" classifier will be requested and setup by NeoGradle. // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"], // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository. - minecraft "net.neoforged:forge:${minecraft_version}-${forge_version}" + minecraft "net.neoforged:forge:${minecraft_version}-${neo_version}" // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime @@ -153,11 +153,11 @@ dependencies { // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html tasks.named('processResources', ProcessResources).configure { var replaceProperties = [ - minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range, - forge_version: forge_version, forge_version_range: forge_version_range, + minecraft_version : minecraft_version, minecraft_version_range: minecraft_version_range, + neo_version : neo_version, neo_version_range: neo_version_range, loader_version_range: loader_version_range, - mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, - mod_authors: mod_authors, mod_description: mod_description, pack_format_number: pack_format_number, + mod_id : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, + mod_authors : mod_authors, mod_description: mod_description, pack_format_number: pack_format_number, ] inputs.properties replaceProperties diff --git a/gradle.properties b/gradle.properties index 3759557..f22c472 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,17 +6,17 @@ org.gradle.daemon=false ## Environment Properties -# The Minecraft version must agree with the Forge version to get a valid artifact +# The Minecraft version must agree with the Neo version to get a valid artifact minecraft_version=1.20.1 # The Minecraft version range can use any release version of Minecraft as bounds. # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly # as they do not follow standard versioning conventions. minecraft_version_range=[1.20,1.21) -# The Forge version must agree with the Minecraft version to get a valid artifact -forge_version=47.1.25 -# The Forge version range can use any version of Forge as bounds or match the loader version range -forge_version_range=[47.1,) -# The loader version range can only use the major version of Forge/FML as bounds +# The Neo version must agree with the Minecraft version to get a valid artifact +neo_version=47.1.25 +# The Neo version range can use any version of Neo as bounds or match the loader version range +neo_version_range=[47.1,) +# The loader version range can only use the major version of Neo/FML as bounds loader_version_range=[47,) # The mapping channel to use for mappings. # The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"]. @@ -28,7 +28,7 @@ loader_version_range=[47,) # | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official | # # You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. -# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md +# See more information here: https://github.com/neoforged/NeoForm/blob/main/Mojang.md # # Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge. # Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started diff --git a/settings.gradle b/settings.gradle index d6db1d7..24584e9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,7 +2,7 @@ pluginManagement { repositories { gradlePluginPortal() maven { - name = 'MinecraftForge' + name = 'NeoForged' url = 'https://maven.neoforged.net/releases' } } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 66aeaf9..c9e2c40 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -20,7 +20,7 @@ modId="${mod_id}" #mandatory version="${mod_version}" #mandatory # A display name for the mod displayName="${mod_name}" #mandatory -# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/ +# A URL to query for updates for this mod. See the JSON update specification https://docs.neoforged.net/docs/misc/updatechecker/ #updateJSONURL="https://change.me.example.invalid/updates.json" #optional # A URL for the "homepage" for this mod, displayed in the mod UI #displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional @@ -47,7 +47,7 @@ description='''${mod_description}''' # Does this dependency have to exist - if not, ordering below must be specified mandatory=true #mandatory # The version range of the dependency - versionRange="${forge_version_range}" #mandatory + versionRange="${neo_version_range}" #mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory # BEFORE - This mod is loaded BEFORE the dependency # AFTER - This mod is loaded AFTER the dependency