MCreator 2025.3 update 1/2

Author: Spectrall368

.github/workflows/test.yml

@@ -21,8 +21,8 @@ jobs:
       - name: Checkout MCreator repository
         uses: actions/checkout@v4
         with:
-          repository: MCreator/MCreator
-          ref: 2025.3.45720
+          repository: Spectrall368/MCreator
+          ref: old_mcreator
           path: mcreator
       - name: Set up JDK 21
         uses: actions/setup-java@v4

src/main/resources/forge-1.17.1/block.definition.yaml

@@ -23,7 +23,7 @@ templates:
   - template: json/block_item.json.ftl
     condition:
       - hasBlockItem
-      - "renderType() #?= 10,11,12,14,110,120,2,4"
+      - "renderType() #?= 10,11,12,14,15,110,120,150,2,4"
     writer: json
     name: "@MODASSETSROOT/models/item/@registryname.json"
   - template: json/block_item_cmodel.json.ftl
@@ -60,6 +60,11 @@ templates:
     condition: "renderType() #= 14"
     writer: json
     name: "@MODASSETSROOT/models/block/@registryname.json"
+  - template: json/block.json.ftl
+    condition: "renderType() #= 15"
+    writer: json
+    name: "@MODASSETSROOT/models/block/@registryname.json"
+    variables: "model=flower_pot_cross;txname=plant"
   - template: json/block.json.ftl
     condition: "renderType() #= 110"
     writer: json
@@ -70,6 +75,11 @@ templates:
     writer: json
     variables: "model=tinted_cross;txname=cross"
     name: "@MODASSETSROOT/models/block/@registryname.json"
+  - template: json/block.json.ftl
+    condition: "renderType() #= 150"
+    writer: json
+    name: "@MODASSETSROOT/models/block/@registryname.json"
+    variables: "model=tinted_flower_pot_cross;txname=plant"
   - template: json/block_cmodel.json.ftl
     condition: "renderType() #= 2"
     writer: json
@@ -260,25 +270,30 @@ templates:
     condition: "blockBase %= Pane"
     writer: json
     name: "@MODASSETSROOT/blockstates/@registryname.json"
-  - template: json/txblock/pane_side.json.ftl
+  - template: json/block_model_tb.json.ftl
     condition: "blockBase %= Pane"
     writer: json
+    variables: "model=template_glass_pane_side;txname=pane;txname_top=edge"
     name: "@MODASSETSROOT/models/block/@registryname_side.json"
-  - template: json/txblock/pane_side_alt.json.ftl
+  - template: json/block_model_tb.json.ftl
     condition: "blockBase %= Pane"
     writer: json
+    variables: "model=template_glass_pane_side_alt;txname=pane;txname_top=edge"
     name: "@MODASSETSROOT/models/block/@registryname_side_alt.json"
-  - template: json/txblock/pane_post.json.ftl
+  - template: json/block_model_tb.json.ftl
     condition: "blockBase %= Pane"
     writer: json
+    variables: "model=template_glass_pane_post;txname=pane;txname_top=edge"
     name: "@MODASSETSROOT/models/block/@registryname_post.json"
-  - template: json/txblock/pane_noside.json.ftl
+  - template: json/block.json.ftl
     condition: "blockBase %= Pane"
     writer: json
+    variables: "model=template_glass_pane_noside;txname=pane"
     name: "@MODASSETSROOT/models/block/@registryname_noside.json"
-  - template: json/txblock/pane_noside_alt.json.ftl
+  - template: json/block.json.ftl
     condition: "blockBase %= Pane"
     writer: json
+    variables: "model=template_glass_pane_noside_alt;txname=pane"
     name: "@MODASSETSROOT/models/block/@registryname_noside_alt.json"
 
   # TX: Door templates
@@ -292,21 +307,25 @@ templates:
     condition: "blockBase %= Door"
     writer: json
     name: "@MODASSETSROOT/blockstates/@registryname.json"
-  - template: json/txblock/door_top.json.ftl
+  - template: json/block_model_tb.json.ftl
     condition: "blockBase %= Door"
     writer: json
+    variables: "model=door_top;txname=bottom;txname_top=top"
     name: "@MODASSETSROOT/models/block/@registryname_top.json"
-  - template: json/txblock/door_top_hinge.json.ftl
+  - template: json/block_model_tb.json.ftl
     condition: "blockBase %= Door"
     writer: json
+    variables: "model=door_top_rh;txname=bottom;txname_top=top"
     name: "@MODASSETSROOT/models/block/@registryname_top_hinge.json"
