Update to 1.18

This commit is contained in:
yitzy299 2021-12-01 19:50:22 +00:00
parent 3b292146b2
commit 952b5ab701
4 changed files with 18 additions and 25 deletions

View File

@ -1,11 +1,11 @@
plugins { plugins {
id 'fabric-loom' version '0.9-SNAPSHOT' id 'fabric-loom' version '0.10-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
id 'org.jetbrains.kotlin.jvm' version "1.5.21" id 'org.jetbrains.kotlin.jvm' version "1.6.0"
} }
sourceCompatibility = JavaVersion.VERSION_16 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_16 targetCompatibility = JavaVersion.VERSION_17
archivesBaseName = project.archives_base_name archivesBaseName = project.archives_base_name
version = project.mod_version version = project.mod_version
@ -19,6 +19,9 @@ repositories {
maven { maven {
url = "https://oss.sonatype.org/content/repositories/snapshots" url = "https://oss.sonatype.org/content/repositories/snapshots"
} }
maven {
url = "https://maven.bymartrixx.me/"
}
} }
dependencies { dependencies {
@ -31,9 +34,9 @@ dependencies {
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
// Yes this has to be capitalised // Yes this has to be capitalised
modImplementation "com.github.quiltservertools:Ledger:1.0.2" modImplementation "com.github.quiltservertools:Ledger:1.2.0"
modImplementation "net.fabricmc:fabric-language-kotlin:1.6.3+kotlin.1.5.21" modImplementation "net.fabricmc:fabric-language-kotlin:1.7.0+kotlin.1.6.0"
// H2 // H2
implementation(include("com.h2database:h2:1.4.200")) implementation(include("com.h2database:h2:1.4.200"))
@ -51,14 +54,9 @@ processResources {
} }
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {
// ensure that the encoding is set to UTF-8, no matter what the system default is
// this fixes some edge cases with special characters not displaying correctly
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
// If Javadoc is generated, this must be specified in that task too.
it.options.encoding = "UTF-8" it.options.encoding = "UTF-8"
// Minecraft 1.17 (21w19a) upwards uses Java 16. it.options.release = 17
it.options.release = 16
} }
java { java {
@ -88,11 +86,6 @@ publishing {
} }
} }
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
repositories { repositories {
// Add repositories to publish to here.
// Notice: This block does NOT have the same function as the block in the top level.
// The repositories here will be used for publishing your artifact, not for
// retrieving dependencies.
} }
} }

View File

@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/versions.html # check these on https://fabricmc.net/versions.html
minecraft_version=1.17.1 minecraft_version=1.18
yarn_mappings=1.17.1+build.37 yarn_mappings=1.18+build.1
loader_version=0.11.6 loader_version=0.12.5
# Mod Properties # Mod Properties
mod_version = 1.0.0 mod_version = 1.0.0
@ -13,4 +13,4 @@ org.gradle.jvmargs=-Xmx1G
archives_base_name = ledger-databases archives_base_name = ledger-databases
# Dependencies # Dependencies
fabric_version=0.37.2+1.17 fabric_version=0.43.1+1.18

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -25,11 +25,11 @@
}, },
"depends": { "depends": {
"fabricloader": ">=0.11.3", "fabricloader": ">=0.12.5",
"fabric": "*", "fabric": "*",
"minecraft": "1.17.x", "minecraft": "1.18.x",
"java": ">=16", "java": ">=16",
"ledger": ">=1.1.0", "ledger": ">=1.2.0",
"fabric-language-kotlin": "*" "fabric-language-kotlin": "*"
} }
} }