Some fixes

Author: Spectrall368

.github/workflows/test.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: MCreator/MCreator
-          ref: master
+          ref: 2025.3.45720
           path: mcreator
       - name: Set up JDK 21
         uses: actions/setup-java@v4

src/main/resources/datapack-1.19.4/generator.yaml

@@ -1,6 +1,6 @@
 name: Data Pack for Java Edition @minecraft
 status: deprecated
-buildfileversion: 45.4.2
+buildfileversion: 45.4.3
 
 # gradle task definitions
 gradle:

src/main/resources/datapack-1.19.4/workspacebase/packloader/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'eclipse'
-    id 'net.neoforged.moddev.legacyforge' version '2.0.116'
+    id 'net.neoforged.moddev.legacyforge' version '2.0.122'
 }
 
 version = '1.0'

src/main/resources/forge-1.19.4/generator.yaml

@@ -1,6 +1,6 @@
 name: Forge for @minecraft (@buildfileversion)
 status: deprecated
-buildfileversion: 45.4.2
+buildfileversion: 45.4.3
 subversion: 1.3 # force setup re-run to update build script for MCREATOR_JVM_OPTIONS
 
 import:

src/main/resources/forge-1.19.4/procedures/item_istype.java.ftl

@@ -1,8 +1,2 @@
 <#include "mcitems.ftl">
-<#if field$item_type == "Sword">
-(${mappedMCItemToItemStackCode(input$item)}.is(ItemTags.SWORDS))
-<#elseif field$item_type == "Pickaxe">
-(${mappedMCItemToItemStackCode(input$item)}.is(ItemTags.PICKAXES))
-<#else>
-(${mappedMCItemToItem(input$item)} instanceof ${generator.map(field$item_type, "itemtypes")}Item)
-</#if>
+(${mappedMCItemToItem(input$item)} instanceof ${generator.map(field$item_type, "itemtypes")}Item)

src/main/resources/forge-1.19.4/templates/item/item_renderer.java.ftl

@@ -73,7 +73,7 @@ package ${package}.client.renderer.item;
 		<#list data.getModels() as model>
 			<#if model.hasCustomJAVAModel()>
 			if (<#list model.stateMap.entrySet() as entry>
-					ItemProperties.getProperty(itemstack, new ResourceLocation("${generator.map(entry.getKey().getPrefixedName(registryname + "_"), "itemproperties")}"))
+					ItemProperties.getProperty(itemstack.getItem(), new ResourceLocation("${generator.map(entry.getKey().getPrefixedName(registryname + "_"), "itemproperties")}"))
 						.call(itemstack, Minecraft.getInstance().level, Minecraft.getInstance().player, 0) >= ${entry.getValue()?is_boolean?then(entry.getValue()?then("1", "0"), entry.getValue())}
 				<#sep> && </#list>) {
 				model = models.get(${model?index + 1});

src/main/resources/forge-1.19.4/templates/modbase/variableslist.java.ftl

@@ -275,7 +275,7 @@ import ${package}.${JavaModName};
 	@Mod.EventBusSubscriber private static class PlayerVariablesProvider implements ICapabilitySerializable<CompoundTag> {
 		@SubscribeEvent public static void onAttachCapabilities(AttachCapabilitiesEvent<Entity> event) {
 			if (event.getObject() instanceof Player && !(event.getObject() instanceof FakePlayer))
-				event.addCapability(ResourceLocation.fromNamespaceAndPath("${modid}", "player_variables"), new PlayerVariablesProvider());
+				event.addCapability(new ResourceLocation("${modid}", "player_variables"), new PlayerVariablesProvider());
 		}
 
 		private final PlayerVariables playerVariables = new PlayerVariables();

src/main/resources/forge-1.19.4/tool.definition.yaml

@@ -25,22 +25,22 @@ templates:
     name: "@MODASSETSROOT/models/item/@registryname_0.json"
 
 tags:
-  - tag: ITEMS:minecraft:pickaxes
+  - tag: ITEMS:forge:tools/pickaxes
     condition_any:
       - "toolType %= Pickaxe"
       - "toolType %= Special"
       - "toolType %= MultiTool"
-  - tag: ITEMS:minecraft:axes
+  - tag: ITEMS:forge:tools/axes
     condition_any:
       - "toolType %= Axe"
       - "toolType %= MultiTool"
-  - tag: ITEMS:minecraft:swords
+  - tag: ITEMS:forge:tools/swords
     condition_any:
       - "toolType %= Sword"
       - "toolType %= MultiTool"
-  - tag: ITEMS:minecraft:shovels
+  - tag: ITEMS:forge:tools/shovels
     condition: "toolType %= Spade"
-  - tag: ITEMS:minecraft:hoes
+  - tag: ITEMS:forge:tools/hoes
     condition: "toolType %= Hoe"
 
 localizationkeys:

src/main/resources/forge-1.19.4/workspacebase/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'eclipse'
-    id 'net.neoforged.moddev.legacyforge' version '2.0.116'
+    id 'net.neoforged.moddev.legacyforge' version '2.0.122'
 }
 
 version = '1.0'

src/main/resources/resourcepack-1.19.4/generator.yaml

@@ -1,6 +1,6 @@
 name: Resource Pack for Java Edition @minecraft
 status: deprecated
-buildfileversion: 45.4.2
+buildfileversion: 45.4.3
 
 # gradle task definitions
 gradle: