Merge pull request #23 from TheNextLvl-net/1.21.4

Update support for Paper version 1.21.4

Author: NonSwag

README.md

@@ -13,9 +13,10 @@ the HologramAPI, you can easily add user-specific and static holograms to enhanc
 ## Versions
 
 > [!IMPORTANT]
-> Holograms only supports the latest version of Paper (1.20.6)<br>
+> Holograms only supports the latest version of Paper (1.21.4)<br>
 > The latest version of Holograms requires Java 21
 
+[Latest version supporting 1.21-1.21.1 (Java 21)](https://github.com/TheNextLvl-net/holograms/releases/tag/v2.1.3)<br>
 [Latest version supporting 1.19-1.20.4 (Java 19)](https://github.com/TheNextLvl-net/holograms/releases/tag/v2.0.2)<br>
 [Latest version supporting 1.19-1.20.2 (Java 17)](https://github.com/TheNextLvl-net/holograms/releases/tag/v2.0.0)<br>
 

api/build.gradle.kts

@@ -4,14 +4,17 @@ plugins {
 }
 
 java {
+    toolchain.languageVersion = JavaLanguageVersion.of(21)
     withSourcesJar()
     withJavadocJar()
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+}
+
+tasks.compileJava {
+    options.release.set(21)
 }
 
 group = "net.thenextlvl.holograms"
-version = "2.1.3"
+version = "2.1.4"
 
 repositories {
     mavenCentral()
@@ -23,8 +26,6 @@ dependencies {
     compileOnly("org.projectlombok:lombok:1.18.36")
     compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
 
-    compileOnly("net.thenextlvl.core:annotations:2.0.1")
-
     annotationProcessor("org.projectlombok:lombok:1.18.36")
 }
 

api/src/main/java/net/thenextlvl/hologram/api/HologramFactory.java

@@ -8,10 +8,12 @@
 import org.bukkit.Location;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.inventory.ItemStack;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A factory that creates {@link Hologram holograms}
  */
+@NullMarked
 public interface HologramFactory {
 
     /**

api/src/main/java/net/thenextlvl/hologram/api/HologramLoader.java

@@ -3,12 +3,14 @@
 import net.thenextlvl.hologram.api.hologram.Hologram;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
+import org.jspecify.annotations.NullMarked;
 
 import java.util.Collection;
 
 /**
  * A loader class that handles loading, unloading and updating of holograms
  */
+@NullMarked
 public interface HologramLoader {
     /**
      * Loads the hologram for the specified player

api/src/main/java/net/thenextlvl/hologram/api/HologramProvider.java

@@ -1,8 +1,11 @@
 package net.thenextlvl.hologram.api;
 
+import org.jspecify.annotations.NullMarked;
+
 /**
  * A class that provides all necessities for managing holograms
  */
+@NullMarked
 public interface HologramProvider {
     /**
      * Get the corresponding {@link HologramRegistry}

api/src/main/java/net/thenextlvl/hologram/api/HologramRegistry.java

@@ -1,12 +1,14 @@
 package net.thenextlvl.hologram.api;
 
 import net.thenextlvl.hologram.api.hologram.Hologram;
+import org.jspecify.annotations.NullMarked;
 
 import java.util.Collection;
 
 /**
  * A registry that holds all registered holograms
  */
+@NullMarked
 public interface HologramRegistry {
     /**
      * Get all the registered holograms

api/src/main/java/net/thenextlvl/hologram/api/hologram/BlockHologram.java

@@ -1,9 +1,11 @@
 package net.thenextlvl.hologram.api.hologram;
 
 import org.bukkit.entity.BlockDisplay;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * An interface that represents a hologram displaying a block
  */
+@NullMarked
 public interface BlockHologram extends Hologram, BlockDisplay {
 }

api/src/main/java/net/thenextlvl/hologram/api/hologram/Hologram.java

@@ -2,10 +2,12 @@
 
 import org.bukkit.Location;
 import org.bukkit.entity.Display;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * An interface that represents a hologram
  */
+@NullMarked
 public interface Hologram extends Display {
     /**
      * Get the location of the hologram

api/src/main/java/net/thenextlvl/hologram/api/hologram/ItemHologram.java

@@ -1,9 +1,11 @@
 package net.thenextlvl.hologram.api.hologram;
 
 import org.bukkit.entity.ItemDisplay;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * An interface that represents a hologram displaying an item
  */
+@NullMarked
 public interface ItemHologram extends Hologram, ItemDisplay {
 }

api/src/main/java/net/thenextlvl/hologram/api/hologram/TextHologram.java

@@ -1,9 +1,11 @@
 package net.thenextlvl.hologram.api.hologram;
 
 import org.bukkit.entity.TextDisplay;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * An interface that represents a hologram displaying a text
  */
+@NullMarked
 public interface TextHologram extends Hologram, TextDisplay {
 }

api/src/main/java/net/thenextlvl/hologram/api/hologram/package-info.java

@@ -1 +1 @@
-gameVersions=1.21
+gameVersions=1.21.2,1.21.3,1.21.4

api/src/main/java/net/thenextlvl/hologram/api/package-info.java

@@ -3,7 +3,7 @@ import net.minecrell.pluginyml.bukkit.BukkitPluginDescription
 
 plugins {
     id("java")
-    id("io.github.goooler.shadow") version "8.1.8"
+    id("com.gradleup.shadow") version "8.3.5"
     id("io.papermc.paperweight.userdev") version "1.7.7"
     id("net.minecrell.plugin-yml.paper") version "0.6.0"
     id("io.papermc.hangar-publish-plugin") version "0.1.2"
@@ -13,27 +13,23 @@ group = project(":api").group
 version = project(":api").version
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    toolchain.languageVersion = JavaLanguageVersion.of(21)
+}
+
+tasks.compileJava {
+    options.release.set(21)
 }
 
 repositories {
     mavenCentral()
     maven("https://repo.thenextlvl.net/releases")
-    maven("https://repo.thenextlvl.net/snapshots")
 }
 
 dependencies {
-    paperweight.paperDevBundle("1.21-R0.1-SNAPSHOT")
-
-    compileOnly("org.projectlombok:lombok:1.18.36")
-    compileOnly("net.thenextlvl.core:annotations:2.0.1")
-
-    implementation(project(":api"))
+    paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT")
 
     implementation("org.bstats:bstats-bukkit:3.1.0")
-
-    annotationProcessor("org.projectlombok:lombok:1.18.36")
+    implementation(project(":api"))
 }
 
 paper {

gradle.properties

@@ -1,17 +1,15 @@
 package net.thenextlvl.hologram;
 
-import core.annotation.FieldsAreNotNullByDefault;
-import core.annotation.MethodsReturnNotNullByDefault;
 import net.thenextlvl.hologram.api.HologramProvider;
 import net.thenextlvl.hologram.implementation.CraftHologramProvider;
 import net.thenextlvl.hologram.listener.HologramListener;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.ServicePriority;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.jspecify.annotations.NullMarked;
 
-@FieldsAreNotNullByDefault
-@MethodsReturnNotNullByDefault
+@NullMarked
 public class HologramAPI extends JavaPlugin {
     private final HologramProvider provider = new CraftHologramProvider();
     private final Metrics metrics = new Metrics(this, 20033);

plugin/build.gradle.kts

@@ -8,7 +8,9 @@
 import org.bukkit.Location;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.inventory.ItemStack;
+import org.jspecify.annotations.NullMarked;
 
+@NullMarked
 public class CraftHologramFactory implements HologramFactory {
     @Override
     public CraftTextHologram createHologram(Location location, Component text) {

plugin/src/main/java/net/thenextlvl/hologram/HologramAPI.java

@@ -8,16 +8,23 @@
 import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket;
 import net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket;
 import net.minecraft.network.syncher.SynchedEntityData;
+import net.minecraft.world.entity.PositionMoveRotation;
 import net.minecraft.world.phys.Vec3;
 import net.thenextlvl.hologram.api.HologramLoader;
 import net.thenextlvl.hologram.api.hologram.Hologram;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.entity.CraftDisplay;
 import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.entity.Player;
+import org.jspecify.annotations.NullMarked;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.WeakHashMap;
 
+@NullMarked
 public class CraftHologramLoader implements HologramLoader {
     private final ClientHologramLoader loader = new ClientHologramLoader();
 
@@ -103,7 +110,12 @@ private void teleport(Hologram hologram, Location location, CraftPlayer player)
             var connection = player.getHandle().connection;
             var display = ((CraftDisplay) hologram).getHandle();
             display.moveTo(location.getX(), location.getY(), location.getZ());
-            connection.send(new ClientboundTeleportEntityPacket(display));
+            connection.send(new ClientboundTeleportEntityPacket(
+                    display.getId(),
+                    PositionMoveRotation.of(display),
+                    Set.of(),
+                    display.onGround()
+            ));
         }
 
         private Set<Hologram> getHolograms(Player player) {

plugin/src/main/java/net/thenextlvl/hologram/implementation/CraftHologramFactory.java

@@ -1,11 +1,29 @@
 package net.thenextlvl.hologram.implementation;
 
-import lombok.Getter;
+import net.thenextlvl.hologram.api.HologramFactory;
+import net.thenextlvl.hologram.api.HologramLoader;
 import net.thenextlvl.hologram.api.HologramProvider;
+import net.thenextlvl.hologram.api.HologramRegistry;
+import org.jspecify.annotations.NullMarked;
 
-@Getter
+@NullMarked
 public class CraftHologramProvider implements HologramProvider {
     private final CraftHologramRegistry hologramRegistry = new CraftHologramRegistry();
     private final CraftHologramFactory hologramFactory = new CraftHologramFactory();
     private final CraftHologramLoader hologramLoader = new CraftHologramLoader();
+
+    @Override
+    public HologramRegistry getHologramRegistry() {
+        return hologramRegistry;
+    }
+
+    @Override
+    public HologramFactory getHologramFactory() {
+        return hologramFactory;
+    }
+
+    @Override
+    public HologramLoader getHologramLoader() {
+        return hologramLoader;
+    }
 }

plugin/src/main/java/net/thenextlvl/hologram/implementation/CraftHologramLoader.java

@@ -1,17 +1,22 @@
 package net.thenextlvl.hologram.implementation;
 
 import com.google.common.base.Preconditions;
-import lombok.Getter;
 import net.thenextlvl.hologram.api.HologramRegistry;
 import net.thenextlvl.hologram.api.hologram.Hologram;
+import org.jspecify.annotations.NullMarked;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-@Getter
+@NullMarked
 public class CraftHologramRegistry implements HologramRegistry {
     private final Collection<Hologram> holograms = new ArrayList<>();
 
+    @Override
+    public Collection<Hologram> getHolograms() {
+        return holograms;
+    }
+
     @Override
     public void register(Hologram hologram) throws IllegalArgumentException {
         Preconditions.checkArgument(!isRegistered(hologram), "Hologram already registered");

plugin/src/main/java/net/thenextlvl/hologram/implementation/CraftHologramProvider.java

@@ -1,6 +1,5 @@
 package net.thenextlvl.hologram.implementation.hologram;
 
-import lombok.Getter;
 import net.minecraft.world.entity.Display;
 import net.minecraft.world.entity.EntityType;
 import net.thenextlvl.hologram.api.hologram.BlockHologram;
@@ -10,10 +9,10 @@
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.craftbukkit.entity.CraftBlockDisplay;
+import org.jspecify.annotations.NullMarked;
 
-@Getter
+@NullMarked
 public class CraftBlockHologram extends CraftBlockDisplay implements BlockHologram {
-    @SuppressWarnings("NotNullFieldNotInitialized")
     private Location location;
 
     public CraftBlockHologram(Location location, BlockData block) {
@@ -24,6 +23,11 @@ public CraftBlockHologram(Location location, BlockData block) {
         setBlock(block);
     }
 
+    @Override
+    public Location getLocation() {
+        return location;
+    }
+
     @Override
     public void setLocation(Location location) {
         getHandle().setPos(location.getX(), location.getY(), location.getZ());