MCreator 2025.3 port

Author: Spectrall368

.github/workflows/test.yml

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

build.gradle

@@ -22,7 +22,6 @@ tasks.register('runMCreatorWithPlugin', JavaExec) {
     dependsOn(processResources, jar)
 
     environment("MCREATOR_PLUGINS_FOLDER", file("./build/libs"))
-    environment("MCREATOR_PLUGINS_DEV", "")
 
     jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED'
 
@@ -43,7 +42,6 @@ subprojects { subproject ->
             dependsOn rootProject.jar
 
             environment("MCREATOR_PLUGINS_FOLDER", new File(rootProject.projectDir, "/build/libs"))
-            environment("MCREATOR_PLUGINS_DEV", "")
             environment("MCREATOR_TEST_GENERATORS", "neoforge-${version}, datapack-${version}, resourcepack-${version}")
 
             workingDir = mcreator_path

gradle.properties

@@ -1,4 +1,4 @@
-mcreatorVersionShort=2025.2
-pluginVersion=1.5
+mcreatorVersionShort=2025.3
+pluginVersion=1.6
 version=1.20.4
 mcreator_path=unassigned

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -47,36 +47,36 @@ tags:
   - tag: BIOMES:minecraft:has_structure/end_city
     condition: spawnEndCity
   - tag: BIOMES:minecraft:has_structure/village_desert
-    condition: "${data.villageType == 'desert'}"
+    condition: "villageType %= desert"
   - tag: BIOMES:minecraft:has_structure/village_plains
-    condition: "${data.villageType == 'plains'}"
+    condition: "villageType %= plains"
   - tag: BIOMES:minecraft:has_structure/village_savanna
-    condition: "${data.villageType == 'savanna'}"
+    condition: "villageType %= savanna"
   - tag: BIOMES:minecraft:has_structure/village_snowy
-    condition: "${data.villageType == 'snowy'}"
+    condition: "villageType %= snowy"
   - tag: BIOMES:minecraft:has_structure/village_taiga
-    condition: "${data.villageType == 'taiga'}"
+    condition: "villageType %= taiga"
   - tag: BIOMES:minecraft:has_structure/ocean_ruin_cold
-    condition: "${data.oceanRuinType == 'COLD'}"
+    condition: "oceanRuinType %= COLD"
   - tag: BIOMES:minecraft:has_structure/ocean_ruin_warm
-    condition: "${data.oceanRuinType == 'WARM'}"
+    condition: "oceanRuinType %= WARM"
   - tag: BIOMES:minecraft:has_structure/ruined_portal_standard
-    condition: "${data.spawnRuinedPortal == 'STANDARD'}"
+    condition: "spawnRuinedPortal %= STANDARD"
   - tag: BIOMES:minecraft:has_structure/ruined_portal_desert
-    condition: "${data.spawnRuinedPortal == 'DESERT'}"
+    condition: "spawnRuinedPortal %= DESERT"
   - tag: BIOMES:minecraft:has_structure/ruined_portal_jungle
-    condition: "${data.spawnRuinedPortal == 'JUNGLE'}"
+    condition: "spawnRuinedPortal %= JUNGLE"
   - tag: BIOMES:minecraft:has_structure/ruined_portal_swamp
-    condition: "${data.spawnRuinedPortal == 'SWAMP'}"
+    condition: "spawnRuinedPortal %= SWAMP"
   - tag: BIOMES:minecraft:has_structure/ruined_portal_mountain
-    condition: "${data.spawnRuinedPortal == 'MOUNTAIN'}"
+    condition: "spawnRuinedPortal %= MOUNTAIN"
   - tag: BIOMES:minecraft:has_structure/ruined_portal_ocean
-    condition: "${data.spawnRuinedPortal == 'OCEAN'}"
+    condition: "spawnRuinedPortal %= OCEAN"
   - tag: BIOMES:minecraft:has_structure/ruined_portal_nether
-    condition: "${data.spawnRuinedPortal == 'NETHER'}"
+    condition: "spawnRuinedPortal %= NETHER"
 
 field_exclusions: [name, coverageEstimate, treeVines, treeFruits, spawnBiome, spawnInCaves, spawnBiomeNether]
 
 localizationkeys:
   - key: biome.@modid.@registryname
-    mapto: name
+    mapto: name

src/main/resources/datapack-1.20.4/biome.definition.yaml

@@ -1,6 +1,6 @@
 name: Data Pack for Java Edition @minecraft
 status: deprecated
-buildfileversion: 20.4.250
+buildfileversion: 20.4.251
 
 # gradle task definitions
 gradle:
@@ -14,7 +14,7 @@ mod_assets_root: "@RESROOT/assets/@modid"
 mod_data_root: "@RESROOT/data/@modid"
 
 # specific resource folders
-structures_dir: "@MODDATAROOT/structures"
+structures_dir: "@MODDATAROOT/structure"
 
 base_templates:
   - template: pack.mcmeta.ftl

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

@@ -0,0 +1,8 @@
+"${generator.map(field$effect, "effects", 1)}": {
+	"amplifier": {
+		"min": ${input$minAmplifier}
+	},
+	"duration": {
+		"min": ${input$minDuration}
+	}
+}

src/main/resources/datapack-1.20.4/jsontriggers/effect_entry.json.ftl

@@ -0,0 +1,8 @@
+{
+	"${generator.map(field$enchantment, "enchantments", 1)}": {
+    	"levels": {
+    		"min": ${field$min},
+    		"max": ${field$max}
+    	}
+    }
+}

src/main/resources/datapack-1.20.4/jsontriggers/enchantment_entry.json.ftl

@@ -0,0 +1,18 @@
+"${registryname}_${cbi}": {
+  "trigger": "minecraft:enchanted_item",
+  "conditions": {
+	"item": {
+		"items": "${input$item}",
+		"predicates": {
+			"enchantments": [
+				<#list input_list$enchantment as enchantment>
+					${enchantment}<#sep>,
+				</#list>
+			]
+		}
+	},
+	"levels": {
+		"min": ${input$levelsSpent}
+	}
+  }
+},