Skip to content

fix: update deps and fix version bounds for 1.21.5+ / 26.1.2 support #334

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
joealjohn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: update deps and fix version bounds for 1.21.5+ / 26.1.2 support #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions ...yExploitFixesFolia/src/main/java/me/xginko/aef/modules/dupepreventions/BookTitleDupe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ public class BookTitleDupe extends PacketModule {
public BookTitleDupe() {
super("dupe-preventions.book-title-dupe",
Platform.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_20_6)
&& !Platform.getServerVersion().isOlderThan(ServerVersion.V_1_21_2),
&& Platform.getServerVersion().isOlderThan(ServerVersion.V_1_21_2),
PacketListenerPriority.HIGHEST,"""
Relevant for 1.20.6 - 1.21:
Relevant for 1.20.6 - 1.21.1:
Will prevent players from sending book packets with a too large title,
to get disconnected and their inventories restored.""");
boolean modernLimits = Platform.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_2);
this.titleLimit = config.getInt(configPath + ".max-title-charlength", modernLimits ? 15 : 120);
this.pageLimit = config.getInt(configPath + ".max-pages", modernLimits ? 90 : 190);
this.pageCharLimit = config.getInt(configPath + ".max-page-charlength", modernLimits ? 1000 : 8100);
// This module only runs on 1.20.6-1.21.1, so modern limits are not relevant here.
this.titleLimit = config.getInt(configPath + ".max-title-charlength", 120);
this.pageLimit = config.getInt(configPath + ".max-pages", 190);
this.pageCharLimit = config.getInt(configPath + ".max-page-charlength", 8100);
this.cooldownMillis = config.getLong(configPath + ".spam-cooldown-millis", 1000);
this.log = config.getBoolean(configPath + ".log", false);
this.kick = config.getBoolean(configPath + ".kick-player", false);
Expand Down
4 changes: 2 additions & 2 deletions ...chyExploitFixesFolia/src/main/java/me/xginko/aef/modules/dupepreventions/TridentDupe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ public class TridentDupe extends AEFModule implements Listener {

public TridentDupe() {
super("dupe-preventions.trident-dupe",
Platform.getServerVersion().isOlderThanOrEquals(ServerVersion.V_1_21_4), """
Prevents trident dupe from working in 1.13 - 1.21.4
true, """
Prevents trident dupe from working in 1.13+.
This dupe was originally found by Autism inc and turned into
a mod by Killet, Laztec, and Ionar.""");
this.dupePreventedMaterial = config.getList(configPath + ".materials",
Expand Down
12 changes: 6 additions & 6 deletions ...ExploitFixesLegacy/src/main/java/me/xginko/aef/modules/dupepreventions/BookTitleDupe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ public class BookTitleDupe extends PacketModule {
public BookTitleDupe() {
super("dupe-preventions.book-title-dupe",
Platform.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_20_6)
&& !Platform.getServerVersion().isOlderThan(ServerVersion.V_1_21_2),
&& Platform.getServerVersion().isOlderThan(ServerVersion.V_1_21_2),
PacketListenerPriority.HIGHEST,
"Relevant for 1.20.6 - 1.21:\n" +
"Relevant for 1.20.6 - 1.21.1:\n" +
"Will prevent players from sending book packets with a too large title,\n" +
"to get disconnected and their inventories restored.");
boolean modernLimits = Platform.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21_2);
this.titleLimit = config.getInt(configPath + ".max-title-charlength", modernLimits ? 15 : 120);
this.pageLimit = config.getInt(configPath + ".max-pages", modernLimits ? 90 : 190);
this.pageCharLimit = config.getInt(configPath + ".max-page-charlength", modernLimits ? 1000 : 8100);
// This module only runs on 1.20.6-1.21.1, so modern limits are not relevant here.
this.titleLimit = config.getInt(configPath + ".max-title-charlength", 120);
this.pageLimit = config.getInt(configPath + ".max-pages", 190);
this.pageCharLimit = config.getInt(configPath + ".max-page-charlength", 8100);
this.cooldownMillis = config.getLong(configPath + ".spam-cooldown-millis", 1000);
this.log = config.getBoolean(configPath + ".log", false);
this.kick = config.getBoolean(configPath + ".kick-player", false);
Expand Down
5 changes: 2 additions & 3 deletions ...hyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/dupepreventions/TridentDupe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ public class TridentDupe extends AEFModule implements Listener {

public TridentDupe() {
super("dupe-preventions.trident-dupe",
Platform.getServerVersion().isOlderThanOrEquals(ServerVersion.V_1_21_4)
&& Platform.getServerVersion().isNewerThan(ServerVersion.V_1_12_2),
"Prevents trident dupe from working in 1.13 - 1.21.4\n"+
Platform.getServerVersion().isNewerThan(ServerVersion.V_1_12_2),
"Prevents trident dupe from working in 1.13+.\n"+
"This dupe was originally found by Autism inc and turned into\n"+
"a mod by Killet, Laztec, and Ionar.");
this.dupePreventedMaterial = config.getList(configPath + ".materials",
Expand Down
4 changes: 2 additions & 2 deletions build-logic/src/main/kotlin/me.xginko.aef.wrapper.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ repositories {

dependencies {
compileOnly("org.apache.logging.log4j:log4j-core:2.23.1") // Better logger
compileOnly("com.github.retrooper:packetevents-spigot:2.12.2") // Cross version packet handling
compileOnly("com.github.retrooper:packetevents-spigot:2.13.0") // Cross version packet handling
compileOnly("de.tr7zw:item-nbt-api-plugin:2.15.7") // Cross version nbt handling
compileOnly("com.mojang:brigadier:1.0.18") // Used in command unregister hack
api("com.github.thatsmusic99:ConfigurationMaster-API:v2.0.0-rc.3") // Enhanced config management
api("com.github.cryptomorin:XSeries:13.7.0") // Crossversion Entity, material, potion, item, etc. handling
api("com.github.cryptomorin:XSeries:13.7.1") // Crossversion Entity, material, potion, item, etc. handling
api("org.bstats:bstats-bukkit:3.0.2") // Bukkit bStats
api("org.reflections:reflections:0.10.2") // Good reflections
}
Expand Down