From 191253a2a71abcb0eec80f3bed392c5b870d0e24 Mon Sep 17 00:00:00 2001 From: KlemenDEV <16374228+KlemenDEV@users.noreply.github.com> Date: Sun, 25 Feb 2024 11:14:11 +0100 Subject: [PATCH] Ported some entity data procedure blocks to NF 1.20.4 --- .../neoforge-1.20.4}/procedures/entity_armor_value.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_canusecommand.java.ftl | 0 .../procedures/entity_check_creature_type.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_check_main_hand.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_checkgamemode.java.ftl | 0 .../procedures/entity_get_armor_slot_item.java.ftl | 0 .../procedures/entity_get_controlling_passenger.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_get_fire_ticks.java.ftl | 0 .../procedures/entity_get_first_passenger.java.ftl | 0 .../procedures/entity_get_root_vehicle.java.ftl | 0 .../procedures/entity_get_scoreboard_score.java.ftl | 2 +- .../neoforge-1.20.4}/procedures/entity_get_shootpower.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_get_use_item.java.ftl | 0 .../procedures/entity_get_use_item_ticks.java.ftl | 0 .../procedures/entity_has_item_inventory.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_has_nogravity.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_has_recipe.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_has_screen_open.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_haspotioneffect.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_health.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_health_max.java.ftl | 0 .../procedures/entity_isimmunetoexplosions.java.ftl | 1 + .../neoforge-1.20.4}/procedures/entity_look_face.java.ftl | 0 .../procedures/entity_looking_at_block.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_lookpos_x.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_lookpos_y.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_lookpos_z.java.ftl | 0 .../procedures/entity_loot_table_foreach.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_name.java.ftl | 0 .../procedures/entity_isimmunetoexplosions.java.ftl | 1 - 30 files changed, 2 insertions(+), 2 deletions(-) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_armor_value.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_canusecommand.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_check_creature_type.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_check_main_hand.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_checkgamemode.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_get_armor_slot_item.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_get_controlling_passenger.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_get_fire_ticks.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_get_first_passenger.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_get_root_vehicle.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_get_scoreboard_score.java.ftl (69%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_get_shootpower.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_get_use_item.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_get_use_item_ticks.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_has_item_inventory.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_has_nogravity.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_has_recipe.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_has_screen_open.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_haspotioneffect.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_health.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_health_max.java.ftl (100%) create mode 100644 plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_isimmunetoexplosions.java.ftl rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_look_face.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_looking_at_block.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_lookpos_x.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_lookpos_y.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_lookpos_z.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_loot_table_foreach.java.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_name.java.ftl (100%) delete mode 100644 plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_isimmunetoexplosions.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_armor_value.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_armor_value.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_armor_value.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_armor_value.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_canusecommand.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_canusecommand.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_canusecommand.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_canusecommand.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_check_creature_type.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_check_creature_type.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_check_creature_type.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_check_creature_type.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_check_main_hand.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_check_main_hand.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_check_main_hand.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_check_main_hand.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_checkgamemode.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_checkgamemode.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_checkgamemode.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_checkgamemode.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_armor_slot_item.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_get_armor_slot_item.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_armor_slot_item.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_get_armor_slot_item.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_controlling_passenger.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_get_controlling_passenger.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_controlling_passenger.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_get_controlling_passenger.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_fire_ticks.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_get_fire_ticks.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_fire_ticks.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_get_fire_ticks.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_first_passenger.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_get_first_passenger.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_first_passenger.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_get_first_passenger.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_root_vehicle.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_get_root_vehicle.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_root_vehicle.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_get_root_vehicle.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_scoreboard_score.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_get_scoreboard_score.java.ftl similarity index 69% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_scoreboard_score.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_get_scoreboard_score.java.ftl index a14cd92c508..584bd91bda6 100644 --- a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_scoreboard_score.java.ftl +++ b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/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})) \ No newline at end of file diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_shootpower.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_get_shootpower.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_shootpower.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_get_shootpower.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_use_item.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_get_use_item.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_use_item.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_get_use_item.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_use_item_ticks.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_get_use_item_ticks.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_get_use_item_ticks.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_get_use_item_ticks.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_has_item_inventory.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_has_item_inventory.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_has_item_inventory.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_has_item_inventory.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_has_nogravity.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_has_nogravity.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_has_nogravity.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_has_nogravity.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_has_recipe.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_has_recipe.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_has_recipe.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_has_recipe.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_has_screen_open.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_has_screen_open.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_has_screen_open.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_has_screen_open.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_haspotioneffect.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_haspotioneffect.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_haspotioneffect.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_haspotioneffect.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_health.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_health.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_health.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_health.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_health_max.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_health_max.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_health_max.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.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 new file mode 100644 index 00000000000..8cd3fd37dac --- /dev/null +++ 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))) \ No newline at end of file diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_look_face.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_look_face.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_look_face.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_look_face.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_looking_at_block.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_looking_at_block.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_looking_at_block.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_looking_at_block.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_lookpos_x.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_lookpos_x.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_lookpos_x.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_lookpos_x.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_lookpos_y.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_lookpos_y.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_lookpos_y.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_lookpos_y.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_lookpos_z.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_lookpos_z.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_lookpos_z.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_lookpos_z.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_loot_table_foreach.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_loot_table_foreach.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_loot_table_foreach.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_loot_table_foreach.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_name.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_name.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_name.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_name.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_isimmunetoexplosions.java.ftl b/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_isimmunetoexplosions.java.ftl deleted file mode 100644 index 638113a6f29..00000000000 --- a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_isimmunetoexplosions.java.ftl +++ /dev/null @@ -1 +0,0 @@ -(${input$entity}.ignoreExplosion()) \ No newline at end of file