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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
LoJoSho
2025-03-25 13:41:16 -05:00
parent 7d25b8c470 c5e62bbf32
commit 04b0e23a96
1 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
v1_21_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R3/NMSPackets.java
View File

@@ -1,5 +1,6 @@
package me.lojosho.hibiscuscommons.nms.v1_21_R3; package me.lojosho.hibiscuscommons.nms.v1_21_R3;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.mojang.datafixers.util.Pair; import com.mojang.datafixers.util.Pair;
import com.mojang.serialization.JsonOps; import com.mojang.serialization.JsonOps;
@@ -26,6 +27,7 @@ import net.minecraft.world.phys.Vec3;
import net.minecraft.world.scores.PlayerTeam; import net.minecraft.world.scores.PlayerTeam;
import net.minecraft.world.scores.Team; import net.minecraft.world.scores.Team;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Color;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.CraftEquipmentSlot; import org.bukkit.craftbukkit.CraftEquipmentSlot;
import org.bukkit.craftbukkit.entity.CraftEntityType; import org.bukkit.craftbukkit.entity.CraftEntityType;
@@ -39,6 +41,7 @@ import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.meta.components.CustomModelDataComponent;
import org.joml.Quaternionf; import org.joml.Quaternionf;
import org.joml.Vector3f; import org.joml.Vector3f;
@@ -318,8 +321,43 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
components.addProperty("minecraft:enchantment_glint_override", true); components.addProperty("minecraft:enchantment_glint_override", true);
} }
if (meta.hasItemModel()) {
components.addProperty("minecraft:item_model", meta.getItemModel().toString());
}
if (meta.hasCustomModelData()) { if (meta.hasCustomModelData()) {
components.addProperty("minecraft:custom_model_data", meta.getCustomModelData()); CustomModelDataComponent customModelDataComponent = meta.getCustomModelDataComponent();
JsonObject customModelDataComponentJson = new JsonObject();
List<Float> floats = customModelDataComponent.getFloats();
if (!floats.isEmpty()) {
JsonArray floatsArray = new JsonArray();
floats.forEach(floatsArray::add);
customModelDataComponentJson.add("floats", floatsArray);
}
List<Boolean> flags = customModelDataComponent.getFlags();
if (!flags.isEmpty()) {
JsonArray flagsArray = new JsonArray();
flags.forEach(flagsArray::add);
customModelDataComponentJson.add("flags", flagsArray);
}
List<String> strings = customModelDataComponent.getStrings();
if (!strings.isEmpty()) {
JsonArray stringsArray = new JsonArray();
strings.forEach(stringsArray::add);
customModelDataComponentJson.add("strings", stringsArray);
}
List<Color> colors = customModelDataComponent.getColors();
if (!colors.isEmpty()) {
JsonArray colorsArray = new JsonArray();
colors.forEach(color -> colorsArray.add(color.asRGB()));
customModelDataComponentJson.add("colors", colorsArray);
}
components.add("minecraft:custom_model_data", customModelDataComponentJson);
} }
iconObj.add("components", components); iconObj.add("components", components);