diff --git a/.github/workflows/pullrequest_test.yml b/.github/workflows/PR_workflow.yml similarity index 84% rename from .github/workflows/pullrequest_test.yml rename to .github/workflows/PR_workflow.yml index fb666a35..ed1d09fe 100644 --- a/.github/workflows/pullrequest_test.yml +++ b/.github/workflows/PR_workflow.yml @@ -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 diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/Tag_workflow.yml similarity index 100% rename from .github/workflows/maven-publish.yml rename to .github/workflows/Tag_workflow.yml diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml index 4b8be4bb..b88696b3 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -102,6 +102,10 @@ papermc https://repo.papermc.io/repository/maven-public/ + + essentials-releases + https://repo.essentialsx.net/releases/ + enginehub-maven https://maven.enginehub.org/repo/ @@ -165,7 +169,7 @@ com.github.retrooper packetevents-spigot - 2.7.0 + 2.9.5 provided @@ -201,7 +205,7 @@ net.essentialsx EssentialsX - 2.19.7-SNAPSHOT + 2.21.2 provided diff --git a/pom.xml b/pom.xml index 2f33267b..e1b1622b 100644 --- a/pom.xml +++ b/pom.xml @@ -131,6 +131,10 @@ papermc https://repo.papermc.io/repository/maven-public/ + + essentials-releases + https://repo.essentialsx.net/releases/ + enginehub-maven https://maven.enginehub.org/repo/ @@ -214,7 +218,7 @@ com.github.retrooper packetevents-spigot - 2.7.0 + 2.9.5 provided @@ -250,7 +254,7 @@ net.essentialsx EssentialsX - 2.19.7-SNAPSHOT + 2.21.2 provided diff --git a/scripts/get_spigot_versions.sh b/scripts/get_spigot_versions.sh deleted file mode 100644 index 41c04135..00000000 --- a/scripts/get_spigot_versions.sh +++ /dev/null @@ -1,24 +0,0 @@ -declare -a spigot_versions - -# shellcheck disable=SC2199 -if [[ ${spigot_versions[@]} ]]; then - for spigot_version in "${spigot_versions[@]}"; do - echo "$spigot_version" - done - return -fi - -declare -n versions="spigot_versions" - -max_index=$(mvn help:evaluate -Dexpression=project.dependencies -q -DforceStdout | grep -c "") - -for ((i=0; i < max_index; i++)); do - artifact_id=$(mvn help:evaluate -Dexpression=project.dependencies["$i"].artifactId -q -DforceStdout) - - if [[ "$artifact_id" == spigot ]]; then - spigot_version=$(mvn help:evaluate -Dexpression=project.dependencies["$i"].version -q -DforceStdout) - versions+=("$spigot_version") - echo "$spigot_version" - break - fi -done diff --git a/scripts/release_tag.sh b/scripts/release_tag.sh deleted file mode 100644 index fa19c8f5..00000000 --- a/scripts/release_tag.sh +++ /dev/null @@ -1,14 +0,0 @@ -if [[ ! $1 ]]; then - echo "Please provide a version string." - return -fi - -mvn versions:set -DnewVersion="$1" - -git add . -git commit -m "Bump version to $1 for release" -git tag -a -m "Release $1" "$1" -git push -git push --tags - -mvn clean package -am -P all \ No newline at end of file diff --git a/scripts/run_buildtools.sh b/scripts/run_buildtools.sh deleted file mode 100644 index 4f72b166..00000000 --- a/scripts/run_buildtools.sh +++ /dev/null @@ -1,31 +0,0 @@ -buildtools_dir=~/buildtools -buildtools=$buildtools_dir/BuildTools.jar - -get_buildtools () { - if [[ -d $buildtools_dir && -f $buildtools ]]; then - return - fi - - mkdir $buildtools_dir - wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar -O $buildtools -} - -versions=$(. ./scripts/get_spigot_versions.sh) - -if [ -n "$versions" ]; then - echo Found Spigot dependencies: "$versions" - - for version in "${versions[@]}"; do - set -e - exit_code=0 - mvn dependency:get -Dartifact=org.spigotmc:spigot:"$version" -q -o || exit_code=$? - if [ $exit_code -ne 0 ]; then - echo Installing missing Spigot version "$version" - revision=${version%%-R*} - get_buildtools - java -jar $buildtools -rev "$revision" --remapped - else - echo Spigot "$version" is already installed - fi - done -fi diff --git a/src/main/java/nl/hauntedmc/serverfeatures/features/liquidtank/internal/packet/ArmourStandPacket.java b/src/main/java/nl/hauntedmc/serverfeatures/features/liquidtank/internal/packet/ArmourStandPacket.java index e09e2d2e..3d926975 100644 --- a/src/main/java/nl/hauntedmc/serverfeatures/features/liquidtank/internal/packet/ArmourStandPacket.java +++ b/src/main/java/nl/hauntedmc/serverfeatures/features/liquidtank/internal/packet/ArmourStandPacket.java @@ -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 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> 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); diff --git a/src/main/java/nl/hauntedmc/serverfeatures/features/nametags/internal/NametagProperties.java b/src/main/java/nl/hauntedmc/serverfeatures/features/nametags/internal/NametagProperties.java index ae482d58..b6f8b544 100644 --- a/src/main/java/nl/hauntedmc/serverfeatures/features/nametags/internal/NametagProperties.java +++ b/src/main/java/nl/hauntedmc/serverfeatures/features/nametags/internal/NametagProperties.java @@ -28,7 +28,7 @@ */ public class NametagProperties { - private final List metadata; + private final List> metadata; public NametagProperties() { metadata = new ArrayList<>(); @@ -69,7 +69,7 @@ public NametagProperties() { // --- Internal helper methods for metadata management --- - private Optional getEntityData(int index) { + private Optional> getEntityData(int index) { return metadata.stream() .filter(data -> data.getIndex() == index) .findFirst(); @@ -84,7 +84,7 @@ private void removeEntityData(int index) { metadata.removeIf(data -> data.getIndex() == index); } - public List getMetadata() { + public List> getMetadata() { return metadata; } diff --git a/src/main/java/nl/hauntedmc/serverfeatures/features/nametags/internal/packet/CreateNametagEntityPacket.java b/src/main/java/nl/hauntedmc/serverfeatures/features/nametags/internal/packet/CreateNametagEntityPacket.java index 1eaa1add..14530998 100644 --- a/src/main/java/nl/hauntedmc/serverfeatures/features/nametags/internal/packet/CreateNametagEntityPacket.java +++ b/src/main/java/nl/hauntedmc/serverfeatures/features/nametags/internal/packet/CreateNametagEntityPacket.java @@ -20,7 +20,7 @@ public class CreateNametagEntityPacket implements Packet { private final WrapperPlayServerSpawnEntity spawnPacket; private final WrapperPlayServerEntityMetadata metaPacket; - public CreateNametagEntityPacket(Player player, int entityID, List metaData) { + public CreateNametagEntityPacket(Player player, int entityID, List> metaData) { Location spawnLocation = SpigotConversionUtil.fromBukkitLocation(player.getLocation().add(0, 1.8, 0)); this.spawnPacket = new WrapperPlayServerSpawnEntity( entityID,