Bug fixes

Author: Spectrall368

src/main/resources/neoforge-1.20.6/procedures/entity_add_modifier.java.ftl

@@ -1,8 +1,7 @@
-<#include "mcelements.ftl">
 <#assign attr = generator.map(field$attribute, "attributes")>
 if (${input$entity} instanceof LivingEntity _entity) {
-	AttributeModifier modifier = new AttributeModifier(${toResourceLocation('"' + modid + ':' + field$name + '"')}, ${input$value}, AttributeModifier.Operation.${field$operation});
-	if (!_entity.getAttribute(${attr}).hasModifier(modifier.id())) {
+	AttributeModifier modifier = new AttributeModifier(${'"' + modid + ':' + field$name + '"'}, ${input$value}, AttributeModifier.Operation.${field$operation});
+	if (_entity.getAttribute(${attr}).getModifiers().stream().noneMatch((e) -> e.name().equals(modifier.name()))) {
 		<#if field$permanent == "TRUE">
 			_entity.getAttribute(${attr}).addPermanentModifier(modifier);
 		<#else>

src/main/resources/neoforge-1.20.6/procedures/entity_has_modifier.java.ftl

@@ -1,3 +1,2 @@
-<#include "mcelements.ftl">
 (${input$entity} instanceof LivingEntity _livingEntity${cbi} && _livingEntity${cbi}.getAttribute(${generator.map(field$attribute, "attributes")})
-	.hasModifier(${toResourceLocation('"' + modid + ':' + field$name + '"')}))
+	.getModifiers().stream().anyMatch((e) -> e.name().equals(${'"' + modid + ':' + field$name + '"'})))

src/main/resources/neoforge-1.20.6/procedures/entity_remove_modifier.java.ftl

@@ -1,4 +1,5 @@
-<#include "mcelements.ftl">
 if (${input$entity} instanceof LivingEntity _entity) {
-	_entity.getAttribute(${generator.map(field$attribute, "attributes")}).removeModifier(${toResourceLocation('"' + modid + ':' + field$name + '"')});
+	_entity.getAttribute(${generator.map(field$attribute, "attributes")}).getModifiers().forEach((_attribute) -> {
+        if(_attribute.name().equals(${'"' + modid + ':' + field$name + '"'})) _entity.getAttribute(${generator.map(field$attribute, "attributes")}).removeModifier(_attribute);
+	});
 }

src/main/resources/neoforge-1.20.6/templates/block/block.java.ftl

@@ -482,8 +482,8 @@ public class ${name}Block extends
 	</#if>
 
 	<#if data.strippingResult?? && !data.strippingResult.isEmpty()>
-	@Override public BlockState getToolModifiedState(BlockState blockstate, UseOnContext context, ItemAbility itemAbility, boolean simulate) {
-		if (ItemAbilities.AXE_STRIP == itemAbility && context.getItemInHand().canPerformAction(itemAbility)) {
+	@Override public BlockState getToolModifiedState(BlockState blockstate, UseOnContext context, ToolAction itemAbility, boolean simulate) {
+		if (ToolActions.AXE_STRIP == itemAbility && context.getItemInHand().canPerformAction(itemAbility)) {
 			return ${mappedBlockToBlock(data.strippingResult)}.withPropertiesOf(blockstate);
 		}
 		return super.getToolModifiedState(blockstate, context, itemAbility, simulate);

src/main/resources/neoforge-1.20.6/templates/item/item_renderer.java.ftl

@@ -94,7 +94,7 @@ package ${package}.client.renderer.item;
 		else
 		</#if>
 		model.setupAnim(null, 0, 0, (System.currentTimeMillis() - start) / 50.0f, 0, 0);
-		model.renderToBuffer(poseStack, vertexConsumer, packedLight, packedOverlay);
+		model.renderToBuffer(poseStack, vertexConsumer, packedLight, packedOverlay, 1, 1, 1, 1);
 		poseStack.popPose();
 	}
 

src/main/resources/neoforge-1.20.6/templates/plant/plant.java.ftl

@@ -187,8 +187,8 @@ public class ${name}Block extends ${getPlantClass(data.plantType)}Block
 	</#if>
 
 	<#if data.strippingResult?? && !data.strippingResult.isEmpty()>
-	@Override public BlockState getToolModifiedState(BlockState blockstate, UseOnContext context, ItemAbility itemAbility, boolean simulate) {
-		if (ItemAbilities.AXE_STRIP == itemAbility && context.getItemInHand().canPerformAction(itemAbility)) {
+	@Override public BlockState getToolModifiedState(BlockState blockstate, UseOnContext context, ToolAction itemAbility, boolean simulate) {
+		if (ToolActions.AXE_STRIP == itemAbility && context.getItemInHand().canPerformAction(itemAbility)) {
 			return ${mappedBlockToBlock(data.strippingResult)}.withPropertiesOf(blockstate);
 		}
 		return super.getToolModifiedState(blockstate, context, itemAbility, simulate);