Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,5 @@ jobs:
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
settings-path: ${{ github.workspace }} # location for the settings.xml file

- name: Install Spigot Dependencies
run: . scripts/run_buildtools.sh

- name: Build with Maven
run: mvn -B package --file pom.xml
# - name: Build with Maven
# run: mvn -B package --file pom.xml
File renamed without changes.
8 changes: 6 additions & 2 deletions dependency-reduced-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@
<id>papermc</id>
<url>https://repo.papermc.io/repository/maven-public/</url>
</repository>
<repository>
<id>essentials-releases</id>
<url>https://repo.essentialsx.net/releases/</url>
</repository>
<repository>
<id>enginehub-maven</id>
<url>https://maven.enginehub.org/repo/</url>
Expand Down Expand Up @@ -165,7 +169,7 @@
<dependency>
<groupId>com.github.retrooper</groupId>
<artifactId>packetevents-spigot</artifactId>
<version>2.7.0</version>
<version>2.9.5</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -201,7 +205,7 @@
<dependency>
<groupId>net.essentialsx</groupId>
<artifactId>EssentialsX</artifactId>
<version>2.19.7-SNAPSHOT</version>
<version>2.21.2</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
8 changes: 6 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@
<id>papermc</id>
<url>https://repo.papermc.io/repository/maven-public/</url>
</repository>
<repository>
<id>essentials-releases</id>
<url>https://repo.essentialsx.net/releases/</url>
</repository>
<repository>
<id>enginehub-maven</id>
<url>https://maven.enginehub.org/repo/</url>
Expand Down Expand Up @@ -214,7 +218,7 @@
<dependency>
<groupId>com.github.retrooper</groupId>
<artifactId>packetevents-spigot</artifactId>
<version>2.7.0</version>
<version>2.9.5</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -250,7 +254,7 @@
<dependency>
<groupId>net.essentialsx</groupId>
<artifactId>EssentialsX</artifactId>
<version>2.19.7-SNAPSHOT</version>
<version>2.21.2</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
24 changes: 0 additions & 24 deletions scripts/get_spigot_versions.sh

This file was deleted.

14 changes: 0 additions & 14 deletions scripts/release_tag.sh

This file was deleted.

31 changes: 0 additions & 31 deletions scripts/run_buildtools.sh

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ public ArmourStandPacket(org.bukkit.Location loc, int entityID, ItemStack head)
entityID, uuid, EntityTypes.ARMOR_STAND, spawnLocation,
spawnLocation.getYaw(), 0, null);

List<EntityData> metadata = List.of(
new EntityData(0, EntityDataTypes.BYTE, (byte) 0x20),
new EntityData(5, EntityDataTypes.BOOLEAN, true),
new EntityData(15, EntityDataTypes.BYTE, (byte) (0x01 | 0x10))
List<EntityData<?>> metadata = List.of(
new EntityData<>(0, EntityDataTypes.BYTE, (byte) 0x20),
new EntityData<>(5, EntityDataTypes.BOOLEAN, true),
new EntityData<>(15, EntityDataTypes.BYTE, (byte) (0x01 | 0x10))
);

this.metaPacket = new WrapperPlayServerEntityMetadata(entityID, metadata);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
*/
public class NametagProperties {

private final List<EntityData> metadata;
private final List<EntityData<?>> metadata;

public NametagProperties() {
metadata = new ArrayList<>();
Expand Down Expand Up @@ -69,7 +69,7 @@ public NametagProperties() {

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

private Optional<EntityData> getEntityData(int index) {
private Optional<EntityData<?>> getEntityData(int index) {
return metadata.stream()
.filter(data -> data.getIndex() == index)
.findFirst();
Expand All @@ -84,7 +84,7 @@ private void removeEntityData(int index) {
metadata.removeIf(data -> data.getIndex() == index);
}

public List<EntityData> getMetadata() {
public List<EntityData<?>> getMetadata() {
return metadata;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class CreateNametagEntityPacket implements Packet {
private final WrapperPlayServerSpawnEntity spawnPacket;
private final WrapperPlayServerEntityMetadata metaPacket;

public CreateNametagEntityPacket(Player player, int entityID, List<EntityData> metaData) {
public CreateNametagEntityPacket(Player player, int entityID, List<EntityData<?>> metaData) {
Location spawnLocation = SpigotConversionUtil.fromBukkitLocation(player.getLocation().add(0, 1.8, 0));
this.spawnPacket = new WrapperPlayServerSpawnEntity(
entityID,
Expand Down