Skip to content

Another 1.18.1 PR #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: 1.17
Choose a base branch
from
Open

Another 1.18.1 PR #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
076dde3
Update Gradle to 7.3.3
trisk Jan 9, 2022
01ebf39
Update dependencies for 1.18.1
trisk Jan 9, 2022
4efbd8e
Fix build for 1.18 yarn mappings
trisk Jan 9, 2022
c6a6790
Bump version to 3.0.0+1.18
trisk Jan 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
plugins {
id 'fabric-loom' version '0.8-SNAPSHOT'
id 'fabric-loom' // version in gradle.properties
id 'maven-publish'
}

sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_16
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

archivesBaseName = project.archives_base_name
version = project.mod_version
group = project.maven_group

minecraft {
accessWidener "src/main/resources/${project.mod_name}.accesswidener"
loom {
accessWidenerPath = file("src/main/resources/${project.mod_name}.accesswidener")
}

repositories {
maven { url "https://maven.jamieswhiteshirt.com/libs-release/" }
//maven { url "https://maven.jamieswhiteshirt.com/libs-release/" }
maven { url "https://maven.terraformersmc.com/releases/" }
maven { url 'https://jitpack.io' }
//maven { url 'https://jitpack.io' }
}

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

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

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

// Minecraft 1.17 (21w19a) upwards uses Java 16.
it.options.release = 16
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
it.options.release = 17
}

java {
Expand All @@ -64,7 +65,7 @@ java {

jar {
from("LICENSE") {
rename { "${it}_${project.archivesBaseName}"}
rename { "${it}_${project.archivesBaseName}" }
}
}

Expand All @@ -89,4 +90,4 @@ publishing {
// The repositories here will be used for publishing your artifact, not for
// retrieving dependencies.
}
}
}
17 changes: 9 additions & 8 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,21 @@
org.gradle.jvmargs=-Xmx1G

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

# Mod Properties
mod_name=resolutioncontrol
mod_version=3.0.0
mod_version=3.0.0+1.18
maven_group=io.github.ultimateboomer
archives_base_name=resolution-control-plus

# Dependencies
# https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api/
fabric_version=0.35.2+1.17
fabric_version=0.45.2+1.18
#developer_mode_version=1.0.15
mod_menu_version=2.0.2
smoothboot_version=1.16.5-1.6.0
mod_menu_version=3.0.1
smoothboot_version=1.18-1.7.0
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading