Ported some entity data procedure blocks to NF 1.20.4

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

Hide file tree

Showing 30 changed files with 2 additions and 2 deletions.
diff --git a/....1/procedures/entity_armor_value.java.ftl → ....4/procedures/entity_armor_value.java.ftl b/....1/procedures/entity_armor_value.java.ftl → ....4/procedures/entity_armor_value.java.ftl
diff --git a/.../procedures/entity_canusecommand.java.ftl → .../procedures/entity_canusecommand.java.ftl b/.../procedures/entity_canusecommand.java.ftl → .../procedures/entity_canusecommand.java.ftl
diff --git a/...dures/entity_check_creature_type.java.ftl → ...dures/entity_check_creature_type.java.ftl b/...dures/entity_check_creature_type.java.ftl → ...dures/entity_check_creature_type.java.ftl
diff --git a/...rocedures/entity_check_main_hand.java.ftl → ...rocedures/entity_check_main_hand.java.ftl b/...rocedures/entity_check_main_hand.java.ftl → ...rocedures/entity_check_main_hand.java.ftl
diff --git a/.../procedures/entity_checkgamemode.java.ftl → .../procedures/entity_checkgamemode.java.ftl b/.../procedures/entity_checkgamemode.java.ftl → .../procedures/entity_checkgamemode.java.ftl
diff --git a/...dures/entity_get_armor_slot_item.java.ftl → ...dures/entity_get_armor_slot_item.java.ftl b/...dures/entity_get_armor_slot_item.java.ftl → ...dures/entity_get_armor_slot_item.java.ftl
diff --git a/...entity_get_controlling_passenger.java.ftl → ...entity_get_controlling_passenger.java.ftl b/...entity_get_controlling_passenger.java.ftl → ...entity_get_controlling_passenger.java.ftl
diff --git a/...procedures/entity_get_fire_ticks.java.ftl → ...procedures/entity_get_fire_ticks.java.ftl b/...procedures/entity_get_fire_ticks.java.ftl → ...procedures/entity_get_fire_ticks.java.ftl
diff --git a/...dures/entity_get_first_passenger.java.ftl → ...dures/entity_get_first_passenger.java.ftl b/...dures/entity_get_first_passenger.java.ftl → ...dures/entity_get_first_passenger.java.ftl
diff --git a/...ocedures/entity_get_root_vehicle.java.ftl → ...ocedures/entity_get_root_vehicle.java.ftl b/...ocedures/entity_get_root_vehicle.java.ftl → ...ocedures/entity_get_root_vehicle.java.ftl
diff --git a/...ures/entity_get_scoreboard_score.java.ftl → ...ures/entity_get_scoreboard_score.java.ftl b/...ures/entity_get_scoreboard_score.java.ftl → ...ures/entity_get_scoreboard_score.java.ftl
@@ -3,7 +3,7 @@
 		Scoreboard _sc = _ent.level().getScoreboard();
 		Objective _so = _sc.getObjective(score);
 		if (_so != null)
-			return _sc.getOrCreatePlayerScore(_ent.getScoreboardName(), _so).getScore();
+			return _sc.getOrCreatePlayerScore(ScoreHolder.forNameOnly(_ent.getScoreboardName()), _so).get();
 		return 0;
 	}
 }.getScore(${input$score}, ${input$entity}))
