Some other fixes

Author: Spectrall368

src/main/resources/forge-1.16.5/procedures/compare_mcitems_oredictionary.java.ftl

@@ -1,3 +1,3 @@
 <#include "mcelements.ftl">
 <#include "mcitems.ftl">
-(${mappedMCItemToItemStackCode(input$a, 1)}.isIn(ItemTags.createOptional(${toResourceLocation(input$b)})))
+(${mappedMCItemToItem(input$a, 1)}.isIn(ItemTags.createOptional(${toResourceLocation(input$b)})))

src/main/resources/forge-1.16.5/templates/gui/gui_window.java.ftl

@@ -221,7 +221,7 @@ public class ${name}Screen extends ContainerScreen<${name}Menu> implements ${Jav
 				if (<@procedureOBJToConditionCode component.displayCondition/>)
 			</#if>
 			this.font.func_243248_b(ms,
-				<#if hasProcedure(component.text)><@procedureOBJToStringCode component.text/><#else>new TranslationTextComponent("gui.${modid}.${registryname}.${component.getName()}")</#if>,
+				<#if hasProcedure(component.text)>new StringTextComponent(<@procedureOBJToStringCode component.text/>)<#else>new TranslationTextComponent("gui.${modid}.${registryname}.${component.getName()}")</#if>,
 				${component.gx(data.width)}, ${component.gy(data.height)}, ${component.color.getRGB()});
 		</#list>
 	}

src/main/resources/forge-1.16.5/utils/triggers.java.ftl

@@ -14,15 +14,15 @@
 		@Override @OnlyIn(Dist.CLIENT) public void addInformation(ItemStack itemstack, <#if isBlock>IBlockReader<#else>World</#if> world, List<ITextComponent> list, ITooltipFlag flag) {
 		super.addInformation(itemstack, world, list, flag);
 		<#if hasProcedure(procedure)>
-			Entity entity = Minecraft.getInstance().player;
+			Entity entity = itemstack.getAttachedEntity() != null ? itemstack.getAttachedEntity() : Minecraft.getInstance().player;
 			String hoverText = <@procedureCode procedure, {
 				"x": "entity.getPosX()",
 				"y": "entity.getPosY()",
 				"z": "entity.getPosZ()",
 				"entity": "entity",
 				"world": "entity.world",
 				"itemstack": "itemstack"
- 			}, false/>;
+			}, false/>;
  			if (hoverText != null) {
  				for (String line : hoverText.split("\n")) {
  					list.add(new StringTextComponent(line));