R3944Realms/PlayerSync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #94 from mlus-asuka/backport-90-to-1.20.4

Browse Source 
[Backport 1.20.4] unify item creation in curios and normal inventory
This commit is contained in:
mlus 2025-07-11 12:48:26 +08:00 committed by GitHub
commit d657c7a819
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/vip/fubuki/playersync/sync/ModsSupport.java
View File

@ -70,9 +70,7 @@ public class ModsSupport {
} }
String serialized = entry.getValue(); String serialized = entry.getValue();
try { try {
String nbtString = VanillaSync.deserializeString(serialized); ItemStack stack = VanillaSync.deserializeAndCreatePlaceholderIfNeeded(serialized);
CompoundTag tag = VanillaSync.snbtToFixedCompoundTag(nbtString);
ItemStack stack = ItemStack.of(tag);
if (handler.getCurios().containsKey(slotType)) { if (handler.getCurios().containsKey(slotType)) {
ICurioStacksHandler stacksHandler = handler.getCurios().get(slotType); ICurioStacksHandler stacksHandler = handler.getCurios().get(slotType);
IDynamicStackHandler dynStacks = stacksHandler.getStacks(); IDynamicStackHandler dynStacks = stacksHandler.getStacks();

2
src/main/java/vip/fubuki/playersync/sync/VanillaSync.java
View File

@ -249,7 +249,7 @@ public class VanillaSync {
} }
// deserialize item and potentially create placeholders // deserialize item and potentially create placeholders
private static ItemStack deserializeAndCreatePlaceholderIfNeeded(String serializedNbt) public static ItemStack deserializeAndCreatePlaceholderIfNeeded(String serializedNbt)
throws CommandSyntaxException { throws CommandSyntaxException {
if (serializedNbt == null || serializedNbt.isEmpty() || serializedNbt.equals("B64:e30=")) { if (serializedNbt == null || serializedNbt.isEmpty() || serializedNbt.equals("B64:e30=")) {
// Check for empty NBT (Base64 encoded '{}') // Check for empty NBT (Base64 encoded '{}')