Move machine NBT constant, change coords to machine_id

Author: robotgryphon

src/main/java/dev/compactmods/machines/block/BlockCompactMachine.java

@@ -10,6 +10,7 @@
 import dev.compactmods.machines.core.EnumMachinePlayersBreakHandling;
 import dev.compactmods.machines.core.Registration;
 import dev.compactmods.machines.reference.EnumMachineSize;
+import dev.compactmods.machines.reference.Reference;
 import dev.compactmods.machines.util.PlayerUtil;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -136,12 +137,12 @@ public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGett
         Block given = getBySize(this.size);
         ItemStack stack = new ItemStack(given, 1);
 
-        CompoundTag nbt = stack.getOrCreateTagElement("cm");
-        nbt.putString("size", this.size.getName());
+        CompoundTag nbt = stack.getOrCreateTag();
+        // nbt.putString("size", this.size.getName());
 
         CompactMachineTile tileEntity = (CompactMachineTile) world.getBlockEntity(pos);
         if (tileEntity != null && tileEntity.mapped()) {
-            nbt.putInt("coords", tileEntity.machineId);
+            nbt.putInt(Reference.CompactMachines.NBT_MACHINE_ID, tileEntity.machineId);
         }
 
         return stack;
@@ -169,8 +170,8 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, @Nullable
 
             if (nbt.contains("cm")) {
                 CompoundTag machineData = nbt.getCompound("cm");
-                if (machineData.contains("coords")) {
-                    int machineID = machineData.getInt("coords");
+                if (machineData.contains(Reference.CompactMachines.NBT_MACHINE_ID)) {
+                    int machineID = machineData.getInt(Reference.CompactMachines.NBT_MACHINE_ID);
                     tile.setMachineId(machineID);
                 }
             }

src/main/java/dev/compactmods/machines/block/tiles/CompactMachineTile.java

@@ -36,7 +36,7 @@ public CompactMachineTile(BlockPos pos, BlockState state) {
     public void load(CompoundTag nbt) {
         super.load(nbt);
 
-        machineId = nbt.getInt("coords");
+        machineId = nbt.getInt(Reference.CompactMachines.NBT_MACHINE_ID);
         // TODO customName = nbt.getString("CustomName");
         if (nbt.contains(Reference.CompactMachines.OWNER_NBT)) {
             owner = nbt.getUUID(Reference.CompactMachines.OWNER_NBT);
@@ -60,7 +60,7 @@ public void load(CompoundTag nbt) {
 
     @Override
     protected void saveAdditional(CompoundTag nbt) {
-        nbt.putInt("coords", machineId);
+        nbt.putInt(Reference.CompactMachines.NBT_MACHINE_ID, machineId);
         // nbt.putString("CustomName", customName.getString());
 
         if (owner != null) {

src/main/java/dev/compactmods/machines/datagen/BlockLootGenerator.java

@@ -67,7 +67,7 @@ protected void addTables() {
 
         private final LootItemFunction.Builder CopyOwnerAndReferenceFunction = CopyNbtFunction.copyData(ContextNbtProvider.BLOCK_ENTITY)
                 .copy(Reference.CompactMachines.OWNER_NBT, Reference.CompactMachines.OWNER_NBT)
-                .copy("coords", "cm.coords");
+                .copy(Reference.CompactMachines.NBT_MACHINE_ID, Reference.CompactMachines.NBT_MACHINE_ID);
 
         private void registerCompactMachineBlockDrops(RegistryObject<Block> block, RegistryObject<Item> item) {
             LootPool.Builder builder = LootPool.lootPool()

src/main/java/dev/compactmods/machines/item/ItemBlockMachine.java

@@ -1,32 +1,29 @@
 package dev.compactmods.machines.item;
 
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
 import com.mojang.authlib.GameProfile;
 import dev.compactmods.machines.api.core.Tooltips;
 import dev.compactmods.machines.block.BlockCompactMachine;
 import dev.compactmods.machines.reference.EnumMachineSize;
 import dev.compactmods.machines.reference.Reference;
 import dev.compactmods.machines.util.PlayerUtil;
 import dev.compactmods.machines.util.TranslationUtil;
-import net.minecraft.world.level.block.Block;
+import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.core.NonNullList;
-import net.minecraft.world.level.Level;
-
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-
-import net.minecraft.ChatFormatting;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.TextComponent;
-import net.minecraft.world.item.Item.Properties;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.TooltipFlag;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
 
 public class ItemBlockMachine extends BlockItem {
 
@@ -43,12 +40,9 @@ public static Optional<Integer> getMachineId(ItemStack stack) {
         if (!stack.hasTag())
             return Optional.empty();
 
-        CompoundTag machineData = stack.getTagElement("cm");
-        if (machineData == null)
-            return Optional.empty();
-
-        if (machineData.contains("coords")) {
-            int c = machineData.getInt("coords");
+        CompoundTag machineData = stack.getOrCreateTag();
+        if (machineData.contains(Reference.CompactMachines.NBT_MACHINE_ID)) {
+            int c = machineData.getInt(Reference.CompactMachines.NBT_MACHINE_ID);
             return c > -1 ? Optional.of(c) : Optional.empty();
         }
 

src/main/java/dev/compactmods/machines/reference/Reference.java

@@ -5,5 +5,6 @@ public static class CompactMachines {
         public static final String OWNER_NBT = "owner";
 
         public static final String COMPACT_POSITION_NBT = "compact-lastpos";
+        public final static String NBT_MACHINE_ID = "machine_id";
     }
 }