diff --git a/mcmc.dev.json b/mcmc.dev.json index 24e7f450..416805a8 100644 --- a/mcmc.dev.json +++ b/mcmc.dev.json @@ -25,9 +25,9 @@ "classifier": "sources" }, { - "suffix": "forge", - "directory": "forge/build/libs", - "pattern": "rhino-forge-([\\d-.]+build\\.\\d+)\\.jar", + "suffix": "neoforge", + "directory": "neoforge/build/libs", + "pattern": "rhino-neoforge-([\\d-.]+build\\.\\d+)\\.jar", "version": "$1" }, { diff --git a/forge/build.gradle b/neoforge/build.gradle similarity index 97% rename from forge/build.gradle rename to neoforge/build.gradle index 8c03184d..11b1c771 100644 --- a/forge/build.gradle +++ b/neoforge/build.gradle @@ -4,9 +4,7 @@ plugins { architectury { platformSetupLoomIde() - neoForge { - platformPackage = "forge" - } + neoForge() } configurations { @@ -97,7 +95,7 @@ unifiedPublishing { publishing { publications { - mavenForge(MavenPublication) { + mavenNeoForge(MavenPublication) { artifactId = "${rootProject.archives_base_name}-neoforge" from components.java } diff --git a/forge/gradle.properties b/neoforge/gradle.properties similarity index 100% rename from forge/gradle.properties rename to neoforge/gradle.properties diff --git a/forge/src/main/java/dev/latvian/mods/rhino/mod/forge/RhinoModForge.java b/neoforge/src/main/java/dev/latvian/mods/rhino/mod/neoforge/RhinoModForge.java similarity index 98% rename from forge/src/main/java/dev/latvian/mods/rhino/mod/forge/RhinoModForge.java rename to neoforge/src/main/java/dev/latvian/mods/rhino/mod/neoforge/RhinoModForge.java index 43895cda..51e0e9ef 100644 --- a/forge/src/main/java/dev/latvian/mods/rhino/mod/forge/RhinoModForge.java +++ b/neoforge/src/main/java/dev/latvian/mods/rhino/mod/neoforge/RhinoModForge.java @@ -1,4 +1,4 @@ -package dev.latvian.mods.rhino.mod.forge; +package dev.latvian.mods.rhino.mod.neoforge; import dev.latvian.mods.rhino.mod.util.MojangMappings; import dev.latvian.mods.rhino.mod.util.RemappingHelper; diff --git a/forge/src/main/java/dev/latvian/mods/rhino/mod/util/forge/RhinoPropertiesImpl.java b/neoforge/src/main/java/dev/latvian/mods/rhino/mod/util/neoforge/RhinoPropertiesImpl.java similarity index 91% rename from forge/src/main/java/dev/latvian/mods/rhino/mod/util/forge/RhinoPropertiesImpl.java rename to neoforge/src/main/java/dev/latvian/mods/rhino/mod/util/neoforge/RhinoPropertiesImpl.java index 7f4ff106..97d985ad 100644 --- a/forge/src/main/java/dev/latvian/mods/rhino/mod/util/forge/RhinoPropertiesImpl.java +++ b/neoforge/src/main/java/dev/latvian/mods/rhino/mod/util/neoforge/RhinoPropertiesImpl.java @@ -1,4 +1,4 @@ -package dev.latvian.mods.rhino.mod.util.forge; +package dev.latvian.mods.rhino.mod.util.neoforge; import net.neoforged.fml.ModList; import net.neoforged.fml.loading.FMLLoader; diff --git a/forge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml similarity index 100% rename from forge/src/main/resources/META-INF/mods.toml rename to neoforge/src/main/resources/META-INF/mods.toml diff --git a/forge/src/main/resources/mm.jsmappings b/neoforge/src/main/resources/mm.jsmappings similarity index 100% rename from forge/src/main/resources/mm.jsmappings rename to neoforge/src/main/resources/mm.jsmappings diff --git a/forge/src/main/resources/pack.mcmeta b/neoforge/src/main/resources/pack.mcmeta similarity index 100% rename from forge/src/main/resources/pack.mcmeta rename to neoforge/src/main/resources/pack.mcmeta diff --git a/settings.gradle b/settings.gradle index 242005c5..4c50446d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,6 +6,6 @@ pluginManagement { } } -include "common", "fabric", "forge" +include "common", "fabric", "neoforge" rootProject.name = 'Rhino' \ No newline at end of file