diff --git a/build.gradle b/build.gradle index 904421d..ace3420 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.3-SNAPSHOT' + id 'fabric-loom' version '1.6-SNAPSHOT' id 'maven-publish' } @@ -19,12 +19,11 @@ repositories { // See https://docs.gradle.org/current/userguide/declaring_repositories.html // for more information about repositories. mavenCentral() - jcenter() - maven { url "https://maven.terraformersmc.com/releases/" } maven { name 'Xander Maven' url 'https://maven.isxander.dev/releases' } + maven { url "https://maven.terraformersmc.com/releases" } } dependencies { @@ -34,9 +33,9 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "dev.isxander.yacl:yet-another-config-lib-fabric:${project.yacl_version}" + modImplementation "dev.isxander:yet-another-config-lib:${project.yacl_version}" - modApi "com.terraformersmc:modmenu:9.0.0" + modApi "com.terraformersmc:modmenu:10.0.0-beta.1" } processResources { @@ -52,7 +51,7 @@ processResources { } } -def targetJavaVersion = 17 +def targetJavaVersion = 21 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 @@ -69,6 +68,9 @@ java { if (JavaVersion.current() < javaVersion) { toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) } + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 + archivesBaseName = project.archives_base_name // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task // if it is present. diff --git a/gradle.properties b/gradle.properties index f6d4f73..b743936 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,18 @@ -org.gradle.jvmargs=-Xmx3G +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.20.4 - yarn_mappings=1.20.4+build.1 - loader_version=0.15.0 +minecraft_version=1.20.6 +yarn_mappings=1.20.6+build.1 +loader_version=0.15.10 # Mod Properties - mod_version = 2.0.1 - maven_group = com.tanishisherewith - archives_base_name = dynamichud +mod_version = 2.0.1 +maven_group = com.tanishisherewith +archives_base_name = dynamichud # Dependencies - fabric_version=0.91.1+1.20.4 - yacl_version=3.3.2+1.20.4 \ No newline at end of file +fabric_version=0.97.8+1.20.6 +yacl_version=3.4.4+1.20.6-fabric \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3499ded..20db9ad 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/com/tanishisherewith/dynamichud/screens/AbstractMoveableScreen.java b/src/main/java/com/tanishisherewith/dynamichud/screens/AbstractMoveableScreen.java index baf7826..7b62fdc 100644 --- a/src/main/java/com/tanishisherewith/dynamichud/screens/AbstractMoveableScreen.java +++ b/src/main/java/com/tanishisherewith/dynamichud/screens/AbstractMoveableScreen.java @@ -74,7 +74,7 @@ public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmou public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) { assert this.client != null; if (this.client.world == null) { - this.renderBackgroundTexture(drawContext); + renderInGameBackground(drawContext); } drawContext.drawText(client.textRenderer,title,client.getWindow().getScaledWidth()/2 - client.textRenderer.getWidth(title.getString())/2,textRenderer.fontHeight/2,-1,true);