Kotori0629/Arclight1.18
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support ip forward

Browse Source
This commit is contained in:
IzzelAliz 2021-03-09 16:28:24 +08:00
parent e2f496eb7c
commit fea081e2ae
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/handshake/ServerHandshakeNetHandlerMixin.java
View File

@ -54,7 +54,6 @@ public class ServerHandshakeNetHandlerMixin {
case LOGIN: { case LOGIN: {
this.networkManager.setConnectionState(ProtocolType.LOGIN); this.networkManager.setConnectionState(ProtocolType.LOGIN);
// todo forge use ip field for storing forge data, this may be an issue
try { try {
long currentTime = System.currentTimeMillis(); long currentTime = System.currentTimeMillis();
long connectionThrottle = Bukkit.getServer().getConnectionThrottle(); long connectionThrottle = Bukkit.getServer().getConnectionThrottle();

35
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/handshake/client/CHandshakePacketMixin.java
View File

@ -1,16 +1,51 @@
package io.izzel.arclight.common.mixin.core.network.handshake.client; package io.izzel.arclight.common.mixin.core.network.handshake.client;
import com.google.gson.Gson;
import com.mojang.authlib.properties.Property;
import net.minecraft.network.PacketBuffer; import net.minecraft.network.PacketBuffer;
import net.minecraft.network.handshake.client.CHandshakePacket; import net.minecraft.network.handshake.client.CHandshakePacket;
import net.minecraftforge.fml.network.FMLNetworkConstants;
import net.minecraftforge.fml.network.NetworkHooks;
import org.spigotmc.SpigotConfig;
import org.spongepowered.asm.mixin.Mixin; 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.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.Objects;
@Mixin(CHandshakePacket.class) @Mixin(CHandshakePacket.class)
public class CHandshakePacketMixin { public class CHandshakePacketMixin {
// @formatter:off
@Shadow(remap = false) private String fmlVersion;
@Shadow public String ip;
// @formatter:on
private static final String EXTRA_DATA = "extraData";
private static final Gson GSON = new Gson();
@Redirect(method = "readPacketData", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/PacketBuffer;readString(I)Ljava/lang/String;")) @Redirect(method = "readPacketData", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/PacketBuffer;readString(I)Ljava/lang/String;"))
private String arclight$bungeeHostname(PacketBuffer packetBuffer, int maxLength) { private String arclight$bungeeHostname(PacketBuffer packetBuffer, int maxLength) {
return packetBuffer.readString(Short.MAX_VALUE); return packetBuffer.readString(Short.MAX_VALUE);
} }
@Inject(method = "readPacketData", cancellable = true, at = @At(value = "FIELD", shift = At.Shift.AFTER, remap = false, target = "Lnet/minecraft/network/handshake/client/CHandshakePacket;fmlVersion:Ljava/lang/String;"))
private void arclight$readFromProfile(PacketBuffer buf, CallbackInfo ci) {
if (SpigotConfig.bungee && !Objects.equals(this.fmlVersion, FMLNetworkConstants.NETVERSION)) {
String[] split = this.ip.split("\0");
if (split.length == 4) {
Property[] properties = GSON.fromJson(split[3], Property[].class);
for (Property property : properties) {
if (Objects.equals(property.getName(), EXTRA_DATA)) {
String extraData = property.getValue().replace("\1", "\0");
this.fmlVersion = NetworkHooks.getFMLVersion(split[0] + extraData);
}
}
}
}
ci.cancel();
}
} }