Repo-Mirror/HMCCosmetics
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HMCCosmetics.git synced 2025-12-31 12:56:39 +00:00
Code Issues Releases Activity

Balloon rework for items as balloons

Browse Source
This commit is contained in:
LoJoSho
2023-01-20 16:08:28 -06:00
parent 1804e4691b
commit 0905071dd2
8 changed files with 119 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java
View File

@@ -43,9 +43,9 @@ public class CosmeticBalloonType extends Cosmetic {
return;
}
Vector velocity = newLocation.clone().toVector().subtract(currentLocation.clone().toVector());
Vector velocity = newLocation.toVector().subtract(currentLocation.toVector());
balloonEntity.setVelocity(velocity.multiply(1.1));
balloonEntity.setLocation(newLocation);
balloonEntity.setVelocity(velocity);
PacketManager.sendTeleportPacket(balloonEntity.getPufferfishBalloonId(), newLocation, false, viewer);
if (!user.getHidden()) PacketManager.sendLeashPacket(balloonEntity.getPufferfishBalloonId(), player.getEntityId(), viewer);

115
common/src/main/java/com/hibiscusmc/hmccosmetics/entities/BalloonEntity.java
View File

@@ -1,6 +1,7 @@
package com.hibiscusmc.hmccosmetics.entities;
import com.hibiscusmc.hmccosmetics.config.Settings;
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
import com.ticxo.modelengine.api.ModelEngineAPI;
@@ -8,20 +9,21 @@ import com.ticxo.modelengine.api.model.ActiveModel;
import com.ticxo.modelengine.api.model.ModeledEntity;
import org.bukkit.Color;
import org.bukkit.Location;
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.util.Vector;
import java.util.UUID;
import java.util.logging.Level;
// This includes the Pufferfish (The Pufferfish that's what the player leashes to) and the model (MEGEntity)
public class BalloonEntity {
private BalloonType balloonType;
private final int balloonID;
private final UUID uniqueID;
private final Entity modelEntity;
private ModeledEntity modeledEntity;
private final ArmorStand modelEntity;
public BalloonEntity(Location location) {
this.uniqueID = UUID.randomUUID();
@@ -29,62 +31,91 @@ public class BalloonEntity {
this.modelEntity = NMSHandlers.getHandler().getMEGEntity(location.add(Settings.getBalloonOffset()));
}
public void spawnModel(final String id, Color color) {
public void spawnModel(CosmeticBalloonType cosmeticBalloonType, Color color) {
// redo this
if (cosmeticBalloonType.getModelName() != null) {
balloonType = BalloonType.MODELENGINE;
} else {
if (cosmeticBalloonType.getItem() != null) {
balloonType = BalloonType.ITEM;
} else {
balloonType = BalloonType.NONE;
}
}
MessagesUtil.sendDebugMessages("balloontype is " + balloonType);
MessagesUtil.sendDebugMessages("Attempting Spawning for " + id);
if (ModelEngineAPI.api.getModelRegistry().getBlueprint(id) == null) {
MessagesUtil.sendDebugMessages("Invalid Model Engine Blueprint " + id, Level.SEVERE);
return;
if (balloonType == BalloonType.MODELENGINE) {
String id = cosmeticBalloonType.getModelName();
MessagesUtil.sendDebugMessages("Attempting Spawning for " + id);
if (ModelEngineAPI.api.getModelRegistry().getBlueprint(id) == null) {
MessagesUtil.sendDebugMessages("Invalid Model Engine Blueprint " + id, Level.SEVERE);
return;
}
ModeledEntity modeledEntity = ModelEngineAPI.getOrCreateModeledEntity(modelEntity);
ActiveModel model = ModelEngineAPI.createActiveModel(ModelEngineAPI.getBlueprint(id));
model.setCanHurt(false);
modeledEntity.addModel(model, false);
if (color != null) {
modeledEntity.getModels().forEach((d, singleModel) -> {
singleModel.getRendererHandler().setColor(color);
singleModel.getRendererHandler().update();
});
}
} else {
modelEntity.getEquipment().setHelmet(cosmeticBalloonType.getItem());
}
ModeledEntity modeledEntity = ModelEngineAPI.getOrCreateModeledEntity(modelEntity);
ActiveModel model = ModelEngineAPI.createActiveModel(ModelEngineAPI.getBlueprint(id));
model.setCanHurt(false);
modeledEntity.addModel(model, false);
if (color != null) {
modeledEntity.getModels().forEach((d, singleModel) -> {
singleModel.getRendererHandler().setColor(color);
singleModel.getRendererHandler().update();
});
}
this.modeledEntity = modeledEntity;
}
public void remove() {
final ModeledEntity entity = ModelEngineAPI.api.getModeledEntity(modelEntity.getUniqueId());
if (balloonType == BalloonType.MODELENGINE) {
final ModeledEntity entity = ModelEngineAPI.api.getModeledEntity(modelEntity.getUniqueId());
if (entity == null) return;
if (entity == null) return;
for (final Player player : entity.getRangeManager().getPlayerInRange()) {
entity.hideFromPlayer(player);
for (final Player player : entity.getRangeManager().getPlayerInRange()) {
entity.hideFromPlayer(player);
}
entity.destroy();
}
//ModelEngineAPI.removeModeledEntity(megEntity.getUniqueId());
entity.destroy();
modelEntity.remove();
}
public void addPlayerToModel(final Player player, final String id) {
addPlayerToModel(player, id, null);
public void addPlayerToModel(final Player player, final CosmeticBalloonType cosmeticBalloonType) {
addPlayerToModel(player, cosmeticBalloonType, null);
}
public void addPlayerToModel(final Player player, final String id, Color color) {
final ModeledEntity model = ModelEngineAPI.api.getModeledEntity(modelEntity.getUniqueId());
if (model == null) {
spawnModel(id, color);
MessagesUtil.sendDebugMessages("model is null");
public void addPlayerToModel(final Player player, final CosmeticBalloonType cosmeticBalloonType, Color color) {
if (balloonType == BalloonType.MODELENGINE) {
final ModeledEntity model = ModelEngineAPI.api.getModeledEntity(modelEntity.getUniqueId());
if (model == null) {
spawnModel(cosmeticBalloonType, color);
MessagesUtil.sendDebugMessages("model is null");
return;
}
//if (model.getRangeManager().getPlayerInRange().contains(player)) return;
model.showToPlayer(player);
MessagesUtil.sendDebugMessages("Show to player");
return;
}
//if (model.getRangeManager().getPlayerInRange().contains(player)) return;
model.showToPlayer(player);
MessagesUtil.sendDebugMessages("Show to player");
if (balloonType == BalloonType.ITEM) {
modelEntity.getEquipment().setHelmet(cosmeticBalloonType.getItem());
}
}
public void removePlayerFromModel(final Player player) {
final ModeledEntity model = ModelEngineAPI.api.getModeledEntity(modelEntity.getUniqueId());
if (balloonType == BalloonType.MODELENGINE) {
final ModeledEntity model = ModelEngineAPI.api.getModeledEntity(modelEntity.getUniqueId());
if (model == null) return;
if (model == null) return;
model.hideFromPlayer(player);
MessagesUtil.sendDebugMessages("Hidden from player");
model.hideFromPlayer(player);
MessagesUtil.sendDebugMessages("Hidden from player");
return;
}
if (balloonType == BalloonType.ITEM) {
modelEntity.getEquipment().clear();
return;
}
}
public Entity getModelEntity() {
@@ -118,4 +149,10 @@ public class BalloonEntity {
public void setVelocity(Vector vector) {
this.getModelEntity().setVelocity(vector);
}
public enum BalloonType {
MODELENGINE,
ITEM,
NONE
}
}

3
common/src/main/java/com/hibiscusmc/hmccosmetics/nms/NMSHandler.java
View File

@@ -6,6 +6,7 @@ import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
import com.hibiscusmc.hmccosmetics.entities.BalloonEntity;
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
import org.bukkit.Location;
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
@@ -20,7 +21,7 @@ public interface NMSHandler {
Entity getInvisibleArmorstand(Location loc);
Entity getMEGEntity(Location loc);
ArmorStand getMEGEntity(Location loc);
Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType);

2
common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
View File

@@ -432,7 +432,7 @@ public class CosmeticUser {
hideCosmetics = false;
if (hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
CosmeticBalloonType balloonType = (CosmeticBalloonType) getCosmetic(CosmeticSlot.BALLOON);
getBalloonEntity().addPlayerToModel(getPlayer(), balloonType.getModelName());
getBalloonEntity().addPlayerToModel(getPlayer(), balloonType);
List<Player> viewer = PlayerUtils.getNearbyPlayers(getPlayer());
PacketManager.sendLeashPacket(getBalloonEntity().getPufferfishBalloonId(), getPlayer().getEntityId(), viewer);
}