diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitCustomItem.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitCustomItem.java index 93e2ad6db..3f5241c91 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitCustomItem.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitCustomItem.java @@ -1,6 +1,7 @@ package net.momirealms.craftengine.bukkit.item; import com.google.common.collect.ImmutableMap; +import com.saicone.rtag.RtagItem; import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine; import net.momirealms.craftengine.bukkit.util.MaterialUtils; import net.momirealms.craftengine.core.item.*; diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/RTagItemWrapper.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/RTagItemWrapper.java index b8785432b..787542c65 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/RTagItemWrapper.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/RTagItemWrapper.java @@ -74,11 +74,6 @@ public class RTagItemWrapper implements ItemWrapper { return this.rtagItem.hasComponent(path); } - @Override - public void update() { - this.rtagItem.update(); - } - @Override public boolean remove(Object... path) { return this.rtagItem.remove(path); @@ -96,13 +91,6 @@ public class RTagItemWrapper implements ItemWrapper { return itemStack; } - @Override - public ItemStack loadCopy() { - ItemStack itemStack = this.rtagItem.loadCopy(); - itemStack.setAmount(this.count); - return itemStack; - } - @Override public Object getLiteralObject() { return this.rtagItem.getLiteralObject(); diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java index 33cea4ae5..fd3e8ef2d 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java @@ -93,11 +93,6 @@ public abstract class BukkitItemFactory extends ItemFactory item) { - item.update(); - } - @Override protected ItemStack load(ItemWrapper item) { return item.load(); @@ -108,11 +103,6 @@ public abstract class BukkitItemFactory extends ItemFactory item) { - return item.loadCopy(); - } - @Override protected boolean is(ItemWrapper item, Key itemTag) { Object literalObject = item.getLiteralObject(); diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/RecipeEventListener.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/RecipeEventListener.java index efb32bfc7..855e7305d 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/RecipeEventListener.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/RecipeEventListener.java @@ -511,7 +511,7 @@ public class RecipeEventListener implements Listener { return; } - Item wrappedFirst = BukkitItemManager.instance().wrap(first); + Item wrappedFirst = BukkitItemManager.instance().wrap(first.clone()); int maxDamage = wrappedFirst.maxDamage().orElse(0); int damage = wrappedFirst.damage().orElse(0); @@ -639,7 +639,7 @@ public class RecipeEventListener implements Listener { } afterPenalty = calculateIncreasedRepairCost(afterPenalty); wrappedFirst.repairCost(afterPenalty); - event.setResult(wrappedFirst.loadCopy()); + event.setResult(wrappedFirst.load()); } } diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/AbstractItem.java b/core/src/main/java/net/momirealms/craftengine/core/item/AbstractItem.java index d45202853..a7e4db0bd 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/AbstractItem.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/AbstractItem.java @@ -280,16 +280,6 @@ public class AbstractItem, I> implements Item { return this.factory.load(this.item); } - @Override - public I loadCopy() { - return this.factory.loadCopy(this.item); - } - - @Override - public void update() { - this.factory.update(this.item); - } - @Override public Item copyWithCount(int count) { return new AbstractItem<>(this.factory, this.item.copyWithCount(count)); diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/Item.java b/core/src/main/java/net/momirealms/craftengine/core/item/Item.java index 6ec67c438..27b295e13 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/Item.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/Item.java @@ -114,10 +114,6 @@ public interface Item { I load(); - I loadCopy(); - - void update(); - int maxStackSize(); Item maxStackSize(int amount); diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/ItemFactory.java b/core/src/main/java/net/momirealms/craftengine/core/item/ItemFactory.java index ab36b86ad..09839cbd7 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/ItemFactory.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/ItemFactory.java @@ -45,14 +45,10 @@ public abstract class ItemFactory

, I> protected abstract void resetComponent(ItemWrapper item, Key type); - protected abstract void update(ItemWrapper item); - protected abstract I load(ItemWrapper item); protected abstract I getItem(ItemWrapper item); - protected abstract I loadCopy(ItemWrapper item); - protected abstract void customModelData(ItemWrapper item, Integer data); protected abstract Optional customModelData(ItemWrapper item); diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/ItemWrapper.java b/core/src/main/java/net/momirealms/craftengine/core/item/ItemWrapper.java index 241ac787e..1847a764f 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/ItemWrapper.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/ItemWrapper.java @@ -6,12 +6,8 @@ public interface ItemWrapper { I getItem(); - void update(); - I load(); - I loadCopy(); - Object getLiteralObject(); boolean set(Object value, Object... path);