Skip to content

Commit 2d2c3ad

Browse files
committed
Added support for 1.21.9
Added more conditions for expressions
1 parent e4ad2c5 commit 2d2c3ad

7 files changed

Lines changed: 15 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,4 +130,6 @@ jobs:
130130
1.21.5
131131
1.21.6
132132
1.21.7
133+
1.21.8
134+
1.21.9
133135
java: 21

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,4 +119,6 @@ jobs:
119119
1.21.5
120120
1.21.6
121121
1.21.7
122+
1.21.8
123+
1.21.9
122124
java: 21

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ ext {
2525

2626
repositories {
2727
mavenCentral()
28+
maven { url = 'https://repo.papermc.io/repository/maven-public/' }
2829
maven { url = 'https://repo.william278.net/velocity/' }
2930
maven { url = 'https://repo.william278.net/releases/' }
3031
maven { url = 'https://repo.william278.net/snapshots/' }
31-
maven { url = 'https://repo.papermc.io/repository/maven-public/' }
3232
maven { url = 'https://repo.minebench.de/' }
3333
maven { url = 'https://jitpack.io' }
3434
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ javaVersion=21
33
org.gradle.jvmargs='-Dfile.encoding=UTF-8'
44
org.gradle.daemon=true
55

6-
plugin_version=1.7.8
6+
plugin_version=1.7.9
77
plugin_archive=velocitab
88
plugin_description=A beautiful and versatile TAB list plugin for Velocity proxies
99

1010
velocity_api_version=3.4.0
11-
velocity_minimum_build=521
11+
velocity_minimum_build=539
1212
papi_proxy_bridge_minimum_version=1.8

src/main/java/net/william278/velocitab/packet/Protocol770Adapter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ public Protocol770Adapter(@NotNull Velocitab plugin) {
3838
super(plugin, Set.of(
3939
ProtocolVersion.MINECRAFT_1_21_5,
4040
ProtocolVersion.MINECRAFT_1_21_6,
41-
ProtocolVersion.MINECRAFT_1_21_7
41+
ProtocolVersion.MINECRAFT_1_21_7,
42+
ProtocolVersion.MINECRAFT_1_21_9
4243
));
4344
}
4445

src/main/java/net/william278/velocitab/packet/ScoreboardManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,8 @@ public void registerPacket() {
423423
.mapping(0x5E, MINECRAFT_1_20_3, false)
424424
.mapping(0x60, MINECRAFT_1_20_5, false)
425425
.mapping(0x67, MINECRAFT_1_21_2, false)
426-
.mapping(0x66, MINECRAFT_1_21_5, false);
426+
.mapping(0x66, MINECRAFT_1_21_5, false)
427+
.mapping(0x6B, MINECRAFT_1_21_9, false);
427428
packetRegistration.register();
428429
} catch (Throwable e) {
429430
plugin.log(Level.ERROR, "Failed to register UpdateTeamsPacket", e);

src/main/java/net/william278/velocitab/placeholder/ConditionManager.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,10 @@ private String processFalseValue(@NotNull String falseValue) {
110110

111111
@NotNull
112112
private String buildExpression(@NotNull String condition) {
113-
return condition.replace("and", "&&").replace("or", "||")
113+
return condition
114+
.replace("GREATER_THAN_OR_EQUAL", ">=").replace("LESS_THAN_OR_EQUAL", "<=")
115+
.replace("GREATER_THAN", ">").replace("LESS_THAN", "<")
116+
.replace("and", "&&").replace("or", "||")
114117
.replace("AND", "&&").replace("OR", "||");
115118
}
116119

0 commit comments

Comments
 (0)