Some fixes

Author: Spectrall368

src/main/resources/forge-1.17.1/utils/mcitems.ftl

@@ -169,15 +169,15 @@
     <#return (extension?has_content)?then("_" + extension, "")>
 </#function>
 
-<#function mappedMCItemToItemObjectJSON mappedBlock>
+<#function mappedMCItemToItemObjectJSON mappedBlock itemKey="item">
     <#if mappedBlock.getUnmappedValue().startsWith("CUSTOM:")>
         <#assign customelement = generator.getRegistryNameFromFullName(mappedBlock.getUnmappedValue())!""/>
         <#if customelement?has_content>
-            <#return "\"item\": \"" + "${modid}:" + customelement
+            <#return "\"" + itemKey + "\": \"" + "${modid}:" + customelement
             + transformExtension(mappedBlock)
             + "\"">
         <#else>
-            <#return "\"item\": \"minecraft:air\"">
+            <#return "\"" + itemKey + "\": \"minecraft:air\"">
         </#if>
     <#elseif mappedBlock.getUnmappedValue().startsWith("TAG:")>
         <#return "\"tag\": \"" + mappedBlock.getUnmappedValue().replace("TAG:", "").replace("mod:", modid + ":")?lower_case + "\"">
@@ -186,9 +186,9 @@
         <#if mapped.startsWith("#")>
             <#return "\"tag\": \"" + mapped.replace("#", "") + "\"">
         <#elseif mapped.contains(":")>
-            <#return "\"item\": \"" + mapped + "\"">
+            <#return "\"" + itemKey + "\": \"" + mapped + "\"">
         <#else>
-            <#return "\"item\": \"minecraft:" + mapped + "\"">
+            <#return "\"" + itemKey + "\": \"minecraft:" + mapped + "\"">
         </#if>
     </#if>
 </#function>

src/main/resources/forge-1.17.1/variables/itemstack.yaml

@@ -36,9 +36,9 @@ scopes:
     set: |
       <#include "mcitems.ftl">
       {
-        ItemStack _setval = ${mappedMCItemToItemStackCode(value, 1)}.copy();
+        ItemStack _setval = ${mappedMCItemToItemStackCode(value, 1)};
         ${entity}.getCapability(${JavaModName}Variables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
-          capability.${name} = _setval;
+          capability.${name} = _setval.copy();
           capability.syncPlayerVariables(${entity});
         });
       }
@@ -52,9 +52,9 @@ scopes:
     set: |
       <#include "mcitems.ftl">
       {
-        ItemStack _setval = ${mappedMCItemToItemStackCode(value, 1)}.copy();
+        ItemStack _setval = ${mappedMCItemToItemStackCode(value, 1)};
         ${entity}.getCapability(${JavaModName}Variables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
-          capability.${name} = _setval;
+          capability.${name} = _setval.copy();
           capability.syncPlayerVariables(${entity});
         });
       }