Mirror von
https://github.com/Moulberry/AxiomPaperPlugin.git
synchronisiert 2024-09-29 07:50:05 +02:00
Attempt to support ViaVersion on the proxy by looking up player version from the data version
Dieser Commit ist enthalten in:
Moulberry
Ursprung
001d8a1a02
Commit
44e9f4bf2b
@ -16,11 +16,10 @@ import io.papermc.paper.event.world.WorldGameRuleChangeEvent;
|
||||
import io.papermc.paper.network.ChannelInitializeListener;
|
||||
import io.papermc.paper.network.ChannelInitializeListenerHolder;
|
||||
import net.kyori.adventure.key.Key;
|
||||
import net.minecraft.SharedConstants;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.IdMapper;
|
||||
import net.minecraft.network.Connection;
|
||||
import net.minecraft.network.ConnectionProtocol;
|
||||
import net.minecraft.network.FriendlyByteBuf;
|
||||
import net.minecraft.network.*;
|
||||
import net.minecraft.network.protocol.Packet;
|
||||
import net.minecraft.network.protocol.PacketFlow;
|
||||
import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
|
||||
@ -41,7 +40,6 @@ import org.incendo.cloud.execution.ExecutionCoordinator;
|
||||
import org.incendo.cloud.paper.PaperCommandManager;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.io.FileReader;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
@ -56,7 +54,7 @@ public class AxiomPaper extends JavaPlugin implements Listener {
|
||||
public final Map<UUID, RateLimiter> playerBlockBufferRateLimiters = new ConcurrentHashMap<>();
|
||||
public final Map<UUID, Restrictions> playerRestrictions = new ConcurrentHashMap<>();
|
||||
public final Map<UUID, IdMapper<BlockState>> playerBlockRegistry = new ConcurrentHashMap<>();
|
||||
public final Set<UUID> mismatchedDataVersionUsingViaVersion = Collections.newSetFromMap(new ConcurrentHashMap<>());
|
||||
public final Map<UUID, Integer> playerProtocolVersion = new ConcurrentHashMap<>();
|
||||
public Configuration configuration;
|
||||
|
||||
public IdMapper<BlockState> allowedBlockRegistry = null;
|
||||
@ -274,7 +272,7 @@ public class AxiomPaper extends JavaPlugin implements Listener {
|
||||
playerBlockBufferRateLimiters.keySet().retainAll(stillActiveAxiomPlayers);
|
||||
playerRestrictions.keySet().retainAll(stillActiveAxiomPlayers);
|
||||
playerBlockRegistry.keySet().retainAll(stillActiveAxiomPlayers);
|
||||
mismatchedDataVersionUsingViaVersion.retainAll(stillActiveAxiomPlayers);
|
||||
playerProtocolVersion.keySet().retainAll(stillActiveAxiomPlayers);
|
||||
}, 20, 20);
|
||||
|
||||
boolean sendMarkers = configuration.getBoolean("send-markers");
|
||||
@ -314,7 +312,11 @@ public class AxiomPaper extends JavaPlugin implements Listener {
|
||||
}
|
||||
|
||||
public boolean isMismatchedDataVersion(UUID uuid) {
|
||||
return this.mismatchedDataVersionUsingViaVersion.contains(uuid);
|
||||
return this.playerProtocolVersion.containsKey(uuid);
|
||||
}
|
||||
|
||||
public int getProtocolVersionFor(UUID uuid) {
|
||||
return this.playerProtocolVersion.getOrDefault(uuid, SharedConstants.getProtocolVersion());
|
||||
}
|
||||
|
||||
public IdMapper<BlockState> getBlockRegistry(UUID uuid) {
|
||||
|
||||
@ -9,18 +9,12 @@ import com.moulberry.axiom.persistence.UUIDDataType;
|
||||
import com.moulberry.axiom.viaversion.ViaVersionHelper;
|
||||
import com.moulberry.axiom.world_properties.server.ServerWorldPropertiesRegistry;
|
||||
import com.viaversion.viaversion.api.Via;
|
||||
import com.viaversion.viaversion.api.data.*;
|
||||
import com.viaversion.viaversion.api.protocol.ProtocolPathEntry;
|
||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
||||
import com.viaversion.viaversion.api.type.ByteBufReader;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
|
||||
import io.netty.buffer.Unpooled;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.format.NamedTextColor;
|
||||
import net.minecraft.SharedConstants;
|
||||
import net.minecraft.core.IdMapper;
|
||||
import net.minecraft.nbt.NbtIo;
|
||||
import net.minecraft.network.FriendlyByteBuf;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import org.bukkit.Bukkit;
|
||||
@ -36,7 +30,6 @@ import org.bukkit.plugin.messaging.PluginMessageListener;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
|
||||
public class HelloPacketListener implements PluginMessageListener {
|
||||
@ -71,19 +64,39 @@ public class HelloPacketListener implements PluginMessageListener {
|
||||
String incompatibleDataVersion = plugin.configuration.getString("incompatible-data-version");
|
||||
if (incompatibleDataVersion == null) incompatibleDataVersion = "warn";
|
||||
|
||||
if (!Bukkit.getPluginManager().isPluginEnabled("ViaVersion")) {
|
||||
Component text = Component.text("Axiom: Incompatible data version detected (client " + dataVersion +
|
||||
", server " + serverDataVersion + ")");
|
||||
Component incompatibleWarning = Component.text("Axiom: Incompatible data version detected (client " + dataVersion +
|
||||
", server " + serverDataVersion + ")");
|
||||
|
||||
if (!Bukkit.getPluginManager().isPluginEnabled("ViaVersion")) {
|
||||
if (incompatibleDataVersion.equals("warn")) {
|
||||
player.sendMessage(text.color(NamedTextColor.RED));
|
||||
player.sendMessage(incompatibleWarning.color(NamedTextColor.RED));
|
||||
return;
|
||||
} else if (!incompatibleDataVersion.equals("ignore")) {
|
||||
player.kick(text);
|
||||
player.kick(incompatibleWarning);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
int playerVersion = Via.getAPI().getPlayerVersion(player.getUniqueId());
|
||||
if (playerVersion == SharedConstants.getProtocolVersion()) {
|
||||
// Likely using via on the proxy, try to get protocol version from data version
|
||||
if (dataVersion < 3337) {
|
||||
player.sendMessage(incompatibleWarning.color(NamedTextColor.RED));
|
||||
return;
|
||||
} else if (dataVersion == 3337) {
|
||||
playerVersion = 762; // 1.19.4
|
||||
} else if (dataVersion <= 3465) {
|
||||
playerVersion = 763; // 1.20.1
|
||||
} else if (dataVersion <= 3578) {
|
||||
playerVersion = 764; // 1.20.2
|
||||
} else if (dataVersion <= 3700) {
|
||||
playerVersion = 765; // 1.20.3 / 1.20.4
|
||||
} else if (dataVersion <= 3837) {
|
||||
playerVersion = 766; // 1.20.3 / 1.20.4
|
||||
} else {
|
||||
player.sendMessage(incompatibleWarning.color(NamedTextColor.RED));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
IdMapper<BlockState> mapper;
|
||||
try {
|
||||
@ -103,7 +116,7 @@ public class HelloPacketListener implements PluginMessageListener {
|
||||
}
|
||||
|
||||
this.plugin.playerBlockRegistry.put(player.getUniqueId(), mapper);
|
||||
this.plugin.mismatchedDataVersionUsingViaVersion.add(player.getUniqueId());
|
||||
this.plugin.playerProtocolVersion.put(player.getUniqueId(), playerVersion);
|
||||
|
||||
Component text = Component.text("Axiom: Warning, client and server versions don't match. " +
|
||||
"Axiom will try to use ViaVersion conversions, but this process may cause problems");
|
||||
|
||||
@ -96,7 +96,7 @@ public class ViaVersionHelper {
|
||||
private static final int UNNAMED_COMPOUND_TAG_CHANGE_VERSION = 764; // 1.20.2
|
||||
|
||||
public static void skipTagViaVersion(FriendlyByteBuf friendlyByteBuf, Player player) throws Exception {
|
||||
skipTagViaVersion(friendlyByteBuf, Via.getAPI().getPlayerVersion(player.getUniqueId()));
|
||||
skipTagViaVersion(friendlyByteBuf, AxiomPaper.PLUGIN.getProtocolVersionFor(player.getUniqueId()));
|
||||
}
|
||||
|
||||
public static void skipTagViaVersion(FriendlyByteBuf friendlyByteBuf, int playerVersion) throws Exception {
|
||||
@ -104,7 +104,7 @@ public class ViaVersionHelper {
|
||||
}
|
||||
|
||||
public static CompoundTag readTagViaVersion(FriendlyByteBuf friendlyByteBuf, Player player) throws Exception {
|
||||
return readTagViaVersion(friendlyByteBuf, Via.getAPI().getPlayerVersion(player.getUniqueId()));
|
||||
return readTagViaVersion(friendlyByteBuf, AxiomPaper.PLUGIN.getProtocolVersionFor(player.getUniqueId()));
|
||||
}
|
||||
|
||||
public static CompoundTag readTagViaVersion(FriendlyByteBuf friendlyByteBuf, int playerVersion) throws Exception {
|
||||
|
||||
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren