Added some entity procedures (MCreator#4221)

* Added some entity procedures * Fix * Fix * eliminated "entity is on rails" procedure * Improved the text of the procedure "is the entity attackable?" Co-authored-by: Max094Reikeb <[email protected]> * Added "get percent frozen" procedure block instead of entity is fully frozen * Dropped support for "entity is ignoring block triggers" procedure block * Fix * Fix * Fix * Fix * applied the changes suggested by Klemen * Slight text change --------- Co-authored-by: Max094Reikeb <[email protected]> Co-authored-by: KlemenDEV <[email protected]>
willpill · Oct 19, 2023 · 3f40575 · 3f40575
1 parent 8d4e94e
commit 3f40575
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 0 deletions.
diff --git a/plugins/generator-1.19.4/forge-1.19.4/procedures/entity_get_percent_frozen.java.ftl b/plugins/generator-1.19.4/forge-1.19.4/procedures/entity_get_percent_frozen.java.ftl
@@ -0,0 +1 @@
+/*@float*/(${input$entity}.getPercentFrozen() * 100)
diff --git a/plugins/generator-1.19.4/forge-1.19.4/procedures/entity_is_attackable.java.ftl b/plugins/generator-1.19.4/forge-1.19.4/procedures/entity_is_attackable.java.ftl
@@ -0,0 +1 @@
+(${input$entity}.isAttackable())
diff --git a/plugins/generator-1.19.4/forge-1.19.4/procedures/entity_is_underwater.java.ftl b/plugins/generator-1.19.4/forge-1.19.4/procedures/entity_is_underwater.java.ftl
@@ -0,0 +1 @@
+(${input$entity}.isUnderWater())
diff --git a/plugins/generator-1.20.1/forge-1.20.1/procedures/entity_get_percent_frozen.java.ftl b/plugins/generator-1.20.1/forge-1.20.1/procedures/entity_get_percent_frozen.java.ftl
@@ -0,0 +1 @@
+/*@float*/(${input$entity}.getPercentFrozen() * 100)
diff --git a/plugins/generator-1.20.1/forge-1.20.1/procedures/entity_is_attackable.java.ftl b/plugins/generator-1.20.1/forge-1.20.1/procedures/entity_is_attackable.java.ftl
@@ -0,0 +1 @@
+(${input$entity}.isAttackable())
diff --git a/plugins/generator-1.20.1/forge-1.20.1/procedures/entity_is_underwater.java.ftl b/plugins/generator-1.20.1/forge-1.20.1/procedures/entity_is_underwater.java.ftl
@@ -0,0 +1 @@
+(${input$entity}.isUnderWater())
diff --git a/plugins/mcreator-core/procedures/entity_get_percent_frozen.json b/plugins/mcreator-core/procedures/entity_get_percent_frozen.json
@@ -0,0 +1,20 @@
+{
+  "args0": [
+    {
+      "type": "input_value",
+      "name": "entity",
+      "check": "Entity"
+    }
+  ],
+  "output": "Number",
+  "colour": "%{BKY_MATH_HUE}",
+  "mcreator": {
+    "toolbox_id": "entitydata",
+    "toolbox_init": [
+      "<value name=\"entity\"><block type=\"entity_from_deps\"></block></value>"
+    ],
+    "inputs": [
+      "entity"
+    ]
+  }
+}
diff --git a/plugins/mcreator-core/procedures/entity_is_attackable.json b/plugins/mcreator-core/procedures/entity_is_attackable.json
@@ -0,0 +1,20 @@
+{
+  "args0": [
+    {
+      "type": "input_value",
+      "name": "entity",
+      "check": "Entity"
+    }
+  ],
+  "output": "Boolean",
+  "colour": "%{BKY_LOGIC_HUE}",
+  "mcreator": {
+    "toolbox_id": "entitydata",
+    "toolbox_init": [
+      "<value name=\"entity\"><block type=\"entity_from_deps\"></block></value>"
+    ],
+    "inputs": [
+      "entity"
+    ]
+  }
+}
diff --git a/plugins/mcreator-core/procedures/entity_is_underwater.json b/plugins/mcreator-core/procedures/entity_is_underwater.json
@@ -0,0 +1,20 @@
+{
+  "args0": [
+    {
+      "type": "input_value",
+      "name": "entity",
+      "check": "Entity"
+    }
+  ],
+  "output": "Boolean",
+  "colour": "%{BKY_LOGIC_HUE}",
+  "mcreator": {
+    "toolbox_id": "entitydata",
+    "toolbox_init": [
+      "<value name=\"entity\"><block type=\"entity_from_deps\"></block></value>"
+    ],
+    "inputs": [
+      "entity"
+    ]
+  }
+}
diff --git a/plugins/mcreator-localization/lang/texts.properties b/plugins/mcreator-localization/lang/texts.properties
@@ -912,6 +912,7 @@ blockly.block.entity_get_first_passenger=%2 Get first passenger of %1
 blockly.block.entity_get_fire_ticks=Get remaining ticks on fire of %1
 blockly.block.entity_get_fly_speed=Get fly speed of %1
 blockly.block.entity_get_oxygen=Get oxygen of %1
+blockly.block.entity_get_percent_frozen=Get frozen percentage of %1
 blockly.block.entity_get_root_vehicle=Get lowest entity that %1 is riding, or self if not riding anything
 blockly.block.entity_get_saturation=Get food saturation level of %1
 blockly.block.entity_get_scoreboard_score=Get %2 scoreboard score for %1
@@ -935,10 +936,12 @@ blockly.block.entity_haspotioneffect=Has %1 active potion %2
 blockly.block.entity_health=Current health of %1
 blockly.block.entity_health_max=Max health of %1
 blockly.block.entity_inventory_foreach=For each slot of inventory of %1 get contents copy as %2 do %3
+blockly.block.entity_is_attackable=Can %1 be attacked
 blockly.block.entity_is_elytra_flying=Is %1 elytra flying
 blockly.block.entity_is_glowing=Is %1 glowing
 blockly.block.entity_is_swimming=Is %1 swimming
 blockly.block.entity_is_tagged_in=Is %1 tagged in entity tags as %2
+blockly.block.entity_is_underwater=Is %1 under water
 blockly.block.entity_isalive=Is %1 alive
 blockly.block.entity_isbeingridden=Is %1 being ridden
 blockly.block.entity_isblocking=Is %1 blocking
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/@float/(${input$entity}.getPercentFrozen() * 100)