Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-11-02 08:59:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed MixinMultiplayerServerListWidget_ServerEntry

Browse Source
This commit is contained in:
FlorianMichael 2023-11-27 16:20:26 +01:00
parent b8152d13ca
commit 0c42add048
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
View File

@ -51,7 +51,6 @@ import java.util.concurrent.CompletableFuture;
* - Add setting for VFP AlphaInventoryProvider * - Add setting for VFP AlphaInventoryProvider
* - Fix MixinAbstractDonkeyEntity * - Fix MixinAbstractDonkeyEntity
* - Check TO DO in MixinEntity * - Check TO DO in MixinEntity
* - Fix MixinMultiplayerServerListWidget_ServerEntry
* - Fix bedrock online mode * - Fix bedrock online mode
*/ */
public class ViaFabricPlus { public class ViaFabricPlus {

15
src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinMultiplayerServerListWidget_ServerEntry.java
View File

@ -21,15 +21,19 @@ package de.florianmichael.viafabricplus.injection.mixin.base.integration;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import de.florianmichael.viafabricplus.injection.access.IServerInfo;
import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
import net.minecraft.client.gui.screen.multiplayer.MultiplayerServerListWidget; import net.minecraft.client.gui.screen.multiplayer.MultiplayerServerListWidget;
import net.minecraft.client.network.ServerInfo; import net.minecraft.client.network.ServerInfo;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.raphimc.vialoader.util.VersionEnum;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@Mixin(MultiplayerServerListWidget.ServerEntry.class) @Mixin(MultiplayerServerListWidget.ServerEntry.class)
@ -41,18 +45,19 @@ public abstract class MixinMultiplayerServerListWidget_ServerEntry {
@WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerScreen;setMultiplayerScreenTooltip(Ljava/util/List;)V", ordinal = 0)) @WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerScreen;setMultiplayerScreenTooltip(Ljava/util/List;)V", ordinal = 0))
private void drawTranslatingState(MultiplayerScreen instance, List<Text> tooltip, Operation<Void> original) { private void drawTranslatingState(MultiplayerScreen instance, List<Text> tooltip, Operation<Void> original) {
/*if (GeneralSettings.global().showAdvertisedServerVersion.getValue()) { final List<Text> tooltipCopy = new ArrayList<>(tooltip);
if (GeneralSettings.global().showAdvertisedServerVersion.getValue()) {
final IServerInfo mixinServerInfo = ((IServerInfo) server); final IServerInfo mixinServerInfo = ((IServerInfo) server);
if (mixinServerInfo.viaFabricPlus$enabled()) { if (mixinServerInfo.viaFabricPlus$enabled()) {
final var versionEnum = VersionEnum.fromProtocolId(mixinServerInfo.viaFabricPlus$translatingVersion()); final var versionEnum = VersionEnum.fromProtocolId(mixinServerInfo.viaFabricPlus$translatingVersion());
tooltip.add(Text.translatable("base.viafabricplus.via_translates_to", versionEnum != VersionEnum.UNKNOWN ? versionEnum.getName() + " (" + versionEnum.getVersion() + ")" : mixinServerInfo.viaFabricPlus$translatingVersion())); tooltipCopy.add(Text.translatable("base.viafabricplus.via_translates_to", versionEnum != VersionEnum.UNKNOWN ? versionEnum.getName() + " (" + versionEnum.getVersion() + ")" : mixinServerInfo.viaFabricPlus$translatingVersion()));
tooltip.add(Text.translatable("base.viafabricplus.server_version", server.version.getString() + " (" + server.protocolVersion + ")")); tooltipCopy.add(Text.translatable("base.viafabricplus.server_version", server.version.getString() + " (" + server.protocolVersion + ")"));
} }
}*/ }
original.call(instance, tooltip); original.call(instance, tooltipCopy);
} }
} }