diff --git a/...procedures/entity_get_shootpower.java.ftl → ...procedures/entity_get_shootpower.java.ftl b/...procedures/entity_get_shootpower.java.ftl → ...procedures/entity_get_shootpower.java.ftl
diff --git a/...1/procedures/entity_get_use_item.java.ftl → ...4/procedures/entity_get_use_item.java.ftl b/...1/procedures/entity_get_use_item.java.ftl → ...4/procedures/entity_get_use_item.java.ftl
diff --git a/...edures/entity_get_use_item_ticks.java.ftl → ...edures/entity_get_use_item_ticks.java.ftl b/...edures/entity_get_use_item_ticks.java.ftl → ...edures/entity_get_use_item_ticks.java.ftl
diff --git a/...edures/entity_has_item_inventory.java.ftl → ...edures/entity_has_item_inventory.java.ftl b/...edures/entity_has_item_inventory.java.ftl → ...edures/entity_has_item_inventory.java.ftl
diff --git a/.../procedures/entity_has_nogravity.java.ftl → .../procedures/entity_has_nogravity.java.ftl b/.../procedures/entity_has_nogravity.java.ftl → .../procedures/entity_has_nogravity.java.ftl
diff --git a/...0.1/procedures/entity_has_recipe.java.ftl → ...0.4/procedures/entity_has_recipe.java.ftl b/...0.1/procedures/entity_has_recipe.java.ftl → ...0.4/procedures/entity_has_recipe.java.ftl
diff --git a/...rocedures/entity_has_screen_open.java.ftl → ...rocedures/entity_has_screen_open.java.ftl b/...rocedures/entity_has_screen_open.java.ftl → ...rocedures/entity_has_screen_open.java.ftl
diff --git a/...rocedures/entity_haspotioneffect.java.ftl → ...rocedures/entity_haspotioneffect.java.ftl b/...rocedures/entity_haspotioneffect.java.ftl → ...rocedures/entity_haspotioneffect.java.ftl
diff --git a/...-1.20.1/procedures/entity_health.java.ftl → ...-1.20.4/procedures/entity_health.java.ftl b/...-1.20.1/procedures/entity_health.java.ftl → ...-1.20.4/procedures/entity_health.java.ftl
diff --git a/...0.1/procedures/entity_health_max.java.ftl → ...0.4/procedures/entity_health_max.java.ftl b/...0.1/procedures/entity_health_max.java.ftl → ...0.4/procedures/entity_health_max.java.ftl
diff --git a/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_isimmunetoexplosions.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_isimmunetoexplosions.java.ftl
@@ -0,0 +1 @@
+(${input$entity}.ignoreExplosion(new Explosion(${input$entity}.level(), null, 0, 0, 0, 4, true, Explosion.BlockInteraction.DESTROY)))
diff --git a/...20.1/procedures/entity_look_face.java.ftl → ...20.4/procedures/entity_look_face.java.ftl b/...20.1/procedures/entity_look_face.java.ftl → ...20.4/procedures/entity_look_face.java.ftl
diff --git a/...ocedures/entity_looking_at_block.java.ftl → ...ocedures/entity_looking_at_block.java.ftl b/...ocedures/entity_looking_at_block.java.ftl → ...ocedures/entity_looking_at_block.java.ftl
diff --git a/...20.1/procedures/entity_lookpos_x.java.ftl → ...20.4/procedures/entity_lookpos_x.java.ftl b/...20.1/procedures/entity_lookpos_x.java.ftl → ...20.4/procedures/entity_lookpos_x.java.ftl
diff --git a/...20.1/procedures/entity_lookpos_y.java.ftl → ...20.4/procedures/entity_lookpos_y.java.ftl b/...20.1/procedures/entity_lookpos_y.java.ftl → ...20.4/procedures/entity_lookpos_y.java.ftl
diff --git a/...20.1/procedures/entity_lookpos_z.java.ftl → ...20.4/procedures/entity_lookpos_z.java.ftl b/...20.1/procedures/entity_lookpos_z.java.ftl → ...20.4/procedures/entity_lookpos_z.java.ftl
diff --git a/...edures/entity_loot_table_foreach.java.ftl → ...edures/entity_loot_table_foreach.java.ftl b/...edures/entity_loot_table_foreach.java.ftl → ...edures/entity_loot_table_foreach.java.ftl
diff --git a/...ge-1.20.1/procedures/entity_name.java.ftl → ...ge-1.20.4/procedures/entity_name.java.ftl b/...ge-1.20.1/procedures/entity_name.java.ftl → ...ge-1.20.4/procedures/entity_name.java.ftl
diff --git a/...nerator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_isimmunetoexplosions.java.ftl b/...nerator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_isimmunetoexplosions.java.ftl
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		(${input$entity}.ignoreExplosion(new Explosion(${input$entity}.level(), null, 0, 0, 0, 4, true, Explosion.BlockInteraction.DESTROY)))