Some fixes

Author: Spectrall368

src/main/resources/datapack-1.15.x/mappings/features.yaml

@@ -43,21 +43,24 @@ feature_bamboo:
 feature_random_patch_simple:
   - RandomPatchFeature
   - BlockClusterFeatureConfig
-feature_random_patch:
-  - RandomPatchFeature
-  - BlockClusterFeatureConfig
 feature_ore:
   - OreFeature
   - OreFeatureConfig
-feature_replace_single_block:
-  - ReplaceBlockFeature
-  - ReplaceBlockConfig
+feature_scattered_ore:
+  - OreFeature
+  - OreFeatureConfig
 feature_simple_random_selector:
   - SingleRandomFeatureConfig
   - SingleRandomFeature
-feature_spring:
-  - SpringFeature
-  - LiquidsConfig
+feature_random_selector:
+  - MultipleWithChanceRandomFeature
+  - MultipleRandomFeatureConfig
+feature_disk_simple:
+  - SphereReplaceFeature
+  - SphereReplaceConfig
+feature_disk:
+  - SphereReplaceFeature
+  - SphereReplaceConfig
 feature_tree_simple:
   - TreeFeature
   - BaseTreeFeatureConfig
@@ -67,6 +70,9 @@ feature_tree_spruce:
 feature_tree_pine:
   - TreeFeature
   - BaseTreeFeatureConfig
+feature_spring:
+  - SpringFeature
+  - LiquidsConfig
 
 # Custom NBT-based feature, not present in vanilla
 feature_custom_structure:

src/main/resources/forge-1.15.2/templates/plant/treegrower.java.ftl

@@ -33,7 +33,7 @@ package ${package}.block.grower;
 
 <#compress>
 public class ${name}TreeGrower extends <#if (data.megaTrees[0]?has_content) || (data.megaTrees[1]?has_content)>Big</#if>Tree {
-	protected ConfiguredFeature<BaseTreeFeatureConfig, ?> getTreeFeature(Random randomSource, boolean hasFlower) {
+	protected ConfiguredFeature<TreeFeatureConfig, ?> getTreeFeature(Random randomSource, boolean hasFlower) {
 		<#if data.secondaryTreeChance != 0 && (data.trees[1]?has_content || data.flowerTrees[1]?has_content)>
 		if (randomSource.nextFloat() < ${data.secondaryTreeChance}) {
 			<#if data.flowerTrees[1]?has_content>
@@ -49,7 +49,7 @@ public class ${name}TreeGrower extends <#if (data.megaTrees[0]?has_content) || (
 	}
 
 	<#if (data.megaTrees[0]?has_content) || (data.megaTrees[1]?has_content)>
-	protected ConfiguredFeature<BaseTreeFeatureConfig, ?> getHugeTreeFeature(Random randomSource) {
+	protected ConfiguredFeature<HugeTreeFeatureConfig, ?> getHugeTreeFeature(Random randomSource) {
 		<#if data.megaTrees[1]?has_content && data.secondaryTreeChance != 0>
 		return (randomSource.nextFloat() < ${data.secondaryTreeChance}) ? <@toTreeKey data.megaTrees[1]/> : <@toTreeKey data.megaTrees[0]/>;
 		<#else>
@@ -62,7 +62,7 @@ public class ${name}TreeGrower extends <#if (data.megaTrees[0]?has_content) || (
 <#-- @formatter:on -->
 <#macro toTreeKey tree="">
 <#if tree?has_content>
-${generator.map(tree, "configuredfeatures")}
+new ${generator.map(tree, "configuredfeatures")}
 <#else>
 null
 </#if>