Random Patch condition

Author: Spectrall368

src/main/resources/forge-1.17.1/features/feature_random_patch_simple.json.ftl

@@ -1,3 +1,6 @@
 <#include "mcitems.ftl">
 new RandomPatchConfiguration.GrassConfigurationBuilder(${mappedBlockToBlockStateProvider(input$block)}, SimpleBlockPlacer.INSTANCE)
-.tries(${field$tries}).xspread(${field$xzSpread}).zspread(${field$xzSpread}).yspread(${field$ySpread}).build()
+.tries(${field$tries}).xspread(${field$xzSpread}).zspread(${field$xzSpread}).yspread(${field$ySpread}).build()
+$
+if(!(${input$condition})) return false;
+$

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

@@ -8,7 +8,7 @@ import:
 
 java_models:
   key: mojmap-1.17.x
-  compatible: [mojmap-1.18.x, mojmap-1.19.x, mojmap-1.20.x]
+  compatible: [mojmap-1.18.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.17.1/templates/feature/feature.java.ftl

@@ -49,11 +49,18 @@ import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvi
 </#if>
 <#assign placementPattern = r'\$([^$]+)\$'>
 <#assign placementMatches = placementcode?matches(placementPattern)>
-<#assign hardcodedElements = []>
+<#assign placementHardcodedElements = []>
 <#list placementMatches as match>
-    <#assign hardcodedElements = hardcodedElements + [match?groups[1]]>
+    <#assign placementHardcodedElements = placementHardcodedElements + [match?groups[1]]>
 </#list>
-<#assign nonHardcodedElements = placementcode?replace(placementPattern, "", "r")>
+<#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;
@@ -64,8 +71,9 @@ public class ${name}Feature extends ${generator.map(featuretype, "features")} {
 	}
 
 	public static Feature<?> feature() {
+		Random random = new Random();
 		FEATURE = new ${name}Feature();
-		CONFIGURED_FEATURE = <#if featuretype == "configured_feature_reference">${configurationcode}<#else>FEATURE.configured(<#if configurationcode == "">NoneFeatureConfiguration.INSTANCE<#else>${configurationcode}</#if>)</#if><#if data.hasPlacedFeature()>${nonHardcodedElements}</#if>;
+		CONFIGURED_FEATURE = <#if featuretype == "configured_feature_reference">${nonHardcodedConfiguration}<#else>FEATURE.configured(<#if nonHardcodedConfiguration == "">NoneFeatureConfiguration.INSTANCE<#else>${nonHardcodedConfiguration}</#if>)</#if><#if data.hasPlacedFeature()>${nonHardcodedPlacement}</#if>;
 
 		Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, new ResourceLocation("${modid}:${registryname}"), CONFIGURED_FEATURE);
 
@@ -105,7 +113,7 @@ public class ${name}Feature extends ${generator.map(featuretype, "features")} {
 	);
 	</#if>
 
-	<#if data.hasPlacedFeature() && ((data.restrictionBiomes?has_content && cond) || data.hasGenerationConditions() || (hardcodedElements?size > 0))>
+	<#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();
@@ -123,13 +131,13 @@ public class ${name}Feature extends ${generator.map(featuretype, "features")} {
 			return false;
 		</#if>
 
-		<#if data.hasPlacedFeature() && (hardcodedElements?size > 0)>
-            <#list hardcodedElements as element>
+		<#if data.hasPlacedFeature() && (allHardcodedElements?size > 0)>
+            <#list allHardcodedElements as element>
             ${element}
             </#list>
 		</#if>
 
-		return super.place(<#if (hardcodedElements?size > 0)>new FeaturePlaceContext<>(world, context.chunkGenerator(), context.random(), origin, context.config())<#else>context</#if>);
+		return super.place(<#if (allHardcodedElements?size > 0)>new FeaturePlaceContext<>(world, context.chunkGenerator(), context.random(), origin, context.config())<#else>context</#if>);
 	}
 	</#if>
 }</#compress>
@@ -178,4 +186,4 @@ public class ${name}Feature extends ${generator.map(featuretype, "features")} {
         <#assign result = "minecraft:" + noHash />
         <#return input?starts_with("#")?then("#" + result, result)/>
     </#if>
-</#function>
+</#function>