Skip to content

Commit c9f2f65

Browse files
committed
update gradle stuff
1 parent 1858e98 commit c9f2f65

5 files changed

+46
-51
lines changed

build.gradle

+26-35
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,44 @@
1-
buildscript {
2-
repositories {
3-
jcenter()
4-
maven { url = "https://plugins.gradle.org/m2/" }
5-
}
6-
}
7-
8-
import groovy.json.JsonSlurper
9-
import groovy.json.JsonOutput
10-
import com.modrinth.minotaur.dependencies.ModDependency
11-
121
plugins {
13-
id 'fabric-loom' version '1.1-SNAPSHOT'
2+
id 'fabric-loom' version '1.3-SNAPSHOT'
143
id 'maven-publish'
154
id 'com.matthewprenger.cursegradle' version '1.4.0'
165
id "com.modrinth.minotaur" version "2.+"
176
}
187

8+
import groovy.json.JsonSlurper
9+
import groovy.json.JsonOutput
10+
import com.modrinth.minotaur.dependencies.ModDependency
11+
1912
sourceCompatibility = JavaVersion.VERSION_17
2013
targetCompatibility = JavaVersion.VERSION_17
2114

22-
archivesBaseName = project.archives_base_name
23-
version = project.mod_version
24-
group = project.maven_group
15+
archivesBaseName = project.modName
16+
version = project.modVersion
17+
group = project.mavenGroup
2518

2619
repositories {
2720
maven { url "https://cfa2.cursemaven.com" }
2821
maven { url "https://maven.shedaniel.me/" }
2922
maven { url "https://maven.terraformersmc.com/" }
30-
maven { url 'https://libs.azuredoom.com:4443/mods'}
31-
maven { url 'https://dl.cloudsmith.io/public/tslat/sbl/maven/' }
23+
maven { url "https://libs.azuredoom.com:4443/mods" }
24+
maven { url "https://dl.cloudsmith.io/public/tslat/sbl/maven/" }
3225
maven { url "https://plugins.gradle.org/m2/" }
3326
maven { url "https://api.modrinth.com/maven" }
3427
}
3528

3629
dependencies {
37-
minecraft "com.mojang:minecraft:${project.minecraft_version}"
30+
minecraft "com.mojang:minecraft:${project.minecraftVersion}"
3831
mappings loom.officialMojangMappings()
39-
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
40-
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
41-
modImplementation 'mod.azure.azurelib:azurelib-fabric-1.20.1:1.0.28'
42-
modImplementation "com.terraformersmc:modmenu:7.2.2"
43-
modImplementation "net.tslat.smartbrainlib:SmartBrainLib-fabric-1.20.1:1.12"
44-
modImplementation "net.tslat.smartbrainlib:SmartBrainLib-common-1.20.1:1.12"
45-
modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:12.0.622"
46-
modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:12.0.622"
47-
modApi "dev.architectury:architectury-fabric:9.0.7"
48-
modApi "me.shedaniel.cloth:cloth-config-fabric:11.0.99"
32+
modImplementation "net.fabricmc:fabric-loader:${project.loaderVersion}"
33+
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabricVersion}"
34+
modImplementation "mod.azure.azurelib:azurelib-fabric-${project.minecraftVersion}:${project.azurelibVersion}"
35+
modImplementation "com.terraformersmc:modmenu:${project.modmenuVersion}"
36+
modImplementation "net.tslat.smartbrainlib:SmartBrainLib-fabric-${project.minecraftVersion}:${project.sblVersion}"
37+
modImplementation "net.tslat.smartbrainlib:SmartBrainLib-common-${project.minecraftVersion}:${project.sblVersion}"
38+
modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.reiVersion}"
39+
modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.reiVersion}"
40+
modApi "dev.architectury:architectury-fabric:${project.archVersion}"
41+
modApi "me.shedaniel.cloth:cloth-config-fabric:${project.clothVersion}"
4942
}
5043

5144
processResources {
@@ -93,11 +86,11 @@ if (file('key.properties').exists()) {
9386

9487
project {
9588
apiKey = curseProp.getProperty('curseKey')
96-
id = "448106"
89+
id = project.curseforgeID
9790
releaseType = "release"
9891
changelogType = 'text'
9992
changelog = file('CHANGELOG.txt')
100-
addGameVersion("1.20.1")
93+
addGameVersion(project.minecraftVersion)
10194
addGameVersion("Fabric")
10295
addGameVersion("Quilt")
10396
addGameVersion("Java 17")
@@ -115,7 +108,6 @@ if (file('key.properties').exists()) {
115108
}
116109
}
117110
options {
118-
//debug = true
119111
forgeGradleIntegration = false
120112
}
121113
}
@@ -128,12 +120,11 @@ if (file('key.properties').exists()) {
128120
modrinthProp.load(secretPropsFile.newInputStream())
129121

130122
token = modrinthProp.getProperty('modrinthKey')
131-
projectId = 'SPMW1tzD'
132-
versionNumber = project.mod_version
133-
versionName = '1.20'
123+
projectId = project. modrinthID
124+
versionNumber = project.modVersion
134125
uploadFile = remapJar
135126
changelog = rootProject.file("changelog.txt").text
136-
gameVersions = ['1.20.1']
127+
gameVersions = [project.minecraftVersion]
137128
loaders = ['fabric', 'quilt']
138129
dependencies {
139130
required.project "azurelib"

gradle.properties

+15-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
# Done to increase the memory available to gradle.
21
org.gradle.jvmargs=-Xmx1G
32

4-
# Fabric Properties
5-
# check these on https://fabricmc.net/use
6-
minecraft_version=1.20.1
7-
loader_version=0.14.21
3+
minecraftVersion=1.20.1
4+
loaderVersion=0.14.21
5+
fabricVersion=0.83.0+1.20.1
86

9-
# Mod Properties
10-
mod_version = 1.4.17
11-
maven_group = mod.azure.hwg
12-
archives_base_name = HWGMod-1.20.1
7+
modVersion=1.4.17
8+
mavenGroup=mod.azure.hwg
9+
modName=HWGMod-1.20.1
1310

14-
# Dependencies
15-
fabric_version=0.83.0+1.20.1
11+
azurelibVersion=1.0.28
12+
sblVersion=1.12
13+
modmenuVersion=7.2.2
14+
reiVersion=12.0.622
15+
archVersion=9.0.7
16+
clothVersion=11.0.99
17+
18+
modrinthID=SPMW1tzD
19+
curseforgeID=448106

gradle/wrapper/gradle-wrapper.jar

3.75 KB
Binary file not shown.
+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

settings.gradle

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
pluginManagement {
22
repositories {
33
jcenter()
4-
maven {
5-
name = 'Fabric'
6-
url = 'https://maven.fabricmc.net/'
7-
}
4+
maven { url = "https://maven.fabricmc.net/" }
85
gradlePluginPortal()
6+
maven { url = "https://plugins.gradle.org/m2/" }
97
}
108
}
119
rootProject.name = 'hwg-fabric-1.20'

0 commit comments

Comments
 (0)