Upstream/HolographicDisplays
1
0
Fork 0
mirror of https://github.com/filoghost/HolographicDisplays.git synced 2024-11-15 23:15:10 +01:00
Code Issues Projects Releases Wiki Activity

Allow null item on ItemLine

Browse Source
This commit is contained in:
filoghost 2021-07-02 21:30:54 +02:00
parent b8dde1ab3e
commit 157be9b679
2 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/main/java/me/filoghost/holographicdisplays/api/line/ItemLine.java
View File

@ -6,7 +6,7 @@
package me.filoghost.holographicdisplays.api.line;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* @since 1
@ -19,7 +19,7 @@ public interface ItemLine extends CollectableLine, TouchableLine {
* @return the ItemStack if this ItemLine.
* @since 1
*/
@NotNull ItemStack getItemStack();
@Nullable ItemStack getItemStack();
/**
* Sets the ItemStack for this ItemLine.
@ -27,6 +27,6 @@ public interface ItemLine extends CollectableLine, TouchableLine {
* @param itemStack the new item, should not be null.
* @since 1
*/
void setItemStack(@NotNull ItemStack itemStack);
void setItemStack(@Nullable ItemStack itemStack);
}

43
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseItemLine.java
View File

@ -8,6 +8,7 @@ package me.filoghost.holographicdisplays.plugin.hologram.base;
import me.filoghost.fcommons.Preconditions;
import me.filoghost.fcommons.logging.Log;
import me.filoghost.holographicdisplays.api.handler.PickupHandler;
import me.filoghost.holographicdisplays.common.DebugLogger;
import me.filoghost.holographicdisplays.common.hologram.StandardItemLine;
import me.filoghost.holographicdisplays.common.nms.SpawnFailedException;
import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand;
@ -15,7 +16,6 @@ import me.filoghost.holographicdisplays.common.nms.entity.NMSItem;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collection;
@ -55,17 +55,30 @@ public abstract class BaseItemLine extends BaseTouchableLine implements Standard
this.pickupHandler = pickupHandler;
}
public @NotNull ItemStack getItemStack() {
public @Nullable ItemStack getItemStack() {
return itemStack;
}
public void setItemStack(@NotNull ItemStack itemStack) {
Preconditions.notNull(itemStack, "itemStack");
Preconditions.checkArgument(0 < itemStack.getAmount() && itemStack.getAmount() <= 64, "Item must have amount between 1 and 64");
public void setItemStack(@Nullable ItemStack itemStack) {
if (itemStack != null) {
Preconditions.checkArgument(0 < itemStack.getAmount() && itemStack.getAmount() <= 64, "itemStack's amount must be between 1 and 64");
}
this.itemStack = itemStack;
if (itemStack == null) {
// Despawn the entity (if existing) since the item shouldn't be visible
despawnItem();
return;
}
if (itemEntity != null) {
// Simply update the existing entity
itemEntity.setItemStackNMS(itemStack);
} else {
// Spawn the entity, if it needs to be spawned
if (super.isSpawned()) {
spawnItem(getWorld(), getX(), getY(), getZ());
}
}
}
@ -74,9 +87,7 @@ public abstract class BaseItemLine extends BaseTouchableLine implements Standard
super.spawnEntities(world, x, y, z);
if (itemStack != null) {
itemEntity = getNMSManager().spawnNMSItem(world, x, y + getItemSpawnOffset(), z, this, itemStack);
itemVehicleEntity = getNMSManager().spawnNMSArmorStand(world, x, y + getItemSpawnOffset(), z, this);
itemVehicleEntity.setPassengerNMS(itemEntity);
spawnItem(world, x, y, z);
}
}
@ -96,6 +107,22 @@ public abstract class BaseItemLine extends BaseTouchableLine implements Standard
public void despawnEntities() {
super.despawnEntities();
despawnItem();
}
private void spawnItem(World world, double x, double y, double z) {
if (world != null) {
try {
itemEntity = getNMSManager().spawnNMSItem(world, x, y + getItemSpawnOffset(), z, this, itemStack);
itemVehicleEntity = getNMSManager().spawnNMSArmorStand(world, x, y + getItemSpawnOffset(), z, this);
itemVehicleEntity.setPassengerNMS(itemEntity);
} catch (SpawnFailedException e) {
DebugLogger.handleSpawnFail(e, this);
}
}
}
private void despawnItem() {
if (itemVehicleEntity != null) {
itemVehicleEntity.killEntityNMS();
itemVehicleEntity = null;