Skip to content

Commit 29aef96

Browse files
committed
MCreator 2025.3 update + switch to official mappings
1 parent 7a2ff1b commit 29aef96

File tree

70 files changed

+824
-555
lines changed

Some content is hidden

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

70 files changed

+824
-555
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
templates:
22
- template: advancement.json.ftl
33
writer: json
4-
name: "@MODDATAROOT/advancements/@registryname.json"
4+
name: "@MODDATAROOT/advancements/@registryname.json"

src/main/resources/datapack-1.16.x/dimension.definition.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ field_inclusions: [mainFillerBlock, fluidBlock, biomesInDimension, seaLevel, gen
1919
horizontalNoiseSize, verticalNoiseSize, imitateOverworldBehaviour, canRespawnHere,
2020
defaultEffects, ambientLight, doesWaterVaporize, bedWorks, hasSkyLight, hasFixedTime, fixedTimeValue,
2121
coordinateScale, infiniburnTag, worldGenType, piglinSafe, hasRaids, monsterSpawnLightLimit,
22-
monsterSpawnBlockLightLimit]
22+
monsterSpawnBlockLightLimit]

src/main/resources/datapack-1.16.x/mappings/achievements.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,4 @@ husbandry/breed_all_animals: minecraft:husbandry/bred_all_animals
8080
husbandry/complete_catalogue: minecraft:husbandry/complete_catalogue
8181
husbandry/tactical_fishing: minecraft:husbandry/tactical_fishing
8282
husbandry/balanced_diet: minecraft:husbandry/balanced_diet
83-
husbandry/obtain_netherite_hoe: minecraft:husbandry/obtain_netherite_hoe
83+
husbandry/obtain_netherite_hoe: minecraft:husbandry/obtain_netherite_hoe

src/main/resources/datapack-1.16.x/mappings/biomes.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
_default: plains
22
_mcreator_map_template: "@modid:@registryname"
3-
_bypass_prefix: "#"
43
ocean: ocean
54
plains: plains
65
desert: desert
@@ -79,4 +78,4 @@ bamboo_jungle_hills: bamboo_jungle_hills
7978
soul_sand_valley: soul_sand_valley
8079
crimson_forest: crimson_forest
8180
warped_forest: warped_forest
82-
basalt_deltas: basalt_deltas
81+
basalt_deltas: basalt_deltas

src/main/resources/datapack-1.16.x/mappings/blocksitems.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3205,6 +3205,9 @@ Items.RECORD_11:
32053205
Items.RECORD_WAIT:
32063206
- Items.MUSIC_DISC_WAIT
32073207
- "music_disc_wait"
3208+
Items.MUSIC_DISC_PIGSTEP:
3209+
- Items.MUSIC_DISC_PIGSTEP
3210+
- "music_disc_pigstep"
32083211
Items.SKULL:
32093212
- Items.SKELETON_SKULL
32103213
- "#forge:heads"
@@ -3467,7 +3470,7 @@ Items.PIGLIN_SPAWN_EGG:
34673470
- Items.PIGLIN_SPAWN_EGG
34683471
- "piglin_spawn_egg"
34693472
Items.PIGLIN_BRUTE_SPAWN_EGG:
3470-
- Items.field_242399_ol
3473+
- Items.PIGLIN_BRUTE_SPAWN_EGG
34713474
- "piglin_brute_spawn_egg"
34723475
Items.STRIDER_SPAWN_EGG:
34733476
- Items.STRIDER_SPAWN_EGG
@@ -3478,9 +3481,6 @@ Items.ZOGLIN_SPAWN_EGG:
34783481
Items.WARPED_FUNGUS_ON_A_STICK:
34793482
- Items.WARPED_FUNGUS_ON_A_STICK
34803483
- "warped_fungus_on_a_stick"
3481-
Items.MUSIC_DISC_PIGSTEP:
3482-
- Items.MUSIC_DISC_PIGSTEP
3483-
- "music_disc_pigstep"
34843484
Items.PIGLIN_BANNER_PATTERN:
34853485
- Items.PIGLIN_BANNER_PATTERN
34863486
- "piglin_banner_pattern"

