diff --git a/src/main/java/net/mcreator/superbwarfare/client/ItemModelHelper.java b/src/main/java/net/mcreator/superbwarfare/client/ItemModelHelper.java
new file mode 100644
index 000000000..af1a5c598
--- /dev/null
+++ b/src/main/java/net/mcreator/superbwarfare/client/ItemModelHelper.java
@@ -0,0 +1,48 @@
+package net.mcreator.superbwarfare.client;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.item.ItemStack;
+import software.bernie.geckolib.cache.object.GeoBone;
+
+public class ItemModelHelper {
+
+    public static void handleGunAttachments(GeoBone bone, ItemStack stack, String name) {
+        CompoundTag tag = stack.getOrCreateTag().getCompound("Attachments");
+
+        try {
+            if (name.startsWith("Scope")) {
+                String[] parts = name.split("(?<=\\D)(?=\\d)");
+                if (parts.length == 2) {
+                    int index = Integer.parseInt(parts[1]);
+                    bone.setHidden(tag.getInt("Scope") != index);
+                }
+            }
+
+            if (name.startsWith("Magazine")) {
+                String[] parts = name.split("(?<=\\D)(?=\\d)");
+                if (parts.length == 2) {
+                    int index = Integer.parseInt(parts[1]);
+                    bone.setHidden(tag.getInt("Magazine") != index);
+                }
+            }
+
+            if (name.startsWith("Barrel")) {
+                String[] parts = name.split("(?<=\\D)(?=\\d)");
+                if (parts.length == 2) {
+                    int index = Integer.parseInt(parts[1]);
+                    bone.setHidden(tag.getInt("Barrel") != index);
+                }
+            }
+
+            if (name.startsWith("Stock")) {
+                String[] parts = name.split("(?<=\\D)(?=\\d)");
+                if (parts.length == 2) {
+                    int index = Integer.parseInt(parts[1]);
+                    bone.setHidden(tag.getInt("Stock") != index);
+                }
+            }
+        } catch (NumberFormatException ignored) {
+        }
+    }
+
+}
diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK12ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK12ItemRenderer.java
index e545a4bf3..6f5959a19 100644
--- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK12ItemRenderer.java
+++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK12ItemRenderer.java
@@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.client.renderer.item;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.mcreator.superbwarfare.client.ItemModelHelper;
 import net.mcreator.superbwarfare.client.layer.AK12Layer;
 import net.mcreator.superbwarfare.client.model.item.AK12ItemModel;
 import net.mcreator.superbwarfare.item.gun.rifle.AK12Item;
@@ -103,42 +104,7 @@ public class AK12ItemRenderer extends GeoItemRenderer<AK12Item> {
                 }
             }
 
-            if (name.equals("Scope1")) {
-                bone.setHidden(itemStack.getOrCreateTag().getInt("scope_type") != 1);
-            }
-
-            if (name.equals("Magazine0")) {
-                bone.setHidden(itemStack.getOrCreateTag().getInt("magazine_type") != 0);
-            }
-
-            if (name.equals("Magazine1")) {
-                bone.setHidden(itemStack.getOrCreateTag().getInt("magazine_type") != 1);
-            }
-
-            if (name.equals("Magazine2")) {
-                bone.setHidden(itemStack.getOrCreateTag().getInt("magazine_type") != 2);
-            }
-
-            if (name.equals("Barrel0")) {
-                bone.setHidden(itemStack.getOrCreateTag().getInt("barrel_type") != 0);
-            }
-
-            if (name.equals("Barrel1")) {
-                bone.setHidden(itemStack.getOrCreateTag().getInt("barrel_type") != 1);
-            }
-
-            if (name.equals("Barrel2")) {
-                bone.setHidden(itemStack.getOrCreateTag().getInt("barrel_type") != 2);
-            }
-
-            if (name.equals("Stock0")) {
-                bone.setHidden(itemStack.getOrCreateTag().getInt("stock_type") != 0);
-            }
-
-            if (name.equals("Stock1")) {
-                bone.setHidden(itemStack.getOrCreateTag().getInt("stock_type") != 1);
-            }
-
+            ItemModelHelper.handleGunAttachments(bone, itemStack, name);
         }
 
 
diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/EditMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/EditMessage.java
index d27e728c2..83bc1da4d 100644
--- a/src/main/java/net/mcreator/superbwarfare/network/message/EditMessage.java
+++ b/src/main/java/net/mcreator/superbwarfare/network/message/EditMessage.java
@@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.network.message;
 
 import net.mcreator.superbwarfare.init.ModTags;
 import net.mcreator.superbwarfare.network.ModVariables;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
@@ -20,11 +21,11 @@ public class EditMessage {
         this.type = buffer.readInt();
     }
 
-    public static void encode(net.mcreator.superbwarfare.network.message.EditMessage message, FriendlyByteBuf buffer) {
+    public static void encode(EditMessage message, FriendlyByteBuf buffer) {
         buffer.writeInt(message.type);
     }
 
-    public static void handler(net.mcreator.superbwarfare.network.message.EditMessage message, Supplier<NetworkEvent.Context> contextSupplier) {
+    public static void handler(EditMessage message, Supplier<NetworkEvent.Context> contextSupplier) {
         NetworkEvent.Context context = contextSupplier.get();
         context.enqueueWork(() -> pressAction(context.getSender(), message.type));
         context.setPacketHandled(true);
@@ -38,32 +39,34 @@ public class EditMessage {
         ItemStack stack = player.getMainHandItem();
 
         if (stack.is(ModTags.Items.CAN_CUSTOM_GUN) && player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) {
+            CompoundTag tag = stack.getOrCreateTag().getCompound("Attachments");
             switch (type) {
-                case 0:
-                    stack.getOrCreateTag().putInt("scope_type", stack.getOrCreateTag().getInt("scope_type") + 1);
-                    if (stack.getOrCreateTag().getInt("scope_type") == 4) {
-                        stack.getOrCreateTag().putInt("scope_type", 0);
-                    }
-                    break;
-                case 1:
-                    stack.getOrCreateTag().putInt("barrel_type", stack.getOrCreateTag().getInt("barrel_type") + 1);
-                    if (stack.getOrCreateTag().getInt("barrel_type") == 3) {
-                        stack.getOrCreateTag().putInt("barrel_type", 0);
-                    }
-                    break;
-                case 2:
-                    stack.getOrCreateTag().putInt("magazine_type", stack.getOrCreateTag().getInt("magazine_type") + 1);
-                    if (stack.getOrCreateTag().getInt("magazine_type") == 3) {
-                        stack.getOrCreateTag().putInt("magazine_type", 0);
-                    }
-                    break;
-                case 3:
-                    stack.getOrCreateTag().putInt("stock_type", stack.getOrCreateTag().getInt("stock_type") + 1);
-                    if (stack.getOrCreateTag().getInt("stock_type") == 3) {
-                        stack.getOrCreateTag().putInt("stock_type", 0);
-                    }
-                    break;
+                case 0 -> {
+                    int att = tag.getInt("Scope");
+                    att++;
+                    att %= 4;
+                    tag.putInt("Scope", att);
+                }
+                case 1 -> {
+                    int att = tag.getInt("Barrel");
+                    att++;
+                    att %= 3;
+                    tag.putInt("Barrel", att);
+                }
+                case 2 -> {
+                    int att = tag.getInt("Magazine");
+                    att++;
+                    att %= 3;
+                    tag.putInt("Magazine", att);
+                }
+                case 3 -> {
+                    int att = tag.getInt("Stock");
+                    att++;
+                    att %= 3;
+                    tag.putInt("Stock", att);
+                }
             }
+            stack.addTagElement("Attachments", tag);
         }
     }
 }