Ported some comparison related procedure blocks to 1.16.4 (#4) (#586)

* Added comparison procedure blocks * Fixed broken tag compare procedures Signed-off-by: KlemenDEV <klemen.pylo@gmail.com> Co-authored-by: KlemenDEV <klemen.pylo@gmail.com>
MCreator · Dec 2, 2020 · d522598 · d522598
1 parent e6bb0c0
commit d522598
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 0 deletions.
diff --git a/plugins/generator-1.16.4/forge-1.16.4/procedures/advancement_isequalto.java.ftl b/plugins/generator-1.16.4/forge-1.16.4/procedures/advancement_isequalto.java.ftl
@@ -0,0 +1,2 @@
+(world instanceof World && ((World) world).getServer() != null?((World) world).getServer().getAdvancementManager()
+    .getAdvancement(new ResourceLocation("${generator.map(field$achievement, "achievements")}" )).equals(advancement):false)
diff --git a/plugins/generator-1.16.4/forge-1.16.4/procedures/blockitem_to_mcitem.java.ftl b/plugins/generator-1.16.4/forge-1.16.4/procedures/blockitem_to_mcitem.java.ftl
@@ -0,0 +1,2 @@
+<#include "mcitems.ftl">
+/*@ItemStack*/(new ItemStack(${mappedBlockToBlockStateCode(input$source)}.getBlock()))
diff --git a/plugins/generator-1.16.4/forge-1.16.4/procedures/compare_directions.java.ftl b/plugins/generator-1.16.4/forge-1.16.4/procedures/compare_directions.java.ftl
@@ -0,0 +1 @@
+(${input$a} == ${input$b})
diff --git a/plugins/generator-1.16.4/forge-1.16.4/procedures/compare_entities.java.ftl b/plugins/generator-1.16.4/forge-1.16.4/procedures/compare_entities.java.ftl
@@ -0,0 +1 @@
+(${input$a} == ${input$b})
diff --git a/plugins/generator-1.16.4/forge-1.16.4/procedures/compare_mcblock_material.java.ftl b/plugins/generator-1.16.4/forge-1.16.4/procedures/compare_mcblock_material.java.ftl
@@ -0,0 +1,2 @@
+<#include "mcitems.ftl">
+(${mappedBlockToBlockStateCode(input$a)}.getMaterial() == net.minecraft.block.material.Material.${generator.map(field$material, "materials")})
diff --git a/plugins/generator-1.16.4/forge-1.16.4/procedures/compare_mcblocks.java.ftl b/plugins/generator-1.16.4/forge-1.16.4/procedures/compare_mcblocks.java.ftl
@@ -0,0 +1,2 @@
+<#include "mcitems.ftl">
+(${mappedBlockToBlockStateCode(input$a)}.getBlock()== ${mappedBlockToBlockStateCode(input$b)}.getBlock())
diff --git a/plugins/generator-1.16.4/forge-1.16.4/procedures/compare_mcblocks_exact.java.ftl b/plugins/generator-1.16.4/forge-1.16.4/procedures/compare_mcblocks_exact.java.ftl
@@ -0,0 +1,2 @@
+<#include "mcitems.ftl">
+(${mappedBlockToBlockStateCode(input$a)}.getBlock()== ${mappedBlockToBlockStateCode(input$b)}.getBlock())
diff --git a/plugins/generator-1.16.4/forge-1.16.4/procedures/compare_mcitems.java.ftl b/plugins/generator-1.16.4/forge-1.16.4/procedures/compare_mcitems.java.ftl
@@ -0,0 +1,2 @@
+<#include "mcitems.ftl">
+(${mappedMCItemToItemStackCode(input$a,1)}.getItem() == ${mappedMCItemToItemStackCode(input$b,1)}.getItem())
diff --git a/plugins/generator-1.16.4/forge-1.16.4/procedures/compare_mcitems_exact.java.ftl b/plugins/generator-1.16.4/forge-1.16.4/procedures/compare_mcitems_exact.java.ftl
@@ -0,0 +1,2 @@
+<#include "mcitems.ftl">
+(${mappedMCItemToItemStackCode(input$a,1)}.getItem() == ${mappedMCItemToItemStackCode(input$b,1)}.getItem())
diff --git a/plugins/generator-1.16.4/forge-1.16.4/procedures/compare_mcitems_oredictionary.java.ftl b/plugins/generator-1.16.4/forge-1.16.4/procedures/compare_mcitems_oredictionary.java.ftl
@@ -0,0 +1,2 @@
+<#include "mcitems.ftl">
+(ItemTags.getCollection().getTagByID(new ResourceLocation((${input$b}).toLowerCase(java.util.Locale.ENGLISH))).contains(${mappedMCItemToItemStackCode(input$a,1)}.getItem()))
diff --git a/...ins/generator-1.16.4/forge-1.16.4/procedures/compare_mcitems_oredictionary_exact.java.ftl b/...ins/generator-1.16.4/forge-1.16.4/procedures/compare_mcitems_oredictionary_exact.java.ftl
@@ -0,0 +1,2 @@
+<#include "mcitems.ftl">
+(ItemTags.getCollection().getTagByID(new ResourceLocation((${input$b}).toLowerCase(java.util.Locale.ENGLISH))).contains(${mappedMCItemToItemStackCode(input$a,1)}.getItem()))