src/main/resources/datapack-1.16.x/mappings/damagesources.yaml

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ _default:
44
_mcreator_map_template:
55
- "@JavaModNameDamageTypes.@REGISTRYNAME"
66
- "@modid:@registryname"
7-
_bypass_prefix: "#"
87
IN_FIRE:
98
- DamageSource.IN_FIRE
109
- inFire
@@ -57,7 +56,7 @@ DRAGON_BREATH:
5756
- DamageSource.DRAGON_BREATH
5857
- dragonBreath
5958
DRYOUT:
60-
- DamageSource.DRYOUT
59+
- DamageSource.DRY_OUT
6160
- dryout
6261
SWEET_BERRY_BUSH:
6362
- DamageSource.SWEET_BERRY_BUSH
@@ -67,4 +66,51 @@ FALLING_BLOCK:
6766
- fallingBlock
6867
ANVIL:
6968
- DamageSource.ANVIL
70-
- anvil
69+
- anvil
70+
FALLING_STALACTITE:
71+
- DamageSource.FALLING_BLOCK
72+
- fallingBlock
73+
74+
## EntityDamageSource/IndirectEntityDamageSource
75+
STING:
76+
- null
77+
- sting
78+
MOB_ATTACK:
79+
- null
80+
- mob
81+
MOB_ATTACK_NO_AGGRO:
82+
- null
83+
- mob
84+
PLAYER_ATTACK:
85+
- null
86+
- player
87+
ARROW:
88+
- null
89+
- arrow
90+
TRIDENT:
91+
- null
92+
- trident
93+
FIREWORKS:
94+
- null
95+
- fireworks
96+
UNATTRIBUTED_FIREBALL:
97+
- null
98+
- onFire
99+
WITHER_SKULL:
100+
- null
101+
- witherSkull
102+
THROWN:
103+
- null
104+
- thrown
105+
INDIRECT_MAGIC:
106+
- null
107+
- indirectMagic
108+
THORNS:
109+
- null
110+
- thorns
111+
PLAYER_EXPLOSION:
112+
- null
113+
- explosion.player
114+
BAD_RESPAWN_POINT:
115+
- null
116+
- badRespawnPoint

src/main/resources/datapack-1.16.x/mappings/dimensions.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ _default:
22
- World.OVERWORLD
33
- "minecraft:overworld"
44
_mcreator_map_template:
5-
- "RegistryKey.getOrCreateKey(Registry.WORLD_KEY, new ResourceLocation(\"@modid:@registryname\"))"
5+
- "RegistryKey.create(Registry.DIMENSION_REGISTRY, new ResourceLocation(\"@modid:@registryname\"))"
66
- "@modid:@registryname"
77
Surface:
88
- World.OVERWORLD
99
- "minecraft:overworld"
1010
Nether:
11-
- World.THE_NETHER
11+
- World.NETHER
1212
- "minecraft:the_nether"
1313
End:
14-
- World.THE_END
15-
- "minecraft:the_end"
14+
- World.END
15+
- "minecraft:the_end"
Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
1-
DOWN: Direction.DOWN
2-
UP: Direction.UP
3-
NORTH: Direction.NORTH
4-
SOUTH: Direction.SOUTH
5-
WEST: Direction.WEST
6-
EAST: Direction.EAST
1+
DOWN:
2+
- Direction.DOWN
3+
- down
4+
UP:
5+
- Direction.UP
6+
- up
7+
NORTH:
8+
- Direction.NORTH
9+
- north
10+
SOUTH:
11+
- Direction.SOUTH
12+
- south
13+
WEST:
14+
- Direction.WEST
15+
- west
16+
EAST:
17+
- Direction.EAST
18+
- east

