diff --git a/build.gradle b/build.gradle index 783d07c..9aee3db 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,8 @@ plugins { id 'idea' id 'maven-publish' id 'java-library' - id 'net.minecraftforge.gradle' version '[6.0,6.2)' + id 'net.neoforged.gradle' version '[6.0.18,6.2)' + id 'org.spongepowered.mixin' version '0.7.+' id 'org.parchmentmc.librarian.forgegradle' version '1.+' } @@ -23,6 +24,9 @@ java { configurations { provided compile.extendsFrom(provided) + implementation.extendsFrom(provided) + runtime.extendsFrom(provided) + minecraftLibrary.extendsFrom(provided) } // Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. @@ -73,7 +77,7 @@ minecraft { runs { // applies to all the run configs below configureEach { - workingDirectory project.file('run') + workingDirectory project.file("run/${it.name}") // Recommended logging data for a userdev environment // The markers can be added/remove as needed separated by commas. @@ -112,8 +116,8 @@ minecraft { } data { - // example of overriding the workingDirectory set in configureEach above - workingDirectory project.file('run-data') + // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it + // workingDirectory project.file('run-data') // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') @@ -156,16 +160,12 @@ dependencies { // The "userdev" classifier will be requested and setup by ForgeGradle. // 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.minecraftforge:forge:${minecraft_version}-${forge_version}" + minecraft "net.neoforged:forge:${minecraft_version}-${neo_version}" provided "dev.zontreck:LibAC:${libac}" - implementation "dev.zontreck:LibAC:${libac}" - minecraftLibrary "dev.zontreck:LibAC:${libac}" provided "dev.zontreck:EventsBus:${eventsbus}" - implementation "dev.zontreck:EventsBus:${eventsbus}" - minecraftLibrary "dev.zontreck:EventsBus:${eventsbus}" // 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 @@ -187,13 +187,13 @@ dependencies { // A missing property will result in an error. Properties are expanded using ${} Groovy notation. // When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments. // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html -tasks.named('processResources', ProcessResources).configure { +tasks.withType(ProcessResources).configureEach { var replaceProperties = [ minecraft_version : minecraft_version, minecraft_version_range: minecraft_version_range, - forge_version : forge_version, forge_version_range: forge_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, + mod_authors : mod_authors, mod_description: mod_description, pack_format_number: pack_format_number, ] inputs.properties replaceProperties @@ -204,11 +204,6 @@ tasks.named('processResources', ProcessResources).configure { // Example for how to get properties into the manifest for reading at runtime. tasks.named('jar', Jar).configure { - from { - configurations.provided.asFileTree.collect{zipTree(it)} - } - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - manifest { attributes([ 'Specification-Title' : mod_id, diff --git a/gradle.properties b/gradle.properties index 5ff2ff9..4b1a893 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,12 +16,13 @@ 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,1.21) -# The Forge version must agree with the Minecraft version to get a valid artifact -forge_version=47.2.0 -# The Forge version range can use any version of Forge as bounds or match the loader version range -forge_version_range=[47,) -# The loader version range can only use the major version of Forge/FML as bounds + +minecraft_version_range=[1.20,1.21) +# The Neo version must agree with the Minecraft version to get a valid artifact +neo_version=47.1.65 +# 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"]. @@ -62,3 +63,6 @@ mod_group_id=dev.zontreck mod_authors=zontreck # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. mod_description=LibZontreck\nLibrary Mod! + +# Pack version - this changes each minecraft release, in general. +pack_format_number=15 \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index a1b1cbb..7cc8ae2 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -5,13 +5,13 @@ # Find more information on toml format here: https://github.com/toml-lang/toml # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml modLoader="javafml" #mandatory -# A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion="${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +# A version range to match for said mod loader - for regular FML @Mod it will be the the FML version. This is currently 47. +loaderVersion="${loader_version_range}" #mandatory # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. license="${mod_license}" # A URL to refer people to when problems occur with this mod -issueTrackerURL="https://github.com/zontreck/LibZontreckMod/issues" #optional +#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional # A list of mods - how many allowed here is determined by the individual mod loader [[mods]] #mandatory # The modid of the mod @@ -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 @@ -42,26 +42,26 @@ authors="${mod_authors}" #optional description='''${mod_description}''' # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. [[dependencies.${mod_id}]] #optional - # the modid of the dependency - modId="forge" #mandatory - # 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 - # 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 - ordering="NONE" - # Side this dependency is applied on - BOTH, CLIENT, or SERVER - side="BOTH" +# the modid of the dependency +modId="forge" #mandatory +# Does this dependency have to exist - if not, ordering below must be specified +mandatory=true #mandatory +# The version range of the dependency +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 +ordering="NONE" +# Side this dependency is applied on - BOTH, CLIENT, or SERVER +side="BOTH" # Here's another dependency [[dependencies.${mod_id}]] - modId="minecraft" - mandatory=true - # This version range declares a minimum of the current minecraft version up to but not including the next major version - versionRange="${minecraft_version_range}" - ordering="NONE" - side="BOTH" +modId="minecraft" +mandatory=true +# This version range declares a minimum of the current minecraft version up to but not including the next major version +versionRange="${minecraft_version_range}" +ordering="NONE" +side="BOTH" # Features are specific properties of the game environment, that you may want to declare you require. This example declares # that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index eca79ae..a7d103a 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -3,6 +3,6 @@ "description": { "text": "${mod_id} resources" }, - "pack_format": 15 - } + "pack_format": ${pack_format_number} +} } \ No newline at end of file