Support Creative Mode Pick Block (GregTechCEu#2428)

Irgendwer01 · Jun 22, 2024 · 18a0bbc · 18a0bbc
1 parent 5af02a3
commit 18a0bbc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/src/main/java/gregtech/api/block/machines/BlockMachine.java b/src/main/java/gregtech/api/block/machines/BlockMachine.java
@@ -4,6 +4,7 @@
 import gregtech.api.block.BlockCustomParticle;
 import gregtech.api.block.UnlistedIntegerProperty;
 import gregtech.api.block.UnlistedStringProperty;
+import gregtech.api.capability.GregtechDataCodes;
 import gregtech.api.cover.Cover;
 import gregtech.api.cover.IFacadeCover;
 import gregtech.api.items.toolitem.ToolClasses;
@@ -262,9 +263,27 @@ public void onBlockPlacedBy(World worldIn, @NotNull BlockPos pos, @NotNull IBloc
                 ((MetaTileEntityHolder) holder).setCustomName(stack.getDisplayName());
             }
             MetaTileEntity metaTileEntity = holder.setMetaTileEntity(sampleMetaTileEntity);
-            if (stack.hasTagCompound()) {
-                // noinspection ConstantConditions
-                metaTileEntity.initFromItemStackData(stack.getTagCompound());
+            var stackTag = stack.getTagCompound();
+            if (stackTag != null && !stackTag.isEmpty()) {
+                if (stackTag.hasKey(GregtechDataCodes.BLOCK_ENTITY_TAG)) {
+                    var blockTag = stackTag.getCompoundTag(GregtechDataCodes.BLOCK_ENTITY_TAG);
+                    String customName = blockTag.getString(GregtechDataCodes.CUSTOM_NAME);
+                    if (!customName.isEmpty())
+                        ((MetaTileEntityHolder) holder).setCustomName(customName);
+
+                    var mteTag = blockTag.getCompoundTag(GregtechDataCodes.TAG_KEY_MTE);
+                    List<String> removed = new ArrayList<>();
+                    for (var key : mteTag.getKeySet()) {
+                        var trait = metaTileEntity.getMTETrait(key);
+                        if (trait == null) continue;
+
+                        removed.add(key);
+                    }
+                    removed.forEach(mteTag::removeTag);
+                    metaTileEntity.readFromNBT(mteTag);
+                } else {
+                    metaTileEntity.initFromItemStackData(stackTag);
+                }
             }
             if (metaTileEntity.isValidFrontFacing(EnumFacing.UP)) {
                 metaTileEntity.setFrontFacing(EnumFacing.getDirectionFromEntityLiving(pos, placer));

diff --git a/src/main/java/gregtech/api/capability/GregtechDataCodes.java b/src/main/java/gregtech/api/capability/GregtechDataCodes.java
@@ -152,6 +152,8 @@ public static int assignId() {
 
     // From MetaTileEntityHolder
     public static final String CUSTOM_NAME = "CustomName";
+    public static final String BLOCK_ENTITY_TAG = "BlockEntityTag";
+    public static final String TAG_KEY_MTE = "MetaTileEntity";
 
     // From MetaTileEntity
     public static final String TAG_KEY_PAINTING_COLOR = "PaintingColor";