Upstream/ViaFabric
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabric.git synced 2025-02-16 01:21:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

reimplement #35 for 1.17, very cursed code

Browse Source
This commit is contained in:
creeper123123321 2021-05-21 20:19:43 -03:00
parent dfcf9cf354
commit 9f528c6e4e
15 changed files with 128 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/viaversion/fabric/common/gui/ViaServerInfo.java Normal file
View File

@ -0,0 +1,11 @@
package com.viaversion.fabric.common.gui;
public interface ViaServerInfo {
boolean isViaTranslating();
void setViaTranslating(boolean via);
int getViaServerVer();
void setViaServerVer(int ver);
}

BIN
src/main/resources/assets/viafabric/textures/gui/icons.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 794 B

2
viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/mixin/address/client/MixinConnectScreenThread.java
View File

@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
import java.net.InetAddress;
import java.net.UnknownHostException;
@Mixin(targets = "net/minecraft/client/gui/screen/ConnectScreen$1", priority = 2000)
@Mixin(targets = "net.minecraft.client.gui.screen.ConnectScreen$1")
public class MixinConnectScreenThread {
@Redirect(method = "run()V", at = @At(value = "INVOKE",
target = "Ljava/net/InetAddress;getByName(Ljava/lang/String;)Ljava/net/InetAddress;"))

2
viafabric-mc114/src/main/resources/mixins.viafabric114.address.json
View File

@ -10,6 +10,6 @@
"client.MixinServerPinger"
],
"injectors": {
"defaultRequire": 1
"defaultRequire": 0
}
}

2
viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/mixin/address/client/MixinConnectScreenThread.java
View File

@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
import java.net.InetAddress;
import java.net.UnknownHostException;
@Mixin(targets = "net/minecraft/client/gui/screen/ConnectScreen$1", priority = 2000)
@Mixin(targets = "net.minecraft.client.gui.screen.ConnectScreen$1")
public class MixinConnectScreenThread {
@Redirect(method = "run()V", at = @At(value = "INVOKE",
target = "Ljava/net/InetAddress;getByName(Ljava/lang/String;)Ljava/net/InetAddress;"))

2
viafabric-mc115/src/main/resources/mixins.viafabric115.address.json
View File

@ -10,6 +10,6 @@
"client.MixinServerPinger"
],
"injectors": {
"defaultRequire": 1
"defaultRequire": 0
}
}

2
viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/mixin/address/client/MixinConnectScreenThread.java
View File

@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
import java.net.InetAddress;
import java.net.UnknownHostException;
@Mixin(targets = "net/minecraft/client/gui/screen/ConnectScreen$1", priority = 2000)
@Mixin(targets = "net.minecraft.client.gui.screen.ConnectScreen$1")
public class MixinConnectScreenThread {
@Redirect(method = "run()V", at = @At(value = "INVOKE",
target = "Ljava/net/InetAddress;getByName(Ljava/lang/String;)Ljava/net/InetAddress;"))

2
viafabric-mc116/src/main/resources/mixins.viafabric116.address.json
View File

@ -10,6 +10,6 @@
"client.MixinServerPinger"
],
"injectors": {
"defaultRequire": 1
"defaultRequire": 0
}
}

29
viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/mixin/gui/client/MixinMultiplayerServerListPingerListener.java Normal file
View File

@ -0,0 +1,29 @@
package com.viaversion.fabric.mc117.mixin.gui.client;
import com.viaversion.fabric.common.gui.ViaServerInfo;
import com.viaversion.fabric.common.handler.FabricDecodeHandler;
import com.viaversion.fabric.mc117.mixin.debug.client.MixinClientConnectionAccessor;
import net.minecraft.client.network.ServerInfo;
import net.minecraft.network.ClientConnection;
import net.minecraft.network.listener.ClientQueryPacketListener;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(targets = "net.minecraft.client.network.MultiplayerServerListPinger$1")
public abstract class MixinMultiplayerServerListPingerListener implements ClientQueryPacketListener {
@Shadow
public abstract ClientConnection getConnection();
@Redirect(method = "onResponse(Lnet/minecraft/network/packet/s2c/query/QueryResponseS2CPacket;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ServerInfo;getIcon()Ljava/lang/String;"))
private String onResponseCaptureServerInfo(ServerInfo serverInfo) {
FabricDecodeHandler decoder = ((MixinClientConnectionAccessor) this.getConnection()).getChannel()
.pipeline().get(FabricDecodeHandler.class);
if (decoder != null) {
((ViaServerInfo) serverInfo).setViaTranslating(decoder.getInfo().isActive());
((ViaServerInfo) serverInfo).setViaServerVer(decoder.getInfo().getProtocolInfo().getServerProtocolVersion());
}
return serverInfo.getIcon();
}
}

