Skip to content

Commit 01ebf39

Browse files
committed
Update dependencies for 1.18.1
1 parent 076dde3 commit 01ebf39

File tree

5 files changed

+30
-22
lines changed

5 files changed

+30
-22
lines changed

build.gradle

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
plugins {
2-
id 'fabric-loom' version '0.8-SNAPSHOT'
2+
id 'fabric-loom' // version in gradle.properties
33
id 'maven-publish'
44
}
55

6-
sourceCompatibility = JavaVersion.VERSION_16
7-
targetCompatibility = JavaVersion.VERSION_16
6+
sourceCompatibility = JavaVersion.VERSION_17
7+
targetCompatibility = JavaVersion.VERSION_17
88

99
archivesBaseName = project.archives_base_name
1010
version = project.mod_version
1111
group = project.maven_group
1212

13-
minecraft {
14-
accessWidener "src/main/resources/${project.mod_name}.accesswidener"
13+
loom {
14+
accessWidenerPath = file("src/main/resources/${project.mod_name}.accesswidener")
1515
}
1616

1717
repositories {
18-
maven { url "https://maven.jamieswhiteshirt.com/libs-release/" }
18+
//maven { url "https://maven.jamieswhiteshirt.com/libs-release/" }
1919
maven { url "https://maven.terraformersmc.com/releases/" }
20-
maven { url 'https://jitpack.io' }
20+
//maven { url 'https://jitpack.io' }
2121
}
2222

2323
dependencies {
@@ -33,7 +33,8 @@ dependencies {
3333
//modCompile "com.jamieswhiteshirt:developer-mode:${project.developer_mode_version}"
3434
modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}"
3535

36-
modRuntime "com.github.ultimateboomer:mc-smoothboot:${project.smoothboot_version}"
36+
// Disable mc-smoothboot until new build is available
37+
//modLocalRuntime "com.github.ultimateboomer:mc-smoothboot:${project.smoothboot_version}"
3738
}
3839

3940
processResources {
@@ -51,8 +52,8 @@ tasks.withType(JavaCompile).configureEach {
5152
// If Javadoc is generated, this must be specified in that task too.
5253
it.options.encoding = "UTF-8"
5354

54-
// Minecraft 1.17 (21w19a) upwards uses Java 16.
55-
it.options.release = 16
55+
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
56+
it.options.release = 17
5657
}
5758

5859
java {
@@ -64,7 +65,7 @@ java {
6465

6566
jar {
6667
from("LICENSE") {
67-
rename { "${it}_${project.archivesBaseName}"}
68+
rename { "${it}_${project.archivesBaseName}" }
6869
}
6970
}
7071

@@ -89,4 +90,4 @@ publishing {
8990
// The repositories here will be used for publishing your artifact, not for
9091
// retrieving dependencies.
9192
}
92-
}
93+
}

gradle.properties

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
5-
# check these on https://fabricmc.net/use
6-
minecraft_version=1.17
7-
yarn_mappings=1.17+build.12
8-
loader_version=0.11.3
5+
# Check https://fabricmc.net/versions.html
6+
minecraft_version=1.18.1
7+
yarn_mappings=1.18.1+build.18
8+
loader_version=0.12.12
9+
loom_version=0.10-SNAPSHOT
910

1011
# Mod Properties
1112
mod_name=resolutioncontrol
@@ -15,7 +16,7 @@ archives_base_name=resolution-control-plus
1516

1617
# Dependencies
1718
# https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api/
18-
fabric_version=0.35.2+1.17
19+
fabric_version=0.45.2+1.18
1920
#developer_mode_version=1.0.15
20-
mod_menu_version=2.0.2
21-
smoothboot_version=1.16.5-1.6.0
21+
mod_menu_version=3.0.1
22+
smoothboot_version=1.18-1.7.0

settings.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@ pluginManagement {
66
}
77
gradlePluginPortal()
88
}
9+
10+
plugins {
11+
id 'fabric-loom' version "${loom_version}"
12+
}
913
}

src/main/resources/fabric.mod.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@
3131
],
3232
"accessWidener": "resolutioncontrol.accesswidener",
3333
"depends": {
34-
"fabricloader": ">=0.4.0",
35-
"fabric": "*"
34+
"fabricloader": ">=0.12.8",
35+
"fabric": "*",
36+
"minecraft": ">=1.18",
37+
"java": ">=17"
3638
},
3739
"suggests": {
3840
"flamingo": "*"

src/main/resources/resolutioncontrol.mixins.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"required": true,
33
"package": "io.github.ultimateboomer.resolutioncontrol.mixin",
4-
"compatibilityLevel": "JAVA_8",
4+
"compatibilityLevel": "JAVA_17",
55
"client": [
66
"GameRendererMixin",
77
"MinecraftClientMixin",

0 commit comments

Comments
 (0)