From 86774f417ea98cb5cd94d75417caf9e50f4581a6 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Sun, 21 Jul 2019 23:45:13 +0200 Subject: [PATCH] Update to Minecraft 1.14.4 --- Minecraft_Client.launch | 6 +++--- Minecraft_Server.launch | 5 ++--- build.gradle | 2 +- gradle.properties | 10 ++++----- .../wurstclient/clickgui/ClickGuiScreen.java | 4 ++-- .../clickgui/EditSliderScreen.java | 4 ++-- .../net/wurstclient/commands/AnnoyCmd.java | 2 +- .../wurstclient/events/ChatInputListener.java | 10 ++++----- .../net/wurstclient/mixin/ChatHudMixin.java | 21 +++++++++---------- .../java/net/wurstclient/util/ChatUtils.java | 10 ++++----- 10 files changed, 36 insertions(+), 38 deletions(-) diff --git a/Minecraft_Client.launch b/Minecraft_Client.launch index e7ca2f53..7e85a83e 100644 --- a/Minecraft_Client.launch +++ b/Minecraft_Client.launch @@ -1,15 +1,15 @@ - + - - + + diff --git a/Minecraft_Server.launch b/Minecraft_Server.launch index 76277f2c..6d5404e7 100644 --- a/Minecraft_Server.launch +++ b/Minecraft_Server.launch @@ -1,15 +1,14 @@ - + - - + diff --git a/build.gradle b/build.gradle index a4d3b80b..d2adc6d3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.2.2-SNAPSHOT' + id 'fabric-loom' version '0.2.3-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 0e58c37d..939c21d2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.14.2 - yarn_mappings=1.14.2+build.2 - loader_version=0.4.8+build.154 + minecraft_version=1.14.4 + yarn_mappings=1.14.4+build.2 + loader_version=0.4.8+build.157 # Mod Properties - mod_version = v7.0-MC1.14.2 + mod_version = v7.0-MC1.14.4 maven_group = net.wurstclient archives_base_name = Wurst-Client # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric - fabric_version=0.3.0+build.175 + fabric_version=0.3.0+build.200 diff --git a/src/main/java/net/wurstclient/clickgui/ClickGuiScreen.java b/src/main/java/net/wurstclient/clickgui/ClickGuiScreen.java index 8d52d56b..62cdcd16 100644 --- a/src/main/java/net/wurstclient/clickgui/ClickGuiScreen.java +++ b/src/main/java/net/wurstclient/clickgui/ClickGuiScreen.java @@ -8,7 +8,7 @@ package net.wurstclient.clickgui; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.text.LiteralText; public final class ClickGuiScreen extends Screen { @@ -16,7 +16,7 @@ public final class ClickGuiScreen extends Screen public ClickGuiScreen(ClickGui gui) { - super(new TextComponent("")); + super(new LiteralText("")); this.gui = gui; } diff --git a/src/main/java/net/wurstclient/clickgui/EditSliderScreen.java b/src/main/java/net/wurstclient/clickgui/EditSliderScreen.java index 0edb1f26..6a3d33df 100644 --- a/src/main/java/net/wurstclient/clickgui/EditSliderScreen.java +++ b/src/main/java/net/wurstclient/clickgui/EditSliderScreen.java @@ -13,7 +13,7 @@ import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.text.LiteralText; import net.wurstclient.settings.SliderSetting; import net.wurstclient.settings.SliderSetting.ValueDisplay; import net.wurstclient.util.MathUtils; @@ -28,7 +28,7 @@ public final class EditSliderScreen extends Screen public EditSliderScreen(Screen prevScreen, SliderSetting slider) { - super(new TextComponent("")); + super(new LiteralText("")); this.prevScreen = prevScreen; this.slider = slider; } diff --git a/src/main/java/net/wurstclient/commands/AnnoyCmd.java b/src/main/java/net/wurstclient/commands/AnnoyCmd.java index 6552f2cd..20586318 100644 --- a/src/main/java/net/wurstclient/commands/AnnoyCmd.java +++ b/src/main/java/net/wurstclient/commands/AnnoyCmd.java @@ -54,7 +54,7 @@ public final class AnnoyCmd extends Command implements ChatInputListener ChatUtils.message("Now annoying " + target + "."); ClientPlayerEntity player = MC.player; - if(player != null && target.equals(player.getName().getText())) + if(player != null && target.equals(player.getName().asString())) ChatUtils.warning("Annoying yourself is a bad idea!"); WURST.getEventManager().add(ChatInputListener.class, this); diff --git a/src/main/java/net/wurstclient/events/ChatInputListener.java b/src/main/java/net/wurstclient/events/ChatInputListener.java index 203755cd..5c9a04ba 100644 --- a/src/main/java/net/wurstclient/events/ChatInputListener.java +++ b/src/main/java/net/wurstclient/events/ChatInputListener.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.gui.hud.ChatHudLine; -import net.minecraft.network.chat.Component; +import net.minecraft.text.Text; import net.wurstclient.event.CancellableEvent; import net.wurstclient.event.Listener; @@ -22,21 +22,21 @@ public interface ChatInputListener extends Listener public static class ChatInputEvent extends CancellableEvent { - private Component component; + private Text component; private List chatLines; - public ChatInputEvent(Component component, List chatLines) + public ChatInputEvent(Text component, List chatLines) { this.component = component; this.chatLines = chatLines; } - public Component getComponent() + public Text getComponent() { return component; } - public void setComponent(Component component) + public void setComponent(Text component) { this.component = component; } diff --git a/src/main/java/net/wurstclient/mixin/ChatHudMixin.java b/src/main/java/net/wurstclient/mixin/ChatHudMixin.java index e0134224..e596b3dc 100644 --- a/src/main/java/net/wurstclient/mixin/ChatHudMixin.java +++ b/src/main/java/net/wurstclient/mixin/ChatHudMixin.java @@ -20,7 +20,7 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.hud.ChatHud; import net.minecraft.client.gui.hud.ChatHudLine; -import net.minecraft.network.chat.Component; +import net.minecraft.text.Text; import net.wurstclient.WurstClient; import net.wurstclient.events.ChatInputListener.ChatInputEvent; @@ -35,28 +35,27 @@ public class ChatHudMixin extends DrawableHelper private MinecraftClient client; @Inject(at = @At("HEAD"), - method = "addMessage(Lnet/minecraft/network/chat/Component;I)V", + method = "addMessage(Lnet/minecraft/text/Text;I)V", cancellable = true) - private void onAddMessage(Component chatComponent, int chatLineId, - CallbackInfo ci) + private void onAddMessage(Text chatText, int chatLineId, CallbackInfo ci) { - ChatInputEvent event = new ChatInputEvent(chatComponent, messages); + ChatInputEvent event = new ChatInputEvent(chatText, messages); WurstClient.INSTANCE.getEventManager().fire(event); if(event.isCancelled()) ci.cancel(); - chatComponent = event.getComponent(); - shadow$addMessage(chatComponent, chatLineId, - client.inGameHud.getTicks(), false); + chatText = event.getComponent(); + shadow$addMessage(chatText, chatLineId, client.inGameHud.getTicks(), + false); - LOGGER.info("[CHAT] {}", chatComponent.getString() - .replaceAll("\r", "\\\\r").replaceAll("\n", "\\\\n")); + LOGGER.info("[CHAT] {}", chatText.getString().replaceAll("\r", "\\\\r") + .replaceAll("\n", "\\\\n")); ci.cancel(); } @Shadow - private void shadow$addMessage(Component component_1, int int_1, int int_2, + private void shadow$addMessage(Text text_1, int int_1, int int_2, boolean boolean_1) { diff --git a/src/main/java/net/wurstclient/util/ChatUtils.java b/src/main/java/net/wurstclient/util/ChatUtils.java index 3da2b32e..ca89b55b 100644 --- a/src/main/java/net/wurstclient/util/ChatUtils.java +++ b/src/main/java/net/wurstclient/util/ChatUtils.java @@ -9,8 +9,8 @@ package net.wurstclient.util; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.hud.ChatHud; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; import net.wurstclient.WurstClient; public enum ChatUtils @@ -35,19 +35,19 @@ public enum ChatUtils ChatUtils.enabled = enabled; } - public static void component(Component component) + public static void component(Text component) { if(!enabled) return; ChatHud chatHud = MC.inGameHud.getChatHud(); - TextComponent prefix = new TextComponent(WURST_PREFIX); + LiteralText prefix = new LiteralText(WURST_PREFIX); chatHud.addMessage(prefix.append(component)); } public static void message(String message) { - component(new TextComponent(message)); + component(new LiteralText(message)); } public static void warning(String message)