-  - template: json/txblock/door_bottom.json.ftl
+  - template: json/block_model_tb.json.ftl
     condition: "blockBase %= Door"
     writer: json
+    variables: "model=door_bottom;txname=bottom;txname_top=top"
     name: "@MODASSETSROOT/models/block/@registryname_bottom.json"
-  - template: json/txblock/door_bottom_hinge.json.ftl
+  - template: json/block_model_tb.json.ftl
     condition: "blockBase %= Door"
     writer: json
+    variables: "model=door_bottom_rh;txname=bottom;txname_top=top"
     name: "@MODASSETSROOT/models/block/@registryname_bottom_hinge.json"
 
   # TX: FenceGate templates
@@ -320,21 +339,25 @@ templates:
     condition: "blockBase %= FenceGate"
     writer: json
     name: "@MODASSETSROOT/blockstates/@registryname.json"
-  - template: json/txblock/fence_gate.json.ftl
+  - template: json/block.json.ftl
     condition: "blockBase %= FenceGate"
     writer: json
+    variables: "model=template_fence_gate;txname=texture"
     name: "@MODASSETSROOT/models/block/@registryname.json"
-  - template: json/txblock/fence_gate_open.json.ftl
+  - template: json/block.json.ftl
     condition: "blockBase %= FenceGate"
     writer: json
+    variables: "model=template_fence_gate_open;txname=texture"
     name: "@MODASSETSROOT/models/block/@registryname_open.json"
-  - template: json/txblock/fence_gate_wall.json.ftl
+  - template: json/block.json.ftl
     condition: "blockBase %= FenceGate"
     writer: json
+    variables: "model=template_fence_gate_wall;txname=texture"
     name: "@MODASSETSROOT/models/block/@registryname_wall.json"
-  - template: json/txblock/fence_gate_wall_open.json.ftl
+  - template: json/block.json.ftl
     condition: "blockBase %= FenceGate"
     writer: json
+    variables: "model=template_fence_gate_wall_open;txname=texture"
     name: "@MODASSETSROOT/models/block/@registryname_wall_open.json"
 
   # TX: EndRod template
@@ -348,9 +371,10 @@ templates:
     condition: "blockBase %= EndRod"
     writer: json
     name: "@MODASSETSROOT/blockstates/@registryname.json"
-  - template: json/txblock/end_rod.json.ftl
+  - template: json/block.json.ftl
     condition: "blockBase %= EndRod"
     writer: json
+    variables: "model=end_rod;txname=end_rod"
     name: "@MODASSETSROOT/models/block/@registryname.json"
 
   # TX: PressurePlate templates
@@ -364,13 +388,15 @@ templates:
     condition: "blockBase %= PressurePlate"
     writer: json
     name: "@MODASSETSROOT/blockstates/@registryname.json"
-  - template: json/txblock/pressure_plate.json.ftl
+  - template: json/block.json.ftl
     condition: "blockBase %= PressurePlate"
     writer: json
+    variables: "model=pressure_plate_up;txname=texture"
     name: "@MODASSETSROOT/models/block/@registryname.json"
-  - template: json/txblock/pressure_plate_down.json.ftl
+  - template: json/block.json.ftl
     condition: "blockBase %= PressurePlate"
     writer: json
+    variables: "model=pressure_plate_down;txname=texture"
     name: "@MODASSETSROOT/models/block/@registryname_down.json"
 
   # TX: Wood StoneButton templates
@@ -384,19 +410,22 @@ templates:
     condition: "blockBase %= Button"
     writer: json
     name: "@MODASSETSROOT/blockstates/@registryname.json"
-  - template: json/txblock/button.json.ftl
+  - template: json/block.json.ftl
     condition: "blockBase %= Button"
     writer: json
+    variables: "model=button;txname=texture"
     name: "@MODASSETSROOT/models/block/@registryname.json"
-  - template: json/txblock/button_pressed.json.ftl
+  - template: json/block.json.ftl
     condition: "blockBase %= Button"
     writer: json
+    variables: "model=button_pressed;txname=texture"
     name: "@MODASSETSROOT/models/block/@registryname_pressed.json"
-  - template: json/txblock/button_inventory.json.ftl
+  - template: json/block.json.ftl
     condition:
       - hasBlockItem
       - "blockBase %= Button"
     writer: json
+    variables: "model=button_inventory;txname=texture"
     name: "@MODASSETSROOT/models/block/@registryname_inventory.json"
 
 block_base_properties:
@@ -421,33 +450,77 @@ localizationkeys:
 
 tags:
   - tag: BLOCKS:minecraft:mineable/pickaxe
