mirror of
https://github.com/ViaVersion/ViaFabricPlus.git
synced 2024-09-27 04:22:36 +02:00
Added setting to disable pinging entirely for <= b1.7.3
This commit is contained in:
FlorianMichael
parent
36fe9f595a
commit
65e25a706f
@ -19,22 +19,32 @@
|
||||
|
||||
package de.florianmichael.viafabricplus.injection.mixin.base.integration;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.WrapWithCondition;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
||||
import de.florianmichael.viafabricplus.injection.access.IServerInfo;
|
||||
import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
|
||||
import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
|
||||
import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
|
||||
import net.minecraft.client.font.TextRenderer;
|
||||
import net.minecraft.client.gui.DrawContext;
|
||||
import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
|
||||
import net.minecraft.client.gui.screen.multiplayer.MultiplayerServerListWidget;
|
||||
import net.minecraft.client.gui.screen.world.WorldIcon;
|
||||
import net.minecraft.client.network.ServerInfo;
|
||||
import net.minecraft.text.OrderedText;
|
||||
import net.minecraft.text.StringVisitable;
|
||||
import net.minecraft.text.Text;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import net.minecraft.util.Identifier;
|
||||
import org.spongepowered.asm.mixin.*;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyArg;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.ThreadPoolExecutor;
|
||||
|
||||
@Mixin(MultiplayerServerListWidget.ServerEntry.class)
|
||||
public abstract class MixinMultiplayerServerListWidget_ServerEntry {
|
||||
@ -43,18 +53,87 @@ public abstract class MixinMultiplayerServerListWidget_ServerEntry {
|
||||
@Final
|
||||
private ServerInfo server;
|
||||
|
||||
@Shadow
|
||||
protected abstract boolean protocolVersionMatches();
|
||||
|
||||
@Mutable
|
||||
@Shadow
|
||||
@Final
|
||||
private WorldIcon icon;
|
||||
|
||||
@Unique
|
||||
private boolean viaFabricPlus$disableServerPinging = false;
|
||||
|
||||
@WrapWithCondition(method = "render", at = @At(value = "INVOKE", target = "Ljava/util/concurrent/ThreadPoolExecutor;submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;"))
|
||||
private boolean disableServerPinging(ThreadPoolExecutor instance, Runnable runnable) {
|
||||
ProtocolVersion version = ((IServerInfo) server).viaFabricPlus$forcedVersion();
|
||||
if (version == null) version = ProtocolTranslator.getTargetVersion();
|
||||
|
||||
viaFabricPlus$disableServerPinging = VisualSettings.global().disableServerPinging.isEnabled(version);
|
||||
if (viaFabricPlus$disableServerPinging) {
|
||||
this.server.version = Text.of(version.getName()); // Show target version
|
||||
}
|
||||
return !viaFabricPlus$disableServerPinging;
|
||||
}
|
||||
|
||||
@Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget$ServerEntry;protocolVersionMatches()Z"))
|
||||
private boolean disableServerPinging(MultiplayerServerListWidget.ServerEntry instance) {
|
||||
if (viaFabricPlus$disableServerPinging) {
|
||||
return false; // server version will always been shown (as we don't have a player count anyway)
|
||||
} else {
|
||||
return protocolVersionMatches();
|
||||
}
|
||||
}
|
||||
|
||||
@Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/font/TextRenderer;wrapLines(Lnet/minecraft/text/StringVisitable;I)Ljava/util/List;"))
|
||||
private List<OrderedText> disableServerPinging(TextRenderer instance, StringVisitable text, int width) {
|
||||
if (viaFabricPlus$disableServerPinging) { // server label will just show the server address
|
||||
return instance.wrapLines(Text.of(server.address), width);
|
||||
} else {
|
||||
return instance.wrapLines(text, width);
|
||||
}
|
||||
}
|
||||
|
||||
@ModifyArg(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawText(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;IIIZ)I"), index = 2)
|
||||
private int disableServerPinging(int x) {
|
||||
if (viaFabricPlus$disableServerPinging) { // Move server label to the right (as we remove the ping bar)
|
||||
x += 15 /* ping bar width */ - 3 /* magical offset */;
|
||||
}
|
||||
return x;
|
||||
}
|
||||
|
||||
@WrapWithCondition(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V", ordinal = 0))
|
||||
private boolean disableServerPinging(DrawContext instance, Identifier texture, int x, int y, int width, int height) {
|
||||
return !viaFabricPlus$disableServerPinging; // Remove ping bar
|
||||
}
|
||||
|
||||
@WrapWithCondition(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerScreen;setMultiplayerScreenTooltip(Ljava/util/List;)V", ordinal = 1))
|
||||
private boolean disableServerPinging(MultiplayerScreen instance, List<Text> tooltip) {
|
||||
return !viaFabricPlus$disableServerPinging; // Remove ping bar tooltip
|
||||
}
|
||||
|
||||
@Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/world/WorldIcon;getTextureId()Lnet/minecraft/util/Identifier;"))
|
||||
private Identifier disableServerPinging(WorldIcon instance) {
|
||||
if (viaFabricPlus$disableServerPinging) { // Remove server icon
|
||||
return WorldIcon.UNKNOWN_SERVER_ID;
|
||||
} else {
|
||||
return this.icon.getTextureId();
|
||||
}
|
||||
}
|
||||
|
||||
@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) {
|
||||
if (viaFabricPlus$disableServerPinging) { // Remove player list tooltip
|
||||
return;
|
||||
}
|
||||
final List<Text> tooltipCopy = new ArrayList<>(tooltip);
|
||||
if (GeneralSettings.global().showAdvertisedServerVersion.getValue()) {
|
||||
final ProtocolVersion version = ((IServerInfo) server).viaFabricPlus$translatingVersion();
|
||||
|
||||
if (version != null) {
|
||||
tooltipCopy.add(Text.translatable("base.viafabricplus.via_translates_to", version.getName() + " (" + version.getOriginalVersion() + ")"));
|
||||
tooltipCopy.add(Text.translatable("base.viafabricplus.server_version", server.version.getString() + " (" + server.protocolVersion + ")"));
|
||||
}
|
||||
}
|
||||
|
||||
original.call(instance, tooltipCopy);
|
||||
}
|
||||
|
||||
|
||||
@ -20,6 +20,7 @@
|
||||
package de.florianmichael.viafabricplus.settings.base;
|
||||
|
||||
import com.google.gson.JsonObject;
|
||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
||||
import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
|
||||
import de.florianmichael.viafabricplus.screen.VFPListEntry;
|
||||
import de.florianmichael.viafabricplus.screen.settings.VersionedBooleanSettingRenderer;
|
||||
@ -62,8 +63,12 @@ public class VersionedBooleanSetting extends AbstractSetting<Integer> {
|
||||
}
|
||||
|
||||
public boolean isEnabled() {
|
||||
return isEnabled(ProtocolTranslator.getTargetVersion());
|
||||
}
|
||||
|
||||
public boolean isEnabled(final ProtocolVersion version) {
|
||||
if (isAuto()) {
|
||||
return protocolRange.contains(ProtocolTranslator.getTargetVersion());
|
||||
return protocolRange.contains(version);
|
||||
} else {
|
||||
return getValue() == ENABLED_INDEX;
|
||||
}
|
||||
|
||||
@ -57,6 +57,7 @@ public class VisualSettings extends SettingGroup {
|
||||
|
||||
// b1.8/b1.8.1 -> b1_7/b1.7.3
|
||||
public final VersionedBooleanSetting removeNewerHudElements = new VersionedBooleanSetting(this, Text.translatable("visual_settings.viafabricplus.remove_newer_hud_elements"), VersionRange.andOlder(LegacyProtocolVersion.b1_7tob1_7_3));
|
||||
public final VersionedBooleanSetting disableServerPinging = new VersionedBooleanSetting(this, Text.translatable("visual_settings.viafabricplus.disable_server_pinging"), VersionRange.andOlder(LegacyProtocolVersion.b1_7tob1_7_3));
|
||||
|
||||
// a1.0.15 -> c0_28/c0_30
|
||||
public final VersionedBooleanSetting replaceCreativeInventory = new VersionedBooleanSetting(this, Text.translatable("visual_settings.viafabricplus.replace_creative_inventory_with_classic_inventory"), VersionRange.andOlder(LegacyProtocolVersion.c0_28toc0_30));
|
||||
|
||||
@ -84,6 +84,7 @@
|
||||
"visual_settings.viafabricplus.change_font_renderer_behaviour": "Change Font renderer behaviour",
|
||||
"visual_settings.viafabricplus.enable_sword_blocking": "Enable sword animation",
|
||||
"visual_settings.viafabricplus.enable_block_hit_animation": "Enable block hit animation",
|
||||
"visual_settings.viafabricplus.disable_server_pinging": "Disable server pinging",
|
||||
|
||||
"bedrock.viafabricplus.login": "Your browser should have opened.\nClosing this screen will cancel the process!",
|
||||
"bedrock.viafabricplus.confirm_transfer_server_prompt": "Do you want to transfer to the following server?\n%s\n\nThis will disconnect the current server and connect to the new one.",
|
||||
|
||||
@ -15,6 +15,7 @@ accessible field net/minecraft/client/font/FontStorage glyphRendererCache Lnet/m
|
||||
accessible field net/minecraft/client/font/FontStorage glyphCache Lnet/minecraft/client/font/GlyphContainer;
|
||||
accessible field net/minecraft/entity/EntityType dimensions Lnet/minecraft/entity/EntityDimensions;
|
||||
accessible field net/minecraft/block/AbstractBlock velocityMultiplier F
|
||||
accessible field net/minecraft/client/gui/screen/world/WorldIcon UNKNOWN_SERVER_ID Lnet/minecraft/util/Identifier;
|
||||
|
||||
accessible method net/minecraft/screen/GenericContainerScreenHandler <init> (Lnet/minecraft/screen/ScreenHandlerType;ILnet/minecraft/entity/player/PlayerInventory;I)V
|
||||
accessible method net/minecraft/client/font/FontStorage$GlyphPair <init> (Lnet/minecraft/client/font/Glyph;Lnet/minecraft/client/font/Glyph;)V
|
||||
|
||||
Loading…
Reference in New Issue
Block a user