Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-11-16 10:55:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
FlorianMichael 2024-03-23 12:39:18 +01:00
commit 36fe9f595a
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/de/florianmichael/viafabricplus/fixes/ClientsideFixes.java
View File

@ -29,7 +29,6 @@ import de.florianmichael.viafabricplus.fixes.versioned.classic.GridItemSelection
import de.florianmichael.viafabricplus.fixes.versioned.visual.ArmorHudEmulation1_8; import de.florianmichael.viafabricplus.fixes.versioned.visual.ArmorHudEmulation1_8;
import de.florianmichael.viafabricplus.fixes.versioned.visual.FootStepParticle1_12_2; import de.florianmichael.viafabricplus.fixes.versioned.visual.FootStepParticle1_12_2;
import de.florianmichael.viafabricplus.injection.access.IClientConnection; import de.florianmichael.viafabricplus.injection.access.IClientConnection;
import de.florianmichael.viafabricplus.injection.access.IServerInfo;
import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator; import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
import de.florianmichael.viafabricplus.settings.impl.BedrockSettings; import de.florianmichael.viafabricplus.settings.impl.BedrockSettings;
import net.minecraft.block.*; import net.minecraft.block.*;
@ -37,10 +36,10 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.FontStorage; import net.minecraft.client.font.FontStorage;
import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.client.network.ClientPlayNetworkHandler;
import net.minecraft.client.network.ServerAddress; import net.minecraft.client.network.ServerAddress;
import net.minecraft.client.network.ServerInfo;
import net.minecraft.network.PacketByteBuf; import net.minecraft.network.PacketByteBuf;
import net.minecraft.registry.Registries; import net.minecraft.registry.Registries;
import net.raphimc.viabedrock.api.BedrockProtocolVersion; import net.raphimc.viabedrock.api.BedrockProtocolVersion;
import net.raphimc.viabedrock.protocol.data.ProtocolConstants;
import net.raphimc.vialegacy.api.LegacyProtocolVersion; import net.raphimc.vialegacy.api.LegacyProtocolVersion;
import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.data.ClassicProtocolExtension; import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.data.ClassicProtocolExtension;
import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.storage.ExtensionProtocolMetadataStorage; import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.storage.ExtensionProtocolMetadataStorage;
@ -156,7 +155,7 @@ public class ClientsideFixes {
// If the default port for this entry should be replaced, check if the address already contains a port // If the default port for this entry should be replaced, check if the address already contains a port
// We can't just replace vanilla's default port because a bedrock server might be running on the same port // We can't just replace vanilla's default port because a bedrock server might be running on the same port
if (BedrockSettings.global().replaceDefaultPort.getValue() && Objects.equals(version, BedrockProtocolVersion.bedrockLatest) && !address.contains(":")) { if (BedrockSettings.global().replaceDefaultPort.getValue() && Objects.equals(version, BedrockProtocolVersion.bedrockLatest) && !address.contains(":")) {
return ServerAddress.parse(address + ":" + 19132); return ServerAddress.parse(address + ":" + ProtocolConstants.BEDROCK_DEFAULT_PORT);
} else { } else {
return ServerAddress.parse(address); return ServerAddress.parse(address);
} }

13
src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinDebugHud.java
View File

@ -32,7 +32,7 @@ import de.florianmichael.viafabricplus.util.ChatUtil;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.hud.DebugHud; import net.minecraft.client.gui.hud.DebugHud;
import net.minecraft.util.Formatting; import net.minecraft.util.Formatting;
import net.raphimc.viabedrock.protocol.data.enums.bedrock.ServerMovementModes; import net.raphimc.viabedrock.protocol.data.enums.bedrock.ServerAuthMovementMode;
import net.raphimc.viabedrock.protocol.storage.ChunkTracker; import net.raphimc.viabedrock.protocol.storage.ChunkTracker;
import net.raphimc.viabedrock.protocol.storage.GameSessionStorage; import net.raphimc.viabedrock.protocol.storage.GameSessionStorage;
import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.storage.ExtensionProtocolMetadataStorage; import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.storage.ExtensionProtocolMetadataStorage;
@ -103,15 +103,8 @@ public abstract class MixinDebugHud {
// bedrock // bedrock
final JoinGameDataTracker joinGameDataTracker = userConnection.get(JoinGameDataTracker.class); final JoinGameDataTracker joinGameDataTracker = userConnection.get(JoinGameDataTracker.class);
if (joinGameDataTracker != null) { if (joinGameDataTracker != null) {
final int movementMode = userConnection.get(GameSessionStorage.class).getMovementMode(); final ServerAuthMovementMode movementMode = userConnection.get(GameSessionStorage.class).getMovementMode();
String movement = "Server with rewind"; information.add("Bedrock Level: " + joinGameDataTracker.getLevelId() + ", Enchantment Seed: " + joinGameDataTracker.getEnchantmentSeed() + ", Movement: " + movementMode.name());
if (movementMode == ServerMovementModes.CLIENT) {
movement = "Client";
} else if (movementMode == ServerMovementModes.SERVER) {
movement = "Server";
}
information.add("Bedrock Level: " + joinGameDataTracker.getLevelId() + ", Enchantment Seed: " + joinGameDataTracker.getEnchantmentSeed() + ", Movement: " + movement);
} }
if (joinGameDataTracker != null) { if (joinGameDataTracker != null) {
information.add("World Seed: " + joinGameDataTracker.getSeed()); information.add("World Seed: " + joinGameDataTracker.getSeed());

3
src/main/resources/assets/viafabricplus/lang/de_de.json
View File

@ -48,8 +48,9 @@
"bedrock_settings.viafabricplus.confirm_transfer_server_prompt": "Öffne Bestätigungsfenster um das Transferieren zu anderen Servern zu bestätigen", "bedrock_settings.viafabricplus.confirm_transfer_server_prompt": "Öffne Bestätigungsfenster um das Transferieren zu anderen Servern zu bestätigen",
"bedrock_settings.viafabricplus.click_to_set_bedrock_account": "Klicke, um den Account für die Bedrock-Edition zu setzen", "bedrock_settings.viafabricplus.click_to_set_bedrock_account": "Klicke, um den Account für die Bedrock-Edition zu setzen",
"bedrock_settings.viafabricplus.replace_default_port": "Standard Port in der Server-Liste ersetzen",
"debug_settings.viafabricplus.queue_config_packets": "Verzögere Konfigurations Packete", "debug_settings.viafabricplus.queue_config_packets": "Konfigurationspackete verzögern",
"debug_settings.viafabricplus.disable_sequencing": "Sequenzierung deaktivieren", "debug_settings.viafabricplus.disable_sequencing": "Sequenzierung deaktivieren",
"debug_settings.viafabricplus.smooth_out_merchant_screens": "Das Villager-Trading-Fenster glätten", "debug_settings.viafabricplus.smooth_out_merchant_screens": "Das Villager-Trading-Fenster glätten",
"debug_settings.viafabricplus.execute_inputs_in_sync": "Eingangssignale synchronisiert ausführen", "debug_settings.viafabricplus.execute_inputs_in_sync": "Eingangssignale synchronisiert ausführen",