Kotori0629/Arclight1.18
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix vanilla item with forge cap handling

Browse Source 
Related to #228 #250 #251
This commit is contained in:
IzzelAliz 2021-05-09 15:30:23 +08:00
parent 8982e79ba6
commit d22c78f007
2 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftItemStackMixin.java
View File

@ -2,15 +2,11 @@ package io.izzel.arclight.common.mixin.bukkit;
import io.izzel.arclight.common.bridge.bukkit.CraftItemStackBridge; import io.izzel.arclight.common.bridge.bukkit.CraftItemStackBridge;
import io.izzel.arclight.common.bridge.bukkit.ItemMetaBridge; import io.izzel.arclight.common.bridge.bukkit.ItemMetaBridge;
import io.izzel.arclight.common.bridge.bukkit.MaterialBridge;
import io.izzel.arclight.common.bridge.item.ItemStackBridge; import io.izzel.arclight.common.bridge.item.ItemStackBridge;
import io.izzel.arclight.i18n.conf.MaterialPropertySpec;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.craftbukkit.v.inventory.CraftItemFactory;
import org.bukkit.craftbukkit.v.inventory.CraftItemStack; import org.bukkit.craftbukkit.v.inventory.CraftItemStack;
import org.bukkit.craftbukkit.v.inventory.CraftMetaItem;
import org.bukkit.craftbukkit.v.legacy.CraftLegacy; import org.bukkit.craftbukkit.v.legacy.CraftLegacy;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
@ -26,34 +22,20 @@ import java.util.Objects;
public abstract class CraftItemStackMixin implements CraftItemStackBridge { public abstract class CraftItemStackMixin implements CraftItemStackBridge {
// @formatter:off // @formatter:off
@Shadow static Material getType(ItemStack item) { return null; }
@Shadow static boolean hasItemMeta(ItemStack item) { return false; }
@Shadow ItemStack handle; @Shadow ItemStack handle;
@Shadow public abstract Material getType(); @Shadow public abstract Material getType();
@Shadow public abstract short getDurability(); @Shadow public abstract short getDurability();
@Shadow public abstract boolean hasItemMeta(); @Shadow public abstract boolean hasItemMeta();
// @formatter:on // @formatter:on
@Inject(method = "getItemMeta(Lnet/minecraft/item/ItemStack;)Lorg/bukkit/inventory/meta/ItemMeta;", @Inject(method = "getItemMeta(Lnet/minecraft/item/ItemStack;)Lorg/bukkit/inventory/meta/ItemMeta;", at = @At("RETURN"))
cancellable = true, at = @At("HEAD"))
private static void arclight$offerCaps(ItemStack item, CallbackInfoReturnable<ItemMeta> cir) { private static void arclight$offerCaps(ItemStack item, CallbackInfoReturnable<ItemMeta> cir) {
Material type = getType(item); ItemMeta meta = cir.getReturnValue();
if (((MaterialBridge) (Object) type).bridge$getType() != MaterialPropertySpec.MaterialType.VANILLA) { CompoundNBT tag = item.getTag();
if (hasItemMeta(item)) { if (tag != null) {
CompoundNBT tag = item.getTag(); ((ItemMetaBridge) meta).bridge$offerUnhandledTags(tag);
CraftMetaItem metaItem;
if (tag != null) {
metaItem = new CraftMetaItem(tag);
((ItemMetaBridge) metaItem).bridge$offerUnhandledTags(tag);
} else {
metaItem = new CraftMetaItem(new CompoundNBT());
}
((ItemMetaBridge) metaItem).bridge$setForgeCaps(((ItemStackBridge) (Object) item).bridge$getForgeCaps());
cir.setReturnValue(metaItem);
} else {
cir.setReturnValue(CraftItemFactory.instance().getItemMeta(getType(item)));
}
} }
((ItemMetaBridge) meta).bridge$setForgeCaps(((ItemStackBridge) (Object) item).bridge$getForgeCaps());
} }
// check when update // check when update

8
arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftMetaItemMixin.java
View File

@ -59,6 +59,12 @@ public class CraftMetaItemMixin implements ItemMetaBridge {
"LodestonePos", "LodestonePos",
"LodestoneTracked" "LodestoneTracked"
); );
@ModifyVariable(method = "<init>(Lnet/minecraft/nbt/CompoundNBT;)V", at = @At(value = "INVOKE", target = "Lorg/bukkit/UnsafeValues;getDataVersion()I"))
private CompoundNBT arclight$provideTag(CompoundNBT tag) {
return tag == null ? new CompoundNBT() : tag;
}
private CompoundNBT forgeCaps; private CompoundNBT forgeCaps;
@Override @Override
@ -116,7 +122,7 @@ public class CraftMetaItemMixin implements ItemMetaBridge {
return 61 * hash + (this.forgeCaps != null ? this.forgeCaps.hashCode() : 0); return 61 * hash + (this.forgeCaps != null ? this.forgeCaps.hashCode() : 0);
} }
@Inject(method = "isEmpty", cancellable = true,at = @At("HEAD")) @Inject(method = "isEmpty", cancellable = true, at = @At("HEAD"))
private void arclight$forgeCapsEmpty(CallbackInfoReturnable<Boolean> cir) { private void arclight$forgeCapsEmpty(CallbackInfoReturnable<Boolean> cir) {
if (this.forgeCaps != null && !this.forgeCaps.isEmpty()) { if (this.forgeCaps != null && !this.forgeCaps.isEmpty()) {
cir.setReturnValue(false); cir.setReturnValue(false);