src/main/resources/datapack-1.16.x/mappings/effects.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
_default:
2-
- Effects.SPEED
2+
- Effects.MOVEMENT_SPEED
33
- "minecraft:speed"
44
_mcreator_map_template:
55
- "@JavaModNameMobEffects.@REGISTRYNAME.get()"
66
- "@modid:@registryname"
77
SPEED:
8-
- Effects.SPEED
8+
- Effects.MOVEMENT_SPEED
99
- "minecraft:speed"
1010
SLOWNESS:
11-
- Effects.SLOWNESS
11+
- Effects.MOVEMENT_SLOWDOWN
1212
- "minecraft:slowness"
1313
HASTE:
14-
- Effects.HASTE
14+
- Effects.DIG_SPEED
1515
- "minecraft:haste"
1616
MINING_FATIGUE:
17-
- Effects.MINING_FATIGUE
17+
- Effects.DIG_SLOWDOWN
1818
- "minecraft:mining_fatigue"
1919
STRENGTH:
20-
- Effects.STRENGTH
20+
- Effects.DAMAGE_BOOST
2121
- "minecraft:strength"
2222
INSTANT_HEALTH:
23-
- Effects.INSTANT_HEALTH
23+
- Effects.HEAL
2424
- "minecraft:instant_health"
2525
INSTANT_DAMAGE:
26-
- Effects.INSTANT_DAMAGE
26+
- Effects.HARM
2727
- "minecraft:instant_damage"
2828
JUMP_BOOST:
29-
- Effects.JUMP_BOOST
29+
- Effects.JUMP
3030
- "minecraft:jump_boost"
3131
NAUSEA:
32-
- Effects.NAUSEA
32+
- Effects.CONFUSION
3333
- "minecraft:nausea"
3434
REGENERATION:
3535
- Effects.REGENERATION
3636
- "minecraft:regeneration"
3737
RESISTANCE:
38-
- Effects.RESISTANCE
38+
- Effects.DAMAGE_RESISTANCE
3939
- "minecraft:resistance"
4040
FIRE_RESISTANCE:
4141
- Effects.FIRE_RESISTANCE

src/main/resources/datapack-1.16.x/mappings/enchantments.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
_default:
2-
- Enchantments.EFFICIENCY
2+
- Enchantments.BLOCK_EFFICIENCY
33
- efficiency
44
_mcreator_map_template:
55
- "@JavaModNameEnchantments.@REGISTRYNAME.get()"
66
- "@modid:@registryname"
77
PROTECTION:
8-
- Enchantments.PROTECTION
8+
- Enchantments.ALL_DAMAGE_PROTECTION
99
- protection
1010
FIRE_PROTECTION:
1111
- Enchantments.FIRE_PROTECTION
1212
- fire_protection
1313
FEATHER_FALLING:
14-
- Enchantments.FEATHER_FALLING
14+
- Enchantments.FALL_PROTECTION
1515
- feather_falling
1616
BLAST_PROTECTION:
1717
- Enchantments.BLAST_PROTECTION
@@ -56,13 +56,13 @@ FIRE_ASPECT:
5656
- Enchantments.FIRE_ASPECT
5757
- fire_aspect
5858
LOOTING:
59-
- Enchantments.LOOTING
59+
- Enchantments.MOB_LOOTING
6060
- looting
6161
SWEEPING:
62-
- Enchantments.SWEEPING
62+
- Enchantments.SWEEPING_EDGE
6363
- sweeping_edge
6464
EFFICIENCY:
65-
- Enchantments.EFFICIENCY
65+
- Enchantments.BLOCK_EFFICIENCY
6666
- efficiency
6767
SILK_TOUCH:
6868
- Enchantments.SILK_TOUCH
@@ -71,25 +71,25 @@ UNBREAKING:
7171
- Enchantments.UNBREAKING
7272
- unbreaking
7373
FORTUNE:
74-
- Enchantments.FORTUNE
74+
- Enchantments.BLOCK_FORTUNE
7575
- fortune
7676
POWER:
77-
- Enchantments.POWER
77+
- Enchantments.POWER_ARROWS
7878
- power
7979
PUNCH:
80-
- Enchantments.PUNCH
80+
- Enchantments.PUNCH_ARROWS
8181
- punch
8282
FLAME:
83-
- Enchantments.FLAME
83+
- Enchantments.FLAMING_ARROWS
8484
- flame
8585
INFINITY:
86-
- Enchantments.INFINITY
86+
- Enchantments.INFINITY_ARROWS
8787
- infinity
8888
LUCK_OF_THE_SEA:
89-
- Enchantments.LUCK_OF_THE_SEA
89+
- Enchantments.FISHING_LUCK
9090
- luck_of_the_sea
9191
LURE:
92-
- Enchantments.LURE
92+
- Enchantments.FISHING_SPEED
9393
- lure
9494
LOYALTY:
9595
- Enchantments.LOYALTY

0 commit comments

Comments
 (0)