Skip to content

Commit 7806d81

Browse files
AlexProgrammerDEAlexProgrammerDE
committed
Add more options and migrate to java 17
1 parent 70f24fd commit 7806d81

13 files changed

Lines changed: 169 additions & 100 deletions

File tree

‎build-data/build.gradle.kts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ plugins {
33
id("net.kyori.blossom")
44
}
55

6-
java.sourceCompatibility = JavaVersion.VERSION_1_8
7-
java.targetCompatibility = JavaVersion.VERSION_1_8
6+
java {
7+
sourceCompatibility = JavaVersion.VERSION_17
8+
targetCompatibility = JavaVersion.VERSION_17
9+
}
810

911
blossom {
1012
replaceToken("{version}", version)

‎buildSrc/src/main/kotlin/pq.java-conventions.gradle.kts‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@ plugins {
55
id("net.kyori.indra.publishing")
66
}
77

8+
java {
9+
sourceCompatibility = JavaVersion.VERSION_17
10+
targetCompatibility = JavaVersion.VERSION_17
11+
}
12+
813
dependencies {
914
implementation("org.jetbrains:annotations:24.0.1")
15+
1016
compileOnly("org.projectlombok:lombok:1.18.28")
1117
annotationProcessor("org.projectlombok:lombok:1.18.28")
1218
}
@@ -17,10 +23,7 @@ tasks {
1723
}
1824
}
1925

20-
java.sourceCompatibility = JavaVersion.VERSION_1_8
21-
java.targetCompatibility = JavaVersion.VERSION_1_8
22-
23-
tasks.withType<JavaCompile>() {
26+
tasks.withType<JavaCompile> {
2427
options.encoding = "UTF-8"
2528
options.compilerArgs.add("-Xlint:all,-serial,-processing")
2629
}
@@ -50,11 +53,6 @@ indra {
5053
}
5154
}
5255
}
53-
54-
versionMapping {
55-
usage(Usage.JAVA_API) { fromResolutionOf(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME) }
56-
usage(Usage.JAVA_RUNTIME) { fromResolutionResult() }
57-
}
5856
}
5957
}
6058

‎buildSrc/src/main/kotlin/pq.platform-conventions.gradle.kts‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2-
31
plugins {
4-
`java-library`
52
id("pq.shadow-conventions")
63
}
74

8-
(tasks.getByName("shadowJar") as ShadowJar).archiveFileName.set(
9-
"PistonQueue-${
10-
project.name.substringAfter("pistonqueue-").capitalize()
11-
}-${project.version}.jar"
12-
)
13-
14-
(tasks.getByName("shadowJar") as ShadowJar).destinationDirectory.set(rootProject.layout.buildDirectory.dir("libs"))
5+
tasks.shadowJar {
6+
archiveFileName.set(
7+
"PistonQueue-${
8+
project.name.substringAfter("pistonqueue-").replaceFirstChar { it.uppercase() }
9+
}-${project.version}.jar"
10+
)
11+
destinationDirectory.set(rootProject.layout.buildDirectory.dir("libs"))
12+
}

‎buildSrc/src/main/kotlin/pq.shadow-conventions.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ plugins {
55
id("com.github.johnrengelman.shadow")
66
}
77