46
viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/mixin/gui/client/MixinServerEntry.java Normal file
View File

@ -0,0 +1,46 @@
package com.viaversion.fabric.mc117.mixin.gui.client;
import com.mojang.blaze3d.systems.RenderSystem;
import com.viaversion.fabric.common.gui.ViaServerInfo;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
import net.minecraft.client.gui.screen.multiplayer.MultiplayerServerListWidget;
import net.minecraft.client.network.ServerInfo;
import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
import net.minecraft.util.Identifier;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import java.util.ArrayList;
import java.util.List;
@Mixin(MultiplayerServerListWidget.ServerEntry.class)
public class MixinServerEntry {
@Shadow
@Final
private ServerInfo server;
// todo fix this intermediary
@Redirect(method = "render", at = @At(value = "INVOKE", ordinal = 0,
target = "Lcom/mojang/blaze3d/systems/RenderSystem;setShaderTexture(ILnet/minecraft/class_2960;)V"))
private void redirectPingIcon(int i, Identifier identifier) {
if (identifier.equals(DrawableHelper.GUI_ICONS_TEXTURE) && ((ViaServerInfo) this.server).isViaTranslating()) {
RenderSystem.setShaderTexture(i, new Identifier("viafabric:textures/gui/icons.png"));
return;
}
RenderSystem.setShaderTexture(i, identifier);
}
@Redirect(method = "render", at = @At(value = "INVOKE", ordinal = 0, target = "Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerScreen;setTooltip(Ljava/util/List;)V"))
private void addServerVer(MultiplayerScreen multiplayerScreen, List<Text> tooltipText) {
ProtocolVersion proto = ProtocolVersion.getProtocol(((ViaServerInfo) this.server).getViaServerVer());
List<Text> lines = new ArrayList<>(tooltipText);
lines.add(new TranslatableText("gui.ping_version.translated", proto.getName()));
multiplayerScreen.setTooltip(lines);
}
}

29
viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/mixin/gui/client/MixinServerInfo.java Normal file
View File

@ -0,0 +1,29 @@
package com.viaversion.fabric.mc117.mixin.gui.client;
import com.viaversion.fabric.common.gui.ViaServerInfo;
import net.minecraft.client.network.ServerInfo;
import org.spongepowered.asm.mixin.Mixin;
@Mixin(ServerInfo.class)
public class MixinServerInfo implements ViaServerInfo {
private boolean viaTranslating;
private int viaServerVer;
public int getViaServerVer() {
return viaServerVer;
}
public void setViaServerVer(int viaServerVer) {
this.viaServerVer = viaServerVer;
}
@Override
public boolean isViaTranslating() {
return viaTranslating;
}
@Override
public void setViaTranslating(boolean via) {
this.viaTranslating = via;
}
}

2
viafabric-mc117/src/main/resources/mixins.viafabric117.address.json
View File

@ -8,6 +8,6 @@
"client.MixinAllowedAddressResolver"
],
"injectors": {
"defaultRequire": 1
"defaultRequire": 0
}
}

5
viafabric-mc117/src/main/resources/mixins.viafabric117.gui.json
View File

@ -5,7 +5,10 @@
"mixins": [
],
"client": [
"client.MixinMultiplayerScreen"
"client.MixinMultiplayerScreen",
"client.MixinMultiplayerServerListPingerListener",
"client.MixinServerEntry",
"client.MixinServerInfo"
],
"injectors": {
"defaultRequire": 0

2
viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/mixin/address/client/MixinConnectScreenThread.java
View File

@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
import java.net.InetAddress;
import java.net.UnknownHostException;
@Mixin(targets = "net/minecraft/client/gui/screen/ConnectScreen$1", priority = 2000)
@Mixin(targets = "net.minecraft.client.gui.screen.ConnectScreen$1")
public class MixinConnectScreenThread {
@Redirect(method = "run()V", at = @At(value = "INVOKE",
target = "Ljava/net/InetAddress;getByName(Ljava/lang/String;)Ljava/net/InetAddress;"))

2
viafabric-mc18/src/main/resources/mixins.viafabric18.address.json
View File

@ -10,6 +10,6 @@
"client.MixinServerPinger"
],
"injectors": {
"defaultRequire": 1
"defaultRequire": 0
}
}