Fixed Labeled Crate item name persistence (issue #127).

readme.md

@@ -13,6 +13,7 @@ Mod sources for Minecraft version 1.16.3.
 
     ~ v1.1.3-b1  [A] The Factory Block Breaker can insert items into Hoppers underneath it (issue #121, winsrp).
                  [F] Help tooltips manually wrapped.
+                 [F] Fixed Labeled Crate item name persistence (issue #127, ty inqie).
 
     - v1.1.2     [U] Updated to Forge 1.16.3-34.1.0.
                  [A] Added Factory Hopper insertion/extraction for entities like Minecarts (issue #125, ty boneskull).

src/main/java/wile/engineersdecor/blocks/EdLabeledCrate.java

@@ -8,7 +8,6 @@
  */
 package wile.engineersdecor.blocks;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
 import wile.engineersdecor.ModContent;
 import wile.engineersdecor.ModEngineersDecor;
 import wile.engineersdecor.libmc.blocks.StandardBlocks;
@@ -48,6 +47,7 @@ import net.minecraft.client.gui.screen.inventory.ContainerScreen;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.common.util.Constants.NBT;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fml.network.NetworkHooks;
@@ -55,6 +55,7 @@ import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemHandlerHelper;
 import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.matrix.MatrixStack;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -108,13 +109,15 @@ public class EdLabeledCrate
     @Override
     public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack)
     {
-      if(world.isRemote) return;
+      if((world.isRemote) || (!stack.hasTag())) return;
-      if((!stack.hasTag()) || (!stack.getTag().contains("tedata"))) return;
-      CompoundNBT te_nbt = stack.getTag().getCompound("tedata");
-      if(te_nbt.isEmpty()) return;
       final TileEntity te = world.getTileEntity(pos);
       if(!(te instanceof LabeledCrateTileEntity)) return;
-      ((LabeledCrateTileEntity)te).readnbt(te_nbt);
+      final CompoundNBT nbt = stack.getTag();
+      if(nbt.contains("tedata")) {
+        CompoundNBT te_nbt = nbt.getCompound("tedata");
+        if(!te_nbt.isEmpty()) ((LabeledCrateTileEntity)te).readnbt(te_nbt);
+      }
+      ((LabeledCrateTileEntity)te).setCustomName(Auxiliaries.getItemLabel(stack));
       ((LabeledCrateTileEntity)te).markDirty();
     }
 
@@ -131,11 +134,10 @@ public class EdLabeledCrate
       if(!explosion) {
         ItemStack stack = new ItemStack(this, 1);
         CompoundNBT te_nbt = ((LabeledCrateTileEntity)te).reset_getnbt();
-        if(!te_nbt.isEmpty()) {
         CompoundNBT nbt = new CompoundNBT();
-          nbt.put("tedata", te_nbt);
+        if(!te_nbt.isEmpty()) nbt.put("tedata", te_nbt);
-          stack.setTag(nbt);
+        if(!nbt.isEmpty()) stack.setTag(nbt);
-        }
+        Auxiliaries.setItemLabel(stack, ((LabeledCrateTileEntity)te).getCustomName());
         stacks.add(stack);
       } else {
         for(ItemStack stack: ((LabeledCrateTileEntity)te).stacks_) stacks.add(stack);
@@ -185,12 +187,15 @@ public class EdLabeledCrate
       }
       int num_free_slots = LabeledCrateTileEntity.ITEMFRAME_SLOTNO - num_used_slots;
       ItemStack frameStack = items.get(LabeledCrateTileEntity.ITEMFRAME_SLOTNO);
-      tooltip.add(Auxiliaries.localizable(getTranslationKey()+".tip", new Object[] {
+      String[] lines =  Auxiliaries.localize(getTranslationKey()+".tip", new Object[] {
         (frameStack.isEmpty() ? (new StringTextComponent("-/-")) : (new TranslationTextComponent(frameStack.getTranslationKey()))),
         num_used_slots,
         num_free_slots,
         total_items
-      }));
+      }).split("\n");
+      for(String line:lines) {
+        tooltip.add(new StringTextComponent(line.trim()));
+      }
     }
   }
 
@@ -207,6 +212,7 @@ public class EdLabeledCrate
     // BTileEntity -----------------------------------------------------------------------------
 
     protected NonNullList<ItemStack> stacks_ = NonNullList.<ItemStack>withSize(NUM_OF_SLOTS, ItemStack.EMPTY);
+    private @Nullable ITextComponent custom_name_;
 
     public LabeledCrateTileEntity()
     { this(ModContent.TET_LABELED_CRATE); }
@@ -227,17 +233,19 @@ public class EdLabeledCrate
       stacks_ = NonNullList.<ItemStack>withSize(NUM_OF_SLOTS, ItemStack.EMPTY);
     }
 
-    public void readnbt(CompoundNBT compound)
+    public void readnbt(CompoundNBT nbt)
     {
       NonNullList<ItemStack> stacks = NonNullList.<ItemStack>withSize(NUM_OF_SLOTS, ItemStack.EMPTY);
-      if(!compound.isEmpty()) ItemStackHelper.loadAllItems(compound, stacks);
+      if(!nbt.isEmpty()) ItemStackHelper.loadAllItems(nbt, stacks);
       while(stacks.size() < NUM_OF_SLOTS) stacks.add(ItemStack.EMPTY);
+      if(nbt.contains("name", NBT.TAG_STRING)) custom_name_ = Auxiliaries.unserializeTextComponent(nbt.getString("name"));
       stacks_ = stacks;
     }
 
