Skip to content

Update to 1.21#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
he3als wants to merge 6 commits into
base:fabric-support
Choose a base branch
from
Open

Update to 1.21 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
133cef0
2.7.0 - Update to support Velocity's new class name
DylanKeir Jan 22, 2024
554d6c3
2.8.0 - Bump required Java verison from 8 -> 17, warn 1.20.5/1.20.6 u…
DylanKeir Jun 1, 2024
13261ab
Merge branch 'master' into fabric
he3als Aug 1, 2024
59ab989
feat(fabric): update dependencies, LiteralText fix
he3als Aug 1, 2024
eeedfe6
fix(fabric): HandshakeC2SPacketAccessor changes
he3als Aug 1, 2024
f78c7b9
feat: bump version to 2.8.1 for Fabric support
he3als Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ It also parses passed IP addresses so the server is aware of the real player IP

### Compatibility

TCPShield is compatible with Spigot / CraftBukkit, BungeeCordand Velocity.
TCPShield is compatible with Spigot / CraftBukkit, BungeeCord, Velocity, and Fabric.

When using Spigot / CraftBukkit, [ProtocolLib](https://github.com/aadnk/ProtocolLib) needs to be installed.

Expand Down
28 changes: 12 additions & 16 deletions build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,13 +21,13 @@ buildscript {
plugins {
id 'java'
id 'idea'
id 'fabric-loom' version '0.6-SNAPSHOT'
id 'fabric-loom' version '1.7-SNAPSHOT'
}

// --
// Variables
// --
version = '2.6.2'
version = '2.8.1'
group = 'net.tcpshield.tcpshield'
archivesBaseName = 'TCPShield'

Expand DownExpand Up@@ -61,8 +61,8 @@ sourceSets {
}

compileJava {
sourceCompatibility = "8"
targetCompatibility = "8"
sourceCompatibility = 17
targetCompatibility = 17
options.encoding = 'UTF-8'
}

Expand All@@ -83,10 +83,7 @@ repositories {
url = 'https://oss.sonatype.org/content/repositories/snapshots'
}
maven {
url = 'https://papermc.io/repo/repository/maven-public/'
}
maven {
url = 'https://repo.velocitypowered.com/snapshots/'
url = 'https://repo.papermc.io/repository/maven-public/'
}
maven {
url = "https://repo.opencollab.dev/maven-snapshots/"
Expand All@@ -98,22 +95,21 @@ repositories {

dependencies {
// Bukkit
compileOnly group: 'org.spigotmc', name: 'spigot-api', version: '1.11-R0.1-SNAPSHOT'
compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '5.0.0-SNAPSHOT'
compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '5.1.0'

// Paper
compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.15.2-R0.1-SNAPSHOT'
// Paper - 1.19.4 so we can bump from JDK 8 -> JDK 17, using 1.20.x as a dependency would require bumping from JDK 8 -> JDK 21
compileOnly group: 'io.papermc.paper', name: 'paper-api', version: '1.19.4-R0.1-SNAPSHOT'

// BungeeCord
compileOnly group: 'net.md-5', name: 'bungeecord-api', version: '1.14-SNAPSHOT'

// Velocity
compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: '1.0.0-SNAPSHOT'
compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: '3.3.0-SNAPSHOT'

// Fabric
minecraft "com.mojang:minecraft:1.16.5"
mappings "net.fabricmc:yarn:1.16.5+build.5:v2"
modImplementation group: 'net.fabricmc', name: 'fabric-loader', version: '0.11.2'
minecraft "com.mojang:minecraft:1.21"
mappings "net.fabricmc:yarn:1.21+build.9"
modImplementation group: 'net.fabricmc', name: 'fabric-loader', version: '0.16.0'

// Testing
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0-M1'
Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/tcpshield/tcpshield/TCPShieldPacketHandler.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
import net.tcpshield.tcpshield.util.validation.timestamp.impl.HTPDateTimestampValidator;

import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
Expand Down
27 changes: 26 additions & 1 deletion src/main/java/net/tcpshield/tcpshield/bukkit/TCPShieldBukkit.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
package net.tcpshield.tcpshield.bukkit;

import java.util.logging.Logger;
import net.tcpshield.tcpshield.TCPShieldPacketHandler;
import net.tcpshield.tcpshield.TCPShieldPlugin;
import net.tcpshield.tcpshield.bukkit.paper.BukkitPaper;
Expand All@@ -9,6 +10,7 @@
import net.tcpshield.tcpshield.provider.ConfigProvider;
import net.tcpshield.tcpshield.util.Debugger;
import net.tcpshield.tcpshield.util.exception.phase.InitializationException;
import org.bukkit.Bukkit;
import org.bukkit.plugin.java.JavaPlugin;

/**
Expand All@@ -31,7 +33,25 @@ public void onEnable() {

// check force plib option -> paper -> plib -> error
if (this.configProvider.preferProtocolLib() && getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
bukkitImpl = new BukkitProtocolLib(this);
try {
String[] protocolLibVersion = getServer().getPluginManager().getPlugin("ProtocolLib").getDescription().getVersion().split("-")[0].split("\\.");
int major = Integer.parseInt(protocolLibVersion[0]);
int minor = Integer.parseInt(protocolLibVersion[1]);
int patch = Integer.parseInt(protocolLibVersion[2]);

String paperVersion = Bukkit.getServer().getMinecraftVersion();
if (major <= 5 && minor <= 2 && patch <= 1 && (paperVersion.equals("1.20.5") || paperVersion.equals("1.20.6"))) {
getLogger().severe("TCPShield is incompatible with ProtocolLib <= 5.2.1 on Paper 1.20.5/1.20.6 due to lack of support from ProtocolLib. Reverting to default Paper handler to prevent issues. This error can be avoided by disabling 'prefer-protocollib' in the config.");
bukkitImpl = new BukkitPaper(this);
} else {
bukkitImpl = new BukkitProtocolLib(this);
}
} catch (Exception t) {
getLogger().warning("Failed to check Paper or ProtocolLib version. This is not a critical error unless you are running Paper 1.20.5/1.20.6 with ProtocolLib version 5.2.1 or below.");
getDebugger().exception(t);

bukkitImpl = new BukkitProtocolLib(this);
}
} else if (BukkitImplProvider.hasPaperEvent()) {
bukkitImpl = new BukkitPaper(this);
} else if (getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
Expand DownExpand Up@@ -72,4 +92,9 @@ public ConfigProvider getConfigProvider() {
return configProvider;
}

@Override
public Logger getLogger() {
return super.getLogger();
}

}
4 changes: 2 additions & 2 deletions src/main/java/net/tcpshield/tcpshield/fabric/impl/FabricPacket.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
import net.tcpshield.tcpshield.provider.PacketProvider;
import net.tcpshield.tcpshield.util.exception.manipulate.PacketManipulationException;

public class FabricPacket implements PacketProvider {
public class FabricPacket implements PacketProvider {

private final HandshakeC2SPacket handshake;

Expand All@@ -15,7 +15,7 @@ public FabricPacket(HandshakeC2SPacket handshake) {

@Override
public String getPayloadString() {
return ((HandshakeC2SPacketAccessor) handshake).getAddress();
return HandshakeC2SPacketAccessor.class.cast(handshake).getAddress();
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/tcpshield/tcpshield/fabric/impl/FabricPlayer.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

import net.minecraft.network.ClientConnection;
import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
import net.tcpshield.tcpshield.fabric.mixin.ClientConnectionAccessor;
import net.tcpshield.tcpshield.provider.PlayerProvider;

Expand DownExpand Up@@ -43,6 +43,6 @@ public void setIP(InetSocketAddress ip) {

@Override
public void disconnect() {
connection.disconnect(new LiteralText("Connection failed. Please try again or contact an administrator."));
connection.disconnect(Text.literal("Connection failed. Please try again or contact an administrator."));
}
}
2 changes: 1 addition & 1 deletion src/main/java/net/tcpshield/tcpshield/fabric/mixin/HandshakeC2SPacketAccessor.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,6 @@

@Mixin(HandshakeC2SPacket.class)
public interface HandshakeC2SPacketAccessor {
@Accessor
@Accessor("address")
String getAddress();
}
10 changes: 9 additions & 1 deletion src/main/java/net/tcpshield/tcpshield/velocity/handler/VelocityPacket.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,15 @@ public class VelocityPacket implements PacketProvider {
Class<?> inboundConnection = Class.forName("com.velocitypowered.proxy.connection.client.InitialInboundConnection");

HANDSHAKE_FIELD = ReflectionUtil.getPrivateField(inboundConnection, "handshake");
HOSTNAME_FIELD = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.Handshake"), "serverAddress");

Field hostnameField;
try {
hostnameField = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.HandshakePacket"), "serverAddress");
} catch (Exception e) {
hostnameField = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.Handshake"), "serverAddress");
}
HOSTNAME_FIELD = hostnameField;

CLEANED_ADDRESS_FIELD = ReflectionUtil.getPrivateField(inboundConnection, "cleanedAddress");
} catch (Exception e) {
throw new InitializationException(new ReflectionException(e));
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/bungee.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: TCPShield
version: 2.6.1
version: 2.8.1
main: net.tcpshield.tcpshield.bungee.TCPShieldBungee
author: https://tcpshield.com
softdepends:
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/config.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,4 @@ debug-mode: false
enable-geyser-support: false

# Spigot/Paper option only, does not affect bungeecord
prefer-protocollib: true
prefer-protocollib: false
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"schemaVersion": 1,
"id": "tcp-shield",
"version": "2.5",
"version": "2.8.1",
"name": "TCPShield",
"description": "TCPShield support for Fabric",
"authors": [
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: TCPShield
version: 2.6.1
version: 2.8.1
main: net.tcpshield.tcpshield.bukkit.TCPShieldBukkit
softdepend:
- ProtocolLib
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/tcpshield.mixins.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"required": true,
"minVersion": "0.8",
"package": "net.tcpshield.tcpshield.fabric.mixin",
"compatibilityLevel": "JAVA_8",
"compatibilityLevel": "JAVA_17",
"mixins": [
"ClientConnectionAccessor",
"HandshakeC2SPacketAccessor",
Expand Down
17 changes: 16 additions & 1 deletion src/main/resources/velocity-plugin.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1 +1,16 @@
{"id":"tcpshield","name":"TCPShield","version":"2.6.1","description":"TCPShield IP parsing capabilities for Velocity","authors":["TCPShield"],"dependencies":[{"id":"floodgate","optional":true}],"main":"net.tcpshield.tcpshield.velocity.TCPShieldVelocity"}
{
"id": "tcpshield",
"name": "TCPShield",
"version": "2.8.1",
"description": "TCPShield IP parsing capabilities for Velocity",
"authors": [
"TCPShield"
],
"dependencies": [
{
"id": "floodgate",
"optional": true
}
],
"main": "net.tcpshield.tcpshield.velocity.TCPShieldVelocity"
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Update to 1.21 by he3als · Pull Request #1 · Draylar/RealIP · GitHub
Skip to content
Update to 1.21#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

he3als
wants to merge
6
commits into

base:fabric-support
Choose a base branch

from

 Open


Update to 1.21
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
133cef0

2.7.0 - Update to support Velocity's new class name


DylanKeir Jan 22, 2024
554d6c3

2.8.0 - Bump required Java verison from 8 -> 17, warn 1.20.5/1.20.6 u…


DylanKeir Jun 1, 2024
13261ab

Merge branch 'master' into fabric


he3als Aug 1, 2024
59ab989

feat(fabric): update dependencies, LiteralText fix


he3als Aug 1, 2024
eeedfe6

fix(fabric): HandshakeC2SPacketAccessor changes


he3als Aug 1, 2024
f78c7b9

feat: bump version to 2.8.1 for Fabric support


he3als Aug 1, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ It also parses passed IP addresses so the server is aware of the real player IP

### Compatibility

TCPShield is compatible with Spigot / CraftBukkit, BungeeCordand Velocity.
TCPShield is compatible with Spigot / CraftBukkit, BungeeCord, Velocity, and Fabric.

When using Spigot / CraftBukkit, [ProtocolLib](https://github.com/aadnk/ProtocolLib) needs to be installed.

Expand Down

28 changes: 12 additions & 16 deletions
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,13 +21,13 @@ buildscript {
plugins {
 id 'java'
 id 'idea'
 id 'fabric-loom' version '0.6-SNAPSHOT'
 id 'fabric-loom' version '1.7-SNAPSHOT'
}

// --
// Variables
// --
version = '2.6.2'
version = '2.8.1'
group = 'net.tcpshield.tcpshield'
archivesBaseName = 'TCPShield'

Expand DownExpand Up@@ -61,8 +61,8 @@ sourceSets {
}

compileJava {
 sourceCompatibility = "8"
 targetCompatibility = "8"
 sourceCompatibility = 17
 targetCompatibility = 17
 options.encoding = 'UTF-8'
}

Expand All@@ -83,10 +83,7 @@ repositories {
 url = 'https://oss.sonatype.org/content/repositories/snapshots'
 }
 maven {
 url = 'https://papermc.io/repo/repository/maven-public/'
 }
 maven {
 url = 'https://repo.velocitypowered.com/snapshots/'
 url = 'https://repo.papermc.io/repository/maven-public/'
 }
 maven {
 url = "https://repo.opencollab.dev/maven-snapshots/"
Expand All@@ -98,22 +95,21 @@ repositories {

dependencies {
 // Bukkit
 compileOnly group: 'org.spigotmc', name: 'spigot-api', version: '1.11-R0.1-SNAPSHOT'
 compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '5.0.0-SNAPSHOT'
 compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '5.1.0'

 // Paper
 compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.15.2-R0.1-SNAPSHOT'
 // Paper - 1.19.4 so we can bump from JDK 8 -> JDK 17, using 1.20.x as a dependency would require bumping from JDK 8 -> JDK 21
 compileOnly group: 'io.papermc.paper', name: 'paper-api', version: '1.19.4-R0.1-SNAPSHOT'

 // BungeeCord
 compileOnly group: 'net.md-5', name: 'bungeecord-api', version: '1.14-SNAPSHOT'

 // Velocity
 compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: '1.0.0-SNAPSHOT'
 compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: '3.3.0-SNAPSHOT'

 // Fabric
 minecraft "com.mojang:minecraft:1.16.5"
 mappings "net.fabricmc:yarn:1.16.5+build.5:v2"
 modImplementation group: 'net.fabricmc', name: 'fabric-loader', version: '0.11.2'
 minecraft "com.mojang:minecraft:1.21"
 mappings "net.fabricmc:yarn:1.21+build.9"
 modImplementation group: 'net.fabricmc', name: 'fabric-loader', version: '0.16.0'

 // Testing
 testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0-M1'
Expand Down

1 change: 1 addition & 0 deletions
src/main/java/net/tcpshield/tcpshield/TCPShieldPacketHandler.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
import net.tcpshield.tcpshield.util.validation.timestamp.impl.HTPDateTimestampValidator;

import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
Expand Down

27 changes: 26 additions & 1 deletion
src/main/java/net/tcpshield/tcpshield/bukkit/TCPShieldBukkit.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
package net.tcpshield.tcpshield.bukkit;

import java.util.logging.Logger;
import net.tcpshield.tcpshield.TCPShieldPacketHandler;
import net.tcpshield.tcpshield.TCPShieldPlugin;
import net.tcpshield.tcpshield.bukkit.paper.BukkitPaper;
Expand All@@ -9,6 +10,7 @@
import net.tcpshield.tcpshield.provider.ConfigProvider;
import net.tcpshield.tcpshield.util.Debugger;
import net.tcpshield.tcpshield.util.exception.phase.InitializationException;
import org.bukkit.Bukkit;
import org.bukkit.plugin.java.JavaPlugin;

/**
Expand All@@ -31,7 +33,25 @@ public void onEnable() {

 // check force plib option -> paper -> plib -> error
 if (this.configProvider.preferProtocolLib() && getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
 bukkitImpl = new BukkitProtocolLib(this);
 try {
 String[] protocolLibVersion = getServer().getPluginManager().getPlugin("ProtocolLib").getDescription().getVersion().split("-")[0].split("\\.");
 int major = Integer.parseInt(protocolLibVersion[0]);
 int minor = Integer.parseInt(protocolLibVersion[1]);
 int patch = Integer.parseInt(protocolLibVersion[2]);

 String paperVersion = Bukkit.getServer().getMinecraftVersion();
 if (major <= 5 && minor <= 2 && patch <= 1 && (paperVersion.equals("1.20.5") || paperVersion.equals("1.20.6"))) {
 getLogger().severe("TCPShield is incompatible with ProtocolLib <= 5.2.1 on Paper 1.20.5/1.20.6 due to lack of support from ProtocolLib. Reverting to default Paper handler to prevent issues. This error can be avoided by disabling 'prefer-protocollib' in the config.");
 bukkitImpl = new BukkitPaper(this);
 } else {
 bukkitImpl = new BukkitProtocolLib(this);
 }
 } catch (Exception t) {
 getLogger().warning("Failed to check Paper or ProtocolLib version. This is not a critical error unless you are running Paper 1.20.5/1.20.6 with ProtocolLib version 5.2.1 or below.");
 getDebugger().exception(t);

 bukkitImpl = new BukkitProtocolLib(this);
 }
 } else if (BukkitImplProvider.hasPaperEvent()) {
 bukkitImpl = new BukkitPaper(this);
 } else if (getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
Expand DownExpand Up@@ -72,4 +92,9 @@ public ConfigProvider getConfigProvider() {
 return configProvider;
	}

	@Override
	public Logger getLogger() {
 return super.getLogger();
	}

}

4 changes: 2 additions & 2 deletions
src/main/java/net/tcpshield/tcpshield/fabric/impl/FabricPacket.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
import net.tcpshield.tcpshield.provider.PacketProvider;
import net.tcpshield.tcpshield.util.exception.manipulate.PacketManipulationException;

public class FabricPacket implements PacketProvider {
public class FabricPacket implements PacketProvider {

 private final HandshakeC2SPacket handshake;

Expand All@@ -15,7 +15,7 @@ public FabricPacket(HandshakeC2SPacket handshake) {

 @Override
 public String getPayloadString() {
 return ((HandshakeC2SPacketAccessor) handshake).getAddress();
 return HandshakeC2SPacketAccessor.class.cast(handshake).getAddress();
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
src/main/java/net/tcpshield/tcpshield/fabric/impl/FabricPlayer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

import net.minecraft.network.ClientConnection;
import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
import net.tcpshield.tcpshield.fabric.mixin.ClientConnectionAccessor;
import net.tcpshield.tcpshield.provider.PlayerProvider;

Expand DownExpand Up@@ -43,6 +43,6 @@ public void setIP(InetSocketAddress ip) {

 @Override
 public void disconnect() {
 connection.disconnect(new LiteralText("Connection failed. Please try again or contact an administrator."));
 connection.disconnect(Text.literal("Connection failed. Please try again or contact an administrator."));
 }
}

2 changes: 1 addition & 1 deletion
src/main/java/net/tcpshield/tcpshield/fabric/mixin/HandshakeC2SPacketAccessor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,6 @@

@Mixin(HandshakeC2SPacket.class)
public interface HandshakeC2SPacketAccessor {
 @Accessor
 @Accessor("address")
 String getAddress();
}

10 changes: 9 additions & 1 deletion
src/main/java/net/tcpshield/tcpshield/velocity/handler/VelocityPacket.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,15 @@ public class VelocityPacket implements PacketProvider {
 Class<?> inboundConnection = Class.forName("com.velocitypowered.proxy.connection.client.InitialInboundConnection");

 HANDSHAKE_FIELD = ReflectionUtil.getPrivateField(inboundConnection, "handshake");
 HOSTNAME_FIELD = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.Handshake"), "serverAddress");

 Field hostnameField;
 try {
 hostnameField = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.HandshakePacket"), "serverAddress");
 } catch (Exception e) {
 hostnameField = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.Handshake"), "serverAddress");
 }
 HOSTNAME_FIELD = hostnameField;

 CLEANED_ADDRESS_FIELD = ReflectionUtil.getPrivateField(inboundConnection, "cleanedAddress");
 } catch (Exception e) {
 throw new InitializationException(new ReflectionException(e));
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/bungee.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: TCPShield
version: 2.6.1
version: 2.8.1
main: net.tcpshield.tcpshield.bungee.TCPShieldBungee
author: https://tcpshield.com
softdepends:
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,4 @@ debug-mode: false
enable-geyser-support: false

# Spigot/Paper option only, does not affect bungeecord
prefer-protocollib: true
prefer-protocollib: false

2 changes: 1 addition & 1 deletion
src/main/resources/fabric.mod.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
 "schemaVersion": 1,
 "id": "tcp-shield",
 "version": "2.5",
 "version": "2.8.1",
 "name": "TCPShield",
 "description": "TCPShield support for Fabric",
 "authors": [
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: TCPShield
version: 2.6.1
version: 2.8.1
main: net.tcpshield.tcpshield.bukkit.TCPShieldBukkit
softdepend:
- ProtocolLib
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/tcpshield.mixins.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 "required": true,
 "minVersion": "0.8",
 "package": "net.tcpshield.tcpshield.fabric.mixin",
 "compatibilityLevel": "JAVA_8",
 "compatibilityLevel": "JAVA_17",
 "mixins": [
 "ClientConnectionAccessor",
 "HandshakeC2SPacketAccessor",
Expand Down

17 changes: 16 additions & 1 deletion
src/main/resources/velocity-plugin.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,16 @@
{"id":"tcpshield","name":"TCPShield","version":"2.6.1","description":"TCPShield IP parsing capabilities for Velocity","authors":["TCPShield"],"dependencies":[{"id":"floodgate","optional":true}],"main":"net.tcpshield.tcpshield.velocity.TCPShieldVelocity"}
{
 "id": "tcpshield",
 "name": "TCPShield",
 "version": "2.8.1",
 "description": "TCPShield IP parsing capabilities for Velocity",
 "authors": [
 "TCPShield"
 ],
 "dependencies": [
 {
 "id": "floodgate",
 "optional": true
 }
 ],
 "main": "net.tcpshield.tcpshield.velocity.TCPShieldVelocity"
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update to 1.21 by he3als · Pull Request #1 · Draylar/RealIP · GitHub
Skip to content
Update to 1.21#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

he3als
wants to merge
6
commits into

base:fabric-support
Choose a base branch

from

 Open


Update to 1.21
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
133cef0

2.7.0 - Update to support Velocity's new class name


DylanKeir Jan 22, 2024
554d6c3

2.8.0 - Bump required Java verison from 8 -> 17, warn 1.20.5/1.20.6 u…


DylanKeir Jun 1, 2024
13261ab

Merge branch 'master' into fabric


he3als Aug 1, 2024
59ab989

feat(fabric): update dependencies, LiteralText fix


he3als Aug 1, 2024
eeedfe6

fix(fabric): HandshakeC2SPacketAccessor changes


he3als Aug 1, 2024
f78c7b9

feat: bump version to 2.8.1 for Fabric support


he3als Aug 1, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ It also parses passed IP addresses so the server is aware of the real player IP

### Compatibility

TCPShield is compatible with Spigot / CraftBukkit, BungeeCordand Velocity.
TCPShield is compatible with Spigot / CraftBukkit, BungeeCord, Velocity, and Fabric.

When using Spigot / CraftBukkit, [ProtocolLib](https://github.com/aadnk/ProtocolLib) needs to be installed.

Expand Down

28 changes: 12 additions & 16 deletions
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,13 +21,13 @@ buildscript {
plugins {
 id 'java'
 id 'idea'
 id 'fabric-loom' version '0.6-SNAPSHOT'
 id 'fabric-loom' version '1.7-SNAPSHOT'
}

// --
// Variables
// --
version = '2.6.2'
version = '2.8.1'
group = 'net.tcpshield.tcpshield'
archivesBaseName = 'TCPShield'

Expand DownExpand Up@@ -61,8 +61,8 @@ sourceSets {
}

compileJava {
 sourceCompatibility = "8"
 targetCompatibility = "8"
 sourceCompatibility = 17
 targetCompatibility = 17
 options.encoding = 'UTF-8'
}

Expand All@@ -83,10 +83,7 @@ repositories {
 url = 'https://oss.sonatype.org/content/repositories/snapshots'
 }
 maven {
 url = 'https://papermc.io/repo/repository/maven-public/'
 }
 maven {
 url = 'https://repo.velocitypowered.com/snapshots/'
 url = 'https://repo.papermc.io/repository/maven-public/'
 }
 maven {
 url = "https://repo.opencollab.dev/maven-snapshots/"
Expand All@@ -98,22 +95,21 @@ repositories {

dependencies {
 // Bukkit
 compileOnly group: 'org.spigotmc', name: 'spigot-api', version: '1.11-R0.1-SNAPSHOT'
 compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '5.0.0-SNAPSHOT'
 compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '5.1.0'

 // Paper
 compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.15.2-R0.1-SNAPSHOT'
 // Paper - 1.19.4 so we can bump from JDK 8 -> JDK 17, using 1.20.x as a dependency would require bumping from JDK 8 -> JDK 21
 compileOnly group: 'io.papermc.paper', name: 'paper-api', version: '1.19.4-R0.1-SNAPSHOT'

 // BungeeCord
 compileOnly group: 'net.md-5', name: 'bungeecord-api', version: '1.14-SNAPSHOT'

 // Velocity
 compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: '1.0.0-SNAPSHOT'
 compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: '3.3.0-SNAPSHOT'

 // Fabric
 minecraft "com.mojang:minecraft:1.16.5"
 mappings "net.fabricmc:yarn:1.16.5+build.5:v2"
 modImplementation group: 'net.fabricmc', name: 'fabric-loader', version: '0.11.2'
 minecraft "com.mojang:minecraft:1.21"
 mappings "net.fabricmc:yarn:1.21+build.9"
 modImplementation group: 'net.fabricmc', name: 'fabric-loader', version: '0.16.0'

 // Testing
 testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0-M1'
Expand Down

1 change: 1 addition & 0 deletions
src/main/java/net/tcpshield/tcpshield/TCPShieldPacketHandler.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
import net.tcpshield.tcpshield.util.validation.timestamp.impl.HTPDateTimestampValidator;

import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
Expand Down

27 changes: 26 additions & 1 deletion
src/main/java/net/tcpshield/tcpshield/bukkit/TCPShieldBukkit.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
package net.tcpshield.tcpshield.bukkit;

import java.util.logging.Logger;
import net.tcpshield.tcpshield.TCPShieldPacketHandler;
import net.tcpshield.tcpshield.TCPShieldPlugin;
import net.tcpshield.tcpshield.bukkit.paper.BukkitPaper;
Expand All@@ -9,6 +10,7 @@
import net.tcpshield.tcpshield.provider.ConfigProvider;
import net.tcpshield.tcpshield.util.Debugger;
import net.tcpshield.tcpshield.util.exception.phase.InitializationException;
import org.bukkit.Bukkit;
import org.bukkit.plugin.java.JavaPlugin;

/**
Expand All@@ -31,7 +33,25 @@ public void onEnable() {

 // check force plib option -> paper -> plib -> error
 if (this.configProvider.preferProtocolLib() && getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
 bukkitImpl = new BukkitProtocolLib(this);
 try {
 String[] protocolLibVersion = getServer().getPluginManager().getPlugin("ProtocolLib").getDescription().getVersion().split("-")[0].split("\\.");
 int major = Integer.parseInt(protocolLibVersion[0]);
 int minor = Integer.parseInt(protocolLibVersion[1]);
 int patch = Integer.parseInt(protocolLibVersion[2]);

 String paperVersion = Bukkit.getServer().getMinecraftVersion();
 if (major <= 5 && minor <= 2 && patch <= 1 && (paperVersion.equals("1.20.5") || paperVersion.equals("1.20.6"))) {
 getLogger().severe("TCPShield is incompatible with ProtocolLib <= 5.2.1 on Paper 1.20.5/1.20.6 due to lack of support from ProtocolLib. Reverting to default Paper handler to prevent issues. This error can be avoided by disabling 'prefer-protocollib' in the config.");
 bukkitImpl = new BukkitPaper(this);
 } else {
 bukkitImpl = new BukkitProtocolLib(this);
 }
 } catch (Exception t) {
 getLogger().warning("Failed to check Paper or ProtocolLib version. This is not a critical error unless you are running Paper 1.20.5/1.20.6 with ProtocolLib version 5.2.1 or below.");
 getDebugger().exception(t);

 bukkitImpl = new BukkitProtocolLib(this);
 }
 } else if (BukkitImplProvider.hasPaperEvent()) {
 bukkitImpl = new BukkitPaper(this);
 } else if (getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
Expand DownExpand Up@@ -72,4 +92,9 @@ public ConfigProvider getConfigProvider() {
 return configProvider;
	}

	@Override
	public Logger getLogger() {
 return super.getLogger();
	}

}

4 changes: 2 additions & 2 deletions
src/main/java/net/tcpshield/tcpshield/fabric/impl/FabricPacket.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
import net.tcpshield.tcpshield.provider.PacketProvider;
import net.tcpshield.tcpshield.util.exception.manipulate.PacketManipulationException;

public class FabricPacket implements PacketProvider {
public class FabricPacket implements PacketProvider {

 private final HandshakeC2SPacket handshake;

Expand All@@ -15,7 +15,7 @@ public FabricPacket(HandshakeC2SPacket handshake) {

 @Override
 public String getPayloadString() {
 return ((HandshakeC2SPacketAccessor) handshake).getAddress();
 return HandshakeC2SPacketAccessor.class.cast(handshake).getAddress();
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
src/main/java/net/tcpshield/tcpshield/fabric/impl/FabricPlayer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

import net.minecraft.network.ClientConnection;
import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
import net.tcpshield.tcpshield.fabric.mixin.ClientConnectionAccessor;
import net.tcpshield.tcpshield.provider.PlayerProvider;

Expand DownExpand Up@@ -43,6 +43,6 @@ public void setIP(InetSocketAddress ip) {

 @Override
 public void disconnect() {
 connection.disconnect(new LiteralText("Connection failed. Please try again or contact an administrator."));
 connection.disconnect(Text.literal("Connection failed. Please try again or contact an administrator."));
 }
}

2 changes: 1 addition & 1 deletion
src/main/java/net/tcpshield/tcpshield/fabric/mixin/HandshakeC2SPacketAccessor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,6 @@

@Mixin(HandshakeC2SPacket.class)
public interface HandshakeC2SPacketAccessor {
 @Accessor
 @Accessor("address")
 String getAddress();
}

10 changes: 9 additions & 1 deletion
src/main/java/net/tcpshield/tcpshield/velocity/handler/VelocityPacket.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,15 @@ public class VelocityPacket implements PacketProvider {
 Class<?> inboundConnection = Class.forName("com.velocitypowered.proxy.connection.client.InitialInboundConnection");

 HANDSHAKE_FIELD = ReflectionUtil.getPrivateField(inboundConnection, "handshake");
 HOSTNAME_FIELD = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.Handshake"), "serverAddress");

 Field hostnameField;
 try {
 hostnameField = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.HandshakePacket"), "serverAddress");
 } catch (Exception e) {
 hostnameField = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.Handshake"), "serverAddress");
 }
 HOSTNAME_FIELD = hostnameField;

 CLEANED_ADDRESS_FIELD = ReflectionUtil.getPrivateField(inboundConnection, "cleanedAddress");
 } catch (Exception e) {
 throw new InitializationException(new ReflectionException(e));
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/bungee.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: TCPShield
version: 2.6.1
version: 2.8.1
main: net.tcpshield.tcpshield.bungee.TCPShieldBungee
author: https://tcpshield.com
softdepends:
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,4 @@ debug-mode: false
enable-geyser-support: false

# Spigot/Paper option only, does not affect bungeecord
prefer-protocollib: true
prefer-protocollib: false

2 changes: 1 addition & 1 deletion
src/main/resources/fabric.mod.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
 "schemaVersion": 1,
 "id": "tcp-shield",
 "version": "2.5",
 "version": "2.8.1",
 "name": "TCPShield",
 "description": "TCPShield support for Fabric",
 "authors": [
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: TCPShield
version: 2.6.1
version: 2.8.1
main: net.tcpshield.tcpshield.bukkit.TCPShieldBukkit
softdepend:
- ProtocolLib
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/tcpshield.mixins.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 "required": true,
 "minVersion": "0.8",
 "package": "net.tcpshield.tcpshield.fabric.mixin",
 "compatibilityLevel": "JAVA_8",
 "compatibilityLevel": "JAVA_17",
 "mixins": [
 "ClientConnectionAccessor",
 "HandshakeC2SPacketAccessor",
Expand Down

17 changes: 16 additions & 1 deletion
src/main/resources/velocity-plugin.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,16 @@
{"id":"tcpshield","name":"TCPShield","version":"2.6.1","description":"TCPShield IP parsing capabilities for Velocity","authors":["TCPShield"],"dependencies":[{"id":"floodgate","optional":true}],"main":"net.tcpshield.tcpshield.velocity.TCPShieldVelocity"}
{
 "id": "tcpshield",
 "name": "TCPShield",
 "version": "2.8.1",
 "description": "TCPShield IP parsing capabilities for Velocity",
 "authors": [
 "TCPShield"
 ],
 "dependencies": [
 {
 "id": "floodgate",
 "optional": true
 }
 ],
 "main": "net.tcpshield.tcpshield.velocity.TCPShieldVelocity"
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update to 1.21 by he3als · Pull Request #1 · Draylar/RealIP · GitHub
Skip to content
Update to 1.21#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

he3als
wants to merge
6
commits into

base:fabric-support
Choose a base branch

from

 Open


Update to 1.21
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
133cef0

2.7.0 - Update to support Velocity's new class name


DylanKeir Jan 22, 2024
554d6c3

2.8.0 - Bump required Java verison from 8 -> 17, warn 1.20.5/1.20.6 u…


DylanKeir Jun 1, 2024
13261ab

Merge branch 'master' into fabric


he3als Aug 1, 2024
59ab989

feat(fabric): update dependencies, LiteralText fix


he3als Aug 1, 2024
eeedfe6

fix(fabric): HandshakeC2SPacketAccessor changes


he3als Aug 1, 2024
f78c7b9

feat: bump version to 2.8.1 for Fabric support


he3als Aug 1, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ It also parses passed IP addresses so the server is aware of the real player IP

### Compatibility

TCPShield is compatible with Spigot / CraftBukkit, BungeeCordand Velocity.
TCPShield is compatible with Spigot / CraftBukkit, BungeeCord, Velocity, and Fabric.

When using Spigot / CraftBukkit, [ProtocolLib](https://github.com/aadnk/ProtocolLib) needs to be installed.

Expand Down

28 changes: 12 additions & 16 deletions
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,13 +21,13 @@ buildscript {
plugins {
 id 'java'
 id 'idea'
 id 'fabric-loom' version '0.6-SNAPSHOT'
 id 'fabric-loom' version '1.7-SNAPSHOT'
}

// --
// Variables
// --
version = '2.6.2'
version = '2.8.1'
group = 'net.tcpshield.tcpshield'
archivesBaseName = 'TCPShield'

Expand DownExpand Up@@ -61,8 +61,8 @@ sourceSets {
}

compileJava {
 sourceCompatibility = "8"
 targetCompatibility = "8"
 sourceCompatibility = 17
 targetCompatibility = 17
 options.encoding = 'UTF-8'
}

Expand All@@ -83,10 +83,7 @@ repositories {
 url = 'https://oss.sonatype.org/content/repositories/snapshots'
 }
 maven {
 url = 'https://papermc.io/repo/repository/maven-public/'
 }
 maven {
 url = 'https://repo.velocitypowered.com/snapshots/'
 url = 'https://repo.papermc.io/repository/maven-public/'
 }
 maven {
 url = "https://repo.opencollab.dev/maven-snapshots/"
Expand All@@ -98,22 +95,21 @@ repositories {

dependencies {
 // Bukkit
 compileOnly group: 'org.spigotmc', name: 'spigot-api', version: '1.11-R0.1-SNAPSHOT'
 compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '5.0.0-SNAPSHOT'
 compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '5.1.0'

 // Paper
 compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.15.2-R0.1-SNAPSHOT'
 // Paper - 1.19.4 so we can bump from JDK 8 -> JDK 17, using 1.20.x as a dependency would require bumping from JDK 8 -> JDK 21
 compileOnly group: 'io.papermc.paper', name: 'paper-api', version: '1.19.4-R0.1-SNAPSHOT'

 // BungeeCord
 compileOnly group: 'net.md-5', name: 'bungeecord-api', version: '1.14-SNAPSHOT'

 // Velocity
 compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: '1.0.0-SNAPSHOT'
 compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: '3.3.0-SNAPSHOT'

 // Fabric
 minecraft "com.mojang:minecraft:1.16.5"
 mappings "net.fabricmc:yarn:1.16.5+build.5:v2"
 modImplementation group: 'net.fabricmc', name: 'fabric-loader', version: '0.11.2'
 minecraft "com.mojang:minecraft:1.21"
 mappings "net.fabricmc:yarn:1.21+build.9"
 modImplementation group: 'net.fabricmc', name: 'fabric-loader', version: '0.16.0'

 // Testing
 testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0-M1'
Expand Down

1 change: 1 addition & 0 deletions
src/main/java/net/tcpshield/tcpshield/TCPShieldPacketHandler.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
import net.tcpshield.tcpshield.util.validation.timestamp.impl.HTPDateTimestampValidator;

import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
Expand Down

27 changes: 26 additions & 1 deletion
src/main/java/net/tcpshield/tcpshield/bukkit/TCPShieldBukkit.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
package net.tcpshield.tcpshield.bukkit;

import java.util.logging.Logger;
import net.tcpshield.tcpshield.TCPShieldPacketHandler;
import net.tcpshield.tcpshield.TCPShieldPlugin;
import net.tcpshield.tcpshield.bukkit.paper.BukkitPaper;
Expand All@@ -9,6 +10,7 @@
import net.tcpshield.tcpshield.provider.ConfigProvider;
import net.tcpshield.tcpshield.util.Debugger;
import net.tcpshield.tcpshield.util.exception.phase.InitializationException;
import org.bukkit.Bukkit;
import org.bukkit.plugin.java.JavaPlugin;

/**
Expand All@@ -31,7 +33,25 @@ public void onEnable() {

 // check force plib option -> paper -> plib -> error
 if (this.configProvider.preferProtocolLib() && getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
 bukkitImpl = new BukkitProtocolLib(this);
 try {
 String[] protocolLibVersion = getServer().getPluginManager().getPlugin("ProtocolLib").getDescription().getVersion().split("-")[0].split("\\.");
 int major = Integer.parseInt(protocolLibVersion[0]);
 int minor = Integer.parseInt(protocolLibVersion[1]);
 int patch = Integer.parseInt(protocolLibVersion[2]);

 String paperVersion = Bukkit.getServer().getMinecraftVersion();
 if (major <= 5 && minor <= 2 && patch <= 1 && (paperVersion.equals("1.20.5") || paperVersion.equals("1.20.6"))) {
 getLogger().severe("TCPShield is incompatible with ProtocolLib <= 5.2.1 on Paper 1.20.5/1.20.6 due to lack of support from ProtocolLib. Reverting to default Paper handler to prevent issues. This error can be avoided by disabling 'prefer-protocollib' in the config.");
 bukkitImpl = new BukkitPaper(this);
 } else {
 bukkitImpl = new BukkitProtocolLib(this);
 }
 } catch (Exception t) {
 getLogger().warning("Failed to check Paper or ProtocolLib version. This is not a critical error unless you are running Paper 1.20.5/1.20.6 with ProtocolLib version 5.2.1 or below.");
 getDebugger().exception(t);

 bukkitImpl = new BukkitProtocolLib(this);
 }
 } else if (BukkitImplProvider.hasPaperEvent()) {
 bukkitImpl = new BukkitPaper(this);
 } else if (getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
Expand DownExpand Up@@ -72,4 +92,9 @@ public ConfigProvider getConfigProvider() {
 return configProvider;
	}

	@Override
	public Logger getLogger() {
 return super.getLogger();
	}

}

4 changes: 2 additions & 2 deletions
src/main/java/net/tcpshield/tcpshield/fabric/impl/FabricPacket.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
import net.tcpshield.tcpshield.provider.PacketProvider;
import net.tcpshield.tcpshield.util.exception.manipulate.PacketManipulationException;

public class FabricPacket implements PacketProvider {
public class FabricPacket implements PacketProvider {

 private final HandshakeC2SPacket handshake;

Expand All@@ -15,7 +15,7 @@ public FabricPacket(HandshakeC2SPacket handshake) {

 @Override
 public String getPayloadString() {
 return ((HandshakeC2SPacketAccessor) handshake).getAddress();
 return HandshakeC2SPacketAccessor.class.cast(handshake).getAddress();
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
src/main/java/net/tcpshield/tcpshield/fabric/impl/FabricPlayer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

import net.minecraft.network.ClientConnection;
import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
import net.tcpshield.tcpshield.fabric.mixin.ClientConnectionAccessor;
import net.tcpshield.tcpshield.provider.PlayerProvider;

Expand DownExpand Up@@ -43,6 +43,6 @@ public void setIP(InetSocketAddress ip) {

 @Override
 public void disconnect() {
 connection.disconnect(new LiteralText("Connection failed. Please try again or contact an administrator."));
 connection.disconnect(Text.literal("Connection failed. Please try again or contact an administrator."));
 }
}

2 changes: 1 addition & 1 deletion
src/main/java/net/tcpshield/tcpshield/fabric/mixin/HandshakeC2SPacketAccessor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,6 @@

@Mixin(HandshakeC2SPacket.class)
public interface HandshakeC2SPacketAccessor {
 @Accessor
 @Accessor("address")
 String getAddress();
}

10 changes: 9 additions & 1 deletion
src/main/java/net/tcpshield/tcpshield/velocity/handler/VelocityPacket.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,15 @@ public class VelocityPacket implements PacketProvider {
 Class<?> inboundConnection = Class.forName("com.velocitypowered.proxy.connection.client.InitialInboundConnection");

 HANDSHAKE_FIELD = ReflectionUtil.getPrivateField(inboundConnection, "handshake");
 HOSTNAME_FIELD = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.Handshake"), "serverAddress");

 Field hostnameField;
 try {
 hostnameField = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.HandshakePacket"), "serverAddress");
 } catch (Exception e) {
 hostnameField = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.Handshake"), "serverAddress");
 }
 HOSTNAME_FIELD = hostnameField;

 CLEANED_ADDRESS_FIELD = ReflectionUtil.getPrivateField(inboundConnection, "cleanedAddress");
 } catch (Exception e) {
 throw new InitializationException(new ReflectionException(e));
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/bungee.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: TCPShield
version: 2.6.1
version: 2.8.1
main: net.tcpshield.tcpshield.bungee.TCPShieldBungee
author: https://tcpshield.com
softdepends:
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,4 @@ debug-mode: false
enable-geyser-support: false

# Spigot/Paper option only, does not affect bungeecord
prefer-protocollib: true
prefer-protocollib: false

2 changes: 1 addition & 1 deletion
src/main/resources/fabric.mod.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
 "schemaVersion": 1,
 "id": "tcp-shield",
 "version": "2.5",
 "version": "2.8.1",
 "name": "TCPShield",
 "description": "TCPShield support for Fabric",
 "authors": [
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: TCPShield
version: 2.6.1
version: 2.8.1
main: net.tcpshield.tcpshield.bukkit.TCPShieldBukkit
softdepend:
- ProtocolLib
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/tcpshield.mixins.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 "required": true,
 "minVersion": "0.8",
 "package": "net.tcpshield.tcpshield.fabric.mixin",
 "compatibilityLevel": "JAVA_8",
 "compatibilityLevel": "JAVA_17",
 "mixins": [
 "ClientConnectionAccessor",
 "HandshakeC2SPacketAccessor",
Expand Down

17 changes: 16 additions & 1 deletion
src/main/resources/velocity-plugin.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,16 @@
{"id":"tcpshield","name":"TCPShield","version":"2.6.1","description":"TCPShield IP parsing capabilities for Velocity","authors":["TCPShield"],"dependencies":[{"id":"floodgate","optional":true}],"main":"net.tcpshield.tcpshield.velocity.TCPShieldVelocity"}
{
 "id": "tcpshield",
 "name": "TCPShield",
 "version": "2.8.1",
 "description": "TCPShield IP parsing capabilities for Velocity",
 "authors": [
 "TCPShield"
 ],
 "dependencies": [
 {
 "id": "floodgate",
 "optional": true
 }
 ],
 "main": "net.tcpshield.tcpshield.velocity.TCPShieldVelocity"
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Update to 1.21 by he3als · Pull Request #1 · Draylar/RealIP · GitHub
Skip to content
Update to 1.21#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

he3als
wants to merge
6
commits into

base:fabric-support
Choose a base branch

from

 Open


Update to 1.21
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
133cef0

2.7.0 - Update to support Velocity's new class name


DylanKeir Jan 22, 2024
554d6c3

2.8.0 - Bump required Java verison from 8 -> 17, warn 1.20.5/1.20.6 u…


DylanKeir Jun 1, 2024
13261ab

Merge branch 'master' into fabric


he3als Aug 1, 2024
59ab989

feat(fabric): update dependencies, LiteralText fix


he3als Aug 1, 2024
eeedfe6

fix(fabric): HandshakeC2SPacketAccessor changes


he3als Aug 1, 2024
f78c7b9

feat: bump version to 2.8.1 for Fabric support


he3als Aug 1, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ It also parses passed IP addresses so the server is aware of the real player IP

### Compatibility

TCPShield is compatible with Spigot / CraftBukkit, BungeeCordand Velocity.
TCPShield is compatible with Spigot / CraftBukkit, BungeeCord, Velocity, and Fabric.

When using Spigot / CraftBukkit, [ProtocolLib](https://github.com/aadnk/ProtocolLib) needs to be installed.

Expand Down

28 changes: 12 additions & 16 deletions
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,13 +21,13 @@ buildscript {
plugins {
 id 'java'
 id 'idea'
 id 'fabric-loom' version '0.6-SNAPSHOT'
 id 'fabric-loom' version '1.7-SNAPSHOT'
}

// --
// Variables
// --
version = '2.6.2'
version = '2.8.1'
group = 'net.tcpshield.tcpshield'
archivesBaseName = 'TCPShield'

Expand DownExpand Up@@ -61,8 +61,8 @@ sourceSets {
}

compileJava {
 sourceCompatibility = "8"
 targetCompatibility = "8"
 sourceCompatibility = 17
 targetCompatibility = 17
 options.encoding = 'UTF-8'
}

Expand All@@ -83,10 +83,7 @@ repositories {
 url = 'https://oss.sonatype.org/content/repositories/snapshots'
 }
 maven {
 url = 'https://papermc.io/repo/repository/maven-public/'
 }
 maven {
 url = 'https://repo.velocitypowered.com/snapshots/'
 url = 'https://repo.papermc.io/repository/maven-public/'
 }
 maven {
 url = "https://repo.opencollab.dev/maven-snapshots/"
Expand All@@ -98,22 +95,21 @@ repositories {

dependencies {
 // Bukkit
 compileOnly group: 'org.spigotmc', name: 'spigot-api', version: '1.11-R0.1-SNAPSHOT'
 compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '5.0.0-SNAPSHOT'
 compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '5.1.0'

 // Paper
 compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.15.2-R0.1-SNAPSHOT'
 // Paper - 1.19.4 so we can bump from JDK 8 -> JDK 17, using 1.20.x as a dependency would require bumping from JDK 8 -> JDK 21
 compileOnly group: 'io.papermc.paper', name: 'paper-api', version: '1.19.4-R0.1-SNAPSHOT'

 // BungeeCord
 compileOnly group: 'net.md-5', name: 'bungeecord-api', version: '1.14-SNAPSHOT'

 // Velocity
 compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: '1.0.0-SNAPSHOT'
 compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: '3.3.0-SNAPSHOT'

 // Fabric
 minecraft "com.mojang:minecraft:1.16.5"
 mappings "net.fabricmc:yarn:1.16.5+build.5:v2"
 modImplementation group: 'net.fabricmc', name: 'fabric-loader', version: '0.11.2'
 minecraft "com.mojang:minecraft:1.21"
 mappings "net.fabricmc:yarn:1.21+build.9"
 modImplementation group: 'net.fabricmc', name: 'fabric-loader', version: '0.16.0'

 // Testing
 testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0-M1'
Expand Down

1 change: 1 addition & 0 deletions
src/main/java/net/tcpshield/tcpshield/TCPShieldPacketHandler.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
import net.tcpshield.tcpshield.util.validation.timestamp.impl.HTPDateTimestampValidator;

import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
Expand Down

27 changes: 26 additions & 1 deletion
src/main/java/net/tcpshield/tcpshield/bukkit/TCPShieldBukkit.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
package net.tcpshield.tcpshield.bukkit;

import java.util.logging.Logger;
import net.tcpshield.tcpshield.TCPShieldPacketHandler;
import net.tcpshield.tcpshield.TCPShieldPlugin;
import net.tcpshield.tcpshield.bukkit.paper.BukkitPaper;
Expand All@@ -9,6 +10,7 @@
import net.tcpshield.tcpshield.provider.ConfigProvider;
import net.tcpshield.tcpshield.util.Debugger;
import net.tcpshield.tcpshield.util.exception.phase.InitializationException;
import org.bukkit.Bukkit;
import org.bukkit.plugin.java.JavaPlugin;

/**
Expand All@@ -31,7 +33,25 @@ public void onEnable() {

 // check force plib option -> paper -> plib -> error
 if (this.configProvider.preferProtocolLib() && getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
 bukkitImpl = new BukkitProtocolLib(this);
 try {
 String[] protocolLibVersion = getServer().getPluginManager().getPlugin("ProtocolLib").getDescription().getVersion().split("-")[0].split("\\.");
 int major = Integer.parseInt(protocolLibVersion[0]);
 int minor = Integer.parseInt(protocolLibVersion[1]);
 int patch = Integer.parseInt(protocolLibVersion[2]);

 String paperVersion = Bukkit.getServer().getMinecraftVersion();
 if (major <= 5 && minor <= 2 && patch <= 1 && (paperVersion.equals("1.20.5") || paperVersion.equals("1.20.6"))) {
 getLogger().severe("TCPShield is incompatible with ProtocolLib <= 5.2.1 on Paper 1.20.5/1.20.6 due to lack of support from ProtocolLib. Reverting to default Paper handler to prevent issues. This error can be avoided by disabling 'prefer-protocollib' in the config.");
 bukkitImpl = new BukkitPaper(this);
 } else {
 bukkitImpl = new BukkitProtocolLib(this);
 }
 } catch (Exception t) {
 getLogger().warning("Failed to check Paper or ProtocolLib version. This is not a critical error unless you are running Paper 1.20.5/1.20.6 with ProtocolLib version 5.2.1 or below.");
 getDebugger().exception(t);

 bukkitImpl = new BukkitProtocolLib(this);
 }
 } else if (BukkitImplProvider.hasPaperEvent()) {
 bukkitImpl = new BukkitPaper(this);
 } else if (getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
Expand DownExpand Up@@ -72,4 +92,9 @@ public ConfigProvider getConfigProvider() {
 return configProvider;
	}

	@Override
	public Logger getLogger() {
 return super.getLogger();
	}

}

4 changes: 2 additions & 2 deletions
src/main/java/net/tcpshield/tcpshield/fabric/impl/FabricPacket.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
import net.tcpshield.tcpshield.provider.PacketProvider;
import net.tcpshield.tcpshield.util.exception.manipulate.PacketManipulationException;

public class FabricPacket implements PacketProvider {
public class FabricPacket implements PacketProvider {

 private final HandshakeC2SPacket handshake;

Expand All@@ -15,7 +15,7 @@ public FabricPacket(HandshakeC2SPacket handshake) {

 @Override
 public String getPayloadString() {
 return ((HandshakeC2SPacketAccessor) handshake).getAddress();
 return HandshakeC2SPacketAccessor.class.cast(handshake).getAddress();
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
src/main/java/net/tcpshield/tcpshield/fabric/impl/FabricPlayer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

import net.minecraft.network.ClientConnection;
import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
import net.tcpshield.tcpshield.fabric.mixin.ClientConnectionAccessor;
import net.tcpshield.tcpshield.provider.PlayerProvider;

Expand DownExpand Up@@ -43,6 +43,6 @@ public void setIP(InetSocketAddress ip) {

 @Override
 public void disconnect() {
 connection.disconnect(new LiteralText("Connection failed. Please try again or contact an administrator."));
 connection.disconnect(Text.literal("Connection failed. Please try again or contact an administrator."));
 }
}

2 changes: 1 addition & 1 deletion
src/main/java/net/tcpshield/tcpshield/fabric/mixin/HandshakeC2SPacketAccessor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,6 @@

@Mixin(HandshakeC2SPacket.class)
public interface HandshakeC2SPacketAccessor {
 @Accessor
 @Accessor("address")
 String getAddress();
}

10 changes: 9 additions & 1 deletion
src/main/java/net/tcpshield/tcpshield/velocity/handler/VelocityPacket.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,15 @@ public class VelocityPacket implements PacketProvider {
 Class<?> inboundConnection = Class.forName("com.velocitypowered.proxy.connection.client.InitialInboundConnection");

 HANDSHAKE_FIELD = ReflectionUtil.getPrivateField(inboundConnection, "handshake");
 HOSTNAME_FIELD = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.Handshake"), "serverAddress");

 Field hostnameField;
 try {
 hostnameField = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.HandshakePacket"), "serverAddress");
 } catch (Exception e) {
 hostnameField = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.Handshake"), "serverAddress");
 }
 HOSTNAME_FIELD = hostnameField;

 CLEANED_ADDRESS_FIELD = ReflectionUtil.getPrivateField(inboundConnection, "cleanedAddress");
 } catch (Exception e) {
 throw new InitializationException(new ReflectionException(e));
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/bungee.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: TCPShield
version: 2.6.1
version: 2.8.1
main: net.tcpshield.tcpshield.bungee.TCPShieldBungee
author: https://tcpshield.com
softdepends:
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,4 @@ debug-mode: false
enable-geyser-support: false

# Spigot/Paper option only, does not affect bungeecord
prefer-protocollib: true
prefer-protocollib: false

2 changes: 1 addition & 1 deletion
src/main/resources/fabric.mod.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
 "schemaVersion": 1,
 "id": "tcp-shield",
 "version": "2.5",
 "version": "2.8.1",
 "name": "TCPShield",
 "description": "TCPShield support for Fabric",
 "authors": [
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: TCPShield
version: 2.6.1
version: 2.8.1
main: net.tcpshield.tcpshield.bukkit.TCPShieldBukkit
softdepend:
- ProtocolLib
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/tcpshield.mixins.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 "required": true,
 "minVersion": "0.8",
 "package": "net.tcpshield.tcpshield.fabric.mixin",
 "compatibilityLevel": "JAVA_8",
 "compatibilityLevel": "JAVA_17",
 "mixins": [
 "ClientConnectionAccessor",
 "HandshakeC2SPacketAccessor",
Expand Down

17 changes: 16 additions & 1 deletion
src/main/resources/velocity-plugin.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,16 @@
{"id":"tcpshield","name":"TCPShield","version":"2.6.1","description":"TCPShield IP parsing capabilities for Velocity","authors":["TCPShield"],"dependencies":[{"id":"floodgate","optional":true}],"main":"net.tcpshield.tcpshield.velocity.TCPShieldVelocity"}
{
 "id": "tcpshield",
 "name": "TCPShield",
 "version": "2.8.1",
 "description": "TCPShield IP parsing capabilities for Velocity",
 "authors": [
 "TCPShield"
 ],
 "dependencies": [
 {
 "id": "floodgate",
 "optional": true
 }
 ],
 "main": "net.tcpshield.tcpshield.velocity.TCPShieldVelocity"
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update to 1.21 by he3als · Pull Request #1 · Draylar/RealIP · GitHub
Skip to content
Update to 1.21#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

he3als
wants to merge
6
commits into

base:fabric-support
Choose a base branch

from

 Open


Update to 1.21
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
133cef0

2.7.0 - Update to support Velocity's new class name


DylanKeir Jan 22, 2024
554d6c3

2.8.0 - Bump required Java verison from 8 -> 17, warn 1.20.5/1.20.6 u…


DylanKeir Jun 1, 2024
13261ab

Merge branch 'master' into fabric


he3als Aug 1, 2024
59ab989

feat(fabric): update dependencies, LiteralText fix


he3als Aug 1, 2024
eeedfe6

fix(fabric): HandshakeC2SPacketAccessor changes


he3als Aug 1, 2024
f78c7b9

feat: bump version to 2.8.1 for Fabric support


he3als Aug 1, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ It also parses passed IP addresses so the server is aware of the real player IP

### Compatibility

TCPShield is compatible with Spigot / CraftBukkit, BungeeCordand Velocity.
TCPShield is compatible with Spigot / CraftBukkit, BungeeCord, Velocity, and Fabric.

When using Spigot / CraftBukkit, [ProtocolLib](https://github.com/aadnk/ProtocolLib) needs to be installed.

Expand Down

28 changes: 12 additions & 16 deletions
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,13 +21,13 @@ buildscript {
plugins {
 id 'java'
 id 'idea'
 id 'fabric-loom' version '0.6-SNAPSHOT'
 id 'fabric-loom' version '1.7-SNAPSHOT'
}

// --
// Variables
// --
version = '2.6.2'
version = '2.8.1'
group = 'net.tcpshield.tcpshield'
archivesBaseName = 'TCPShield'

Expand DownExpand Up@@ -61,8 +61,8 @@ sourceSets {
}

compileJava {
 sourceCompatibility = "8"
 targetCompatibility = "8"
 sourceCompatibility = 17
 targetCompatibility = 17
 options.encoding = 'UTF-8'
}

Expand All@@ -83,10 +83,7 @@ repositories {
 url = 'https://oss.sonatype.org/content/repositories/snapshots'
 }
 maven {
 url = 'https://papermc.io/repo/repository/maven-public/'
 }
 maven {
 url = 'https://repo.velocitypowered.com/snapshots/'
 url = 'https://repo.papermc.io/repository/maven-public/'
 }
 maven {
 url = "https://repo.opencollab.dev/maven-snapshots/"
Expand All@@ -98,22 +95,21 @@ repositories {

dependencies {
 // Bukkit
 compileOnly group: 'org.spigotmc', name: 'spigot-api', version: '1.11-R0.1-SNAPSHOT'
 compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '5.0.0-SNAPSHOT'
 compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '5.1.0'

 // Paper
 compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.15.2-R0.1-SNAPSHOT'
 // Paper - 1.19.4 so we can bump from JDK 8 -> JDK 17, using 1.20.x as a dependency would require bumping from JDK 8 -> JDK 21
 compileOnly group: 'io.papermc.paper', name: 'paper-api', version: '1.19.4-R0.1-SNAPSHOT'

 // BungeeCord
 compileOnly group: 'net.md-5', name: 'bungeecord-api', version: '1.14-SNAPSHOT'

 // Velocity
 compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: '1.0.0-SNAPSHOT'
 compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: '3.3.0-SNAPSHOT'

 // Fabric
 minecraft "com.mojang:minecraft:1.16.5"
 mappings "net.fabricmc:yarn:1.16.5+build.5:v2"
 modImplementation group: 'net.fabricmc', name: 'fabric-loader', version: '0.11.2'
 minecraft "com.mojang:minecraft:1.21"
 mappings "net.fabricmc:yarn:1.21+build.9"
 modImplementation group: 'net.fabricmc', name: 'fabric-loader', version: '0.16.0'

 // Testing
 testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0-M1'
Expand Down

1 change: 1 addition & 0 deletions
src/main/java/net/tcpshield/tcpshield/TCPShieldPacketHandler.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
import net.tcpshield.tcpshield.util.validation.timestamp.impl.HTPDateTimestampValidator;

import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
Expand Down

27 changes: 26 additions & 1 deletion
src/main/java/net/tcpshield/tcpshield/bukkit/TCPShieldBukkit.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
package net.tcpshield.tcpshield.bukkit;

import java.util.logging.Logger;
import net.tcpshield.tcpshield.TCPShieldPacketHandler;
import net.tcpshield.tcpshield.TCPShieldPlugin;
import net.tcpshield.tcpshield.bukkit.paper.BukkitPaper;
Expand All@@ -9,6 +10,7 @@
import net.tcpshield.tcpshield.provider.ConfigProvider;
import net.tcpshield.tcpshield.util.Debugger;
import net.tcpshield.tcpshield.util.exception.phase.InitializationException;
import org.bukkit.Bukkit;
import org.bukkit.plugin.java.JavaPlugin;

/**
Expand All@@ -31,7 +33,25 @@ public void onEnable() {

 // check force plib option -> paper -> plib -> error
 if (this.configProvider.preferProtocolLib() && getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
 bukkitImpl = new BukkitProtocolLib(this);
 try {
 String[] protocolLibVersion = getServer().getPluginManager().getPlugin("ProtocolLib").getDescription().getVersion().split("-")[0].split("\\.");
 int major = Integer.parseInt(protocolLibVersion[0]);
 int minor = Integer.parseInt(protocolLibVersion[1]);
 int patch = Integer.parseInt(protocolLibVersion[2]);

 String paperVersion = Bukkit.getServer().getMinecraftVersion();
 if (major <= 5 && minor <= 2 && patch <= 1 && (paperVersion.equals("1.20.5") || paperVersion.equals("1.20.6"))) {
 getLogger().severe("TCPShield is incompatible with ProtocolLib <= 5.2.1 on Paper 1.20.5/1.20.6 due to lack of support from ProtocolLib. Reverting to default Paper handler to prevent issues. This error can be avoided by disabling 'prefer-protocollib' in the config.");
 bukkitImpl = new BukkitPaper(this);
 } else {
 bukkitImpl = new BukkitProtocolLib(this);
 }
 } catch (Exception t) {
 getLogger().warning("Failed to check Paper or ProtocolLib version. This is not a critical error unless you are running Paper 1.20.5/1.20.6 with ProtocolLib version 5.2.1 or below.");
 getDebugger().exception(t);

 bukkitImpl = new BukkitProtocolLib(this);
 }
 } else if (BukkitImplProvider.hasPaperEvent()) {
 bukkitImpl = new BukkitPaper(this);
 } else if (getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
Expand DownExpand Up@@ -72,4 +92,9 @@ public ConfigProvider getConfigProvider() {
 return configProvider;
	}

	@Override
	public Logger getLogger() {
 return super.getLogger();
	}

}

4 changes: 2 additions & 2 deletions
src/main/java/net/tcpshield/tcpshield/fabric/impl/FabricPacket.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
import net.tcpshield.tcpshield.provider.PacketProvider;
import net.tcpshield.tcpshield.util.exception.manipulate.PacketManipulationException;

public class FabricPacket implements PacketProvider {
public class FabricPacket implements PacketProvider {

 private final HandshakeC2SPacket handshake;

Expand All@@ -15,7 +15,7 @@ public FabricPacket(HandshakeC2SPacket handshake) {

 @Override
 public String getPayloadString() {
 return ((HandshakeC2SPacketAccessor) handshake).getAddress();
 return HandshakeC2SPacketAccessor.class.cast(handshake).getAddress();
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
src/main/java/net/tcpshield/tcpshield/fabric/impl/FabricPlayer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

import net.minecraft.network.ClientConnection;
import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
import net.tcpshield.tcpshield.fabric.mixin.ClientConnectionAccessor;
import net.tcpshield.tcpshield.provider.PlayerProvider;

Expand DownExpand Up@@ -43,6 +43,6 @@ public void setIP(InetSocketAddress ip) {

 @Override
 public void disconnect() {
 connection.disconnect(new LiteralText("Connection failed. Please try again or contact an administrator."));
 connection.disconnect(Text.literal("Connection failed. Please try again or contact an administrator."));
 }
}

2 changes: 1 addition & 1 deletion
src/main/java/net/tcpshield/tcpshield/fabric/mixin/HandshakeC2SPacketAccessor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,6 @@

@Mixin(HandshakeC2SPacket.class)
public interface HandshakeC2SPacketAccessor {
 @Accessor
 @Accessor("address")
 String getAddress();
}

10 changes: 9 additions & 1 deletion
src/main/java/net/tcpshield/tcpshield/velocity/handler/VelocityPacket.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,15 @@ public class VelocityPacket implements PacketProvider {
 Class<?> inboundConnection = Class.forName("com.velocitypowered.proxy.connection.client.InitialInboundConnection");

 HANDSHAKE_FIELD = ReflectionUtil.getPrivateField(inboundConnection, "handshake");
 HOSTNAME_FIELD = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.Handshake"), "serverAddress");

 Field hostnameField;
 try {
 hostnameField = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.HandshakePacket"), "serverAddress");
 } catch (Exception e) {
 hostnameField = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.Handshake"), "serverAddress");
 }
 HOSTNAME_FIELD = hostnameField;

 CLEANED_ADDRESS_FIELD = ReflectionUtil.getPrivateField(inboundConnection, "cleanedAddress");
 } catch (Exception e) {
 throw new InitializationException(new ReflectionException(e));
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/bungee.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: TCPShield
version: 2.6.1
version: 2.8.1
main: net.tcpshield.tcpshield.bungee.TCPShieldBungee
author: https://tcpshield.com
softdepends:
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,4 @@ debug-mode: false
enable-geyser-support: false

# Spigot/Paper option only, does not affect bungeecord
prefer-protocollib: true
prefer-protocollib: false

2 changes: 1 addition & 1 deletion
src/main/resources/fabric.mod.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
 "schemaVersion": 1,
 "id": "tcp-shield",
 "version": "2.5",
 "version": "2.8.1",
 "name": "TCPShield",
 "description": "TCPShield support for Fabric",
 "authors": [
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: TCPShield
version: 2.6.1
version: 2.8.1
main: net.tcpshield.tcpshield.bukkit.TCPShieldBukkit
softdepend:
- ProtocolLib
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/tcpshield.mixins.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 "required": true,
 "minVersion": "0.8",
 "package": "net.tcpshield.tcpshield.fabric.mixin",
 "compatibilityLevel": "JAVA_8",
 "compatibilityLevel": "JAVA_17",
 "mixins": [
 "ClientConnectionAccessor",
 "HandshakeC2SPacketAccessor",
Expand Down

17 changes: 16 additions & 1 deletion
src/main/resources/velocity-plugin.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,16 @@
{"id":"tcpshield","name":"TCPShield","version":"2.6.1","description":"TCPShield IP parsing capabilities for Velocity","authors":["TCPShield"],"dependencies":[{"id":"floodgate","optional":true}],"main":"net.tcpshield.tcpshield.velocity.TCPShieldVelocity"}
{
 "id": "tcpshield",
 "name": "TCPShield",
 "version": "2.8.1",
 "description": "TCPShield IP parsing capabilities for Velocity",
 "authors": [
 "TCPShield"
 ],
 "dependencies": [
 {
 "id": "floodgate",
 "optional": true
 }
 ],
 "main": "net.tcpshield.tcpshield.velocity.TCPShieldVelocity"
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update to 1.21 by he3als · Pull Request #1 · Draylar/RealIP · GitHub
Skip to content
Update to 1.21#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

he3als
wants to merge
6
commits into

base:fabric-support
Choose a base branch

from

 Open


Update to 1.21
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
133cef0

2.7.0 - Update to support Velocity's new class name


DylanKeir Jan 22, 2024
554d6c3

2.8.0 - Bump required Java verison from 8 -> 17, warn 1.20.5/1.20.6 u…


DylanKeir Jun 1, 2024
13261ab

Merge branch 'master' into fabric


he3als Aug 1, 2024
59ab989

feat(fabric): update dependencies, LiteralText fix


he3als Aug 1, 2024
eeedfe6

fix(fabric): HandshakeC2SPacketAccessor changes


he3als Aug 1, 2024
f78c7b9

feat: bump version to 2.8.1 for Fabric support


he3als Aug 1, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ It also parses passed IP addresses so the server is aware of the real player IP

### Compatibility

TCPShield is compatible with Spigot / CraftBukkit, BungeeCordand Velocity.
TCPShield is compatible with Spigot / CraftBukkit, BungeeCord, Velocity, and Fabric.

When using Spigot / CraftBukkit, [ProtocolLib](https://github.com/aadnk/ProtocolLib) needs to be installed.

Expand Down

28 changes: 12 additions & 16 deletions
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,13 +21,13 @@ buildscript {
plugins {
 id 'java'
 id 'idea'
 id 'fabric-loom' version '0.6-SNAPSHOT'
 id 'fabric-loom' version '1.7-SNAPSHOT'
}

// --
// Variables
// --
version = '2.6.2'
version = '2.8.1'
group = 'net.tcpshield.tcpshield'
archivesBaseName = 'TCPShield'

Expand DownExpand Up@@ -61,8 +61,8 @@ sourceSets {
}

compileJava {
 sourceCompatibility = "8"
 targetCompatibility = "8"
 sourceCompatibility = 17
 targetCompatibility = 17
 options.encoding = 'UTF-8'
}

Expand All@@ -83,10 +83,7 @@ repositories {
 url = 'https://oss.sonatype.org/content/repositories/snapshots'
 }
 maven {
 url = 'https://papermc.io/repo/repository/maven-public/'
 }
 maven {
 url = 'https://repo.velocitypowered.com/snapshots/'
 url = 'https://repo.papermc.io/repository/maven-public/'
 }
 maven {
 url = "https://repo.opencollab.dev/maven-snapshots/"
Expand All@@ -98,22 +95,21 @@ repositories {

dependencies {
 // Bukkit
 compileOnly group: 'org.spigotmc', name: 'spigot-api', version: '1.11-R0.1-SNAPSHOT'
 compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '5.0.0-SNAPSHOT'
 compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '5.1.0'

 // Paper
 compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.15.2-R0.1-SNAPSHOT'
 // Paper - 1.19.4 so we can bump from JDK 8 -> JDK 17, using 1.20.x as a dependency would require bumping from JDK 8 -> JDK 21
 compileOnly group: 'io.papermc.paper', name: 'paper-api', version: '1.19.4-R0.1-SNAPSHOT'

 // BungeeCord
 compileOnly group: 'net.md-5', name: 'bungeecord-api', version: '1.14-SNAPSHOT'

 // Velocity
 compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: '1.0.0-SNAPSHOT'
 compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: '3.3.0-SNAPSHOT'

 // Fabric
 minecraft "com.mojang:minecraft:1.16.5"
 mappings "net.fabricmc:yarn:1.16.5+build.5:v2"
 modImplementation group: 'net.fabricmc', name: 'fabric-loader', version: '0.11.2'
 minecraft "com.mojang:minecraft:1.21"
 mappings "net.fabricmc:yarn:1.21+build.9"
 modImplementation group: 'net.fabricmc', name: 'fabric-loader', version: '0.16.0'

 // Testing
 testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0-M1'
Expand Down

1 change: 1 addition & 0 deletions
src/main/java/net/tcpshield/tcpshield/TCPShieldPacketHandler.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
import net.tcpshield.tcpshield.util.validation.timestamp.impl.HTPDateTimestampValidator;

import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
Expand Down

27 changes: 26 additions & 1 deletion
src/main/java/net/tcpshield/tcpshield/bukkit/TCPShieldBukkit.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
package net.tcpshield.tcpshield.bukkit;

import java.util.logging.Logger;
import net.tcpshield.tcpshield.TCPShieldPacketHandler;
import net.tcpshield.tcpshield.TCPShieldPlugin;
import net.tcpshield.tcpshield.bukkit.paper.BukkitPaper;
Expand All@@ -9,6 +10,7 @@
import net.tcpshield.tcpshield.provider.ConfigProvider;
import net.tcpshield.tcpshield.util.Debugger;
import net.tcpshield.tcpshield.util.exception.phase.InitializationException;
import org.bukkit.Bukkit;
import org.bukkit.plugin.java.JavaPlugin;

/**
Expand All@@ -31,7 +33,25 @@ public void onEnable() {

 // check force plib option -> paper -> plib -> error
 if (this.configProvider.preferProtocolLib() && getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
 bukkitImpl = new BukkitProtocolLib(this);
 try {
 String[] protocolLibVersion = getServer().getPluginManager().getPlugin("ProtocolLib").getDescription().getVersion().split("-")[0].split("\\.");
 int major = Integer.parseInt(protocolLibVersion[0]);
 int minor = Integer.parseInt(protocolLibVersion[1]);
 int patch = Integer.parseInt(protocolLibVersion[2]);

 String paperVersion = Bukkit.getServer().getMinecraftVersion();
 if (major <= 5 && minor <= 2 && patch <= 1 && (paperVersion.equals("1.20.5") || paperVersion.equals("1.20.6"))) {
 getLogger().severe("TCPShield is incompatible with ProtocolLib <= 5.2.1 on Paper 1.20.5/1.20.6 due to lack of support from ProtocolLib. Reverting to default Paper handler to prevent issues. This error can be avoided by disabling 'prefer-protocollib' in the config.");
 bukkitImpl = new BukkitPaper(this);
 } else {
 bukkitImpl = new BukkitProtocolLib(this);
 }
 } catch (Exception t) {
 getLogger().warning("Failed to check Paper or ProtocolLib version. This is not a critical error unless you are running Paper 1.20.5/1.20.6 with ProtocolLib version 5.2.1 or below.");
 getDebugger().exception(t);

 bukkitImpl = new BukkitProtocolLib(this);
 }
 } else if (BukkitImplProvider.hasPaperEvent()) {
 bukkitImpl = new BukkitPaper(this);
 } else if (getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
Expand DownExpand Up@@ -72,4 +92,9 @@ public ConfigProvider getConfigProvider() {
 return configProvider;
	}

	@Override
	public Logger getLogger() {
 return super.getLogger();
	}

}

4 changes: 2 additions & 2 deletions
src/main/java/net/tcpshield/tcpshield/fabric/impl/FabricPacket.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
import net.tcpshield.tcpshield.provider.PacketProvider;
import net.tcpshield.tcpshield.util.exception.manipulate.PacketManipulationException;

public class FabricPacket implements PacketProvider {
public class FabricPacket implements PacketProvider {

 private final HandshakeC2SPacket handshake;

Expand All@@ -15,7 +15,7 @@ public FabricPacket(HandshakeC2SPacket handshake) {

 @Override
 public String getPayloadString() {
 return ((HandshakeC2SPacketAccessor) handshake).getAddress();
 return HandshakeC2SPacketAccessor.class.cast(handshake).getAddress();
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
src/main/java/net/tcpshield/tcpshield/fabric/impl/FabricPlayer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

import net.minecraft.network.ClientConnection;
import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
import net.tcpshield.tcpshield.fabric.mixin.ClientConnectionAccessor;
import net.tcpshield.tcpshield.provider.PlayerProvider;

Expand DownExpand Up@@ -43,6 +43,6 @@ public void setIP(InetSocketAddress ip) {

 @Override
 public void disconnect() {
 connection.disconnect(new LiteralText("Connection failed. Please try again or contact an administrator."));
 connection.disconnect(Text.literal("Connection failed. Please try again or contact an administrator."));
 }
}

2 changes: 1 addition & 1 deletion
src/main/java/net/tcpshield/tcpshield/fabric/mixin/HandshakeC2SPacketAccessor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,6 @@

@Mixin(HandshakeC2SPacket.class)
public interface HandshakeC2SPacketAccessor {
 @Accessor
 @Accessor("address")
 String getAddress();
}

10 changes: 9 additions & 1 deletion
src/main/java/net/tcpshield/tcpshield/velocity/handler/VelocityPacket.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,15 @@ public class VelocityPacket implements PacketProvider {
 Class<?> inboundConnection = Class.forName("com.velocitypowered.proxy.connection.client.InitialInboundConnection");

 HANDSHAKE_FIELD = ReflectionUtil.getPrivateField(inboundConnection, "handshake");
 HOSTNAME_FIELD = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.Handshake"), "serverAddress");

 Field hostnameField;
 try {
 hostnameField = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.HandshakePacket"), "serverAddress");
 } catch (Exception e) {
 hostnameField = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.Handshake"), "serverAddress");
 }
 HOSTNAME_FIELD = hostnameField;

 CLEANED_ADDRESS_FIELD = ReflectionUtil.getPrivateField(inboundConnection, "cleanedAddress");
 } catch (Exception e) {
 throw new InitializationException(new ReflectionException(e));
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/bungee.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: TCPShield
version: 2.6.1
version: 2.8.1
main: net.tcpshield.tcpshield.bungee.TCPShieldBungee
author: https://tcpshield.com
softdepends:
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,4 @@ debug-mode: false
enable-geyser-support: false

# Spigot/Paper option only, does not affect bungeecord
prefer-protocollib: true
prefer-protocollib: false

2 changes: 1 addition & 1 deletion
src/main/resources/fabric.mod.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
 "schemaVersion": 1,
 "id": "tcp-shield",
 "version": "2.5",
 "version": "2.8.1",
 "name": "TCPShield",
 "description": "TCPShield support for Fabric",
 "authors": [
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: TCPShield
version: 2.6.1
version: 2.8.1
main: net.tcpshield.tcpshield.bukkit.TCPShieldBukkit
softdepend:
- ProtocolLib
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/tcpshield.mixins.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 "required": true,
 "minVersion": "0.8",
 "package": "net.tcpshield.tcpshield.fabric.mixin",
 "compatibilityLevel": "JAVA_8",
 "compatibilityLevel": "JAVA_17",
 "mixins": [
 "ClientConnectionAccessor",
 "HandshakeC2SPacketAccessor",
Expand Down

17 changes: 16 additions & 1 deletion
src/main/resources/velocity-plugin.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,16 @@
{"id":"tcpshield","name":"TCPShield","version":"2.6.1","description":"TCPShield IP parsing capabilities for Velocity","authors":["TCPShield"],"dependencies":[{"id":"floodgate","optional":true}],"main":"net.tcpshield.tcpshield.velocity.TCPShieldVelocity"}
{
 "id": "tcpshield",
 "name": "TCPShield",
 "version": "2.8.1",
 "description": "TCPShield IP parsing capabilities for Velocity",
 "authors": [
 "TCPShield"
 ],
 "dependencies": [
 {
 "id": "floodgate",
 "optional": true
 }
 ],
 "main": "net.tcpshield.tcpshield.velocity.TCPShieldVelocity"
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Update to 1.21 by he3als · Pull Request #1 · Draylar/RealIP · GitHub
Skip to content
Update to 1.21#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

he3als
wants to merge
6
commits into

base:fabric-support
Choose a base branch

from

 Open


Update to 1.21
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
133cef0

2.7.0 - Update to support Velocity's new class name


DylanKeir Jan 22, 2024
554d6c3

2.8.0 - Bump required Java verison from 8 -> 17, warn 1.20.5/1.20.6 u…


DylanKeir Jun 1, 2024
13261ab

Merge branch 'master' into fabric


he3als Aug 1, 2024
59ab989

feat(fabric): update dependencies, LiteralText fix


he3als Aug 1, 2024
eeedfe6

fix(fabric): HandshakeC2SPacketAccessor changes


he3als Aug 1, 2024
f78c7b9

feat: bump version to 2.8.1 for Fabric support


he3als Aug 1, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ It also parses passed IP addresses so the server is aware of the real player IP

### Compatibility

TCPShield is compatible with Spigot / CraftBukkit, BungeeCordand Velocity.
TCPShield is compatible with Spigot / CraftBukkit, BungeeCord, Velocity, and Fabric.

When using Spigot / CraftBukkit, [ProtocolLib](https://github.com/aadnk/ProtocolLib) needs to be installed.

Expand Down

28 changes: 12 additions & 16 deletions
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,13 +21,13 @@ buildscript {
plugins {
 id 'java'
 id 'idea'
 id 'fabric-loom' version '0.6-SNAPSHOT'
 id 'fabric-loom' version '1.7-SNAPSHOT'
}

// --
// Variables
// --
version = '2.6.2'
version = '2.8.1'
group = 'net.tcpshield.tcpshield'
archivesBaseName = 'TCPShield'

Expand DownExpand Up@@ -61,8 +61,8 @@ sourceSets {
}

compileJava {
 sourceCompatibility = "8"
 targetCompatibility = "8"
 sourceCompatibility = 17
 targetCompatibility = 17
 options.encoding = 'UTF-8'
}

Expand All@@ -83,10 +83,7 @@ repositories {
 url = 'https://oss.sonatype.org/content/repositories/snapshots'
 }
 maven {
 url = 'https://papermc.io/repo/repository/maven-public/'
 }
 maven {
 url = 'https://repo.velocitypowered.com/snapshots/'
 url = 'https://repo.papermc.io/repository/maven-public/'
 }
 maven {
 url = "https://repo.opencollab.dev/maven-snapshots/"
Expand All@@ -98,22 +95,21 @@ repositories {

dependencies {
 // Bukkit
 compileOnly group: 'org.spigotmc', name: 'spigot-api', version: '1.11-R0.1-SNAPSHOT'
 compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '5.0.0-SNAPSHOT'
 compileOnly group: 'com.comphenix.protocol', name: 'ProtocolLib', version: '5.1.0'

 // Paper
 compileOnly group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.15.2-R0.1-SNAPSHOT'
 // Paper - 1.19.4 so we can bump from JDK 8 -> JDK 17, using 1.20.x as a dependency would require bumping from JDK 8 -> JDK 21
 compileOnly group: 'io.papermc.paper', name: 'paper-api', version: '1.19.4-R0.1-SNAPSHOT'

 // BungeeCord
 compileOnly group: 'net.md-5', name: 'bungeecord-api', version: '1.14-SNAPSHOT'

 // Velocity
 compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: '1.0.0-SNAPSHOT'
 compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: '3.3.0-SNAPSHOT'

 // Fabric
 minecraft "com.mojang:minecraft:1.16.5"
 mappings "net.fabricmc:yarn:1.16.5+build.5:v2"
 modImplementation group: 'net.fabricmc', name: 'fabric-loader', version: '0.11.2'
 minecraft "com.mojang:minecraft:1.21"
 mappings "net.fabricmc:yarn:1.21+build.9"
 modImplementation group: 'net.fabricmc', name: 'fabric-loader', version: '0.16.0'

 // Testing
 testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0-M1'
Expand Down

1 change: 1 addition & 0 deletions
src/main/java/net/tcpshield/tcpshield/TCPShieldPacketHandler.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
import net.tcpshield.tcpshield.util.validation.timestamp.impl.HTPDateTimestampValidator;

import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
Expand Down

27 changes: 26 additions & 1 deletion
src/main/java/net/tcpshield/tcpshield/bukkit/TCPShieldBukkit.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
package net.tcpshield.tcpshield.bukkit;

import java.util.logging.Logger;
import net.tcpshield.tcpshield.TCPShieldPacketHandler;
import net.tcpshield.tcpshield.TCPShieldPlugin;
import net.tcpshield.tcpshield.bukkit.paper.BukkitPaper;
Expand All@@ -9,6 +10,7 @@
import net.tcpshield.tcpshield.provider.ConfigProvider;
import net.tcpshield.tcpshield.util.Debugger;
import net.tcpshield.tcpshield.util.exception.phase.InitializationException;
import org.bukkit.Bukkit;
import org.bukkit.plugin.java.JavaPlugin;

/**
Expand All@@ -31,7 +33,25 @@ public void onEnable() {

 // check force plib option -> paper -> plib -> error
 if (this.configProvider.preferProtocolLib() && getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
 bukkitImpl = new BukkitProtocolLib(this);
 try {
 String[] protocolLibVersion = getServer().getPluginManager().getPlugin("ProtocolLib").getDescription().getVersion().split("-")[0].split("\\.");
 int major = Integer.parseInt(protocolLibVersion[0]);
 int minor = Integer.parseInt(protocolLibVersion[1]);
 int patch = Integer.parseInt(protocolLibVersion[2]);

 String paperVersion = Bukkit.getServer().getMinecraftVersion();
 if (major <= 5 && minor <= 2 && patch <= 1 && (paperVersion.equals("1.20.5") || paperVersion.equals("1.20.6"))) {
 getLogger().severe("TCPShield is incompatible with ProtocolLib <= 5.2.1 on Paper 1.20.5/1.20.6 due to lack of support from ProtocolLib. Reverting to default Paper handler to prevent issues. This error can be avoided by disabling 'prefer-protocollib' in the config.");
 bukkitImpl = new BukkitPaper(this);
 } else {
 bukkitImpl = new BukkitProtocolLib(this);
 }
 } catch (Exception t) {
 getLogger().warning("Failed to check Paper or ProtocolLib version. This is not a critical error unless you are running Paper 1.20.5/1.20.6 with ProtocolLib version 5.2.1 or below.");
 getDebugger().exception(t);

 bukkitImpl = new BukkitProtocolLib(this);
 }
 } else if (BukkitImplProvider.hasPaperEvent()) {
 bukkitImpl = new BukkitPaper(this);
 } else if (getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
Expand DownExpand Up@@ -72,4 +92,9 @@ public ConfigProvider getConfigProvider() {
 return configProvider;
	}

	@Override
	public Logger getLogger() {
 return super.getLogger();
	}

}

4 changes: 2 additions & 2 deletions
src/main/java/net/tcpshield/tcpshield/fabric/impl/FabricPacket.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
import net.tcpshield.tcpshield.provider.PacketProvider;
import net.tcpshield.tcpshield.util.exception.manipulate.PacketManipulationException;

public class FabricPacket implements PacketProvider {
public class FabricPacket implements PacketProvider {

 private final HandshakeC2SPacket handshake;

Expand All@@ -15,7 +15,7 @@ public FabricPacket(HandshakeC2SPacket handshake) {

 @Override
 public String getPayloadString() {
 return ((HandshakeC2SPacketAccessor) handshake).getAddress();
 return HandshakeC2SPacketAccessor.class.cast(handshake).getAddress();
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
src/main/java/net/tcpshield/tcpshield/fabric/impl/FabricPlayer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

import net.minecraft.network.ClientConnection;
import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
import net.tcpshield.tcpshield.fabric.mixin.ClientConnectionAccessor;
import net.tcpshield.tcpshield.provider.PlayerProvider;

Expand DownExpand Up@@ -43,6 +43,6 @@ public void setIP(InetSocketAddress ip) {

 @Override
 public void disconnect() {
 connection.disconnect(new LiteralText("Connection failed. Please try again or contact an administrator."));
 connection.disconnect(Text.literal("Connection failed. Please try again or contact an administrator."));
 }
}

2 changes: 1 addition & 1 deletion
src/main/java/net/tcpshield/tcpshield/fabric/mixin/HandshakeC2SPacketAccessor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,6 @@

@Mixin(HandshakeC2SPacket.class)
public interface HandshakeC2SPacketAccessor {
 @Accessor
 @Accessor("address")
 String getAddress();
}

10 changes: 9 additions & 1 deletion
src/main/java/net/tcpshield/tcpshield/velocity/handler/VelocityPacket.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,15 @@ public class VelocityPacket implements PacketProvider {
 Class<?> inboundConnection = Class.forName("com.velocitypowered.proxy.connection.client.InitialInboundConnection");

 HANDSHAKE_FIELD = ReflectionUtil.getPrivateField(inboundConnection, "handshake");
 HOSTNAME_FIELD = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.Handshake"), "serverAddress");

 Field hostnameField;
 try {
 hostnameField = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.HandshakePacket"), "serverAddress");
 } catch (Exception e) {
 hostnameField = ReflectionUtil.getPrivateField(Class.forName("com.velocitypowered.proxy.protocol.packet.Handshake"), "serverAddress");
 }
 HOSTNAME_FIELD = hostnameField;

 CLEANED_ADDRESS_FIELD = ReflectionUtil.getPrivateField(inboundConnection, "cleanedAddress");
 } catch (Exception e) {
 throw new InitializationException(new ReflectionException(e));
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/bungee.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: TCPShield
version: 2.6.1
version: 2.8.1
main: net.tcpshield.tcpshield.bungee.TCPShieldBungee
author: https://tcpshield.com
softdepends:
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,4 @@ debug-mode: false
enable-geyser-support: false

# Spigot/Paper option only, does not affect bungeecord
prefer-protocollib: true
prefer-protocollib: false

2 changes: 1 addition & 1 deletion
src/main/resources/fabric.mod.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
 "schemaVersion": 1,
 "id": "tcp-shield",
 "version": "2.5",
 "version": "2.8.1",
 "name": "TCPShield",
 "description": "TCPShield support for Fabric",
 "authors": [
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/plugin.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
name: TCPShield
version: 2.6.1
version: 2.8.1
main: net.tcpshield.tcpshield.bukkit.TCPShieldBukkit
softdepend:
- ProtocolLib
Expand Down

2 changes: 1 addition & 1 deletion
src/main/resources/tcpshield.mixins.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 "required": true,
 "minVersion": "0.8",
 "package": "net.tcpshield.tcpshield.fabric.mixin",
 "compatibilityLevel": "JAVA_8",
 "compatibilityLevel": "JAVA_17",
 "mixins": [
 "ClientConnectionAccessor",
 "HandshakeC2SPacketAccessor",
Expand Down

17 changes: 16 additions & 1 deletion
src/main/resources/velocity-plugin.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,16 @@
{"id":"tcpshield","name":"TCPShield","version":"2.6.1","description":"TCPShield IP parsing capabilities for Velocity","authors":["TCPShield"],"dependencies":[{"id":"floodgate","optional":true}],"main":"net.tcpshield.tcpshield.velocity.TCPShieldVelocity"}
{
 "id": "tcpshield",
 "name": "TCPShield",
 "version": "2.8.1",
 "description": "TCPShield IP parsing capabilities for Velocity",
 "authors": [
 "TCPShield"
 ],
 "dependencies": [
 {
 "id": "floodgate",
 "optional": true
 }
 ],
 "main": "net.tcpshield.tcpshield.velocity.TCPShieldVelocity"
}