mirror of
https://github.com/Xiao-MoMi/craft-engine.git
synced 2025-12-25 01:49:30 +00:00
移除一些方法以便重构
This commit is contained in:
@@ -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.*;
|
||||
|
||||
@@ -74,11 +74,6 @@ public class RTagItemWrapper implements ItemWrapper<ItemStack> {
|
||||
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<ItemStack> {
|
||||
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();
|
||||
|
||||
@@ -93,11 +93,6 @@ public abstract class BukkitItemFactory extends ItemFactory<CraftEngine, ItemWra
|
||||
return item.remove(path);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void update(ItemWrapper<ItemStack> item) {
|
||||
item.update();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ItemStack load(ItemWrapper<ItemStack> item) {
|
||||
return item.load();
|
||||
@@ -108,11 +103,6 @@ public abstract class BukkitItemFactory extends ItemFactory<CraftEngine, ItemWra
|
||||
return item.getItem();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ItemStack loadCopy(ItemWrapper<ItemStack> item) {
|
||||
return item.loadCopy();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean is(ItemWrapper<ItemStack> item, Key itemTag) {
|
||||
Object literalObject = item.getLiteralObject();
|
||||
|
||||
@@ -511,7 +511,7 @@ public class RecipeEventListener implements Listener {
|
||||
return;
|
||||
}
|
||||
|
||||
Item<ItemStack> wrappedFirst = BukkitItemManager.instance().wrap(first);
|
||||
Item<ItemStack> 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());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -280,16 +280,6 @@ public class AbstractItem<W extends ItemWrapper<I>, I> implements Item<I> {
|
||||
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<I> copyWithCount(int count) {
|
||||
return new AbstractItem<>(this.factory, this.item.copyWithCount(count));
|
||||
|
||||
@@ -114,10 +114,6 @@ public interface Item<I> {
|
||||
|
||||
I load();
|
||||
|
||||
I loadCopy();
|
||||
|
||||
void update();
|
||||
|
||||
int maxStackSize();
|
||||
|
||||
Item<I> maxStackSize(int amount);
|
||||
|
||||
@@ -45,14 +45,10 @@ public abstract class ItemFactory<P extends Plugin, W extends ItemWrapper<I>, I>
|
||||
|
||||
protected abstract void resetComponent(ItemWrapper<I> item, Key type);
|
||||
|
||||
protected abstract void update(ItemWrapper<I> item);
|
||||
|
||||
protected abstract I load(ItemWrapper<I> item);
|
||||
|
||||
protected abstract I getItem(ItemWrapper<I> item);
|
||||
|
||||
protected abstract I loadCopy(ItemWrapper<I> item);
|
||||
|
||||
protected abstract void customModelData(ItemWrapper<I> item, Integer data);
|
||||
|
||||
protected abstract Optional<Integer> customModelData(ItemWrapper<I> item);
|
||||
|
||||
@@ -6,12 +6,8 @@ public interface ItemWrapper<I> {
|
||||
|
||||
I getItem();
|
||||
|
||||
void update();
|
||||
|
||||
I load();
|
||||
|
||||
I loadCopy();
|
||||
|
||||
Object getLiteralObject();
|
||||
|
||||
boolean set(Object value, Object... path);
|
||||
|
||||
Reference in New Issue
Block a user