From 10c916dfaaec32ba473e1bb134a3be66f8b21f20 Mon Sep 17 00:00:00 2001 From: DarkKronicle Date: Sat, 5 Mar 2022 11:34:00 -0700 Subject: [PATCH] [skip ci] 1.18.2 update --- build.gradle | 7 ++----- gradle.properties | 12 ++++++------ .../advancedchatcore/chat/AdvancedChatScreen.java | 2 +- .../advancedchatcore/mixin/MixinChatHud.java | 2 +- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index e56332b..828d005 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ import javax.net.ssl.HttpsURLConnection import java.nio.file.Files plugins { - id 'fabric-loom' version '0.10.+' + id 'fabric-loom' version '0.11-SNAPSHOT' id 'maven-publish' id "io.freefair.lombok" version "6.0.0-m2" id "com.diffplug.spotless" version "5.17.1" @@ -20,9 +20,6 @@ if (file("extra.properties").exists()) { additionalProperties.load(file("extra.properties").newReader()) } -minecraft { -} - repositories { mavenCentral() maven { url 'https://masa.dy.fi/maven' } @@ -34,7 +31,7 @@ dependencies { mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" - modImplementation "fi.dy.masa.malilib:malilib-fabric-1.18.1:${project.malilib_version}" + modImplementation "fi.dy.masa.malilib:malilib-fabric-1.18.2:${project.malilib_version}" modCompileOnly "io.github.prospector:modmenu:1.16.8" modImplementation "com.github.DarkKronicle:KommandLib:${project.kommandlib_version}" diff --git a/gradle.properties b/gradle.properties index 820413a..135f251 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,16 @@ org.gradle.jvmargs=-Xmx1G -minecraft_version=1.18.1 -yarn_mappings=1.18.1+build.1 -loader_version=0.12.5 -fabric_api_version=0.44.0+1.18 +minecraft_version=1.18.2 +yarn_mappings=1.18.2+build.1 +loader_version=0.13.3 +fabric_api_version=0.47.9+1.18.2 -mod_version=1.4.3 +mod_version=1.4.4 maven_group=io.github.darkkronicle archives_base_name=AdvancedChatCore kommandlib_version=1.0.0-build2 -malilib_version = 0.11.5 +malilib_version = 0.12.0 konstruct_version=2.0.2-build1 mxparser_version=4.4.2 owo_version=2.0.0 diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedChatScreen.java b/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedChatScreen.java index 595feb2..90c3088 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedChatScreen.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedChatScreen.java @@ -247,7 +247,7 @@ public boolean mouseScrolled(double mouseX, double mouseY, double amount) { } // Send to hud to scroll - client.inGameHud.getChatHud().scroll(amount); + client.inGameHud.getChatHud().scroll((int) amount); return true; } diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/mixin/MixinChatHud.java b/src/main/java/io/github/darkkronicle/advancedchatcore/mixin/MixinChatHud.java index e032f73..07d6952 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/mixin/MixinChatHud.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/mixin/MixinChatHud.java @@ -42,7 +42,7 @@ private void addMessage(Text text, int id, CallbackInfo ci) { @Inject(method = "clear", at = @At("HEAD"), cancellable = true) private void clearMessages(boolean clearTextHistory, CallbackInfo ci) { if (!clearTextHistory) { - // This only get's called if it is the keybind f3 + d + // This only gets called if it is the keybind f3 + d return; } if (!ConfigStorage.General.CLEAR_ON_DISCONNECT.config.getBooleanValue()) {