-    condition: "${data.destroyTool == 'pickaxe'}"
+    condition: "destroyTool %= pickaxe"
   - tag: BLOCKS:minecraft:mineable/axe
-    condition: "${data.destroyTool == 'axe'}"
+    condition: "destroyTool %= axe"
   - tag: BLOCKS:minecraft:mineable/shovel
-    condition: "${data.destroyTool == 'shovel'}"
+    condition: "destroyTool %= shovel"
   - tag: BLOCKS:minecraft:mineable/hoe
-    condition: "${data.destroyTool == 'hoe'}"
+    condition: "destroyTool %= hoe"
 
   - tag: BLOCKS:minecraft:needs_stone_tool
-    condition: "${data.requiresCorrectTool && data.vanillaToolTier == 'STONE'}"
+    condition:
+      - requiresCorrectTool
+      - "vanillaToolTier %= STONE"
   - tag: BLOCKS:minecraft:needs_iron_tool
-    condition: "${data.requiresCorrectTool && data.vanillaToolTier == 'IRON'}"
+    condition:
+      - requiresCorrectTool
+      - "vanillaToolTier %= IRON"
   - tag: BLOCKS:minecraft:needs_diamond_tool
-    condition: "${data.requiresCorrectTool && data.vanillaToolTier == 'DIAMOND'}"
+    condition:
+      - requiresCorrectTool
+      - "vanillaToolTier %= DIAMOND"
 
   - tag: BLOCKS:minecraft:stairs
-    condition: "${data.blockBase! == 'Stairs'}"
+    condition: "blockBase %= Stairs"
   - tag: BLOCKS:minecraft:slabs
-    condition: "${data.blockBase! == 'Slab'}"
+    condition: "blockBase %= Slab"
   - tag: BLOCKS:minecraft:wooden_fences
-    condition: "${(data.blockBase! == 'Fence') && (data.blockSetType == 'OAK')}"
+    condition:
+      - "blockBase %= Fence"
+      - "blockSetType %= OAK"
   - tag: BLOCKS:minecraft:fences
-    condition: "${(data.blockBase! == 'Fence') && (data.blockSetType != 'OAK')}"
+    condition:
+      - "blockBase %= Fence"
+      - "!blockSetType %= OAK"
   - tag: BLOCKS:minecraft:walls
-    condition: "${data.blockBase! == 'Wall'}"
+    condition: "blockBase %= Wall"
   - tag: BLOCKS:minecraft:leaves
-    condition: "${data.blockBase! == 'Leaves'}"
+    condition: "blockBase %= Leaves"
+  - tag: BLOCKS:minecraft:wooden_trapdoors
+    condition:
+      - "blockBase %= TrapDoor"
+      - "blockSetType %= OAK"
+  - tag: BLOCKS:minecraft:trapdoors
+    condition:
+      - "blockBase %= TrapDoor"
+      - "!blockSetType %= OAK"
+  - tag: BLOCKS:minecraft:wooden_doors
+    condition:
+      - "blockBase %= Door"
+      - "blockSetType %= OAK"
+  - tag: BLOCKS:minecraft:doors
+    condition:
+      - "blockBase %= Door"
+      - "!blockSetType %= OAK"
+  - tag: BLOCKS:minecraft:wooden_pressure_plates
+    condition:
+      - "blockBase %= PressurePlate"
+      - "blockSetType %= OAK"
+  - tag: BLOCKS:minecraft:pressure_plates
+    condition:
+      - "blockBase %= PressurePlate"
+      - "!blockSetType %= OAK"
+  - tag: BLOCKS:minecraft:wooden_buttons
+    condition:
+      - "blockBase %= Button"
+      - "blockSetType %= OAK"
+  - tag: BLOCKS:minecraft:buttons
+    condition:
+      - "blockBase %= Button"
+      - "!blockSetType %= OAK"
+  - tag: BLOCKS:minecraft:flower_pots
+    condition: "blockBase %= FlowerPot"
 
   - tag: BLOCKS:minecraft:climbable
     condition: isLadder

src/main/resources/forge-1.17.1/gui.definition.yaml

@@ -9,6 +9,9 @@ templates:
   - template: gui/gui_msg_slot.java.ftl
     name: "@SRCROOT/@BASEPACKAGEPATH/network/@NAMESlotMessage.java"
     condition: hasSlotEvents()
+  - template: gui/gui_msg_slider.java.ftl
+    name: "@SRCROOT/@BASEPACKAGEPATH/network/@NAMESliderMessage.java"
+    condition: hasSliderEvents()
 
 global_templates:
   - template: elementinits/menus.java.ftl
