Skip to content

Commit

Permalink
Move some constants into gradle.properties
Browse files Browse the repository at this point in the history
  • Loading branch information
YaLTeR committed Jun 17, 2024
1 parent d215d11 commit 16e4968
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 42 deletions.
25 changes: 15 additions & 10 deletions build-fabric.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@ plugins {
id 'fabric-loom' version '1.6-SNAPSHOT'
}

def minecraftVersion = "1.20.6" // Used for output JAR filenames.

version = project.mod_version
version = project.modVersion
group = "yalter.mousetweaks"
archivesBaseName = "MouseTweaks-fabric-mc${minecraftVersion}"
archivesBaseName = "MouseTweaks-fabric-mc${project.fabricMcVersion}"

java.toolchain.languageVersion = JavaLanguageVersion.of(21)
java.toolchain.languageVersion = JavaLanguageVersion.of(project.modJavaVersion)

repositories {
maven {
Expand All @@ -35,19 +33,26 @@ loom {
}

dependencies {
minecraft "com.mojang:minecraft:${minecraftVersion}"
minecraft "com.mojang:minecraft:${project.fabricMcVersion}"
mappings loom.officialMojangMappings()
modImplementation "net.fabricmc:fabric-loader:0.15.10"
modImplementation "net.fabricmc.fabric-api:fabric-api:0.97.8+1.20.6"
modImplementation "net.fabricmc:fabric-loader:${project.fabricLoaderVersion}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabricApiVersion}"

modImplementation 'com.terraformersmc:modmenu:10.0.0-beta.1'
modImplementation "com.terraformersmc:modmenu:${project.fabricModMenuVersion}"
}

processResources {
inputs.property "version", project.version

filesMatching("fabric.mod.json") {
expand "version": project.version
expand([
"version": project.modVersion,
"modJavaVersion": project.modJavaVersion,
"fabricMcVersion": project.fabricMcVersion,
"fabricLoaderVersion": project.fabricLoaderVersion,
"modCredits": project.modCredits,
"modDescription": project.modDescription,
])
}
}

Expand Down
19 changes: 11 additions & 8 deletions build-neoforge.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,14 @@ plugins {
id 'net.neoforged.gradle.userdev' version '7.0.109'
}

def minecraftVersion = "1.20.6" // Used for output JAR filenames.

version = project.mod_version
version = project.modVersion
group = "yalter.mousetweaks"

base {
archivesName = "MouseTweaks-neoforge-mc${minecraftVersion}"
archivesName = "MouseTweaks-neoforge-mc${project.neoMcVersion}"
}

java.toolchain.languageVersion = JavaLanguageVersion.of(21)
java.toolchain.languageVersion = JavaLanguageVersion.of(project.modJavaVersion)

sourceSets {
main {
Expand All @@ -33,9 +31,14 @@ sourceSets {
}

processResources {
inputs.property "version", project.mod_version
inputs.property "version", project.modVersion
filesMatching("META-INF/neoforge.mods.toml") {
expand "version": project.mod_version
expand([
"version": project.modVersion,
"neoLoaderVersion": project.neoLoaderVersion,
"modCredits": project.modCredits,
"modDescription": project.modDescription,
])
}
}

Expand All @@ -58,7 +61,7 @@ runs {
}

dependencies {
implementation "net.neoforged:neoforge:20.6.11-beta"
implementation "net.neoforged:neoforge:${project.neoVersion}"
}

task srcJar(type: Jar) {
Expand Down
21 changes: 12 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,11 @@ buildscript {
apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'org.spongepowered.mixin'

def minecraftVersion = "1.20.6" // Used for output JAR filenames.

version = project.mod_version
version = project.modVersion
group = "yalter.mousetweaks"
base.archivesName = "MouseTweaks-forge-mc${minecraftVersion}"
base.archivesName = "MouseTweaks-forge-mc${project.forgeMcVersion}"

java.toolchain.languageVersion = JavaLanguageVersion.of(21)
java.toolchain.languageVersion = JavaLanguageVersion.of(project.modJavaVersion)

sourceSets {
main {
Expand All @@ -39,7 +37,7 @@ mixin {
}

minecraft {
mappings channel: 'official', version: '1.20.6'
mappings channel: 'official', version: project.forgeMcVersion

reobf = false

Expand Down Expand Up @@ -73,14 +71,19 @@ minecraft {
}

processResources {
inputs.property "version", project.mod_version
inputs.property "version", project.modVersion
filesMatching("META-INF/mods.toml") {
expand "version": project.mod_version
expand([
"version": project.modVersion,
"forgeLoaderVersion": project.forgeLoaderVersion,
"modCredits": project.modCredits,
"modDescription": project.modDescription,
])
}
}

dependencies {
minecraft 'net.minecraftforge:forge:1.20.6-50.0.0'
minecraft "net.minecraftforge:forge:${project.forgeMcVersion}-${project.forgeVersion}"
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
}

Expand Down
20 changes: 19 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,22 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.parallel=true
org.gradle.daemon=false
mod_version=2.26

modVersion=2.26
modJavaVersion=21
# Remember to update fabric.mod.json
modCredits=Contributors: mezz, juliand665, panoskj, FabiClawZ, ErrorMikey.
modDescription=A mod that enhances the inventory management by adding various additional functions to the usual mouse buttons.

forgeMcVersion=1.20.6
forgeVersion=50.0.0
forgeLoaderVersion=[50,)

neoMcVersion=1.20.6
neoVersion=20.6.11-beta
neoLoaderVersion=[2,)

fabricMcVersion=1.20.6
fabricLoaderVersion=0.15.10
fabricApiVersion=0.97.8+1.20.6
fabricModMenuVersion=10.0.0-beta.1
8 changes: 3 additions & 5 deletions src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
modLoader="javafml"
loaderVersion="[50,)"
loaderVersion="${forgeLoaderVersion}"
license="BSD-3-Clause"
issueTrackerURL="https://github.com/YaLTeR/MouseTweaks/issues"
clientSideOnly=true
Expand All @@ -10,8 +10,6 @@ version="${version}"
displayName="Mouse Tweaks"
displayURL="https://minecraft.curseforge.com/projects/mouse-tweaks"
logoFile="mousetweaks_logo.png"
credits="Contributors: mezz, juliand665, panoskj, FabiClawZ, ErrorMikey."
credits="${modCredits}"
authors="Ivan Molodetskikh (YaLTeR)"
description='''
A mod that enhances the inventory management by adding various additional functions to the usual mouse buttons.
'''
description="${modDescription}"
8 changes: 3 additions & 5 deletions src/main/resources/META-INF/neoforge.mods.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
modLoader="javafml"
loaderVersion="[2,)"
loaderVersion="${neoLoaderVersion}"
license="BSD-3-Clause"
issueTrackerURL="https://github.com/YaLTeR/MouseTweaks/issues"

Expand All @@ -9,11 +9,9 @@ version="${version}"
displayName="Mouse Tweaks"
displayURL="https://minecraft.curseforge.com/projects/mouse-tweaks"
logoFile="mousetweaks_logo.png"
credits="Contributors: mezz, juliand665, panoskj, FabiClawZ, ErrorMikey."
credits="${modCredits}"
authors="Ivan Molodetskikh (YaLTeR)"
description='''
A mod that enhances the inventory management by adding various additional functions to the usual mouse buttons.
'''
description="${modDescription}"

[[mixins]]
config="mousetweaks.mixins.json"
8 changes: 4 additions & 4 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "mousetweaks",
"version": "${version}",
"name": "Mouse Tweaks",
"description": "A mod that enhances the inventory management by adding various additional functions to the usual mouse buttons.",
"description": "${modDescription}",
"authors": [
"Ivan Molodetskikh (YaLTeR)"
],
Expand Down Expand Up @@ -35,10 +35,10 @@
"mousetweaks-fabric.mixins.json"
],
"depends": {
"fabricloader": ">=0.15.10",
"fabricloader": ">=${fabricLoaderVersion}",
"fabric-api": "*",
"minecraft": "~1.20.6",
"java": ">=21"
"minecraft": "~${fabricMcVersion}",
"java": ">=${modJavaVersion}"
},
"suggests": {}
}

0 comments on commit 16e4968

Please sign in to comment.