From 5422d8164ad9de934462188fd0eaac54cb415057 Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Tue, 15 Nov 2022 19:22:15 -0600 Subject: [PATCH] Balloon work --- .../cosmetic/types/CosmeticBackpackType.java | 3 --- .../cosmetic/types/CosmeticBalloonType.java | 19 ++++++++++++++++--- .../resources/cosmetics/examplecosmetics.yml | 3 +++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java b/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java index 64f19ff0..f5c7dd28 100644 --- a/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java +++ b/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java @@ -14,8 +14,6 @@ import org.bukkit.inventory.ItemStack; import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.serialize.SerializationException; -import java.util.List; - public class CosmeticBackpackType extends Cosmetic { private ItemStack backpackItem; @@ -29,7 +27,6 @@ public class CosmeticBackpackType extends Cosmetic { @Override public void update(CosmeticUser user) { Player player = Bukkit.getPlayer(user.getUniqueId()); - List sendTo = PlayerUtils.getNearbyPlayers(player.getLocation()); Location loc = player.getLocation().clone(); user.getBackpackEntity().getBukkitLivingEntity().setRotation(loc.getYaw(), loc.getPitch()); diff --git a/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java b/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java index f37d2acd..eea9ebb2 100644 --- a/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java +++ b/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java @@ -1,9 +1,10 @@ package com.hibiscusmc.hmccosmetics.cosmetic.types; +import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin; import com.hibiscusmc.hmccosmetics.config.Settings; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; -import com.hibiscusmc.hmccosmetics.util.PlayerUtils; +import com.ticxo.modelengine.api.ModelEngineAPI; import com.ticxo.modelengine.api.generator.model.ModelBlueprint; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -17,19 +18,31 @@ public class CosmeticBalloonType extends Cosmetic { private ModelBlueprint model; public CosmeticBalloonType(String id, ConfigurationNode config) { super(id, config); + + String modelId = config.node("model").getString(); + + HMCCosmeticsPlugin.getInstance().getLogger().info("Attempting Spawning"); + if (ModelEngineAPI.api.getModelRegistry().getBlueprint(modelId) == null) { + HMCCosmeticsPlugin.getInstance().getLogger().warning("Invalid Model Engine Blueprint " + id); + HMCCosmeticsPlugin.getInstance().getLogger().warning("Possible Blueprints" + ModelEngineAPI.api.getModelRegistry().getAllBlueprintId()); + return; + } + this.model = ModelEngineAPI.api.getModelRegistry().getBlueprint(modelId); } @Override public void update(CosmeticUser user) { Player player = Bukkit.getPlayer(user.getUniqueId()); - List sendTo = PlayerUtils.getNearbyPlayers(player.getLocation()); Location loc = player.getLocation().clone(); - // TODO: Offsets loc.add(Settings.getBalloonOffset()); user.getBalloonEntity().setLocation(loc); //user.getBackpackEntity().getBukkitLivingEntity().setRotation(loc.getYaw(), loc.getPitch()); } + + public ModelBlueprint getModel() { + return this.model; + } } diff --git a/src/main/resources/cosmetics/examplecosmetics.yml b/src/main/resources/cosmetics/examplecosmetics.yml index 7cee8c8e..c5de8c6e 100644 --- a/src/main/resources/cosmetics/examplecosmetics.yml +++ b/src/main/resources/cosmetics/examplecosmetics.yml @@ -25,3 +25,6 @@ colorfulbackpack: item: material: PAPER model-data: 4 +colorfulballoon: + slot: BALLOON + model: green_balloon