Skip to content

Commit c4858c9

Browse files
committed
MCreator 2025.2 port
1 parent 74d0354 commit c4858c9

File tree

106 files changed

+2287
-1307
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+2287
-1307
lines changed

datalists/materials.yaml

Lines changed: 0 additions & 105 deletions
This file was deleted.

datapack-1.18.x/generator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Data Pack for Java Edition @minecraft
22
status: deprecated
3-
buildfileversion: 40.3.10
3+
buildfileversion: 40.3.11
44

55
# gradle task definitions
66
gradle:

datapack-1.18.x/mappings/blocksitems.yaml

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,9 @@ Blocks.SAND#1:
118118
Blocks.GRAVEL:
119119
- Blocks.GRAVEL
120120
- "gravel"
121-
Blocks.FLOWING_WATER:
122-
- Blocks.WATER
123-
- "water"
124121
Blocks.WATER:
125122
- Blocks.WATER
126123
- "water"
127-
Blocks.FLOWING_LAVA:
128-
- Blocks.LAVA
129-
- "lava"
130124
Blocks.LAVA:
131125
- Blocks.LAVA
132126
- "lava"
@@ -145,9 +139,6 @@ Blocks.IRON_ORE:
145139
Blocks.REDSTONE_ORE:
146140
- Blocks.REDSTONE_ORE
147141
- "redstone_ore"
148-
Blocks.LIT_REDSTONE_ORE:
149-
- Blocks.REDSTONE_ORE
150-
- "redstone_ore"
151142
Blocks.GOLD_ORE:
152143
- Blocks.GOLD_ORE
153144
- "gold_ore"
@@ -244,9 +235,6 @@ Blocks.LOG#2:
244235
Blocks.LOG#3:
245236
- Blocks.JUNGLE_LOG
246237
- "jungle_log"
247-
Blocks.LOG2:
248-
- Blocks.ACACIA_LOG
249-
- "#minecraft:logs"
250238
Blocks.LOG2#0:
251239
- Blocks.ACACIA_LOG
252240
- "acacia_log"
@@ -268,9 +256,6 @@ Blocks.LEAVES#2:
268256
Blocks.LEAVES#3:
269257
- Blocks.JUNGLE_LEAVES
270258
- "jungle_leaves"
271-
Blocks.LEAVES2:
272-
- Blocks.ACACIA_LEAVES
273-
- "#minecraft:leaves"
274259
Blocks.LEAVES2#0:
275260
- Blocks.ACACIA_LEAVES
276261
- "acacia_leaves"
@@ -331,21 +316,12 @@ Blocks.DETECTOR_RAIL:
331316
Blocks.ACTIVATOR_RAIL:
332317
- Blocks.ACTIVATOR_RAIL
333318
- "activator_rail"
334-
Blocks.BED:
335-
- Blocks.WHITE_BED
336-
- "white_bed"
337319
Blocks.WEB:
338320
- Blocks.COBWEB
339321
- "cobweb"
340322
Blocks.DEADBUSH:
341323
- Blocks.DEAD_BUSH
342324
- "dead_bush"
343-
Blocks.TALLGRASS:
344-
- Blocks.GRASS
345-
- "grass"
346-
Blocks.TALLGRASS#0:
347-
- Blocks.DEAD_BUSH
348-
- "dead_bush"
349325
Blocks.TALLGRASS#1:
350326
- Blocks.GRASS
351327
- "grass"
@@ -577,36 +553,21 @@ Blocks.TRIPWIRE:
577553
Blocks.DAYLIGHT_DETECTOR:
578554
- Blocks.DAYLIGHT_DETECTOR
579555
- "daylight_detector"
580-
Blocks.DAYLIGHT_DETECTOR_INVERTED:
581-
- Blocks.DAYLIGHT_DETECTOR
582-
- "daylight_detector"
583556
Blocks.REDSTONE_TORCH:
584557
- Blocks.REDSTONE_TORCH
585558
- "redstone_torch"
586-
Blocks.UNLIT_REDSTONE_TORCH:
587-
- Blocks.REDSTONE_TORCH
588-
- "redstone_torch"
589559
Blocks.REDSTONE_WIRE:
590560
- Blocks.REDSTONE_WIRE
591561
- "redstone_wire"
592562
Blocks.UNPOWERED_REPEATER:
593563
- Blocks.REPEATER
594564
- "repeater"
595-
Blocks.POWERED_REPEATER:
596-
- Blocks.REPEATER
597-
- "repeater"
598565
Blocks.UNPOWERED_COMPARATOR:
599566
- Blocks.COMPARATOR
600567
- "comparator"
601-
Blocks.POWERED_COMPARATOR:
602-
- Blocks.COMPARATOR
603-
- "comparator"
604568
Blocks.REDSTONE_LAMP:
605569
- Blocks.REDSTONE_LAMP
606570
- "redstone_lamp"
607-
Blocks.LIT_REDSTONE_LAMP:
608-
- Blocks.REDSTONE_LAMP
609-
- "redstone_lamp"
610571
Blocks.DISPENSER:
611572
- Blocks.DISPENSER
612573
- "dispenser"
@@ -805,9 +766,6 @@ Blocks.PURPUR_PILLAR:
805766
Blocks.PURPUR_SLAB:
806767
- Blocks.PURPUR_SLAB
807768
- "purpur_slab"
808-
Blocks.PURPUR_DOUBLE_SLAB:
809-
- Blocks.PURPUR_SLAB
810-
- "purpur_slab"
811769
Blocks.BEETROOTS:
812770
- Blocks.BEETROOTS
813771
- "beetroots"
@@ -1444,18 +1402,6 @@ Blocks.STRUCTURE_VOID:
14441402
Blocks.STRUCTURE_BLOCK:
14451403
- Blocks.STRUCTURE_BLOCK
14461404
- "structure_block"
1447-
Blocks.STRUCTURE_BLOCK#1:
1448-
- Blocks.STRUCTURE_BLOCK
1449-
- "structure_block"
1450-
Blocks.STRUCTURE_BLOCK#2:
1451-
- Blocks.STRUCTURE_BLOCK
1452-
- "structure_block"
1453-
Blocks.STRUCTURE_BLOCK#3:
1454-
- Blocks.STRUCTURE_BLOCK
1455-
- "structure_block"
1456-
Blocks.STRUCTURE_BLOCK#4:
1457-
- Blocks.STRUCTURE_BLOCK
1458-
- "structure_block"
14591405
Blocks.NORMAL_STONE_STAIRS:
14601406
- Blocks.STONE_STAIRS
14611407
- "stone_stairs"

