From 65877bff5b98655a36e9d22bb0e1ee18eda7270e Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Tue, 19 Dec 2023 19:55:57 -0600 Subject: [PATCH] clean: move nms spawn balloon method to CosmeticUser --- .../hibiscusmc/hmccosmetics/nms/NMSHandler.java | 2 -- .../hmccosmetics/user/CosmeticUser.java | 13 +++++++++++-- .../hmccosmetics/nms/v1_18_R2/NMSHandler.java | 15 --------------- .../hmccosmetics/nms/v1_19_R1/NMSHandler.java | 14 -------------- .../hmccosmetics/nms/v1_19_R2/NMSHandler.java | 15 --------------- .../hmccosmetics/nms/v1_19_R3/NMSHandler.java | 14 -------------- .../hmccosmetics/nms/v1_20_R1/NMSHandler.java | 14 -------------- .../hmccosmetics/nms/v1_20_R2/NMSHandler.java | 14 -------------- .../hmccosmetics/nms/v1_20_R3/NMSHandler.java | 14 -------------- 9 files changed, 11 insertions(+), 104 deletions(-) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/nms/NMSHandler.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/nms/NMSHandler.java index 61a5d120..d98b0c99 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/nms/NMSHandler.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/nms/NMSHandler.java @@ -23,8 +23,6 @@ public interface NMSHandler { Entity spawnDisplayEntity(Location location, String text); - UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType); - void slotUpdate( Player player, int slot diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java index 8e800ae1..0d1a9662 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java @@ -385,8 +385,17 @@ public class CosmeticUser { public void spawnBalloon(CosmeticBalloonType cosmeticBalloonType) { if (this.userBalloonManager != null) return; - this.userBalloonManager = NMSHandlers.getHandler().spawnBalloon(this, cosmeticBalloonType); - //updateCosmetic(cosmeticBalloonType); + + org.bukkit.entity.Entity entity = getEntity(); + + UserBalloonManager userBalloonManager1 = new UserBalloonManager(this, entity.getLocation()); + userBalloonManager1.getModelEntity().teleport(entity.getLocation().add(cosmeticBalloonType.getBalloonOffset())); + + userBalloonManager1.spawnModel(cosmeticBalloonType, getCosmeticColor(cosmeticBalloonType.getSlot())); + userBalloonManager1.addPlayerToModel(this, cosmeticBalloonType, getCosmeticColor(cosmeticBalloonType.getSlot())); + + this.userBalloonManager = userBalloonManager1; + //this.userBalloonManager = NMSHandlers.getHandler().spawnBalloon(this, cosmeticBalloonType); } public void despawnBalloon() { diff --git a/v1_18_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_18_R2/NMSHandler.java b/v1_18_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_18_R2/NMSHandler.java index 21a5b8b4..96748e5f 100644 --- a/v1_18_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_18_R2/NMSHandler.java +++ b/v1_18_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_18_R2/NMSHandler.java @@ -63,21 +63,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return null; } - - @Override - public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) { - org.bukkit.entity.Entity entity = user.getEntity(); - - UserBalloonManager userBalloonManager1 = new UserBalloonManager(user, entity.getLocation()); - userBalloonManager1.getModelEntity().teleport(entity.getLocation().add(cosmeticBalloonType.getBalloonOffset())); - - userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot())); - userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot())); - - return userBalloonManager1; - } - - @Override public void equipmentSlotUpdate( int entityId, diff --git a/v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/NMSHandler.java b/v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/NMSHandler.java index e857ea5c..22b76437 100644 --- a/v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/NMSHandler.java +++ b/v1_19_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R1/NMSHandler.java @@ -63,20 +63,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return null; } - @Override - public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) { - org.bukkit.entity.Entity entity = user.getEntity(); - - UserBalloonManager userBalloonManager1 = new UserBalloonManager(user, entity.getLocation()); - userBalloonManager1.getModelEntity().teleport(entity.getLocation().add(cosmeticBalloonType.getBalloonOffset())); - - userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot())); - userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot())); - - return userBalloonManager1; - } - - @Override public void equipmentSlotUpdate( int entityId, diff --git a/v1_19_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R2/NMSHandler.java b/v1_19_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R2/NMSHandler.java index 8f5b7a6e..c5797848 100644 --- a/v1_19_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R2/NMSHandler.java +++ b/v1_19_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R2/NMSHandler.java @@ -63,21 +63,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return null; } - - - @Override - public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) { - org.bukkit.entity.Entity entity = user.getEntity(); - - UserBalloonManager userBalloonManager1 = new UserBalloonManager(user, entity.getLocation()); - userBalloonManager1.getModelEntity().teleport(entity.getLocation().add(cosmeticBalloonType.getBalloonOffset())); - - userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot())); - userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot())); - - return userBalloonManager1; - } - @Override public void equipmentSlotUpdate( int entityId, diff --git a/v1_19_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R3/NMSHandler.java b/v1_19_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R3/NMSHandler.java index 5f649969..9b3b6373 100644 --- a/v1_19_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R3/NMSHandler.java +++ b/v1_19_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_19_R3/NMSHandler.java @@ -77,20 +77,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return entity.getBukkitEntity(); } - @Override - public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) { - Entity entity = user.getEntity(); - - UserBalloonManager userBalloonManager1 = new UserBalloonManager(user, entity.getLocation()); - userBalloonManager1.getModelEntity().teleport(entity.getLocation().add(cosmeticBalloonType.getBalloonOffset())); - - userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot())); - userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot())); - - return userBalloonManager1; - } - - @Override public void equipmentSlotUpdate( int entityId, diff --git a/v1_20_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R1/NMSHandler.java b/v1_20_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R1/NMSHandler.java index 08c528c5..b1b750c0 100644 --- a/v1_20_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R1/NMSHandler.java +++ b/v1_20_R1/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R1/NMSHandler.java @@ -76,20 +76,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return entity.getBukkitEntity(); } - @Override - public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) { - org.bukkit.entity.Entity entity = user.getEntity(); - - UserBalloonManager userBalloonManager1 = new UserBalloonManager(user, entity.getLocation()); - userBalloonManager1.getModelEntity().teleport(entity.getLocation().add(cosmeticBalloonType.getBalloonOffset())); - - userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot())); - userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot())); - - return userBalloonManager1; - } - - @Override public void equipmentSlotUpdate( int entityId, diff --git a/v1_20_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R2/NMSHandler.java b/v1_20_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R2/NMSHandler.java index f54194be..9d8ae762 100644 --- a/v1_20_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R2/NMSHandler.java +++ b/v1_20_R2/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R2/NMSHandler.java @@ -76,20 +76,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return entity.getBukkitEntity(); } - @Override - public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) { - org.bukkit.entity.Entity entity = user.getEntity(); - - UserBalloonManager userBalloonManager1 = new UserBalloonManager(user, entity.getLocation()); - userBalloonManager1.getModelEntity().teleport(entity.getLocation().add(cosmeticBalloonType.getBalloonOffset())); - - userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot())); - userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot())); - - return userBalloonManager1; - } - - @Override public void equipmentSlotUpdate( int entityId, diff --git a/v1_20_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R3/NMSHandler.java b/v1_20_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R3/NMSHandler.java index 1c9207fa..3f649e94 100644 --- a/v1_20_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R3/NMSHandler.java +++ b/v1_20_R3/src/main/java/com/hibiscusmc/hmccosmetics/nms/v1_20_R3/NMSHandler.java @@ -76,20 +76,6 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler { return entity.getBukkitEntity(); } - @Override - public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) { - org.bukkit.entity.Entity entity = user.getEntity(); - - UserBalloonManager userBalloonManager1 = new UserBalloonManager(user, entity.getLocation()); - userBalloonManager1.getModelEntity().teleport(entity.getLocation().add(cosmeticBalloonType.getBalloonOffset())); - - userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot())); - userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot())); - - return userBalloonManager1; - } - - @Override public void equipmentSlotUpdate( int entityId,