diff options
author | Wyvest <45589059+Wyvest@users.noreply.github.com> | 2022-01-14 19:44:16 +0700 |
---|---|---|
committer | Wyvest <45589059+Wyvest@users.noreply.github.com> | 2022-01-14 19:44:16 +0700 |
commit | 3215c603b437d64d8c37188ce8f934e30c7ac154 (patch) | |
tree | 8ce480db0f9eae73ce37cad2cb31e1d28b34fce5 | |
parent | bb4ece833b793551524896dd882542cb25ff5241 (diff) | |
download | Chatting-3215c603b437d64d8c37188ce8f934e30c7ac154.tar.gz Chatting-3215c603b437d64d8c37188ce8f934e30c7ac154.tar.bz2 Chatting-3215c603b437d64d8c37188ce8f934e30c7ac154.zip |
update essential
-rw-r--r-- | build.gradle | 2 | ||||
-rw-r--r-- | src/main/java/cc/woverflow/chatting/mixin/GuiNewChatMixin.java | 2 | ||||
-rw-r--r-- | src/main/kotlin/cc/woverflow/chatting/Chatting.kt | 12 | ||||
-rw-r--r-- | src/main/kotlin/cc/woverflow/chatting/updater/Updater.kt | 4 | ||||
-rw-r--r-- | src/main/resources/chatting_at.cfg | 2 | ||||
-rw-r--r-- | src/main/resources/mixins.chatting.json | 1 |
6 files changed, 13 insertions, 10 deletions
diff --git a/build.gradle b/build.gradle index d323b45..f37be39 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ dependencies { include ('gg.essential:loader-launchwrapper:1.1.3') { transitive = false } - compileOnly 'gg.essential:essential-1.8.9-forge:1725' + compileOnly 'gg.essential:essential-1.8.9-forge:1788' compileOnly annotationProcessor ('org.spongepowered:mixin:0.8.5-SNAPSHOT') annotationProcessor("com.google.code.gson:gson:2.2.4") annotationProcessor("com.google.guava:guava:21.0") diff --git a/src/main/java/cc/woverflow/chatting/mixin/GuiNewChatMixin.java b/src/main/java/cc/woverflow/chatting/mixin/GuiNewChatMixin.java index 677ba4c..3951558 100644 --- a/src/main/java/cc/woverflow/chatting/mixin/GuiNewChatMixin.java +++ b/src/main/java/cc/woverflow/chatting/mixin/GuiNewChatMixin.java @@ -51,7 +51,7 @@ public abstract class GuiNewChatMixin extends Gui implements GuiNewChatHook { @Shadow public abstract int getLineCount(); @Shadow private int scrollPos; - @Shadow @Final private List<ChatLine> chatLines; + @Shadow @Final public List<ChatLine> chatLines; @Shadow public abstract void deleteChatLine(int id); diff --git a/src/main/kotlin/cc/woverflow/chatting/Chatting.kt b/src/main/kotlin/cc/woverflow/chatting/Chatting.kt index 8bdaee6..4588847 100644 --- a/src/main/kotlin/cc/woverflow/chatting/Chatting.kt +++ b/src/main/kotlin/cc/woverflow/chatting/Chatting.kt @@ -153,20 +153,20 @@ object Chatting { } if (isSkytils) { if (Config.chatTabs) { - EssentialAPI.getNotifications().push(NAME, "Skytils' chat tabs can be disabled as it is replace by Chatting.\nClick here to automatically do this.", 6F) { + EssentialAPI.getNotifications().push(NAME, "Skytils' chat tabs can be disabled as it is replace by Chatting.\nClick here to automatically do this.", 6F, action = { Config.chatTabs = false ChattingConfig.chatTabs = true ChattingConfig.hypixelOnlyChatTabs = true Config.markDirty() Config.writeData() - } + }) } if (Config.copyChat) { - EssentialAPI.getNotifications().push(NAME, "Skytils' copy chat messages can be disabled as it is replace by Chatting.\nClick here to automatically do this.", 6F) { + EssentialAPI.getNotifications().push(NAME, "Skytils' copy chat messages can be disabled as it is replace by Chatting.\nClick here to automatically do this.", 6F, action = { Config.copyChat = false Config.markDirty() Config.writeData() - } + }) } } } @@ -244,11 +244,11 @@ object Chatting { Minecraft.getMinecraft().entityRenderer.setupOverlayRendering() Minecraft.getMinecraft().framebuffer.bindFramebuffer(true) EssentialAPI.getNotifications() - .push("Chatting", "Chat screenshotted successfully." + (if (ChattingConfig.copyMode != 1) "\nClick to open." else "")) { + .push("Chatting", "Chat screenshotted successfully." + (if (ChattingConfig.copyMode != 1) "\nClick to open." else ""), action = { if (!UDesktop.open(file)) { EssentialAPI.getNotifications().push("Chatting", "Could not browse!") } - } + }) return image } } diff --git a/src/main/kotlin/cc/woverflow/chatting/updater/Updater.kt b/src/main/kotlin/cc/woverflow/chatting/updater/Updater.kt index dadaf0c..dbd851c 100644 --- a/src/main/kotlin/cc/woverflow/chatting/updater/Updater.kt +++ b/src/main/kotlin/cc/woverflow/chatting/updater/Updater.kt @@ -38,8 +38,8 @@ object Updater { if (ChattingConfig.showUpdate) { EssentialAPI.getNotifications().push( Chatting.NAME, - "${Chatting.NAME} has a new update ($latestTag)! Click here to download it automatically!" - ) { EssentialAPI.getGuiUtil().openScreen(DownloadGui()) } + "${Chatting.NAME} has a new update ($latestTag)! Click here to download it automatically!", action = { EssentialAPI.getGuiUtil().openScreen(DownloadGui()) } + ) } shouldUpdate = true } diff --git a/src/main/resources/chatting_at.cfg b/src/main/resources/chatting_at.cfg new file mode 100644 index 0000000..79f9967 --- /dev/null +++ b/src/main/resources/chatting_at.cfg @@ -0,0 +1,2 @@ +public net.minecraft.client.gui.GuiNewChat func_146237_a(Lnet/minecraft/util/IChatComponent;IIZ)V # setChatLine +public net.minecraft.client.gui.GuiNewChat field_146252_h # chatLines
\ No newline at end of file diff --git a/src/main/resources/mixins.chatting.json b/src/main/resources/mixins.chatting.json index 3a488ae..9377858 100644 --- a/src/main/resources/mixins.chatting.json +++ b/src/main/resources/mixins.chatting.json @@ -10,6 +10,7 @@ "GuiNewChatAccessor", "GuiNewChatMapMixin", "GuiNewChatMixin", + "GuiIngameForgeMixin", "GuiUtilsMixin", "WyvtilsListenerMixin" ], |