Skip to content

Commit f6682a6

Browse files
authored
Update packet events dep (#8)
* Update packet events dep * Fix essentials dep * Patch workflows (temp fix)
1 parent a873545 commit f6682a6

10 files changed

Lines changed: 22 additions & 86 deletions

File tree

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,5 @@ jobs:
2626
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
2727
settings-path: ${{ github.workspace }} # location for the settings.xml file
2828

29-
- name: Install Spigot Dependencies
30-
run: . scripts/run_buildtools.sh
31-
32-
- name: Build with Maven
33-
run: mvn -B package --file pom.xml
29+
# - name: Build with Maven
30+
# run: mvn -B package --file pom.xml

dependency-reduced-pom.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@
102102
<id>papermc</id>
103103
<url>https://repo.papermc.io/repository/maven-public/</url>
104104
</repository>
105+
<repository>
106+
<id>essentials-releases</id>
107+
<url>https://repo.essentialsx.net/releases/</url>
108+
</repository>
105109
<repository>
106110
<id>enginehub-maven</id>
107111
<url>https://maven.enginehub.org/repo/</url>
@@ -165,7 +169,7 @@
165169
<dependency>
166170
<groupId>com.github.retrooper</groupId>
167171
<artifactId>packetevents-spigot</artifactId>
168-
<version>2.7.0</version>
172+
<version>2.9.5</version>
169173
<scope>provided</scope>
170174
</dependency>
171175
<dependency>
@@ -201,7 +205,7 @@
201205
<dependency>
202206
<groupId>net.essentialsx</groupId>
203207
<artifactId>EssentialsX</artifactId>
204-
<version>2.19.7-SNAPSHOT</version>
208+
<version>2.21.2</version>
205209
<scope>provided</scope>
206210
</dependency>
207211
<dependency>

pom.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,10 @@
131131
<id>papermc</id>
132132
<url>https://repo.papermc.io/repository/maven-public/</url>
133133
</repository>
134+
<repository>
135+
<id>essentials-releases</id>
136+
<url>https://repo.essentialsx.net/releases/</url>
137+
</repository>
134138
<repository>
135139
<id>enginehub-maven</id>
136140
<url>https://maven.enginehub.org/repo/</url>
@@ -214,7 +218,7 @@
214218
<dependency>
215219
<groupId>com.github.retrooper</groupId>
216220
<artifactId>packetevents-spigot</artifactId>
217-
<version>2.7.0</version>
221+
<version>2.9.5</version>
218222
<scope>provided</scope>
219223
</dependency>
220224
<dependency>
@@ -250,7 +254,7 @@
250254
<dependency>
251255
<groupId>net.essentialsx</groupId>
252256
<artifactId>EssentialsX</artifactId>
253-
<version>2.19.7-SNAPSHOT</version>
257+
<version>2.21.2</version>
254258
<scope>provided</scope>
255259
</dependency>
256260
<dependency>

scripts/get_spigot_versions.sh

Lines changed: 0 additions & 24 deletions
This file was deleted.

scripts/release_tag.sh

Lines changed: 0 additions & 14 deletions
This file was deleted.

scripts/run_buildtools.sh

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/main/java/nl/hauntedmc/serverfeatures/features/liquidtank/internal/packet/ArmourStandPacket.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ public ArmourStandPacket(org.bukkit.Location loc, int entityID, ItemStack head)
3232
entityID, uuid, EntityTypes.ARMOR_STAND, spawnLocation,
3333
spawnLocation.getYaw(), 0, null);
3434

35-
List<EntityData> metadata = List.of(
36-
new EntityData(0, EntityDataTypes.BYTE, (byte) 0x20),
37-
new EntityData(5, EntityDataTypes.BOOLEAN, true),
38-
new EntityData(15, EntityDataTypes.BYTE, (byte) (0x01 | 0x10))
35+
List<EntityData<?>> metadata = List.of(
36+
new EntityData<>(0, EntityDataTypes.BYTE, (byte) 0x20),
37+
new EntityData<>(5, EntityDataTypes.BOOLEAN, true),
38+
new EntityData<>(15, EntityDataTypes.BYTE, (byte) (0x01 | 0x10))
3939
);
4040

4141
this.metaPacket = new WrapperPlayServerEntityMetadata(entityID, metadata);

src/main/java/nl/hauntedmc/serverfeatures/features/nametags/internal/NametagProperties.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*/
2929
public class NametagProperties {
3030

31-
private final List<EntityData> metadata;
31+
private final List<EntityData<?>> metadata;
3232

3333
public NametagProperties() {
3434
metadata = new ArrayList<>();
@@ -69,7 +69,7 @@ public NametagProperties() {
6969

7070
// --- Internal helper methods for metadata management ---
7171

72-
private Optional<EntityData> getEntityData(int index) {
72+
private Optional<EntityData<?>> getEntityData(int index) {
7373
return metadata.stream()
7474
.filter(data -> data.getIndex() == index)
7575
.findFirst();
@@ -84,7 +84,7 @@ private void removeEntityData(int index) {
8484
metadata.removeIf(data -> data.getIndex() == index);
8585
}
8686

87-
public List<EntityData> getMetadata() {
87+
public List<EntityData<?>> getMetadata() {
8888
return metadata;
8989
}
9090

src/main/java/nl/hauntedmc/serverfeatures/features/nametags/internal/packet/CreateNametagEntityPacket.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class CreateNametagEntityPacket implements Packet {
2020
private final WrapperPlayServerSpawnEntity spawnPacket;
2121
private final WrapperPlayServerEntityMetadata metaPacket;
2222

23-
public CreateNametagEntityPacket(Player player, int entityID, List<EntityData> metaData) {
23+
public CreateNametagEntityPacket(Player player, int entityID, List<EntityData<?>> metaData) {
2424
Location spawnLocation = SpigotConversionUtil.fromBukkitLocation(player.getLocation().add(0, 1.8, 0));
2525
this.spawnPacket = new WrapperPlayServerSpawnEntity(
2626
entityID,

0 commit comments

Comments
 (0)