mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-07-15 00:12:53 +00:00
Code Issues Releases Wiki Activity

Preserve item NBT for turtle tools

Browse Source 
This is a pre-requisite for #1501, and some other refactorings I want to do.

Also fix items in the turtle upgrade slots vanishing. We now explicitly
invalidate the cache when setting the item.
This commit is contained in:
Jonathan Coates 2023-07-02 11:02:10 +01:00
parent f54cb8a432
commit d138d9c4a5
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
projects/common/src/main/java/dan200/computercraft/shared/turtle/inventory/UpgradeContainer.java
View File

@ -14,6 +14,7 @@ import net.minecraft.world.Container;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import javax.annotation.Nullable;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -46,24 +47,28 @@ class UpgradeContainer implements Container {
@Override @Override
public ItemStack getItem(int slot) { public ItemStack getItem(int slot) {
var side = getSide(slot); var side = getSide(slot);
var upgrade = turtle.getUpgrade(side); var upgrade = turtle.getUpgradeWithData(side);
if (upgrade == null) return ItemStack.EMPTY; if (upgrade == null) return ItemStack.EMPTY;
// We don't want to return getCraftingItem directly here, as consumers may mutate the stack (they shouldn't!, // We don't want to return getUpgradeItem directly here, as we'd end up recreating the stack each tick. To
// but if they do it's a pain to track down). To avoid recreating the stack each tick, we maintain a simple // avoid that, we maintain a simple cache.
// cache. We use an inlined getUpgradeData here to avoid the additional defensive copy. if (upgrade.equals(lastUpgrade.get(slot))) return lastStack.get(slot);
var upgradeData = UpgradeData.of(upgrade, turtle.getUpgradeNBTData(side));
if (upgradeData.equals(lastUpgrade.get(slot))) return lastStack.get(slot);
var stack = upgradeData.getUpgradeItem(); return setUpgradeStack(slot, upgrade);
lastUpgrade.set(slot, upgradeData.copy()); }
private ItemStack setUpgradeStack(int slot, @Nullable UpgradeData<ITurtleUpgrade> upgrade) {
var stack = upgrade == null ? ItemStack.EMPTY : upgrade.getUpgradeItem();
lastUpgrade.set(slot, upgrade);
lastStack.set(slot, stack); lastStack.set(slot, stack);
return stack; return stack;
} }
@Override @Override
public void setItem(int slot, ItemStack itemStack) { public void setItem(int slot, ItemStack itemStack) {
turtle.setUpgradeWithData(getSide(slot), TurtleUpgrades.instance().get(itemStack)); var upgrade = TurtleUpgrades.instance().get(itemStack);
turtle.setUpgradeWithData(getSide(slot), upgrade);
setUpgradeStack(slot, upgrade);
} }
@Override @Override

21
projects/common/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java
View File

@ -14,6 +14,7 @@ import dan200.computercraft.shared.util.DropConsumer;
import dan200.computercraft.shared.util.WorldUtil; import dan200.computercraft.shared.util.WorldUtil;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.tags.TagKey; import net.minecraft.tags.TagKey;
@ -59,7 +60,7 @@ public class TurtleTool extends AbstractTurtleUpgrade {
// Check we've not got anything vaguely interesting on the item. We allow other mods to add their // Check we've not got anything vaguely interesting on the item. We allow other mods to add their
// own NBT, with the understanding such details will be lost to the mist of time. // own NBT, with the understanding such details will be lost to the mist of time.
if (stack.isDamaged() || stack.isEnchanted() || stack.hasCustomHoverName()) return false; if (stack.isDamaged() || stack.isEnchanted()) return false;
if (tag.contains("AttributeModifiers", TAG_LIST) && !tag.getList("AttributeModifiers", TAG_COMPOUND).isEmpty()) { if (tag.contains("AttributeModifiers", TAG_LIST) && !tag.getList("AttributeModifiers", TAG_COMPOUND).isEmpty()) {
return false; return false;
} }
@ -67,6 +68,21 @@ public class TurtleTool extends AbstractTurtleUpgrade {
return true; return true;
} }
@Override
public CompoundTag getUpgradeData(ItemStack stack) {
// Just use the current item's tag.
var itemTag = stack.getTag();
return itemTag == null ? new CompoundTag() : itemTag;
}
@Override
public ItemStack getUpgradeItem(CompoundTag upgradeData) {
// Copy upgrade data back to the item.
var item = super.getUpgradeItem(upgradeData);
if (!upgradeData.isEmpty()) item.setTag(upgradeData);
return item;
}
@Override @Override
public TurtleCommandResult useTool(ITurtleAccess turtle, TurtleSide side, TurtleVerb verb, Direction direction) { public TurtleCommandResult useTool(ITurtleAccess turtle, TurtleSide side, TurtleVerb verb, Direction direction) {
return switch (verb) { return switch (verb) {
@ -177,7 +193,8 @@ public class TurtleTool extends AbstractTurtleUpgrade {
} }
private static boolean isTriviallyBreakable(BlockGetter reader, BlockPos pos, BlockState state) { private static boolean isTriviallyBreakable(BlockGetter reader, BlockPos pos, BlockState state) {
return state.is(ComputerCraftTags.Blocks.TURTLE_ALWAYS_BREAKABLE) return
state.is(ComputerCraftTags.Blocks.TURTLE_ALWAYS_BREAKABLE)
// Allow breaking any "instabreak" block. // Allow breaking any "instabreak" block.
|| state.getDestroySpeed(reader, pos) == 0; || state.getDestroySpeed(reader, pos) == 0;
} }