-    protected void writenbt(CompoundNBT compound)
+    protected void writenbt(CompoundNBT nbt)
     {
-      if(!stacks_.stream().allMatch(ItemStack::isEmpty)) ItemStackHelper.saveAllItems(compound, stacks_);
+      if(custom_name_ != null) nbt.putString("name", Auxiliaries.serializeTextComponent(custom_name_));
+      if(!stacks_.stream().allMatch(ItemStack::isEmpty)) ItemStackHelper.saveAllItems(nbt, stacks_);
     }
 
     public ItemStack getItemFrameStack()
@@ -292,15 +300,24 @@ public class EdLabeledCrate
 
     @Override
     public ITextComponent getName()
-    { final Block block=getBlockState().getBlock(); return new StringTextComponent((block!=null) ? block.getTranslationKey() : "Small Waste Incinerator"); }
+    {
+      if(custom_name_ != null) return custom_name_;
+      final Block block = getBlockState().getBlock();
+      if(block!=null) return new TranslationTextComponent(block.getTranslationKey());
+      return new StringTextComponent("Labeled Crate");
+    }
+
+    @Override
+    @Nullable
+    public ITextComponent getCustomName()
+    { return custom_name_; }
 
     @Override
     public boolean hasCustomName()
-    { return false; }
+    { return (custom_name_ != null); }
 
-    @Override
+    public void setCustomName(ITextComponent name)
-    public ITextComponent getCustomName()
+    { custom_name_ = name; }
-    { return getName(); }
 
     // IContainerProvider ----------------------------------------------------------------------
 
@@ -717,6 +734,8 @@ public class EdLabeledCrate
       player_ = player_inventory.player;
       xSize = 213;
       ySize = 206;
+      titleX = 23;
+      titleY = -10;
     }
 
     @Override
@@ -724,7 +743,7 @@ public class EdLabeledCrate
     { super.init(); }
 
     @Override
-    public void render/*render*/(MatrixStack mx, int mouseX, int mouseY, float partialTicks)
+    public void render(MatrixStack mx, int mouseX, int mouseY, float partialTicks)
     {
       renderBackground/*renderBackground*/(mx);
       super.render(mx, mouseX, mouseY, partialTicks);
@@ -733,7 +752,10 @@ public class EdLabeledCrate
 
     @Override
     protected void drawGuiContainerForegroundLayer(MatrixStack mx, int x, int y)
-    {}
+    {
+      font.func_243248_b(mx, title, (float)titleX+1, (float)titleY+1, 0x303030);
+      font.func_243248_b(mx, title, (float)titleX, (float)titleY, 0x707070);
+    }
 
     @Override
     @SuppressWarnings("deprecation")

src/main/java/wile/engineersdecor/libmc/detail/Auxiliaries.java

@@ -11,6 +11,7 @@ package wile.engineersdecor.libmc.detail;
 import net.minecraft.client.util.InputMappings;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.nbt.INBT;
 import net.minecraft.util.Direction;
 import net.minecraft.util.Direction.Axis;
 import net.minecraft.util.SharedConstants;
@@ -232,6 +233,45 @@ public class Auxiliaries
     if(!s.isEmpty()) player.sendMessage(new TranslationTextComponent(s), new UUID(0,0));
   }
 
+  public static @Nullable ITextComponent unserializeTextComponent(String serialized)
+  { return ITextComponent.Serializer.func_240643_a_(serialized); }
+
+  public static String serializeTextComponent(ITextComponent tc)
+  { return (tc==null) ? ("") : (ITextComponent.Serializer.toJson(tc)); }
+
+  // -------------------------------------------------------------------------------------------------------------------
+  // Item NBT data
+  // -------------------------------------------------------------------------------------------------------------------
+
+  /**
+   * Equivalent to getDisplayName(), returns null if no custom name is set.
+   */
+  public static @Nullable ITextComponent getItemLabel(ItemStack stack)
+  {
+    CompoundNBT nbt = stack.getChildTag("display");
+    if(nbt != null && nbt.contains("Name", 8)) {
+      try {
+        ITextComponent tc = unserializeTextComponent(nbt.getString("Name"));
+        if(tc != null) return tc;
+        nbt.remove("Name");
+      } catch(Exception e) {
+        nbt.remove("Name");
+      }
+    }
+    return null;
+  }
+
+  public static ItemStack setItemLabel(ItemStack stack, @Nullable ITextComponent name)
+  {
+    if(name != null) {
+      CompoundNBT nbt = stack.getOrCreateChildTag("display");
+      nbt.putString("Name", serializeTextComponent(name));
+    } else {
+      if(stack.hasTag()) stack.removeChildTag("display");
+    }
+    return stack;
+  }
+
   // -------------------------------------------------------------------------------------------------------------------
   // Block handling
   // -------------------------------------------------------------------------------------------------------------------