Repo-Mirror/HMCCosmetics
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HMCCosmetics.git synced 2026-01-06 15:51:50 +00:00
Code Issues Releases Activity

Fixed balloons not being removed in wardrobe

Browse Source
This commit is contained in:
Fisher2911
2022-04-05 21:44:03 -04:00
parent 0ea5c92d86
commit bc994bfa2f
8 changed files with 115 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/main/java/io/github/fisher2911/hmccosmetics/gui/ArmorItem.java
View File

@@ -347,6 +347,18 @@ public class ArmorItem extends WrappedGuiItem {
};
}
@Nullable
public static Type fromPacketSlot(final com.github.retrooper.packetevents.protocol.player.EquipmentSlot slot) {
return switch (slot) {
case HELMET -> Type.HAT;
case CHESTPLATE -> Type.CHEST_PLATE;
case LEGGINGS -> Type.PANTS;
case BOOTS -> Type.BOOTS;
case OFFHAND -> Type.OFF_HAND;
default -> null;
};
}
@Nullable
public static Type fromEquipmentSlot(final EquipmentSlot slot) {
for (final Type type : values()) {

3
common/src/main/java/io/github/fisher2911/hmccosmetics/hook/entity/BalloonEntity.java
View File

@@ -117,8 +117,7 @@ public class BalloonEntity {
entity.removePlayerAsync(player);
}
entity.getEntity().remove();
ModelEngineAPI.api.getModelManager().removeModeledEntity(this.getUuid());
entity.getEntity().remove();
}
}

172
common/src/main/java/io/github/fisher2911/hmccosmetics/listener/CosmeticFixListener.java
View File

@@ -37,6 +37,7 @@ import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
import java.util.Map;
@@ -103,7 +104,7 @@ public class CosmeticFixListener implements Listener {
@EventHandler
public void onHoldItem(final PlayerItemHeldEvent event) {
this.userManager.get(event.getPlayer().getUniqueId()).ifPresent(user -> {
if (user.isWardrobeActive()) event.setCancelled(true);
if (user.isWardrobeActive()) event.setCancelled(true);
});
}
@@ -119,20 +120,23 @@ public class CosmeticFixListener implements Listener {
if (user.isEmpty()) return;
final ArmorItem.Type type = ArmorItem.Type.fromWrapper(slot);
if (type == null) return;
final EntityEquipment equipment = player.getEquipment();
final ItemStack current;
if (equipment == null) {
current = new ItemStack(Material.AIR);
} else {
current = equipment.getItem(slot);
}
updateOnClick(
player,
slot,
user.get(),
type,
current
);
this.taskManager.submit(() -> {
final EntityEquipment equipment = player.getEquipment();
final ItemStack current;
if (equipment == null) {
current = new ItemStack(Material.AIR);
} else {
current = equipment.getItem(slot);
}
updateOnClick(
player,
slot,
user.get(),
type,
current
);
});
}
private void registerInventoryClickListener() {
@@ -144,54 +148,61 @@ public class CosmeticFixListener implements Listener {
final WrapperPlayClientClickWindow packet = new WrapperPlayClientClickWindow(event);
if (packet.getWindowId() != 0) return;
if (!(event.getPlayer() instanceof final Player player)) return;
final Optional<User> optionalUser = userManager.get(player.getUniqueId());
if (optionalUser.isEmpty()) return;
final User user = optionalUser.get();
int slotClicked = packet.getSlot();
final WrapperPlayClientClickWindow.WindowClickType clickType = packet.getWindowClickType();
EquipmentSlot slot = getPacketArmorSlot(slotClicked);
if (slot == null) {
return;
}
final EntityEquipment entityEquipment = player.getEquipment();
if (entityEquipment == null) return;
final ItemStack current = Utils.replaceIfNull(entityEquipment.getItem(slot), new ItemStack(Material.AIR));
final ArmorItem.Type type = ArmorItem.Type.fromEquipmentSlot(slot);
if (type == null) return;
updateOnClick(
player,
slot,
user,
type,
current
);
taskManager.submit(() -> {
final Optional<User> optionalUser = userManager.get(player.getUniqueId());
if (optionalUser.isEmpty()) return;
final User user = optionalUser.get();
EquipmentSlot slot = getPacketArmorSlot(slotClicked);
if (slot == null) {
return;
}
final EntityEquipment entityEquipment = player.getEquipment();
if (entityEquipment == null) return;
final ItemStack current = Utils.replaceIfNull(entityEquipment.getItem(slot), new ItemStack(Material.AIR));
final ArmorItem.Type type = ArmorItem.Type.fromEquipmentSlot(slot);
if (type == null) return;
updateOnClick(
player,
slot,
user,
type,
current
);
});
}
}
);
}
private void updateOnClick(final Player player, final EquipmentSlot slot, final User user, final ArmorItem.Type type, final ItemStack current) {
taskManager.submit(() -> {
final Location location = player.getLocation();
final Equipment equipment = Equipment.fromEntityEquipment(player.getEquipment());
final ItemStack cosmetic = userManager.getCosmeticItem(
user.getPlayerArmor().getItem(type),
current,
ArmorItem.Status.APPLIED,
slot
);
if (cosmetic != null && cosmetic.getType() != Material.AIR) equipment.setItem(slot, cosmetic);
final Location location = player.getLocation();
final Equipment equipment = Equipment.fromEntityEquipment(player.getEquipment());
final ItemStack cosmetic = userManager.getCosmeticItem(
user.getPlayerArmor().getItem(type),
current,
ArmorItem.Status.APPLIED,
slot
);
if (cosmetic != null && cosmetic.getType() != Material.AIR) equipment.setItem(slot, cosmetic);
final List<com.github.retrooper.packetevents.protocol.player.Equipment> items =
userManager.getItemList(user, equipment, Set.of(type));
for (final Player other : Bukkit.getOnlinePlayers()) {
if (!settings.isInViewDistance(location, other.getLocation())) continue;
userManager.sendUpdatePacket(
user,
items
);
}
final List<com.github.retrooper.packetevents.protocol.player.Equipment> items =
userManager.getItemList(user, equipment, Collections.emptySet());
items.removeIf(e -> {
final com.github.retrooper.packetevents.protocol.player.EquipmentSlot s = e.getSlot();
final ArmorItem.Type t = ArmorItem.Type.fromPacketSlot(s);
if (t == null) return false;
final ArmorItem armorItem = user.getPlayerArmor().getItem(t);
final ItemStack i = SpigotDataHelper.toBukkitItemStack(e.getItem());
return armorItem.isEmpty() && i.equals(equipment.getItem(t.getSlot()));
});
for (final Player other : Bukkit.getOnlinePlayers()) {
if (!settings.isInViewDistance(location, other.getLocation())) continue;
userManager.sendUpdatePacket(
user,
items
);
}
}
private void registerMenuChangeListener() {
@@ -202,34 +213,35 @@ public class CosmeticFixListener implements Listener {
if (event.getPacketType() != PacketType.Play.Server.WINDOW_ITEMS) return;
final WrapperPlayServerWindowItems packet = new WrapperPlayServerWindowItems(event);
if (!(event.getPlayer() instanceof final Player player)) return;
final Optional<User> optionalUser = userManager.get(player.getUniqueId());
if (optionalUser.isEmpty()) return;
final User user = optionalUser.get();
if (packet.getWindowId() != 0) return;
final int windowId = packet.getWindowId();
final List<com.github.retrooper.packetevents.protocol.item.ItemStack> itemStacks = packet.getItems();
final int size = itemStacks.size();
final PlayerArmor playerArmor = user.getPlayerArmor();
final List<com.github.retrooper.packetevents.protocol.player.Equipment> equipmentList = new ArrayList<>();
for (final ArmorItem armorItem : playerArmor.getArmorItems()) {
final ArmorItem.Type type = armorItem.getType();
final EquipmentSlot slot = type.getSlot();
if (slot == null) continue;
final int packetSlot = getPacketArmorSlot(slot);
if (packetSlot == -1) continue;
if (packetSlot >= size) continue;
final ItemStack current = SpigotDataHelper.toBukkitItemStack(itemStacks.get(packetSlot));
final com.github.retrooper.packetevents.protocol.item.ItemStack setTo =
SpigotDataHelper.fromBukkitItemStack(userManager.getCosmeticItem(
armorItem,
current,
ArmorItem.Status.APPLIED,
slot
));
// itemStacks.set(packetSlot, setTo);
equipmentList.add(PacketManager.getEquipment(setTo, slot));
}
taskManager.submit(() -> {
final Optional<User> optionalUser = userManager.get(player.getUniqueId());
if (optionalUser.isEmpty()) return;
final User user = optionalUser.get();
if (windowId != 0) return;
final int size = itemStacks.size();
final PlayerArmor playerArmor = user.getPlayerArmor();
final List<com.github.retrooper.packetevents.protocol.player.Equipment> equipmentList = new ArrayList<>();
for (final ArmorItem armorItem : playerArmor.getArmorItems()) {
final ArmorItem.Type type = armorItem.getType();
final EquipmentSlot slot = type.getSlot();
if (slot == null) continue;
final int packetSlot = getPacketArmorSlot(slot);
if (packetSlot == -1) continue;
if (packetSlot >= size) continue;
final ItemStack current = SpigotDataHelper.toBukkitItemStack(itemStacks.get(packetSlot));
final com.github.retrooper.packetevents.protocol.item.ItemStack setTo =
SpigotDataHelper.fromBukkitItemStack(userManager.getCosmeticItem(
armorItem,
current,
ArmorItem.Status.APPLIED,
slot
));
if (SpigotDataHelper.fromBukkitItemStack(current).equals(setTo)) continue;
equipmentList.add(PacketManager.getEquipment(setTo, slot));
}
userManager.sendUpdatePacket(
user,
equipmentList

1
common/src/main/java/io/github/fisher2911/hmccosmetics/packet/PacketManager.java
View File

@@ -488,4 +488,5 @@ public class PacketManager {
case OFF_HAND -> EquipmentSlot.OFFHAND;
};
}
}

2
common/src/main/java/io/github/fisher2911/hmccosmetics/user/BaseUser.java
View File

@@ -105,10 +105,10 @@ public abstract class BaseUser<T> {
public void despawnBalloon() {
final HookManager hookManager = HookManager.getInstance();
if (!hookManager.isEnabled(ModelEngineHook.class)) return;
PacketManager.sendEntityDestroyPacket(this.getBalloonId(), Bukkit.getOnlinePlayers());
this.balloon.remove();
this.viewingBalloon.clear();
this.balloon.setAlive(false);
PacketManager.sendEntityDestroyPacket(this.getBalloonId(), Bukkit.getOnlinePlayers());
}
protected void despawnBalloon(final Player other) {

1
common/src/main/java/io/github/fisher2911/hmccosmetics/user/UserManager.java
View File

@@ -298,6 +298,7 @@ public class UserManager {
final Location location = user.getLocation();
if (location == null) return;
final int entityId = user.getEntityId();
if (items.isEmpty()) return;
for (final User otherUser : this.userMap.values()) {
final Player other = otherUser.getPlayer();
if (other == null) continue;

7
common/src/main/java/io/github/fisher2911/hmccosmetics/user/Wardrobe.java
View File

@@ -125,8 +125,6 @@ public class Wardrobe extends User {
() -> {
this.spawned = false;
final int entityId = this.getEntityId();
this.despawnAttached();
this.despawnBalloon();
PacketManager.sendEntityDestroyPacket(entityId, viewer);
PacketManager.sendRemovePlayerPacket(viewer, this.id, viewer);
PacketManager.sendEntityDestroyPacket(
@@ -169,7 +167,10 @@ public class Wardrobe extends User {
true
).chain(
() -> viewer.teleport(settings.getLeaveLocation())
).
).chain(() -> {
this.despawnAttached();
this.despawnBalloon();
}, true).
execute();
},
settings.getDespawnDelay()

6
common/src/main/resources/config.yml
View File

@@ -2,9 +2,9 @@ default-menu: main
cosmetic-settings:
require-empty-helmet: false
require-empty-off-hand: true
require-empty-chest-plate: true
require-empty-pants: true
require-empty-boots: true
require-empty-chest-plate: false
require-empty-pants: false
require-empty-boots: false
# The pitch the player must look down for the backpack to be removed
# Set to -1 for no removal