From c014403225dc0d55b4bd8150bc12451fc8b02329 Mon Sep 17 00:00:00 2001 From: KlemenDEV <16374228+KlemenDEV@users.noreply.github.com> Date: Sun, 25 Feb 2024 16:45:38 +0100 Subject: [PATCH] Ported some more entity procedure blocks to NF 1.20.4 --- .../neoforge-1.20.4}/procedures/entity_remove_recipe.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_remove_xp.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_remove_xp_level.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_rotate_to_face.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_run_function.java.ftl | 2 +- .../neoforge-1.20.4}/procedures/entity_send_chat.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_stop_navigation.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_swing_mainhand.java.ftl | 0 .../neoforge-1.20.4}/procedures/entity_swing_offhand.java.ftl | 0 .../procedures/entity_switch_dimension.java.ftl | 0 10 files changed, 1 insertion(+), 1 deletion(-) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_remove_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_remove_xp.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_remove_xp_level.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_rotate_to_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_run_function.java.ftl (63%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/procedures/entity_send_chat.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_stop_navigation.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_swing_mainhand.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_swing_offhand.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_switch_dimension.java.ftl (100%) diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_remove_recipe.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_remove_recipe.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_remove_recipe.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_remove_recipe.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_remove_xp.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_remove_xp.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_remove_xp.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_remove_xp.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_remove_xp_level.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_remove_xp_level.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_remove_xp_level.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_remove_xp_level.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_rotate_to_face.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_rotate_to_face.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_rotate_to_face.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_rotate_to_face.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_run_function.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_run_function.java.ftl similarity index 63% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_run_function.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_run_function.java.ftl index a71c936f183..24ab8e57f98 100644 --- a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_run_function.java.ftl +++ b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_run_function.java.ftl @@ -2,7 +2,7 @@ { Entity _ent = ${input$entity}; if (!_ent.level().isClientSide() && _ent.getServer() != null) { - Optional _fopt = _ent.getServer().getFunctions().get(${toResourceLocation(input$function)}); + Optional> _fopt = _ent.getServer().getFunctions().get(${toResourceLocation(input$function)}); if (_fopt.isPresent()) _ent.getServer().getFunctions().execute(_fopt.get(), _ent.createCommandSourceStack()); } diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_send_chat.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_send_chat.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_send_chat.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_send_chat.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_stop_navigation.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_stop_navigation.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_stop_navigation.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_stop_navigation.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_swing_mainhand.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_swing_mainhand.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_swing_mainhand.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_swing_mainhand.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_swing_offhand.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_swing_offhand.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_swing_offhand.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_swing_offhand.java.ftl diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_switch_dimension.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_switch_dimension.java.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/procedures/entity_switch_dimension.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/procedures/entity_switch_dimension.java.ftl