Repo-Mirror/HibiscusCommons
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HibiscusCommons.git synced 2025-12-19 15:09:26 +00:00
Code Issues Releases Activity

feat: latest changes and wrappers

Browse Source
This commit is contained in:
LoJoSho
2025-06-26 14:43:04 -05:00
parent 7865b8b372
commit ee96da9abd
6 changed files with 68 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/src/main/java/me/lojosho/hibiscuscommons/packets/PacketInterface.java
View File

@@ -1,36 +1,33 @@
package me.lojosho.hibiscuscommons.packets; package me.lojosho.hibiscuscommons.packets;
import me.lojosho.hibiscuscommons.packets.wrapper.ContainerContentWrapper; import me.lojosho.hibiscuscommons.packets.wrapper.*;
import me.lojosho.hibiscuscommons.packets.wrapper.EntityEquipmentWrapper;
import me.lojosho.hibiscuscommons.packets.wrapper.PassengerWrapper;
import me.lojosho.hibiscuscommons.packets.wrapper.SlotContentWrapper;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public interface PacketInterface { public interface PacketInterface {
default PacketAction writeContainerContent(@NotNull Player player, ContainerContentWrapper wrapper) { default PacketAction writeContainerContent(@NotNull Player player, @NotNull ContainerContentWrapper wrapper) {
return PacketAction.NOTHING; return PacketAction.NOTHING;
} }
default PacketAction writeSlotContent(@NotNull Player player, SlotContentWrapper wrapper) { default PacketAction writeSlotContent(@NotNull Player player, @NotNull SlotContentWrapper wrapper) {
return PacketAction.NOTHING; return PacketAction.NOTHING;
} }
default PacketAction writeEquipmentContent(@NotNull Player player, EntityEquipmentWrapper wrapper) { default PacketAction writeEquipmentContent(@NotNull Player player, @NotNull EntityEquipmentWrapper wrapper) {
return PacketAction.NOTHING; return PacketAction.NOTHING;
} }
default PacketAction writePassengerContent(@NotNull Player player, PassengerWrapper wrapper) { default PacketAction writePassengerContent(@NotNull Player player, @NotNull PassengerWrapper wrapper) {
return PacketAction.NOTHING; return PacketAction.NOTHING;
} }
default PacketAction readInventoryClick(@NotNull Player player, Integer clickType, Integer slotNumber) { default PacketAction readInventoryClick(@NotNull Player player, @NotNull InventoryClickWrapper wrapper) {
return PacketAction.NOTHING; return PacketAction.NOTHING;
// Override // Override
} }
default PacketAction readPlayerAction(@NotNull Player player, Integer actionType) { default PacketAction readPlayerAction(@NotNull Player player, @NotNull PlayerActionWrapper wrapper) {
return PacketAction.NOTHING; return PacketAction.NOTHING;
// Override // Override
} }

4
common/src/main/java/me/lojosho/hibiscuscommons/packets/wrapper/EntityEquipmentWrapper.java
View File

@@ -11,9 +11,11 @@ import java.util.Map;
@Getter @Setter @Getter @Setter
public class EntityEquipmentWrapper { public class EntityEquipmentWrapper {
private int entityId;
private Map<EquipmentSlot, ItemStack> armor; private Map<EquipmentSlot, ItemStack> armor;
public EntityEquipmentWrapper(@NotNull Map<EquipmentSlot, ItemStack> armor) { public EntityEquipmentWrapper(int entityId, @NotNull Map<EquipmentSlot, ItemStack> armor) {
this.entityId = entityId;
this.armor = armor; this.armor = armor;
} }
} }

17
common/src/main/java/me/lojosho/hibiscuscommons/packets/wrapper/InventoryClickWrapper.java Normal file
View File

@@ -0,0 +1,17 @@
package me.lojosho.hibiscuscommons.packets.wrapper;
import lombok.Getter;
import lombok.Setter;
import org.jetbrains.annotations.NotNull;
@Getter @Setter
public class InventoryClickWrapper {
private int clickType;
private int slotNumber;
public InventoryClickWrapper(@NotNull Integer clickType, @NotNull Integer slotNumber) {
this.clickType = clickType;
this.slotNumber = slotNumber;
}
}

14
common/src/main/java/me/lojosho/hibiscuscommons/packets/wrapper/PlayerActionWrapper.java Normal file
View File

@@ -0,0 +1,14 @@
package me.lojosho.hibiscuscommons.packets.wrapper;
import lombok.Getter;
import lombok.Setter;
@Getter @Setter
public class PlayerActionWrapper {
private String actionType;
public PlayerActionWrapper(String actionType) {
this.actionType = actionType;
}
}

58
v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSPacketChannel.java
View File

@@ -7,10 +7,7 @@ import io.netty.channel.ChannelPromise;
import lombok.Getter; import lombok.Getter;
import me.lojosho.hibiscuscommons.nms.NMSHandlers; import me.lojosho.hibiscuscommons.nms.NMSHandlers;
import me.lojosho.hibiscuscommons.packets.PacketAction; import me.lojosho.hibiscuscommons.packets.PacketAction;
import me.lojosho.hibiscuscommons.packets.wrapper.ContainerContentWrapper; import me.lojosho.hibiscuscommons.packets.wrapper.*;
import me.lojosho.hibiscuscommons.packets.wrapper.EntityEquipmentWrapper;
import me.lojosho.hibiscuscommons.packets.wrapper.PassengerWrapper;
import me.lojosho.hibiscuscommons.packets.wrapper.SlotContentWrapper;
import me.lojosho.hibiscuscommons.plugins.SubPlugins; import me.lojosho.hibiscuscommons.plugins.SubPlugins;
import me.lojosho.hibiscuscommons.util.MessagesUtil; import me.lojosho.hibiscuscommons.util.MessagesUtil;
import net.minecraft.core.NonNullList; import net.minecraft.core.NonNullList;
@@ -66,46 +63,47 @@ public class NMSPacketChannel extends ChannelDuplexHandler {
List<org.bukkit.inventory.ItemStack> bukkitItems = slotData.stream().map(CraftItemStack::asBukkitCopy).toList(); List<org.bukkit.inventory.ItemStack> bukkitItems = slotData.stream().map(CraftItemStack::asBukkitCopy).toList();
AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING); AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING);
ContainerContentWrapper wrapper = new ContainerContentWrapper(windowId, bukkitItems);
SubPlugins.getSubPlugins().forEach(plugin -> { SubPlugins.getSubPlugins().forEach(plugin -> {
PacketAction pluginAction = plugin.getPacketInterface().writeContainerContent(player, new ContainerContentWrapper(windowId, bukkitItems)); PacketAction pluginAction = plugin.getPacketInterface().writeContainerContent(player, wrapper);
if (pluginAction != PacketAction.NOTHING) action.set(pluginAction); if (pluginAction != PacketAction.NOTHING) action.set(pluginAction);
}); });
List<ItemStack> nmsItems = bukkitItems.stream().map(CraftItemStack::asNMSCopy).toList();
if (action.get() == PacketAction.CANCELLED) return null; if (action.get() == PacketAction.CANCELLED) return null;
if (action.get() == PacketAction.NOTHING) return packet; if (action.get() == PacketAction.NOTHING) return packet;
List<ItemStack> nmsItems = wrapper.getSlotData().stream().map(CraftItemStack::asNMSCopy).toList();
return new ClientboundContainerSetContentPacket(0, packet.stateId(), nmsItems, packet.carriedItem()); return new ClientboundContainerSetContentPacket(0, packet.stateId(), nmsItems, packet.carriedItem());
} }
private Packet<?> handleSlotChange(@NotNull ClientboundContainerSetSlotPacket packet) { private Packet<?> handleSlotChange(@NotNull ClientboundContainerSetSlotPacket packet) {
MessagesUtil.sendDebugMessages("SetSlot Initial "); MessagesUtil.sendDebugMessages("SetSlot Initial ");
Integer windowId = packet.getContainerId(); final int windowId = packet.getContainerId();
Integer slot = packet.getSlot(); final int slot = packet.getSlot();
ItemStack item = packet.getItem(); final ItemStack item = packet.getItem();
org.bukkit.inventory.ItemStack bukkitItem = CraftItemStack.asBukkitCopy(item); org.bukkit.inventory.ItemStack bukkitItem = CraftItemStack.asBukkitCopy(item);
AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING); AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING);
SubPlugins.getSubPlugins().forEach(plugin -> { SlotContentWrapper wrapper = new SlotContentWrapper(windowId, slot, bukkitItem);
PacketAction pluginAction = plugin.getPacketInterface().writeSlotContent(player, new SlotContentWrapper(windowId, slot, bukkitItem)); SubPlugins.getSubPlugins().forEach(plugin -> {
PacketAction pluginAction = plugin.getPacketInterface().writeSlotContent(player, wrapper);
if (pluginAction != PacketAction.NOTHING) action.set(pluginAction); if (pluginAction != PacketAction.NOTHING) action.set(pluginAction);
}); });
if (action.get() == PacketAction.CANCELLED) return null; if (action.get() == PacketAction.CANCELLED) return null;
if (action.get() == PacketAction.NOTHING) return packet; if (action.get() == PacketAction.NOTHING) return packet;
final ItemStack nmsItem = CraftItemStack.asNMSCopy(bukkitItem); final ItemStack nmsItem = CraftItemStack.asNMSCopy(wrapper.getItemStack());
return new ClientboundContainerSetSlotPacket(0, packet.getStateId(), slot, nmsItem); return new ClientboundContainerSetSlotPacket(0, packet.getStateId(), wrapper.getSlot(), nmsItem);
} }
private Packet<?> handlePlayerEquipment(@NotNull ClientboundSetEquipmentPacket packet) { private Packet<?> handlePlayerEquipment(@NotNull ClientboundSetEquipmentPacket packet) {
final List<Pair<net.minecraft.world.entity.EquipmentSlot, ItemStack>> nmsArmor = packet.getSlots(); final List<Pair<net.minecraft.world.entity.EquipmentSlot, ItemStack>> nmsArmor = packet.getSlots();
final int entity = packet.getEntity();
HashMap<EquipmentSlot, org.bukkit.inventory.ItemStack> bukkitArmor = new HashMap<>(); HashMap<EquipmentSlot, org.bukkit.inventory.ItemStack> bukkitArmor = new HashMap<>();
for (Pair<net.minecraft.world.entity.EquipmentSlot, ItemStack> piece : nmsArmor) { for (Pair<net.minecraft.world.entity.EquipmentSlot, ItemStack> piece : nmsArmor) {
EquipmentSlot slot = CraftEquipmentSlot.getSlot(piece.getFirst()); EquipmentSlot slot = CraftEquipmentSlot.getSlot(piece.getFirst());
@@ -113,25 +111,20 @@ public class NMSPacketChannel extends ChannelDuplexHandler {
bukkitArmor.put(slot, itemStack); bukkitArmor.put(slot, itemStack);
} }
final var finalArmor = bukkitArmor;
AtomicReference<Map<EquipmentSlot, org.bukkit.inventory.ItemStack>> armor = new AtomicReference<>(new HashMap<>());
AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING); AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING);
SubPlugins.getSubPlugins().forEach(plugin -> { EntityEquipmentWrapper wrapper = new EntityEquipmentWrapper(entity, bukkitArmor);
EntityEquipmentWrapper wrapper = new EntityEquipmentWrapper(finalArmor); SubPlugins.getSubPlugins().forEach(plugin -> {
PacketAction pluginAction = plugin.getPacketInterface().writeEquipmentContent(player, wrapper); PacketAction pluginAction = plugin.getPacketInterface().writeEquipmentContent(player, wrapper);
if (pluginAction != PacketAction.NOTHING) { if (pluginAction != PacketAction.NOTHING) action.set(pluginAction);
armor.set(wrapper.getArmor());
action.set(pluginAction);
}
}); });
if (action.get() == PacketAction.CANCELLED) return null; if (action.get() == PacketAction.CANCELLED) return null;
if (action.get() == PacketAction.NOTHING) return packet; if (action.get() == PacketAction.NOTHING) return packet;
List<Pair<net.minecraft.world.entity.EquipmentSlot, ItemStack>> newArmor = new ArrayList<>(); List<Pair<net.minecraft.world.entity.EquipmentSlot, ItemStack>> newArmor = new ArrayList<>();
for (Map.Entry<EquipmentSlot, org.bukkit.inventory.ItemStack> entry : armor.get().entrySet()) { for (Map.Entry<EquipmentSlot, org.bukkit.inventory.ItemStack> entry : wrapper.getArmor().entrySet()) {
net.minecraft.world.entity.EquipmentSlot slot = CraftEquipmentSlot.getNMS(entry.getKey()); net.minecraft.world.entity.EquipmentSlot slot = CraftEquipmentSlot.getNMS(entry.getKey());
ItemStack itemStack = CraftItemStack.asNMSCopy(entry.getValue()); ItemStack itemStack = CraftItemStack.asNMSCopy(entry.getValue());
newArmor.add(new Pair<>(slot, itemStack)); newArmor.add(new Pair<>(slot, itemStack));
@@ -141,16 +134,17 @@ public class NMSPacketChannel extends ChannelDuplexHandler {
} }
private Packet<?> handlePassengerSet(@NotNull ClientboundSetPassengersPacket packet) { private Packet<?> handlePassengerSet(@NotNull ClientboundSetPassengersPacket packet) {
Integer ownerId = packet.getVehicle(); int ownerId = packet.getVehicle();
List<Integer> passengers = Arrays.stream(packet.getPassengers()).boxed().collect(Collectors.toList()); List<Integer> passengers = Arrays.stream(packet.getPassengers()).boxed().collect(Collectors.toList());
MessagesUtil.sendDebugMessages("Mount Packet Sent - Read - EntityID: " + ownerId); MessagesUtil.sendDebugMessages("Mount Packet Sent - Read - EntityID: " + ownerId);
AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING); AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING);
PassengerWrapper wrapper = new PassengerWrapper(ownerId, passengers);
SubPlugins.getSubPlugins().forEach(plugin -> { SubPlugins.getSubPlugins().forEach(plugin -> {
PacketAction pluginAction = plugin.getPacketInterface().writePassengerContent(player, wrapper);
PacketAction pluginAction = plugin.getPacketInterface().writePassengerContent(player, new PassengerWrapper(ownerId, passengers)); if (pluginAction != PacketAction.NOTHING) {
if (pluginAction != PacketAction.NOTHING) action.set(pluginAction); action.set(pluginAction);
}
}); });
if (action.get() == PacketAction.CANCELLED) return null; if (action.get() == PacketAction.CANCELLED) return null;
@@ -184,7 +178,7 @@ public class NMSPacketChannel extends ChannelDuplexHandler {
AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING); AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING);
SubPlugins.getSubPlugins().forEach(plugin -> { SubPlugins.getSubPlugins().forEach(plugin -> {
PacketAction pluginAction = plugin.getPacketInterface().readInventoryClick(player, clickType.id(), slotClicked); PacketAction pluginAction = plugin.getPacketInterface().readInventoryClick(player, new InventoryClickWrapper(clickType.id(), slotClicked));
if (pluginAction != PacketAction.NOTHING) action.set(pluginAction); if (pluginAction != PacketAction.NOTHING) action.set(pluginAction);
}); });
@@ -198,7 +192,7 @@ public class NMSPacketChannel extends ChannelDuplexHandler {
AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING); AtomicReference<PacketAction> action = new AtomicReference<>(PacketAction.NOTHING);
SubPlugins.getSubPlugins().forEach(plugin -> { SubPlugins.getSubPlugins().forEach(plugin -> {
PacketAction pluginAction = plugin.getPacketInterface().readPlayerAction(player, playerAction.ordinal()); PacketAction pluginAction = plugin.getPacketInterface().readPlayerAction(player, new PlayerActionWrapper(playerAction.name()));
if (pluginAction != PacketAction.NOTHING) action.set(pluginAction); if (pluginAction != PacketAction.NOTHING) action.set(pluginAction);
}); });

1
v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSPackets.java
View File

@@ -251,6 +251,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
passenger.setId(id); passenger.setId(id);
return passenger; return passenger;
}).toList(); }).toList();
fakeNmsEntity.setId(mountId);
fakeNmsEntity.passengers = ImmutableList.copyOf(passengers); fakeNmsEntity.passengers = ImmutableList.copyOf(passengers);
ClientboundSetPassengersPacket packet = new ClientboundSetPassengersPacket(fakeNmsEntity); ClientboundSetPassengersPacket packet = new ClientboundSetPassengersPacket(fakeNmsEntity);
fakeNmsEntity.passengers = ImmutableList.of(); fakeNmsEntity.passengers = ImmutableList.of();