Merge pull request #662 from refinedmods/fix/GH-660/custom-name

fix: retain and use custom names
refinedmods · Aug 11, 2024 · 1e92b54 · 1e92b54
2 parents 68798f4 + 4b18690
commit 1e92b54
Show file tree

Hide file tree

Showing 293 changed files with 2,508 additions and 99 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 -   External Storage screen unnecessarily showing upgrade slots.
 -   Grid setting changes not persisting after restarting Minecraft.
 -   Fixed not being able to extract fluids from the Grid with an empty bucket or other empty fluid container.
+-   All blocks and items now correctly retain their custom name.
 
 ## [2.0.0-milestone.4.6] - 2024-08-08
 

diff --git a/...a/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkEnergyItem.java b/...a/com/refinedmods/refinedstorage/common/api/support/energy/AbstractNetworkEnergyItem.java
@@ -8,7 +8,9 @@
 
 import java.util.List;
 import java.util.Optional;
+import javax.annotation.Nullable;
 
+import net.minecraft.core.component.DataComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
@@ -69,10 +71,13 @@ public void use(final ServerPlayer player, final ItemStack stack, final SlotRefe
             player,
             slotReference
         );
-        use(player, slotReference, context);
+        use(stack.get(DataComponents.CUSTOM_NAME), player, slotReference, context);
     }
 
-    protected abstract void use(ServerPlayer player, SlotReference slotReference, NetworkItemContext context);
+    protected abstract void use(@Nullable Component name,
+                                ServerPlayer player,
+                                SlotReference slotReference,
+                                NetworkItemContext context);
 
     public boolean isBound(final ItemStack stack) {
         return networkItemHelper.isBound(stack);

diff --git a/...age-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_cable.json b/...age-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_cable.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...mmon/src/generated/resources/data/refinedstorage/loot_table/blocks/black_constructor.json b/...mmon/src/generated/resources/data/refinedstorage/loot_table/blocks/black_constructor.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...ommon/src/generated/resources/data/refinedstorage/loot_table/blocks/black_controller.json b/...ommon/src/generated/resources/data/refinedstorage/loot_table/blocks/black_controller.json
@@ -3,6 +3,13 @@
   "functions": [
     {
       "function": "refinedstorage:energy"
+    },
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
     }
   ],
   "pools": [

diff --git a/...on/src/generated/resources/data/refinedstorage/loot_table/blocks/black_crafting_grid.json b/...on/src/generated/resources/data/refinedstorage/loot_table/blocks/black_crafting_grid.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/.../generated/resources/data/refinedstorage/loot_table/blocks/black_creative_controller.json b/.../generated/resources/data/refinedstorage/loot_table/blocks/black_creative_controller.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...ommon/src/generated/resources/data/refinedstorage/loot_table/blocks/black_destructor.json b/...ommon/src/generated/resources/data/refinedstorage/loot_table/blocks/black_destructor.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_detector.json b/...-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_detector.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...n/src/generated/resources/data/refinedstorage/loot_table/blocks/black_disk_interface.json b/...n/src/generated/resources/data/refinedstorage/loot_table/blocks/black_disk_interface.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...rage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_grid.json b/...rage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_grid.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_receiver.json b/...src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_receiver.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/.../generated/resources/data/refinedstorage/loot_table/blocks/black_network_transmitter.json b/.../generated/resources/data/refinedstorage/loot_table/blocks/black_network_transmitter.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...mon/src/generated/resources/data/refinedstorage/loot_table/blocks/black_pattern_grid.json b/...mon/src/generated/resources/data/refinedstorage/loot_table/blocks/black_pattern_grid.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...age-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_relay.json b/...age-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_relay.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...src/generated/resources/data/refinedstorage/loot_table/blocks/black_security_manager.json b/...src/generated/resources/data/refinedstorage/loot_table/blocks/black_security_manager.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...generated/resources/data/refinedstorage/loot_table/blocks/black_wireless_transmitter.json b/...generated/resources/data/refinedstorage/loot_table/blocks/black_wireless_transmitter.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...rage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_cable.json b/...rage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_cable.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...ommon/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_constructor.json b/...ommon/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_constructor.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_controller.json b/...common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_controller.json
@@ -3,6 +3,13 @@
   "functions": [
     {
       "function": "refinedstorage:energy"
+    },
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
     }
   ],
   "pools": [

diff --git a/...mon/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_crafting_grid.json b/...mon/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_crafting_grid.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...c/generated/resources/data/refinedstorage/loot_table/blocks/blue_creative_controller.json b/...c/generated/resources/data/refinedstorage/loot_table/blocks/blue_creative_controller.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_destructor.json b/...common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_destructor.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...e-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_detector.json b/...e-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_detector.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...on/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_disk_interface.json b/...on/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_disk_interface.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,

diff --git a/...orage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_grid.json b/...orage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_grid.json
@@ -1,5 +1,14 @@
 {
   "type": "minecraft:block",
+  "functions": [
+    {
+      "function": "minecraft:copy_components",
+      "include": [
+        "minecraft:custom_name"
+      ],
+      "source": "block_entity"
+    }
+  ],
   "pools": [
     {
       "bonus_rolls": 0.0,