1.17 Datapack update

Author: Spectrall368

.github/workflows/test.yml

@@ -21,14 +21,16 @@ jobs:
       - name: Checkout MCreator repository
         uses: actions/checkout@v4
         with:
-          repository: Spectrall368/MCreator
-          ref: old_mcreator
+          repository: MCreator/MCreator
+          ref: 2025.3.45720
           path: mcreator
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '21.0.7+6.0.LTS'
+          java-version: '21.0.8+9.0.LTS'
           distribution: 'temurin'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
       - name: Cache Gradle Packages
         uses: actions/cache@v4
         with:
@@ -40,12 +42,10 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: Grant execute permission for gradlew
-        run: chmod +x ./gradlew
-      - name: Run MCreator Test With Plugin
-        run: xvfb-run -a ./gradlew test --project-prop mcreator_path=${{ github.workspace }}/mcreator
+      - name: Build and Test Using Gradle
+        run: xvfb-run -a gradle test --project-prop mcreator_path=${{ github.workspace }}/mcreator
       - name: Test Javadoc Generation
-        run: ./gradlew javadoc
+        run: gradle javadoc
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@9379f0ccddcab154835d4e2487555ee79614fe95
         if: always() # always run even if the previous step fails

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", "forge-${version}, datapack-1.17.x, resourcepack-${version}")
 
             workingDir = mcreator_path

gradle.properties

@@ -1,4 +1,4 @@
-mcreatorVersionShort=2025.2
-pluginVersion=2.2
+mcreatorVersionShort=2025.3
+pluginVersion=2.3
 version=1.17.1
 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.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -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.17.x/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.17.x/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.17.x/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}
+	}
+  }
+},

src/main/resources/datapack-1.17.x/jsontriggers/item_enchanted.json.ftl

@@ -0,0 +1,10 @@
+"${registryname}_${cbi}": {
+  "trigger": "minecraft:effects_changed",
+  "conditions": {
+  	"effects": {
+    <#list input_list$effect as effect>
+    	${effect}<#sep>,
+    </#list>
+  	}
+  }
+},