mirror/Wurst7
0
0
Fork 0
mirror of https://github.com/Wurst-Imperium/Wurst7.git synced 2024-09-20 01:12:13 +02:00
Code

Manual fixes

Browse Source
This commit is contained in:
Alexander01998 2022-07-22 05:23:37 +02:00
parent 9bc1a7b45a
commit 26be48883a
5 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -9,7 +9,7 @@ yarn_mappings=1.19.1-pre2+build.3
loader_version=0.14.8
#Fabric api
fabric_version=0.57.3+1.19.1
fabric_version=0.57.1+1.19.1
# Mod Properties
mod_version = v7.27-MC1.19.1-pre2

7
src/main/java/net/wurstclient/events/ChatInputListener.java
View File

@ -11,7 +11,6 @@ import java.util.ArrayList;
import java.util.List;
import net.minecraft.client.gui.hud.ChatHudLine;
import net.minecraft.text.OrderedText;
import net.minecraft.text.Text;
import net.wurstclient.event.CancellableEvent;
import net.wurstclient.event.Listener;
@ -24,10 +23,10 @@ public interface ChatInputListener extends Listener
extends CancellableEvent<ChatInputListener>
{
private Text component;
private List<ChatHudLine<OrderedText>> chatLines;
private List<ChatHudLine.Visible> chatLines;
public ChatInputEvent(Text component,
List<ChatHudLine<OrderedText>> visibleMessages)
List<ChatHudLine.Visible> visibleMessages)
{
this.component = component;
chatLines = visibleMessages;
@ -43,7 +42,7 @@ public interface ChatInputListener extends Listener
this.component = component;
}
public List<ChatHudLine<OrderedText>> getChatLines()
public List<ChatHudLine.Visible> getChatLines()
{
return chatLines;
}

6
src/main/java/net/wurstclient/hacks/AntiSpamHack.java
View File

@ -47,7 +47,7 @@ public final class AntiSpamHack extends Hack implements ChatInputListener
@Override
public void onReceivedMessage(ChatInputEvent event)
{
List<ChatHudLine<OrderedText>> chatLines = event.getChatLines();
List<ChatHudLine.Visible> chatLines = event.getChatLines();
if(chatLines.isEmpty())
return;
@ -91,7 +91,7 @@ public final class AntiSpamHack extends Hack implements ChatInputListener
{
JustGiveMeTheStringVisitor oldLineVS =
new JustGiveMeTheStringVisitor();
chatLines.get(i).getText().accept(oldLineVS);
chatLines.get(i).content().accept(oldLineVS);
String oldLine = oldLineVS.toString();
if(matchingLines <= newLines.size() - 1)
@ -121,7 +121,7 @@ public final class AntiSpamHack extends Hack implements ChatInputListener
{
JustGiveMeTheStringVisitor nextOldLineVS =
new JustGiveMeTheStringVisitor();
chatLines.get(i - 1).getText().accept(nextOldLineVS);
chatLines.get(i - 1).content().accept(nextOldLineVS);
String nextOldLine = nextOldLineVS.toString();
String twoLines = oldLine + nextOldLine;

33
src/main/java/net/wurstclient/mixin/ChatHudMixin.java
View File

@ -9,6 +9,7 @@ package net.wurstclient.mixin;
import java.util.List;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@ -20,8 +21,9 @@ 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.text.OrderedText;
import net.minecraft.client.gui.hud.MessageIndicator;
import net.minecraft.text.Text;
import net.minecraft.util.Util;
import net.wurstclient.event.EventManager;
import net.wurstclient.events.ChatInputListener.ChatInputEvent;
@ -29,18 +31,19 @@ import net.wurstclient.events.ChatInputListener.ChatInputEvent;
public class ChatHudMixin extends DrawableHelper
{
@Shadow
private List<ChatHudLine<OrderedText>> visibleMessages;
private List<ChatHudLine.Visible> visibleMessages;
@Shadow
private static Logger LOGGER;
@Shadow
private MinecraftClient client;
@Inject(at = @At("HEAD"),
method = "addMessage(Lnet/minecraft/text/Text;I)V",
method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/client/gui/hud/MessageIndicator;)V",
cancellable = true)
private void onAddMessage(Text chatText, int chatLineId, CallbackInfo ci)
private void onAddMessage(Text message,
@Nullable MessageIndicator indicator, CallbackInfo ci)
{
ChatInputEvent event = new ChatInputEvent(chatText, visibleMessages);
ChatInputEvent event = new ChatInputEvent(message, visibleMessages);
EventManager.fire(event);
if(event.isCancelled())
@ -49,18 +52,26 @@ public class ChatHudMixin extends DrawableHelper
return;
}
chatText = event.getComponent();
shadow$addMessage(chatText, chatLineId, client.inGameHud.getTicks(),
message = event.getComponent();
shadow$addMessage(message, client.inGameHud.getTicks(), indicator,
false);
LOGGER.info("[CHAT] {}",
chatText.getString().replace("\r", "\\r").replace("\n", "\\n"));
String messageString =
message.getString().replace("\r", "\\r").replace("\n", "\\n");
String indicatorString =
Util.map(indicator, MessageIndicator::loggedName);
if(indicatorString != null)
LOGGER.info("[{}] [CHAT] {}", indicatorString, messageString);
else
LOGGER.info("[CHAT] {}", messageString);
ci.cancel();
}
@Shadow
private void shadow$addMessage(Text text, int messageId, int timestamp,
boolean bl)
private void shadow$addMessage(Text message, int messageId,
@Nullable MessageIndicator indicator, boolean refresh)
{
}

4
src/main/resources/fabric.mod.json
View File

@ -29,8 +29,8 @@
"depends": {
"fabricloader": ">=0.14.8",
"fabric": ">=0.51.0",
"minecraft": "~1.19.1-alpha.22.24.a",
"fabric": ">=0.57.1",
"minecraft": "~1.19.1-beta.2",
"java": ">=17"
},
"suggests": {