diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_armor_slot_item.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_armor_slot_item.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_armor_slot_item.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_armor_slot_item.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_display_name.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_display_name.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_display_name.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_display_name.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_fire.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_fire.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_fire.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_fire.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_flying.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_flying.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_flying.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_flying.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_foodlevel.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_foodlevel.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_foodlevel.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_foodlevel.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_gamemode.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_gamemode.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_gamemode.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_gamemode.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_health.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_health.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_health.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_health.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_invisible.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_invisible.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_invisible.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_invisible.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_movement.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_movement.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_movement.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_movement.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_nogravity.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_nogravity.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_nogravity.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_nogravity.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_oxygen.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_oxygen.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_oxygen.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_oxygen.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_rotation.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_rotation.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_rotation.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_rotation.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_saturation.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_saturation.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_saturation.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_saturation.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_scoreboard_score.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_scoreboard_score.java.ftl
similarity index 65%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_scoreboard_score.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_scoreboard_score.java.ftl
index 2b22fc127d6..39db8dd3931 100644
--- a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_scoreboard_score.java.ftl
+++ b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/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)});
 }
\ No newline at end of file
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_sneaking.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_sneaking.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_sneaking.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_sneaking.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_spawn.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_spawn.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_spawn.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_spawn.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_sprinting.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_sprinting.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_sprinting.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_sprinting.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_stepheight.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_stepheight.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_stepheight.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_stepheight.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_target.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_target.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_target.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_target.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_ticks_frozen.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_ticks_frozen.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_set_ticks_frozen.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_set_ticks_frozen.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_setinweb.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_setinweb.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_setinweb.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_setinweb.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_xp_until_next_level.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_xp_until_next_level.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_xp_until_next_level.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_xp_until_next_level.java.ftl
diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_xplevel.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_xplevel.java.ftl
similarity index 100%
rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_xplevel.java.ftl
rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_xplevel.java.ftl