Some fixes

Spectrall368 · Spectrall368 · commit 9532b773db4d · 2025-09-17T19:39:41.000+02:00
diff --git a/src/main/resources/forge-1.14.4/procedures/entity_get_shootpower.java.ftl b/src/main/resources/forge-1.14.4/procedures/entity_get_shootpower.java.ftl
@@ -1 +1 @@
-(${input$projectile_entity}.getEntity() instanceof IProjectile ? ((IProjectile) ${input$projectile_entity}.getEntity()).getMotion().distanceTo(Vec3d.ZERO) : 0)
+(${input$projectile_entity}.getEntity() instanceof AbstractArrowEntity ? ((AbstractArrowEntity) ${input$projectile_entity}.getEntity()).getMotion().distanceTo(Vector3d.ZERO):0)
diff --git a/src/main/resources/forge-1.14.4/procedures/entity_istamed.java.ftl b/src/main/resources/forge-1.14.4/procedures/entity_istamed.java.ftl
@@ -1 +1 @@
-(${input$entity} instanceof TamableEntity && ((TameableEntity) ${input$entity}).isTamed())
+(${input$entity} instanceof TameableEntity && ((TameableEntity) ${input$entity}).isTamed())
diff --git a/src/main/resources/forge-1.14.4/procedures/entity_istamed_by.java.ftl b/src/main/resources/forge-1.14.4/procedures/entity_istamed_by.java.ftl
@@ -1,2 +1,2 @@
-(${input$entity} instanceof TamableEntity && ${input$tamedBy} instanceof LivingEntity
+(${input$entity} instanceof TameableEntity && ${input$tamedBy} instanceof LivingEntity
         && ((TameableEntity) ${input$entity}).isOwner((LivingEntity) ${input$tamedBy}))
diff --git a/src/main/resources/forge-1.14.4/procedures/get_command_parameter_blockstate.java.ftl b/src/main/resources/forge-1.14.4/procedures/get_command_parameter_blockstate.java.ftl
@@ -1 +1 @@
-/*@BlockState*/(BlockStateArgument.getBlockState(arguments, "${field$param}").getState().getBlock())
+/*@BlockState*/(BlockStateArgument.getBlockState(arguments, "${field$param}").getState())
diff --git a/src/main/resources/forge-1.14.4/procedures/world_make_portal.java.ftl b/src/main/resources/forge-1.14.4/procedures/world_make_portal.java.ftl
@@ -1,3 +1,3 @@
 <#include "mcelements.ftl">
 if(world instanceof World)
-  ${field$dimension.replace("CUSTOM:", "")}PortalBlock.portalSpawn(world.getWorld(), ${toBlockPos(input$x,input$y,input$z)});
+  ${JavaModName}Blocks.${field$dimension.replace("CUSTOM:", "")?upper_case}_PORTAL.portalSpawn(world.getWorld(), ${toBlockPos(input$x,input$y,input$z)});
diff --git a/src/main/resources/forge-1.14.4/procedures/world_spawn_falling_block.java.ftl b/src/main/resources/forge-1.14.4/procedures/world_spawn_falling_block.java.ftl
@@ -1,6 +1,6 @@
 <#include "mcitems.ftl">
-if (world instanceof ServerWorld) {
-    FallingBlockEntity blockToSpawn = new FallingBlockEntity(world, ${input$x}, ${input$y}, ${input$z}, ${mappedBlockToBlockStateCode(input$block)});
+{
+    FallingBlockEntity blockToSpawn = new FallingBlockEntity(world.getWorld(), ${input$x}, ${input$y}, ${input$z}, ${mappedBlockToBlockStateCode(input$block)});
     blockToSpawn.fallTime = 1;
     world.addEntity(blockToSpawn);
 }
diff --git a/src/main/resources/forge-1.14.4/templates/block/block.java.ftl b/src/main/resources/forge-1.14.4/templates/block/block.java.ftl
@@ -145,7 +145,7 @@ public class ${name}Block extends
 			<#else>
 			3
 			</#if>)
-			.harvestTool(ToolType.${data.destroyTool?upper_case})
+			.harvestTool(ToolType.<#if data.destroyTool?upper_case == "HOE">get("${data.destroyTool}")<#else>${data.destroyTool?upper_case}</#if>)
 		</#if>
 		<#if data.isNotColidable>
 			.doesNotBlockMovement()
diff --git a/src/main/resources/forge-1.14.4/templates/dispensebehaviour.java.ftl b/src/main/resources/forge-1.14.4/templates/dispensebehaviour.java.ftl
@@ -47,7 +47,7 @@ package ${package}.item.extension;
 					int z = blockSource.getBlockPos().getZ();
 
 					<#if hasSuccessCondition>
-						this.successful(<@procedureOBJToConditionCode data.dispenseSuccessCondition/>);
+						this.successful = <@procedureOBJToConditionCode data.dispenseSuccessCondition/>;
 					</#if>
 
 					<#if hasProcedure(data.dispenseResultItemstack)>
diff --git a/src/main/resources/forge-1.14.4/templates/elementinits/fluids.java.ftl b/src/main/resources/forge-1.14.4/templates/elementinits/fluids.java.ftl
@@ -44,14 +44,5 @@ public class ${JavaModName}Fluids {
 	public static final RegistryObject<FlowingFluid> FLOWING_${fluid.getModElement().getRegistryNameUpper()} =
 		REGISTRY.register("flowing_${fluid.getModElement().getRegistryName()}", ${fluid.getModElement().getName()}Fluid.Flowing::new);
 	</#list>
-
-	@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public static class FluidsClientSideHandler {
-		@SubscribeEvent public static void clientSetup(FMLClientSetupEvent event) {
-			<#list fluids as fluid>
-			RenderTypeLookup.setRenderLayer(${fluid.getModElement().getRegistryNameUpper()}.get(), RenderType.getTranslucent());
-			RenderTypeLookup.setRenderLayer(FLOWING_${fluid.getModElement().getRegistryNameUpper()}.get(), RenderType.getTranslucent());
-			</#list>
-		}
-	}
 }
 <#-- @formatter:on -->
diff --git a/src/main/resources/forge-1.14.4/templates/fluid/fluidattributes.java.ftl b/src/main/resources/forge-1.14.4/templates/fluid/fluidattributes.java.ftl
@@ -55,15 +55,15 @@ public class ${name}FluidAttributes extends FluidAttributes {
 		<#elseif data.tintType == "Foliage">
 			BiomeColors.getFoliageColor(world, pos)
 		<#elseif data.tintType == "Default foliage">
-			FoliageColor.getDefault()
+			FoliageColors.getDefault()
 		<#elseif data.tintType == "Birch foliage">
-			FoliageColor.getBirch()
+			FoliageColors.getBirch()
 		<#elseif data.tintType == "Spruce foliage">
-			FoliageColor.getSpruce()
+			FoliageColors.getSpruce()
 		<#elseif data.tintType == "Water">
 			BiomeColors.getWaterColor(world, pos)
 		<#else>
-			Minecraft.getInstance().world.getBiome(pos).value().getWaterFogColor()
+			Minecraft.getInstance().world.getBiome(pos).getWaterFogColor()
 		</#if> | 0xFF000000;
 	}
 	</#if>
diff --git a/src/main/resources/forge-1.14.4/templates/gui/gui_window.java.ftl b/src/main/resources/forge-1.14.4/templates/gui/gui_window.java.ftl
@@ -233,7 +233,7 @@ public class ${name}Screen extends ContainerScreen<${name}Menu> implements ${Jav
 			${component.getName()} = new TextFieldWidget(this.font, this.guiLeft + ${component.gx(data.width) + 1}, this.guiTop + ${component.gy(data.height) + 1},
 			${component.width - 2}, ${component.height - 2}, new TranslationTextComponent("gui.${modid}.${registryname}.${component.getName()}").getString());
 			${component.getName()}.setMaxStringLength(8192);
-			${component.getName()}.setResponder(content -> {
+			${component.getName()}.func_212954_a(content -> {
 				if (!menuStateUpdateActive)
 					container.sendMenuStateUpdate(entity, 0, "${component.getName()}", content, false);
 			});
diff --git a/src/main/resources/forge-1.14.4/templates/livingentity/livingentity.java.ftl b/src/main/resources/forge-1.14.4/templates/livingentity/livingentity.java.ftl
@@ -880,7 +880,7 @@ public class ${name}Entity extends ${extendsClass}Entity <#if interfaces?size gt
 					}
 					<#else>
 					(entityType, world, reason, pos, random) ->
-							(world.getBlockState(pos) == Blocks.WATER && world.getBlockState(pos.up()) == Blocks.WATER)
+							(world.getBlockState(pos).getBlock() == Blocks.WATER && world.getBlockState(pos.up()).getBlock() == Blocks.WATER)
 					</#if>
 			);
 			<#elseif data.mobSpawningType == "undergroundWaterCreature">
@@ -895,7 +895,7 @@ public class ${name}Entity extends ${extendsClass}Entity <#if interfaces?size gt
 					}
 					<#else>
 					(entityType, world, reason, pos, random) -> {
-					    return world.getFluidState(pos.down()).isTagged(FluidTags.WATER) && world.getBlockState(pos.up()) == Blocks.WATER && pos.getY() >= (world.getSeaLevel() - 13) && pos.getY() <= world.getSeaLevel();
+					    return world.getFluidState(pos.down()).isTagged(FluidTags.WATER) && world.getBlockState(pos.up()).getBlock() == Blocks.WATER && pos.getY() >= (world.getSeaLevel() - 13) && pos.getY() <= world.getSeaLevel();
                     }
 					</#if>
 			);
diff --git a/src/main/resources/forge-1.14.4/templates/procedure.java.ftl b/src/main/resources/forge-1.14.4/templates/procedure.java.ftl
@@ -37,6 +37,7 @@ import net.minecraftforge.eventbus.api.Event;
 <#if !(data.skipDependencyNullCheck)>
 	<#list dependencies as dependency>
 		<#if dependency.getRawType() != "number"
+			&& dependency.getRawType() != "dimensiontype"
 			&& dependency.getRawType() != "world"
 			&& dependency.getRawType() != "itemstack"
 			&& dependency.getRawType() != "blockstate"
diff --git a/src/main/resources/forge-1.14.4/triggers/player_use_hoe.java.ftl b/src/main/resources/forge-1.14.4/triggers/player_use_hoe.java.ftl
@@ -1,18 +1,16 @@
 <#include "procedures.java.ftl">
 @Mod.EventBusSubscriber public class ${name}Procedure {
 	@SubscribeEvent public static void onUseHoe(UseHoeEvent event) {
-		if (event.getPlayer() != null) {
-			<#assign dependenciesCode><#compress>
-				<@procedureDependenciesCode dependencies, {
-				"x": "event.getContext().getPos().getX()",
-				"y": "event.getContext().getPos().getY()",
-				"z": "event.getContext().getPos().getZ()",
-				"world": "event.getContext().getWorld()",
-				"entity": "event.getContext()",
-				"blockstate": "event.getContext().getWorld().getBlockState(event.getContext().getPos())",
-				"event": "event"
-				}/>
-			</#compress></#assign>
-			execute(event<#if dependenciesCode?has_content>,</#if>${dependenciesCode});
-		}
-	}
+		<#assign dependenciesCode><#compress>
+			<@procedureDependenciesCode dependencies, {
+			"x": "event.getContext().getPos().getX()",
+			"y": "event.getContext().getPos().getY()",
+			"z": "event.getContext().getPos().getZ()",
+			"world": "event.getPlayer().world",
+			"entity": "event.getPlayer()",
+			"blockstate": "event.getPlayer().world.getBlockState(event.getContext().getPos())",
+			"event": "event"
+			}/>
+		</#compress></#assign>
+		execute(event<#if dependenciesCode?has_content>,</#if>${dependenciesCode});
+	}
diff --git a/src/main/resources/forge-1.14.4/utils/mcelements.ftl b/src/main/resources/forge-1.14.4/utils/mcelements.ftl
@@ -35,3 +35,28 @@
 <#function toBlockPos x y z>
     <#return "new BlockPos(" + opt.removeParentheses(x) + "," + opt.removeParentheses(y) + "," + opt.removeParentheses(z) +")">
 </#function>
+
+<#function toPlacedFeature featureType featureConfig placement="">
+    <#local placementPattern = r'\$([^$]+)\$'>
+    <#local placementMatches = placement?matches(placementPattern)>
+    <#local hasHardcodedElements = (placementMatches?size > 0)>
+    <#local nonHardcodedElements = placement>
+
+    <#if hasHardcodedElements>
+        <#local nonHardcodedElements = placement?replace(placementPattern, "", "r")>
+    </#if>
+
+	<#if featureType == "placed_feature_inline">
+		<#return featureConfig>
+	<#else>
+        <#if featureType == "configured_feature_reference" && placement == "">
+		        <#return featureConfig>
+        <#elseif featureType == "configured_feature_reference">
+		        <#return featureConfig + nonHardcodedElements>
+		<#elseif placement == "">
+		        <#return generator.map(featureType, "features", 3) + '.withConfiguration(' + featureConfig + ')'>
+		<#else>
+		        <#return generator.map(featureType, "features", 3) + '.withConfiguration(' + featureConfig + ')' + nonHardcodedElements>
+		</#if>
+	</#if>
+</#function>
diff --git a/src/main/resources/forge-1.14.4/utils/mcitems.ftl b/src/main/resources/forge-1.14.4/utils/mcitems.ftl
@@ -352,3 +352,20 @@
     </#if>
     <#return '{ "Name": "minecraft:air" }'>
 </#function>
+
+<#function toFeatureState block>
+    <#if block?contains("FeatureUtils") && block?contains(".getDefaultState()")>
+        <#local idx = block?last_index_of(".getDefaultState()")>
+        <#return block?substring(0, idx) + block?substring(idx + ".getDefaultState()"?length)>
+    <#else>
+        <#return block>
+    </#if>
+</#function>
+
+<#function toStateProvidertoFeatureState block>
+    <#return toFeatureState(mappedBlockToBlockStateProvider(block))>
+</#function>
+
+<#function toStatetoFeatureState block>
+    <#return toFeatureState(mappedBlockToBlockStateCode(block))>
+</#function>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-(${input$projectile_entity}.getEntity() instanceof IProjectile ? ((IProjectile) ${input$projectile_entity}.getEntity()).getMotion().distanceTo(Vec3d.ZERO) : 0)`
	`1`	`+(${input$projectile_entity}.getEntity() instanceof AbstractArrowEntity ? ((AbstractArrowEntity) ${input$projectile_entity}.getEntity()).getMotion().distanceTo(Vector3d.ZERO):0)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-(${input$entity} instanceof TamableEntity && ((TameableEntity) ${input$entity}).isTamed())`
	`1`	`+(${input$entity} instanceof TameableEntity && ((TameableEntity) ${input$entity}).isTamed())`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-(${input$entity} instanceof TamableEntity && ${input$tamedBy} instanceof LivingEntity`
	`1`	`+(${input$entity} instanceof TameableEntity && ${input$tamedBy} instanceof LivingEntity`
`2`	`2`	`&& ((TameableEntity) ${input$entity}).isOwner((LivingEntity) ${input$tamedBy}))`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-/@BlockState/(BlockStateArgument.getBlockState(arguments, "${field$param}").getState().getBlock())`
	`1`	`+/@BlockState/(BlockStateArgument.getBlockState(arguments, "${field$param}").getState())`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<#include "mcitems.ftl">`
`2`		`-if (world instanceof ServerWorld) {`
`3`		`- FallingBlockEntity blockToSpawn = new FallingBlockEntity(world, ${input$x}, ${input$y}, ${input$z}, ${mappedBlockToBlockStateCode(input$block)});`
	`2`	`+{`
	`3`	`+ FallingBlockEntity blockToSpawn = new FallingBlockEntity(world.getWorld(), ${input$x}, ${input$y}, ${input$z}, ${mappedBlockToBlockStateCode(input$block)});`
`4`	`4`	`blockToSpawn.fallTime = 1;`
`5`	`5`	`world.addEntity(blockToSpawn);`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public class ${name}Block extends`
`145`	`145`	`<#else>`
`146`	`146`	`3`
`147`	`147`	`</#if>)`
`148`		`- .harvestTool(ToolType.${data.destroyTool?upper_case})`
	`148`	`+ .harvestTool(ToolType.<#if data.destroyTool?upper_case == "HOE">get("${data.destroyTool}")<#else>${data.destroyTool?upper_case}</#if>)`
`149`	`149`	`</#if>`
`150`	`150`	`<#if data.isNotColidable>`
`151`	`151`	`.doesNotBlockMovement()`