Procedure improvements

src/main/resources/forge-1.20.1/procedures/entity_get_slot.java.ftl

@@ -1,10 +1 @@
-<#include "mcitems.ftl">
-/*@ItemStack*/(new Object(){
-	public ItemStack getItemStack(int sltid, Entity entity) {
-		AtomicReference<ItemStack> _retval = new AtomicReference<>(ItemStack.EMPTY);
-		entity.getCapability(ForgeCapabilities.ITEM_HANDLER, null).ifPresent(capability -> {
-			_retval.set(capability.getStackInSlot(sltid).copy());
-		});
-		return _retval.get();
-	}
-}.getItemStack(${opt.toInt(input$slotid)}, ${input$entity}))
+/*@ItemStack*/(${input$entity}.getCapability(ForgeCapabilities.ITEM_HANDLER, null) instanceof IItemHandlerModifiable _modHandler${cbi} ? _modHandler${cbi}.getStackInSlot(${opt.toInt(input$slotid)}).copy() : ItemStack.EMPTY)

src/main/resources/forge-1.20.1/procedures/entity_has_item_inventory.java.ftl

@@ -1,2 +1,3 @@
 <#include "mcitems.ftl">
-(${input$entity} instanceof Player _playerHasItem? _playerHasItem.getInventory().contains(${mappedMCItemToItemStackCode(input$item, 1)}):false)
+<@addTemplate file="utils/entity/entity_has_item_inventory.java.ftl"/>
+(hasEntityInInventory(${input$entity}, ${mappedMCItemToItemStackCode(input$item, 1)}))

src/main/resources/forge-1.20.1/procedures/gui_damage_item.java.ftl

@@ -1,7 +1,7 @@
-if(${input$entity} instanceof Player _player && _player.level() instanceof ServerLevel _serverLevel && _player.containerMenu instanceof ${JavaModName}Menus.MenuAccessor _menu) {
+if(${input$entity} instanceof Player _player && _player.containerMenu instanceof ${JavaModName}Menus.MenuAccessor _menu) {
 	ItemStack stack = _menu.getSlots().get(${opt.toInt(input$slotid)}).getItem();
 	if(stack != null) {
-		if(stack.hurt(${opt.toInt(input$amount)},RandomSource.create(),null)){
+		if(stack.hurt(${opt.toInt(input$amount)}, RandomSource.create(), null)) {
 			stack.shrink(1);
 			stack.setDamageValue(0);
 		}

src/main/resources/forge-1.20.1/procedures/gui_get_item_inslot.java.ftl

@@ -1,2 +1,2 @@
 /*@ItemStack*/(${input$entity} instanceof Player _plrSlotItem && _plrSlotItem.containerMenu instanceof ${JavaModName}Menus.MenuAccessor _menu${cbi} ?
-    _menu${cbi}.getSlots().get(${opt.toInt(input$slotid)}).getItem() : ItemStack.EMPTY)
+	_menu${cbi}.getSlots().get(${opt.toInt(input$slotid)}).getItem() : ItemStack.EMPTY)

src/main/resources/forge-1.20.1/procedures/gui_set_text_textfield.java.ftl

@@ -1,4 +1,4 @@
 <#if w.hasElementsOfType("gui")>
 if (${input$entity} instanceof Player _player && _player.containerMenu instanceof ${JavaModName}Menus.MenuAccessor _menu)
-    _menu.sendMenuStateUpdate(_player, 0, "${field$textfield}", ${input$text}, true);
+	_menu.sendMenuStateUpdate(_player, 0, "${field$textfield}", ${input$text}, true);
 </#if>

src/main/resources/forge-1.20.1/procedures/utils/entity/entity_has_item_inventory.java.ftl

@@ -0,0 +1,14 @@
+private static boolean hasEntityInInventory(Entity entity, ItemStack itemstack) {
+	if (entity instanceof Player player) {
+	    Inventory inventory = player.getInventory();
+	    List<NonNullList<ItemStack>> compartments = com.google.common.collect.ImmutableList.of(inventory.items, inventory.armor, inventory.offhand);
+        for (List<ItemStack> list : compartments) {
+            for (ItemStack itemstack2 : list) {
+                if (!itemstack2.isEmpty() && ItemStack.isSameItem(itemstack2, itemstack)) {
+                    return true;
+                }
+            }
+        }
+    }
+	return false;
+}

src/main/resources/forge-1.20.1/procedures/utils/gui_get_amount_inslot.java.ftl

@@ -0,0 +1,8 @@
+private static int getAmountInGUISlot(Entity entity, int sltid) {
+	if(entity instanceof Player player && player.containerMenu instanceof ${JavaModName}Menus.MenuAccessor menuAccessor) {
+		ItemStack stack = menuAccessor.getSlots().get(sltid).getItem();
+		if(stack != null)
+			return stack.getCount();
+	}
+	return 0;
+}

src/main/resources/forge-1.20.1/procedures/world_trigger_gameevent.java.ftl

@@ -0,0 +1 @@
+world.gameEvent(${input$trigger}, ${generator.map(field$gameevent, "gameevents")}, new Vec3(${input$x}, ${input$y}, ${input$z}));