@@ -33,4 +36,10 @@ localizationkeys:
     mapto: text
   - fromlist: data.getComponentsOfType('Checkbox')
     key: gui.@modid.@registryname.@[getName()]
-    mapto: text
+    mapto: text
+  - fromlist: data.getComponentsOfType('Slider')
+    key: gui.@modid.@registryname.@[getName()]_prefix
+    mapto: prefix
+  - fromlist: data.getComponentsOfType('Slider')
+    key: gui.@modid.@registryname.@[getName()]_suffix
+    mapto: suffix

src/main/resources/forge-1.17.1/item.definition.yaml

@@ -62,6 +62,8 @@ list_templates:
 tags:
   - tag: ITEMS:minecraft:music_discs
     condition: isMusicDisc
+  - tag: ITEMS:minecraft:piglin_loved
+    condition: isPiglinCurrency
 
 localizationkeys:
   - key: item.@modid.@registryname
@@ -75,4 +77,4 @@ localizationkeys:
   - fromlist: data.getFixedSpecialInformation()
     key: item.@modid.@registryname.description_@item_index
 
-field_exclusions: [musicDiscLengthInTicks]
+field_exclusions: [musicDiscLengthInTicks, animations]

src/main/resources/forge-1.17.1/livingentity.definition.yaml

@@ -15,7 +15,7 @@ unmodifiable_ai_bases: [ Bat, MagmaCube, Slime ]
 
 tags:
   - tag: ENTITIES:minecraft:raiders
-    condition: "${data.mobBehaviourType == 'Raider'}"
+    condition: "mobBehaviourType %= Raider"
 
   - tag: GAME_EVENTS:minecraft:@registryname_can_listen
     condition:

src/main/resources/forge-1.17.1/mappings/screens.yaml

@@ -82,5 +82,4 @@ Win: WinScreen
 Advancements: AdvancementsScreen
 ItemCombiner: ItemCombinerScreen
 SocialInteractions: SocialInteractionsScreen
-Realms: RealmsScreen
-DisconnectedRealms: DisconnectedRealmsScreen
+Realms: RealmsScreen

src/main/resources/forge-1.17.1/mappings/types.yaml

@@ -13,3 +13,4 @@ dimensiontype: ResourceKey<Level>
 actionresulttype: InteractionResult
 cmdcontext: CommandContext<CommandSourceStack>
 damagesource: DamageSource
+vector: Vec3

src/main/resources/forge-1.17.1/procedures/_event_parameter_set.java.ftl

@@ -1,11 +1,11 @@
 <#assign floatParameters = ["FALL_DISTANCE", "FALL_DAMAGE_MULTIPLIER", "CRITICAL_DAMAGE_MULTIPLIER"]>
 <#assign intParameters = ["DROPPED_EXPERIENCE"]>
-if (event instanceof ${eventClass} _event){
+if (event instanceof ${eventClass} _event) {
 	<#if floatParameters?seq_contains(fieldParameterName)>
 		_event.${method}(${opt.toFloat(inputValue)});
-	<#elseif intParameters?seq_contains(fieldParameterName)>
+    <#elseif intParameters?seq_contains(fieldParameterName)>
 		_event.${method}(${opt.toInt(inputValue)});
-	<#else>
+    <#else>
 		_event.${method}(${inputValue});
-	</#if>
+    </#if>
 }

src/main/resources/forge-1.17.1/procedures/block_fluid_to_bucket.java.ftl

@@ -1,3 +1,2 @@
 <#include "mcitems.ftl">
-/*@ItemStack*/(${mappedBlockToBlock(input$block)} instanceof LiquidBlock _liquid ?
-        new ItemStack(_liquid.getFluid().getBucket()) : ItemStack.EMPTY)
+/*@ItemStack*/(${mappedBlockToBlock(input$block)} instanceof LiquidBlock _liquid ? new ItemStack(_liquid.getFluid().getBucket()) : ItemStack.EMPTY)

src/main/resources/forge-1.17.1/procedures/block_inv_can_insert.java.ftl

@@ -0,0 +1,4 @@
+<#include "mcelements.ftl">
+<#include "mcitems.ftl">
+<@addTemplate file="utils/block_inventory/can_insert.java.ftl"/>
+(canInsertInBlockInventory(world, ${toBlockPos(input$x, input$y, input$z)}, ${opt.toInt(input$slotid)}, ${opt.toInt(input$amount)}, ${mappedMCItemToItemStackCode(input$item, 1)}))