Upstream/HolographicDisplays
1
0
Fork 0
mirror of https://github.com/filoghost/HolographicDisplays.git synced 2024-06-26 14:44:57 +02:00
Code Issues Projects Releases Wiki Activity

Rename old references to "pieces"

Browse Source
This commit is contained in:
filoghost 2021-03-15 19:09:01 +01:00
parent 977a422bb3
commit 4d3ccd1a2e
18 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/me/filoghost/holographicdisplays/core/DebugLogger.java
View File

@ -48,8 +48,8 @@ public class DebugLogger {
}
}
public static void handleSpawnFail(SpawnFailedException exception, StandardHologramLine parentPiece) {
severe("Couldn't spawn entity for this hologram: " + parentPiece.getHologram(), exception);
public static void handleSpawnFail(SpawnFailedException exception, StandardHologramLine parentHologramLine) {
severe("Couldn't spawn entity for this hologram: " + parentHologramLine.getHologram(), exception);
}
public static void cannotSetPassenger(Throwable t) {

6
core/src/main/java/me/filoghost/holographicdisplays/core/nms/NMSManager.java
View File

@ -18,11 +18,11 @@ public interface NMSManager {
// A method to register all the custom entities of the plugin, it may fail.
void setup() throws Exception;
NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException;
NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException;
NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentPiece, ItemStack stack) throws SpawnFailedException;
NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentHologramLine, ItemStack stack) throws SpawnFailedException;
NMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException;
NMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException;
boolean isNMSEntityBase(org.bukkit.entity.Entity bukkitEntity);

2
core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSEntity.java
View File

@ -12,7 +12,7 @@ import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
*/
public interface NMSEntity {
// Returns the linked line, all the entities are part of a piece. Should never be null.
// Returns the linked line, all the entities are part of a line. Should never be null.
StandardHologramLine getHologramLine();
// Sets the location through NMS.

12
nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionNMSManager.java
View File

@ -57,9 +57,9 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentPiece, ItemStack stack) throws SpawnFailedException {
public NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentHologramLine, ItemStack stack) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentPiece);
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentHologramLine);
item.setLocationNMS(x, y, z);
item.setItemStackNMS(stack);
addEntityToWorld(nmsWorld, item);
@ -67,18 +67,18 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public EntityNMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public EntityNMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentPiece);
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentHologramLine);
slime.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, slime);
return slime;
}
@Override
public NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) world).getHandle();
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentPiece, protocolPacketSettings);
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentHologramLine, protocolPacketSettings);
armorStand.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, armorStand);
return armorStand;

12
nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionNMSManager.java
View File

@ -65,9 +65,9 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentPiece, ItemStack stack) throws SpawnFailedException {
public NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentHologramLine, ItemStack stack) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentPiece);
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentHologramLine);
item.setLocationNMS(x, y, z);
item.setItemStackNMS(stack);
addEntityToWorld(nmsWorld, item);
@ -75,18 +75,18 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public EntityNMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public EntityNMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentPiece);
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentHologramLine);
slime.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, slime);
return slime;
}
@Override
public NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) world).getHandle();
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentPiece, protocolPacketSettings);
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentHologramLine, protocolPacketSettings);
armorStand.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, armorStand);
return armorStand;

12
nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionNMSManager.java
View File

@ -65,9 +65,9 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentPiece, ItemStack stack) throws SpawnFailedException {
public NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentHologramLine, ItemStack stack) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentPiece);
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentHologramLine);
item.setLocationNMS(x, y, z);
item.setItemStackNMS(stack);
addEntityToWorld(nmsWorld, item);
@ -75,18 +75,18 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public EntityNMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public EntityNMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentPiece);
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentHologramLine);
slime.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, slime);
return slime;
}
@Override
public NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) world).getHandle();
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentPiece, protocolPacketSettings);
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentHologramLine, protocolPacketSettings);
armorStand.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, armorStand);
return armorStand;

12
nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/VersionNMSManager.java
View File

@ -71,9 +71,9 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentPiece, ItemStack stack) throws SpawnFailedException {
public NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentHologramLine, ItemStack stack) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentPiece);
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentHologramLine);
item.setLocationNMS(x, y, z);
item.setItemStackNMS(stack);
addEntityToWorld(nmsWorld, item);
@ -81,18 +81,18 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public EntityNMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public EntityNMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentPiece);
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentHologramLine);
slime.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, slime);
return slime;
}
@Override
public NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) world).getHandle();
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentPiece, protocolPacketSettings);
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentHologramLine, protocolPacketSettings);
armorStand.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, armorStand);
return armorStand;

12
nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionNMSManager.java
View File

@ -72,9 +72,9 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentPiece, ItemStack stack) throws SpawnFailedException {
public NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentHologramLine, ItemStack stack) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentPiece);
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentHologramLine);
item.setLocationNMS(x, y, z);
item.setItemStackNMS(stack);
addEntityToWorld(nmsWorld, item);
@ -82,18 +82,18 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public EntityNMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public EntityNMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentPiece);
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentHologramLine);
slime.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, slime);
return slime;
}
@Override
public NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) world).getHandle();
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentPiece, protocolPacketSettings);
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentHologramLine, protocolPacketSettings);
armorStand.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, armorStand);
return armorStand;

12
nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionNMSManager.java
View File

@ -71,9 +71,9 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public NMSItem spawnNMSItem(World bukkitWorld, double x, double y, double z, StandardItemLine parentPiece, ItemStack stack) throws SpawnFailedException {
public NMSItem spawnNMSItem(World bukkitWorld, double x, double y, double z, StandardItemLine parentHologramLine, ItemStack stack) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentPiece);
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentHologramLine);
item.setLocationNMS(x, y, z);
item.setItemStackNMS(stack);
addEntityToWorld(nmsWorld, item);
@ -81,18 +81,18 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public EntityNMSSlime spawnNMSSlime(World bukkitWorld, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public EntityNMSSlime spawnNMSSlime(World bukkitWorld, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentPiece);
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentHologramLine);
slime.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, slime);
return slime;
}
@Override
public NMSArmorStand spawnNMSArmorStand(World world, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public NMSArmorStand spawnNMSArmorStand(World world, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) world).getHandle();
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentPiece, protocolPacketSettings);
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentHologramLine, protocolPacketSettings);
armorStand.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, armorStand);
return armorStand;

12
nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionNMSManager.java
View File

@ -70,9 +70,9 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public NMSItem spawnNMSItem(World bukkitWorld, double x, double y, double z, StandardItemLine parentPiece, ItemStack stack) throws SpawnFailedException {
public NMSItem spawnNMSItem(World bukkitWorld, double x, double y, double z, StandardItemLine parentHologramLine, ItemStack stack) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentPiece);
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentHologramLine);
item.setLocationNMS(x, y, z);
item.setItemStackNMS(stack);
addEntityToWorld(nmsWorld, item);
@ -80,18 +80,18 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public EntityNMSSlime spawnNMSSlime(World bukkitWorld, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public EntityNMSSlime spawnNMSSlime(World bukkitWorld, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentPiece);
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentHologramLine);
slime.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, slime);
return slime;
}
@Override
public NMSArmorStand spawnNMSArmorStand(World world, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public NMSArmorStand spawnNMSArmorStand(World world, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) world).getHandle();
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentPiece, protocolPacketSettings);
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentHologramLine, protocolPacketSettings);
armorStand.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, armorStand);
return armorStand;

12
nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionNMSManager.java
View File

@ -70,9 +70,9 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public NMSItem spawnNMSItem(World bukkitWorld, double x, double y, double z, StandardItemLine parentPiece, ItemStack stack) throws SpawnFailedException {
public NMSItem spawnNMSItem(World bukkitWorld, double x, double y, double z, StandardItemLine parentHologramLine, ItemStack stack) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentPiece);
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentHologramLine);
item.setLocationNMS(x, y, z);
item.setItemStackNMS(stack);
addEntityToWorld(nmsWorld, item);
@ -80,18 +80,18 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public EntityNMSSlime spawnNMSSlime(World bukkitWorld, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public EntityNMSSlime spawnNMSSlime(World bukkitWorld, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentPiece);
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentHologramLine);
slime.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, slime);
return slime;
}
@Override
public NMSArmorStand spawnNMSArmorStand(World world, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public NMSArmorStand spawnNMSArmorStand(World world, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) world).getHandle();
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentPiece, protocolPacketSettings);
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentHologramLine, protocolPacketSettings);
armorStand.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, armorStand);
return armorStand;

12
nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionNMSManager.java
View File

@ -61,9 +61,9 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public NMSItem spawnNMSItem(World bukkitWorld, double x, double y, double z, StandardItemLine parentPiece, ItemStack stack) throws SpawnFailedException {
public NMSItem spawnNMSItem(World bukkitWorld, double x, double y, double z, StandardItemLine parentHologramLine, ItemStack stack) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentPiece);
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentHologramLine);
item.setLocationNMS(x, y, z);
item.setItemStackNMS(stack);
addEntityToWorld(nmsWorld, item);
@ -71,18 +71,18 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public EntityNMSSlime spawnNMSSlime(World bukkitWorld, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public EntityNMSSlime spawnNMSSlime(World bukkitWorld, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentPiece);
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentHologramLine);
slime.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, slime);
return slime;
}
@Override
public NMSArmorStand spawnNMSArmorStand(World world, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public NMSArmorStand spawnNMSArmorStand(World world, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) world).getHandle();
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentPiece, protocolPacketSettings);
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentHologramLine, protocolPacketSettings);
armorStand.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, armorStand);
return armorStand;

12
nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionNMSManager.java
View File

