Added PlacementFixed + Support for 1.21.x models

Author: Spectrall368

src/main/resources/forge-1.18.2/features/placement_fixed.json.ftl

@@ -0,0 +1,8 @@
+$if(!(
+  <#if field_list$x?size != 0>
+    <#list 0..field_list$x?size-1 as i>
+    (context.origin().getX() == ${field_list$x[i]} && context.origin().getY() == ${field_list$y[i]} && context.origin().getZ() == ${field_list$z[i]})
+    <#sep> ||</#list>
+  <#else>false</#if>
+  ))
+return false;$

src/main/resources/forge-1.18.2/generator.yaml

@@ -8,7 +8,7 @@ import:
 
 java_models:
   key: mojmap-1.18.x
-  compatible: [mojmap-1.17.x, mojmap-1.19.x, mojmap-1.20.x]
+  compatible: [mojmap-1.17.x, mojmap-1.19.x, mojmap-1.20.x, mojmap-1.21.x]
   requested_key_words: [ModelPart, ~ModelRenderer, ~(ResourceLocation.]
 
 # gradle task definitions

src/main/resources/forge-1.18.2/templates/feature/feature.java.ftl

@@ -47,6 +47,20 @@ import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvi
 		</#if>
 	</#list>
 </#if>
+<#assign placementPattern = r'\$([^$]+)\$'>
+<#assign placementMatches = placementcode?matches(placementPattern)>
+<#assign placementHardcodedElements = []>
+<#list placementMatches as match>
+    <#assign placementHardcodedElements = placementHardcodedElements + [match?groups[1]]>
+</#list>
+<#assign nonHardcodedPlacement = placementcode?replace(placementPattern, "", "r")>
+<#assign configurationMatches = configurationcode?matches(placementPattern)>
+<#assign configurationHardcodedElements = []>
+<#list configurationMatches as match>
+    <#assign configurationHardcodedElements = configurationHardcodedElements + [match?groups[1]]>
+</#list>
+<#assign nonHardcodedConfiguration = configurationcode?replace(placementPattern, "", "r")>
+<#assign allHardcodedElements = placementHardcodedElements + configurationHardcodedElements>
 <#compress>
 public class ${name}Feature extends ${generator.map(featuretype, "features")} {
 	private static ${name}Feature FEATURE = null;
@@ -59,9 +73,9 @@ public class ${name}Feature extends ${generator.map(featuretype, "features")} {
 
 	public static Feature<?> feature() {
 		FEATURE = new ${name}Feature();
-		CONFIGURED_FEATURE = <#if featuretype == "configured_feature_reference">${configurationcode}<#else>FeatureUtils.register("${modid}:${registryname}", FEATURE, ${configurationcode})</#if>;
+		CONFIGURED_FEATURE = <#if featuretype == "configured_feature_reference">${nonHardcodedConfiguration}<#else>FeatureUtils.register("${modid}:${registryname}", FEATURE, ${nonHardcodedConfiguration})</#if>;
 		PLACED_FEATURE = PlacementUtils.register("${modid}:${registryname}", CONFIGURED_FEATURE,
-			List.of(<#if data.hasPlacedFeature()>${placementcode?remove_ending(",")}</#if>));
+			List.of(<#if data.hasPlacedFeature()>${nonHardcodedPlacement?remove_ending(",")}</#if>));
 		return FEATURE;
 	}
 
@@ -98,7 +112,7 @@ public class ${name}Feature extends ${generator.map(featuretype, "features")} {
 	);
 	</#if>
 
-	<#if data.hasPlacedFeature() && ((data.restrictionBiomes?has_content && cond) || data.hasGenerationConditions())>
+	<#if data.hasPlacedFeature() && (((data.restrictionBiomes?has_content && cond) || data.hasGenerationConditions()) || (allHardcodedElements?size > 0))>
 	@Override public boolean place(FeaturePlaceContext<${configuration}> context) {
 		<#-- #4781 - we need to use WorldGenLevel instead of Level, or one can run incompatible procedures in condition -->
 		WorldGenLevel world = context.level();
@@ -115,6 +129,12 @@ public class ${name}Feature extends ${generator.map(featuretype, "features")} {
 			return false;
 		</#if>
 
+		<#if (allHardcodedElements?size > 0)>
+		    <#list allHardcodedElements as element>
+		    ${element}
+		    </#list>
+		</#if>
+
 		return super.place(context);
 	}
 	</#if>

src/main/resources/forge-1.18.2/utils/mcelements.ftl

@@ -37,17 +37,26 @@
 </#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 'PlacementUtils.inlinePlaced(' + featureConfig + ')'>
         <#elseif featureType == "configured_feature_reference">
-		        <#return 'PlacementUtils.inlinePlaced(' + featureConfig + ',' + placement?remove_ending(",") + ')'>
-		<#elseif placement == "">
+		        <#return 'PlacementUtils.inlinePlaced(' + featureConfig + ',' + nonHardcodedElements?remove_ending(",") + ')'>
+		<#elseif nonHardcodedElements == "">
 		        <#return 'PlacementUtils.inlinePlaced(' + generator.map(featureType, "features", 2) + ', ' + featureConfig + ')'>
 		<#else>
-		        <#return 'PlacementUtils.inlinePlaced(' + generator.map(featureType, "features", 2) + ', ' + featureConfig + ',' + placement?remove_ending(",") + ')'>
+		        <#return 'PlacementUtils.inlinePlaced(' + generator.map(featureType, "features", 2) + ', ' + featureConfig + ',' + nonHardcodedElements?remove_ending(",") + ')'>
 		</#if>
 	</#if>
 </#function>