8+
java {
9+
sourceCompatibility = JavaVersion.VERSION_17
10+
targetCompatibility = JavaVersion.VERSION_17
11+
}
12+
813
tasks {
914
jar {
1015
archiveClassifier.set("unshaded")

‎bukkit/build.gradle.kts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
plugins {
2-
id("pq.platform-conventions")
3-
}
4-
51
dependencies {
62
implementation("org.bstats:bstats-bukkit:3.0.2")
73

‎bukkit/src/main/java/net/pistonmaster/pistonqueue/bukkit/PistonQueueBukkit.java‎

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,24 @@ public final class PistonQueueBukkit extends JavaPlugin {
3939
private boolean restrictMovement;
4040
private boolean forceGamemode;
4141
private String forcedGamemode;
42-
private boolean protocolLib;
43-
private boolean disableDebug;
42+
4443
private boolean team;
4544
private String teamName;
46-
private boolean noChunk;
47-
private boolean noTime;
48-
private boolean noHealth;
49-
private boolean noAdvancements;
50-
private boolean noExperience;
51-
private boolean showHead;
45+
46+
private boolean preventExperience;
47+
private boolean preventDamage;
48+
private boolean preventHunger;
49+
50+
private boolean protocolLib;
51+
private boolean disableDebug;
52+
53+
private boolean noChunkPackets;
54+
private boolean noTimePackets;
55+
private boolean noHealthPackets;
56+
private boolean noAdvancementPackets;
57+
private boolean noExperiencePackets;
58+
private boolean showHeadPacket;
59+
5260
private boolean playXP;
5361

5462
@Override
@@ -69,15 +77,22 @@ public void onEnable() {
6977
disableChat = getConfig().getBoolean("disableChat");
7078
disableCmd = getConfig().getBoolean("disableCmd");
7179
forcedGamemode = getConfig().getString("forcedGamemode");
72-
disableDebug = getConfig().getBoolean("disableDebug");
7380
team = getConfig().getBoolean("team");
7481
teamName = getConfig().getString("teamName");
75-
noChunk = getConfig().getBoolean("noChunk");
76-
noTime = getConfig().getBoolean("noTime");
77-
noHealth = getConfig().getBoolean("noHealth");
78-
noAdvancements = getConfig().getBoolean("noAdvancements");
79-
noExperience = getConfig().getBoolean("noExperience");
80-
showHead = getConfig().getBoolean("showHead");
82+
83+
preventExperience = getConfig().getBoolean("preventExperience");
84+
preventDamage = getConfig().getBoolean("preventDamage");
85+
preventHunger = getConfig().getBoolean("preventHunger");
86+
87+
disableDebug = getConfig().getBoolean("disableDebug");
88+
89+
noChunkPackets = getConfig().getBoolean("noChunkPackets");
90+
noTimePackets = getConfig().getBoolean("noTimePackets");
91+
noHealthPackets = getConfig().getBoolean("noHealthPackets");
92+
noAdvancementPackets = getConfig().getBoolean("noAdvancementPackets");
93+
noExperiencePackets = getConfig().getBoolean("noExperiencePackets");
94+
showHeadPacket = getConfig().getBoolean("showHeadPacket");
95+
8196
playXP = getConfig().getBoolean("playXP");
8297

8398
getLogger().info(ChatColor.BLUE + "Preparing server");

‎bukkit/src/main/java/net/pistonmaster/pistonqueue/bukkit/ProtocolLibWrapper.java‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
import com.comphenix.protocol.events.PacketEvent;
2929
import org.bukkit.entity.Player;
3030

31-
import java.lang.reflect.InvocationTargetException;
32-
3331
public final class ProtocolLibWrapper {
3432
private ProtocolLibWrapper() {
3533
}
@@ -49,52 +47,58 @@ public static void removeDebug(Player player) {
4947
public static void setupProtocolLib(PistonQueueBukkit plugin) {
5048
ProtocolManager manager = ProtocolLibrary.getProtocolManager();
5149

52-
if (plugin.isNoChunk())
50+
if (plugin.isNoChunkPackets()){
5351
manager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.NORMAL, PacketType.Play.Server.MAP_CHUNK) {
5452
@Override
5553
public void onPacketSending(PacketEvent event) {
5654
event.setCancelled(true);
5755
}
5856
});
57+
}
5958

60-
if (plugin.isNoTime())
59+
if (plugin.isNoTimePackets()) {
6160
manager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.NORMAL, PacketType.Play.Server.UPDATE_TIME) {
6261
@Override
6362
public void onPacketSending(PacketEvent event) {
6463
event.setCancelled(true);
6564
}
6665
});
66+
}
6767

68-
if (plugin.isNoHealth())
68+
if (plugin.isNoHealthPackets()) {
6969
manager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.NORMAL, PacketType.Play.Server.UPDATE_HEALTH) {
7070
@Override
7171
public void onPacketSending(PacketEvent event) {
7272
event.setCancelled(true);
7373
}
7474
});
75+
}
7576

76-
if (plugin.isNoAdvancements())
77+
if (plugin.isNoAdvancementPackets()) {
7778
manager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.NORMAL, PacketType.Play.Server.ADVANCEMENTS) {
7879
@Override
7980
public void onPacketSending(PacketEvent event) {
8081
event.setCancelled(true);
8182
}
8283
});
84+
}
8385

84-
if (plugin.isNoExperience())
86+
if (plugin.isNoExperiencePackets()) {
8587
manager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.NORMAL, PacketType.Play.Server.EXPERIENCE) {
8688
@Override
8789
public void onPacketSending(PacketEvent event) {
8890
event.setCancelled(true);
8991
}
9092
});
93+
}
9194

92-
if (plugin.isShowHead())
95+
if (plugin.isShowHeadPacket()) {
9396
manager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.NORMAL, PacketType.Play.Server.ENTITY_METADATA) {
9497
@Override
9598
public void onPacketSending(PacketEvent event) {
9699
event.setCancelled(true);
97100
}
98101
});
102+
}
99103
}
100104
}

0 commit comments

Comments
 (0)