Ported some entity set and data procedure blocks to NF 1.20.4

willpill · Feb 25, 2024 · bfa0893 · bfa0893
1 parent 191253a
commit bfa0893
Show file tree

Hide file tree

Showing 23 changed files with 2 additions and 2 deletions.
diff --git a/...dures/entity_set_armor_slot_item.java.ftl → ...dures/entity_set_armor_slot_item.java.ftl b/...dures/entity_set_armor_slot_item.java.ftl → ...dures/entity_set_armor_slot_item.java.ftl
diff --git a/...ocedures/entity_set_display_name.java.ftl → ...ocedures/entity_set_display_name.java.ftl b/...ocedures/entity_set_display_name.java.ftl → ...ocedures/entity_set_display_name.java.ftl
diff --git a/....20.1/procedures/entity_set_fire.java.ftl → ....20.4/procedures/entity_set_fire.java.ftl b/....20.1/procedures/entity_set_fire.java.ftl → ....20.4/procedures/entity_set_fire.java.ftl
diff --git a/...0.1/procedures/entity_set_flying.java.ftl → ...0.4/procedures/entity_set_flying.java.ftl b/...0.1/procedures/entity_set_flying.java.ftl → ...0.4/procedures/entity_set_flying.java.ftl
diff --git a/.../procedures/entity_set_foodlevel.java.ftl → .../procedures/entity_set_foodlevel.java.ftl b/.../procedures/entity_set_foodlevel.java.ftl → .../procedures/entity_set_foodlevel.java.ftl
diff --git a/...1/procedures/entity_set_gamemode.java.ftl → ...4/procedures/entity_set_gamemode.java.ftl b/...1/procedures/entity_set_gamemode.java.ftl → ...4/procedures/entity_set_gamemode.java.ftl
diff --git a/...0.1/procedures/entity_set_health.java.ftl → ...0.4/procedures/entity_set_health.java.ftl b/...0.1/procedures/entity_set_health.java.ftl → ...0.4/procedures/entity_set_health.java.ftl
diff --git a/.../procedures/entity_set_invisible.java.ftl → .../procedures/entity_set_invisible.java.ftl b/.../procedures/entity_set_invisible.java.ftl → .../procedures/entity_set_invisible.java.ftl
diff --git a/...1/procedures/entity_set_movement.java.ftl → ...4/procedures/entity_set_movement.java.ftl b/...1/procedures/entity_set_movement.java.ftl → ...4/procedures/entity_set_movement.java.ftl
diff --git a/.../procedures/entity_set_nogravity.java.ftl → .../procedures/entity_set_nogravity.java.ftl b/.../procedures/entity_set_nogravity.java.ftl → .../procedures/entity_set_nogravity.java.ftl
diff --git a/...0.1/procedures/entity_set_oxygen.java.ftl → ...0.4/procedures/entity_set_oxygen.java.ftl b/...0.1/procedures/entity_set_oxygen.java.ftl → ...0.4/procedures/entity_set_oxygen.java.ftl
diff --git a/...1/procedures/entity_set_rotation.java.ftl → ...4/procedures/entity_set_rotation.java.ftl b/...1/procedures/entity_set_rotation.java.ftl → ...4/procedures/entity_set_rotation.java.ftl
diff --git a/...procedures/entity_set_saturation.java.ftl → ...procedures/entity_set_saturation.java.ftl b/...procedures/entity_set_saturation.java.ftl → ...procedures/entity_set_saturation.java.ftl
diff --git a/...ures/entity_set_scoreboard_score.java.ftl → ...ures/entity_set_scoreboard_score.java.ftl b/...ures/entity_set_scoreboard_score.java.ftl → ...ures/entity_set_scoreboard_score.java.ftl
@@ -3,6 +3,6 @@
 	Scoreboard _sc = _ent.level().getScoreboard();
 	Objective _so = _sc.getObjective(${input$score});
 	if (_so == null)
-		_so = _sc.addObjective(${input$score}, ObjectiveCriteria.DUMMY, Component.literal(${input$score}), ObjectiveCriteria.RenderType.INTEGER);
-	_sc.getOrCreatePlayerScore(_ent.getScoreboardName(), _so).setScore(${opt.toInt(input$value)});
+		_so = _sc.addObjective(${input$score}, ObjectiveCriteria.DUMMY, Component.literal(${input$score}), ObjectiveCriteria.RenderType.INTEGER, true, null);
+	_sc.getOrCreatePlayerScore(ScoreHolder.forNameOnly(_ent.getScoreboardName()), _so).set(${opt.toInt(input$value)});
 }
diff --git a/...1/procedures/entity_set_sneaking.java.ftl → ...4/procedures/entity_set_sneaking.java.ftl b/...1/procedures/entity_set_sneaking.java.ftl → ...4/procedures/entity_set_sneaking.java.ftl
diff --git a/...20.1/procedures/entity_set_spawn.java.ftl → ...20.4/procedures/entity_set_spawn.java.ftl b/...20.1/procedures/entity_set_spawn.java.ftl → ...20.4/procedures/entity_set_spawn.java.ftl
diff --git a/.../procedures/entity_set_sprinting.java.ftl → .../procedures/entity_set_sprinting.java.ftl b/.../procedures/entity_set_sprinting.java.ftl → .../procedures/entity_set_sprinting.java.ftl
diff --git a/...procedures/entity_set_stepheight.java.ftl → ...procedures/entity_set_stepheight.java.ftl b/...procedures/entity_set_stepheight.java.ftl → ...procedures/entity_set_stepheight.java.ftl
diff --git a/...0.1/procedures/entity_set_target.java.ftl → ...0.4/procedures/entity_set_target.java.ftl b/...0.1/procedures/entity_set_target.java.ftl → ...0.4/procedures/entity_set_target.java.ftl
diff --git a/...ocedures/entity_set_ticks_frozen.java.ftl → ...ocedures/entity_set_ticks_frozen.java.ftl b/...ocedures/entity_set_ticks_frozen.java.ftl → ...ocedures/entity_set_ticks_frozen.java.ftl
diff --git a/....20.1/procedures/entity_setinweb.java.ftl → ....20.4/procedures/entity_setinweb.java.ftl b/....20.1/procedures/entity_setinweb.java.ftl → ....20.4/procedures/entity_setinweb.java.ftl
diff --git a/...dures/entity_xp_until_next_level.java.ftl → ...dures/entity_xp_until_next_level.java.ftl b/...dures/entity_xp_until_next_level.java.ftl → ...dures/entity_xp_until_next_level.java.ftl
diff --git a/...1.20.1/procedures/entity_xplevel.java.ftl → ...1.20.4/procedures/entity_xplevel.java.ftl b/...1.20.1/procedures/entity_xplevel.java.ftl → ...1.20.4/procedures/entity_xplevel.java.ftl