Skip to content

Commit 08dba0b

Browse files
committed
Some fixes
1 parent 64b4218 commit 08dba0b

Some content is hidden

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

43 files changed

+91
-93
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/checkout@v4
2323
with:
2424
repository: MCreator/MCreator
25-
ref: master
25+
ref: 2025.3.45720
2626
path: mcreator
2727
- name: Set up JDK 21
2828
uses: actions/setup-java@v4

src/main/resources/datapack-1.20.1/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: 47.4.10
3+
buildfileversion: 47.4.13
44

55
# gradle task definitions
66
gradle:

src/main/resources/datapack-1.20.1/mappings/damagesources.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ _default:
22
- DamageTypes.GENERIC
33
- generic
44
_mcreator_map_template:
5-
- "ResourceKey.create(Registries.DAMAGE_TYPE, ResourceLocation.parse(\"@modid:@registryname\"))"
5+
- "ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(\"@modid:@registryname\"))"
66
- "@modid:@registryname"
77
_bypass_prefix: "#"
88
IN_FIRE:

src/main/resources/datapack-1.20.1/mappings/dimensions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ _default:
22
- Level.OVERWORLD
33
- "minecraft:overworld"
44
_mcreator_map_template:
5-
- "ResourceKey.create(Registries.DIMENSION, ResourceLocation.parse(\"@modid:@registryname\"))"
5+
- "ResourceKey.create(Registries.DIMENSION, new ResourceLocation(\"@modid:@registryname\"))"
66
- "@modid:@registryname"
77
Surface:
88
- Level.OVERWORLD

src/main/resources/datapack-1.20.1/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.116'
3+
id 'net.neoforged.moddev.legacyforge' version '2.0.122'
44
}
55

66
version = '1.0'

src/main/resources/forge-1.20.1/generator.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Forge for @minecraft (@buildfileversion)
22
status: deprecated
3-
buildfileversion: 47.4.10
4-
subversion: 1.5 # force setup re-run to update build script to downlaod Mixin Extras
3+
buildfileversion: 47.4.13
4+
subversion: 1.6 # force setup re-run to update build script to downlaod Mixin Extras
55

66
import:
77
- datapack-1.20.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
(world instanceof Level _lvl${cbi} && _lvl${cbi}.getServer() != null && _lvl${cbi}.getServer().getAdvancements()
2-
.getAdvancement(ResourceLocation.parse("${generator.map(field$achievement, "achievements")}" )).equals(advancement))
2+
.getAdvancement(new ResourceLocation("${generator.map(field$achievement, "achievements")}" )).equals(advancement))

src/main/resources/forge-1.20.1/procedures/entity_add_achievement.java.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if(${input$entity} instanceof ServerPlayer _player) {
2-
Advancement _adv = _player.server.getAdvancements().getAdvancement(ResourceLocation.parse("${generator.map(field$achievement, "achievements")}"));
2+
Advancement _adv = _player.server.getAdvancements().getAdvancement(new ResourceLocation("${generator.map(field$achievement, "achievements")}"));
33
AdvancementProgress _ap = _player.getAdvancements().getOrStartProgress(_adv);
44
if (!_ap.isDone()) {
55
for (String criteria : _ap.getRemainingCriteria())
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<#assign plr = "_plr" + cbi>
22
(${input$entity} instanceof ServerPlayer ${plr} && ${plr}.level() instanceof ServerLevel _serverLevel${cbi} && ${plr}.getAdvancements()
3-
.getOrStartProgress(_serverLevel${cbi}.getServer().getAdvancements().getAdvancement(ResourceLocation.parse("${generator.map(field$achievement, "achievements")}"))).isDone())
3+
.getOrStartProgress(_serverLevel${cbi}.getServer().getAdvancements().getAdvancement(new ResourceLocation("${generator.map(field$achievement, "achievements")}"))).isDone())

src/main/resources/forge-1.20.1/procedures/entity_remove_achievement.java.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if(${input$entity} instanceof ServerPlayer _player && _player.level() instanceof ServerLevel _level) {
2-
Advancement _adv = _level.getServer().getAdvancements().getAdvancement(ResourceLocation.parse("${generator.map(field$achievement, "achievements")}"));
2+
Advancement _adv = _level.getServer().getAdvancements().getAdvancement(new ResourceLocation("${generator.map(field$achievement, "achievements")}"));
33
if (_adv != null) {
44
AdvancementProgress _ap = _player.getAdvancements().getOrStartProgress(_adv);
55
if (_ap.isDone()) {

0 commit comments

Comments
 (0)