diff --git a/build.gradle.kts b/build.gradle.kts index 68456ec5..554834a5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -75,7 +75,7 @@ allprojects { compileOnly("org.jetbrains:annotations:23.0.0") compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0") compileOnly("me.clip:placeholderapi:2.11.3") - compileOnly("com.ticxo:modelengine:R3.0.1") + compileOnly("com.ticxo.modelengine:ModelEngine:R4.0.0") compileOnly("com.github.oraxen:oraxen:1.160.0") compileOnly("com.github.LoneDev6:API-ItemsAdder:3.2.5") compileOnly("com.mineinabyss:geary-papermc:0.24.1") diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 4cfe6718..49dde58a 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { compileOnly("org.jetbrains:annotations:23.0.0") compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0") compileOnly("me.clip:placeholderapi:2.11.3") - compileOnly("com.ticxo:modelengine:R3.0.1") + compileOnly("com.ticxo.modelengine:ModelEngine:R4.0.0") compileOnly("com.github.oraxen:oraxen:1.160.0") compileOnly("com.github.LoneDev6:API-ItemsAdder:3.2.5") compileOnly("com.mineinabyss:geary-papermc:0.24-SNAPSHOT") diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBackpackManager.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBackpackManager.java index b7854b2a..ea6d1655 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBackpackManager.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBackpackManager.java @@ -91,7 +91,7 @@ public class UserBackpackManager { // No one should be using ME because it barely works but some still use it, so it's here if (cosmeticBackpackType.getModelName() != null && Hooks.isActiveHook("ModelEngine")) { - if (ModelEngineAPI.api.getModelRegistry().getBlueprint(cosmeticBackpackType.getModelName()) == null) { + if (ModelEngineAPI.getBlueprint(cosmeticBackpackType.getModelName()) == null) { MessagesUtil.sendDebugMessages("Invalid Model Engine Blueprint " + cosmeticBackpackType.getModelName(), Level.SEVERE); return; } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonManager.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonManager.java index e46f5b8c..135912b7 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonManager.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonManager.java @@ -53,7 +53,7 @@ public class UserBalloonManager { if (balloonType == BalloonType.MODELENGINE) { String id = cosmeticBalloonType.getModelName(); MessagesUtil.sendDebugMessages("Attempting Spawning for " + id); - if (ModelEngineAPI.api.getModelRegistry().getBlueprint(id) == null) { + if (ModelEngineAPI.getBlueprint(id) == null) { MessagesUtil.sendDebugMessages("Invalid Model Engine Blueprint " + id, Level.SEVERE); return; } @@ -64,8 +64,8 @@ public class UserBalloonManager { if (color != null) { modeledEntity.getModels().forEach((d, singleModel) -> { if (cosmeticBalloonType.isDyablePart(d)) { - singleModel.getRendererHandler().setColor(color); - singleModel.getRendererHandler().update(); + singleModel.setDefaultTint(color); + singleModel.getModelRenderer().sendToClient(); } }); } @@ -78,13 +78,13 @@ public class UserBalloonManager { public void remove() { if (balloonType == BalloonType.MODELENGINE) { - final ModeledEntity entity = ModelEngineAPI.api.getModeledEntity(modelEntity.getUniqueId()); - + final ModeledEntity entity = ModelEngineAPI.getModeledEntity(modelEntity.getUniqueId()); if (entity == null) return; - for (final Player player : entity.getRangeManager().getPlayerInRange()) { - entity.hideFromPlayer(player); + for (String model : entity.getModels().keySet()) { + entity.removeModel(model); } + entity.destroy(); } @@ -98,14 +98,14 @@ public class UserBalloonManager { public void addPlayerToModel(final CosmeticUser user, final CosmeticBalloonType cosmeticBalloonType, Color color) { if (balloonType == BalloonType.MODELENGINE) { - final ModeledEntity model = ModelEngineAPI.api.getModeledEntity(modelEntity.getUniqueId()); + final ModeledEntity model = ModelEngineAPI.getModeledEntity(modelEntity.getUniqueId()); if (model == null) { spawnModel(cosmeticBalloonType, color); MessagesUtil.sendDebugMessages("model is null"); return; } //if (model.getRangeManager().getPlayerInRange().contains(player)) return; - model.showToPlayer(user.getPlayer()); + //model.showToPlayer(user.getPlayer()); MessagesUtil.sendDebugMessages("Show to player"); return; } @@ -115,11 +115,12 @@ public class UserBalloonManager { } public void removePlayerFromModel(final Player player) { if (balloonType == BalloonType.MODELENGINE) { - final ModeledEntity model = ModelEngineAPI.api.getModeledEntity(modelEntity.getUniqueId()); + final ModeledEntity model = ModelEngineAPI.getModeledEntity(modelEntity.getUniqueId()); if (model == null) return; - model.hideFromPlayer(player); + //model.hideFromPlayer(player); + MessagesUtil.sendDebugMessages("Hidden from player"); return; }