@ -61,9 +61,9 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public NMSItem spawnNMSItem(World bukkitWorld, double x, double y, double z, StandardItemLine parentPiece, ItemStack stack) throws SpawnFailedException {
public NMSItem spawnNMSItem(World bukkitWorld, double x, double y, double z, StandardItemLine parentHologramLine, ItemStack stack) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentPiece);
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentHologramLine);
item.setLocationNMS(x, y, z);
item.setItemStackNMS(stack);
addEntityToWorld(nmsWorld, item);
@ -71,18 +71,18 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public EntityNMSSlime spawnNMSSlime(World bukkitWorld, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public EntityNMSSlime spawnNMSSlime(World bukkitWorld, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentPiece);
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentHologramLine);
slime.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, slime);
return slime;
}
@Override
public NMSArmorStand spawnNMSArmorStand(World world, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public NMSArmorStand spawnNMSArmorStand(World world, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) world).getHandle();
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentPiece, protocolPacketSettings);
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentHologramLine, protocolPacketSettings);
armorStand.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, armorStand);
return armorStand;

12
nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/VersionNMSManager.java
View File

@ -58,9 +58,9 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentPiece, ItemStack stack) throws SpawnFailedException {
public NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentHologramLine, ItemStack stack) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentPiece);
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentHologramLine);
item.setLocationNMS(x, y, z);
item.setItemStackNMS(stack);
addEntityToWorld(nmsWorld, item);
@ -68,18 +68,18 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public EntityNMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public EntityNMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentPiece);
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentHologramLine);
slime.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, slime);
return slime;
}
@Override
public NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) world).getHandle();
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentPiece, protocolPacketSettings);
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentHologramLine, protocolPacketSettings);
armorStand.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, armorStand);
return armorStand;

12
nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionNMSManager.java
View File

@ -58,9 +58,9 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentPiece, ItemStack stack) throws SpawnFailedException {
public NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentHologramLine, ItemStack stack) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentPiece);
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentHologramLine);
item.setLocationNMS(x, y, z);
item.setItemStackNMS(stack);
addEntityToWorld(nmsWorld, item);
@ -68,18 +68,18 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public EntityNMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public EntityNMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentPiece);
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentHologramLine);
slime.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, slime);
return slime;
}
@Override
public NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) world).getHandle();
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentPiece, protocolPacketSettings);
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentHologramLine, protocolPacketSettings);
armorStand.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, armorStand);
return armorStand;

12
nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/VersionNMSManager.java
View File

@ -57,9 +57,9 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentPiece, ItemStack stack) throws SpawnFailedException {
public NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentHologramLine, ItemStack stack) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentPiece);
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentHologramLine);
item.setLocationNMS(x, y, z);
item.setItemStackNMS(stack);
addEntityToWorld(nmsWorld, item);
@ -67,18 +67,18 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public EntityNMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public EntityNMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentPiece);
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentHologramLine);
slime.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, slime);
return slime;
}
@Override
public NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) world).getHandle();
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentPiece, protocolPacketSettings);
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentHologramLine, protocolPacketSettings);
armorStand.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, armorStand);
return armorStand;

12
nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionNMSManager.java
View File

@ -57,9 +57,9 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentPiece, ItemStack stack) throws SpawnFailedException {
public NMSItem spawnNMSItem(org.bukkit.World bukkitWorld, double x, double y, double z, StandardItemLine parentHologramLine, ItemStack stack) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentPiece);
EntityNMSItem item = new EntityNMSItem(nmsWorld, parentHologramLine);
item.setLocationNMS(x, y, z);
item.setItemStackNMS(stack);
addEntityToWorld(nmsWorld, item);
@ -67,18 +67,18 @@ public class VersionNMSManager implements NMSManager {
}
@Override
public EntityNMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public EntityNMSSlime spawnNMSSlime(org.bukkit.World bukkitWorld, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) bukkitWorld).getHandle();
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentPiece);
EntityNMSSlime slime = new EntityNMSSlime(nmsWorld, parentHologramLine);
slime.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, slime);
return slime;
}
@Override
public NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentPiece) throws SpawnFailedException {
public NMSArmorStand spawnNMSArmorStand(org.bukkit.World world, double x, double y, double z, StandardHologramLine parentHologramLine) throws SpawnFailedException {
WorldServer nmsWorld = ((CraftWorld) world).getHandle();
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentPiece, protocolPacketSettings);
EntityNMSArmorStand armorStand = new EntityNMSArmorStand(nmsWorld, parentHologramLine, protocolPacketSettings);
armorStand.setLocationNMS(x, y, z);
addEntityToWorld(nmsWorld, armorStand);
return armorStand;

2
plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseTouchableLine.java
View File

@ -22,7 +22,7 @@ import java.util.Map;
import java.util.WeakHashMap;
/**
* Useful class that implements TouchablePiece. The downside is that subclasses must extend this, and cannot extend other classes.
* Useful class that implements StandardTouchableLine. The downside is that subclasses must extend this, and cannot extend other classes.
* But all the current items are touchable.
*/
public abstract class BaseTouchableLine extends BaseHologramLine implements StandardTouchableLine {