datapack-1.18.x/mappings/configuredfeatures.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ _mcreator_map_template:
22
- "@modid:@registryname"
33
- "@NAMEFeature.feature()"
44
- "@NAMEFeature.CONFIGURED_FEATURE"
5+
_default:
6+
- oak
7+
- TreeFeatures.OAK
8+
- TreeConfiguration
59
acacia:
610
- acacia
711
- TreeFeatures.ACACIA

datapack-1.18.x/recipe.definition.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,9 @@ templates:
2828
name: "@RESROOT/data/@[getNamespace()]/recipes/@[getName()].json"
2929
condition: "recipeType %= Smithing"
3030

31+
- template: recipe/unlocking_advancement.json.ftl
32+
writer: json
33+
name: "@MODDATAROOT/advancements/recipes/@registryname.json"
34+
condition: "hasAdvancement()"
35+
3136
field_exclusions: [cookingBookCategory, craftingBookCategory, brewingRecipeMaker, smithingRecipeMaker.cb4]
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<#include "../mcitems.ftl">
2+
{
3+
"parent": "minecraft:recipes/root",
4+
"criteria": {
5+
"has_the_recipe": {
6+
"conditions": {
7+
"recipe": "${data.getNamespace()}:${data.getName()}"
8+
},
9+
"trigger": "minecraft:recipe_unlocked"
10+
},
11+
<#list data.unlockingItems as item>
12+
"has_ingredient_${item?index}": {
13+
"conditions": {
14+
"items": [
15+
{
16+
<#assign retval = mappedMCItemToRegistryName(item, true)>
17+
<#if retval?contains("#")>
18+
"tag": "${retval?replace("#", "")}"
19+
<#else>
20+
"items": [
21+
"${retval}"
22+
]
23+
</#if>
24+
}
25+
]
26+
},
27+
"trigger": "minecraft:inventory_changed"
28+
}<#sep>,
29+
</#list>
30+
},
31+
"requirements": [
32+
[
33+
"has_the_recipe",
34+
<#list data.unlockingItems as item>
35+
"has_ingredient_${item?index}"<#sep>,
36+
</#list>
37+
]
38+
],
39+
"rewards": {
40+
"recipes": [
41+
"${data.getNamespace()}:${data.getName()}"
42+
]
43+
}
44+
}

datapack-1.18.x/templates/tags.json.ftl

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,33 @@
44
"values": [
55
<#if type == "items" || type == "blocks">
66
<#list w.normalizeTagElements(tag.resourcePath(), 1, elements) as value>
7-
"${mappedMCItemToRegistryName(value, true)}"<#sep>,
7+
<@tagEntry value mappedMCItemToRegistryName(value, true)/><#sep>,
88
</#list>
99
<#elseif type == "entities">
1010
<#list w.normalizeTagElements(tag.resourcePath(), 2, elements) as value>
11-
"${value.getMappedValue(2)}"<#sep>,
11+
<@tagEntry value value.getMappedValue(2)/><#sep>,
1212
</#list>
1313
<#elseif type == "biomes" || type == "structures" || type == "game_events">
1414
<#list w.normalizeTagElements(tag.resourcePath(), 0, elements) as value>
15-
"${value}"<#sep>,
15+
<@tagEntry value value/><#sep>,
1616
</#list>
1717
<#elseif type == "functions">
1818
<#list w.filterBrokenReferences(elements) as value>
19-
"${generator.getResourceLocationForModElement(value)}"<#sep>,
19+
<@tagEntry value generator.getResourceLocationForModElement(value)/><#sep>,
2020
</#list>
2121
</#if>
2222
]
23-
}
23+
}
24+
25+
<#macro tagEntry valueObject name>
26+
<#assign value = valueObject.getUnmappedValue()>
27+
<#-- make external entries and tag entries optional -->
28+
<#if value?starts_with("EXTERNAL:") || value?starts_with("TAG:") || value?starts_with("#")>
29+
{
30+
"id": "${name}",
31+
"required": false
32+
}
33+
<#else>
34+
"${name}"
35+
</#if>
36+
</#macro>
181 Bytes
Binary file not shown.

datapack-1.18.x/workspacebase/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

datapack-1.18.x/workspacebase/packloader/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'eclipse'
3-
id 'net.neoforged.moddev.legacyforge' version '2.0.89'
3+
id 'net.neoforged.moddev.legacyforge' version '2.0.103'
44
}
55

66
version = '1.0'

0 commit comments

Comments
 (0)