Some fixes

Author: Spectrall368

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

@@ -2,110 +2,137 @@ _default:
   - NoOpFeature
   - NoFeatureConfig
   - NoFeatureConfig.field_236558_a_
+  - Feature.NO_OP
 feature_no_op:
   - NoOpFeature
   - NoFeatureConfig
   - NoFeatureConfig.field_236558_a_
+  - Feature.NO_OP
 feature_lake:
   - LakesFeature
   - BlockStateFeatureConfig
   - BlockStateFeatureConfig.field_236455_a_
+  - Feature.LAKE
 feature_simple_block:
   - Feature<BlockStateFeatureConfig>
   - BlockStateFeatureConfig
   - BlockStateFeatureConfig.field_236455_a_
+  - Feature.SIMPLE_BLOCK
 feature_block_pile:
   - BlockPileFeature
   - BlockStateProvidingFeatureConfig
   - BlockStateProvidingFeatureConfig.field_236453_a_
+  - Feature.BLOCK_PILE
 feature_huge_brown_mushroom:
   - BigBrownMushroomFeature
   - BigMushroomFeatureConfig
   - BigMushroomFeatureConfig.CODEC
+  - Feature.HUGE_BROWN_MUSHROOM
 feature_huge_red_mushroom:
   - BigRedMushroomFeature
   - BigMushroomFeatureConfig
   - BigMushroomFeatureConfig.CODEC
+  - Feature.HUGE_RED_MUSHROOM
 feature_coral_claw:
   - CoralClawFeature
   - NoFeatureConfig
   - NoFeatureConfig.field_236558_a_
+  - Feature.CORAL_CLAW
 feature_coral_mushroom:
   - CoralMushroomFeature
   - NoFeatureConfig
   - NoFeatureConfig.field_236558_a_
+  - Feature.CORAL_MUSHROOM
 feature_coral_tree:
   - CoralTreeFeature
   - NoFeatureConfig
   - NoFeatureConfig.field_236558_a_
+  - Feature.CORAL_TREE
 feature_forest_rock:
   - BlockBlobFeature
   - BlockStateFeatureConfig
   - BlockStateFeatureConfig.field_236455_a_
+  - Feature.FOREST_ROCK
 feature_huge_fungus:
   - HugeFungusFeature
   - HugeFungusConfig
   - HugeFungusConfig.field_236298_a_
+  - Feature.HUGE_FUNGUS
 feature_delta:
   - BasaltDeltasStructure
   - BasaltDeltasFeature
   - BasaltDeltasFeature.field_236495_a_
+  - Feature.DELTA_FEATURE
 feature_replace_sphere:
   - SphereReplaceFeature
   - SphereReplaceConfig
   - SphereReplaceConfig.field_236516_a_
+  - Feature.DISK
 feature_seagrass:
   - SeaGrassFeature
   - ProbabilityConfig
   - ProbabilityConfig.CODEC
+  - Feature.SEAGRASS
 feature_bamboo:
   - BambooFeature
   - ProbabilityConfig
   - ProbabilityConfig.CODEC
+  - Feature.BAMBOO
 feature_random_patch_simple:
   - RandomPatchFeature
   - BlockClusterFeatureConfig
   - BlockClusterFeatureConfig.field_236587_a_
+  - Feature.RANDOM_PATCH
 feature_ore:
   - OreFeature
   - OreFeatureConfig
   - OreFeatureConfig.CODEC
+  - Feature.ORE
 feature_scattered_ore:
   - NoExposedOreFeature
   - OreFeatureConfig
   - OreFeatureConfig.CODEC
+  - Feature.NO_SURFACE_ORE
 feature_simple_random_selector:
   - SingleRandomFeatureConfig
   - SingleRandomFeature
   - SingleRandomFeature.field_236642_a_
+  - Feature.SIMPLE_RANDOM_SELECTOR
 feature_random_selector:
   - MultipleWithChanceRandomFeature
   - MultipleRandomFeatureConfig
   - MultipleRandomFeatureConfig.field_236583_a_
+  - Feature.RANDOM_SELECTOR
 feature_disk_simple:
   - SphereReplaceFeature
   - SphereReplaceConfig
   - SphereReplaceConfig.field_236516_a_
+  - Feature.DISK
 feature_disk:
   - SphereReplaceFeature
   - SphereReplaceConfig
   - SphereReplaceConfig.field_236516_a_
+  - Feature.DISK
 feature_tree_simple:
   - TreeFeature
   - BaseTreeFeatureConfig
   - BaseTreeFeatureConfig.CODEC
+  - Feature.TREE
 feature_tree_spruce:
   - TreeFeature
   - BaseTreeFeatureConfig
   - BaseTreeFeatureConfig.CODEC
+  - Feature.TREE
 feature_tree_pine:
   - TreeFeature
   - BaseTreeFeatureConfig
   - BaseTreeFeatureConfig.CODEC
+  - Feature.TREE
 feature_spring:
   - SpringFeature
   - LiquidsConfig
   - LiquidsConfig.field_236649_a_
+  - Feature.SPRING_FEATURE
 
 # Custom NBT-based feature, not present in vanilla
 feature_custom_structure:

src/main/resources/forge-1.16.5/features/configured_feature_reference.json.ftl

@@ -1 +1 @@
-${generator.map(field$feature, "configuredfeatures", 1)}
+${generator.map(field$feature, "configuredfeatures")}

src/main/resources/forge-1.16.5/mappings/attributes.yaml

@@ -9,11 +9,11 @@ BLOCK_REACH: ForgeMod.REACH_DISTANCE.get()
 FLYING_SPEED: Attributes.FLYING_SPEED
 FOLLOW_RANGE: Attributes.FOLLOW_RANGE
 ENTITY_GRAVITY: ForgeMod.ENTITY_GRAVITY.get()
-JUMP_STRENGTH: Attributes.JUMP_STRENGTH
+JUMP_STRENGTH: Attributes.HORSE_JUMP_STRENGTH
 KNOCKBACK_RESISTANCE: Attributes.KNOCKBACK_RESISTANCE
 LUCK: Attributes.LUCK
 MAX_HEALTH: Attributes.MAX_HEALTH
 MOVEMENT_SPEED: Attributes.MOVEMENT_SPEED
-SPAWN_REINFORCEMENTS_CHANCE: Attributes.SPAWN_REINFORCEMENTS_CHANCE
+SPAWN_REINFORCEMENTS_CHANCE: Attributes.ZOMBIE_SPAWN_REINFORCEMENTS
 SWIM_SPEED: ForgeMod.SWIM_SPEED.get()
 NAMETAG_RENDER_DISTANCE: ForgeMod.NAMETAG_DISTANCE.get()

src/main/resources/forge-1.16.5/procedures/compare_mcitems_oredictionary.java.ftl

@@ -1,3 +1,3 @@
 <#include "mcelements.ftl">
 <#include "mcitems.ftl">
-(${mappedMCItemToItem(input$a, 1)}.isIn(ItemTags.createOptional(${toResourceLocation(input$b)})))
+(${mappedMCItemToItem(input$a)}.isIn(ItemTags.createOptional(${toResourceLocation(input$b)})))

src/main/resources/forge-1.16.5/procedures/entity_istamed.java.ftl

@@ -1 +1 @@
-(${input$entity} instanceof TamableEntity ? ((TameableEntity) ${input$entity}).isTamed():false)
+(${input$entity} instanceof TameableEntity && ((TameableEntity) ${input$entity}).isTamed())

src/main/resources/forge-1.16.5/procedures/world_data_num_setgamerule.java.ftl

@@ -1,8 +1,8 @@
 <#if generator.map(field$gamerulesnumber, "gamerules") != "null">
-if(world instanceof ServerWorld && ((ServerWorld) world).getServer() != null) {
-	((ServerWorld) world).getServer().getCommandManager().handleCommand(
+if(world instanceof ServerWorld && ((World) world).getServer() != null) {
+	((World) world).getServer().getCommandManager().handleCommand(
 		new CommandSource(ICommandSource.DUMMY, Vector3d.ZERO, Vector2f.ZERO, ((ServerWorld) world),
-			4, "", new StringTextComponent(""), world.getServer(), null).withFeedbackDisabled(),
+			4, "", new StringTextComponent(""), ((World) world).getServer(), null).withFeedbackDisabled(),
 				String.format("gamerule %s %d", (${generator.map(field$gamerulesnumber, "gamerules")}).toString(), ${opt.toInt(input$gameruleValue)}));
 }
 </#if>

src/main/resources/forge-1.16.5/templates/block/block.java.ftl

@@ -741,11 +741,11 @@ public class ${name}Block extends
 					<#elseif data.tintType == "Water">
 						BiomeColors.getWaterColor(world, pos) : -1;
 					<#elseif data.tintType == "Sky">
-						Minecraft.getInstance().world.getBiome(pos).value().getSkyColor() : 8562943;
+						Minecraft.getInstance().world.getBiome(pos).getSkyColor() : 8562943;
 					<#elseif data.tintType == "Fog">
-						Minecraft.getInstance().world.getBiome(pos).value().getFogColor() : 12638463;
+						Minecraft.getInstance().world.getBiome(pos).getFogColor() : 12638463;
 					<#else>
-						Minecraft.getInstance().world.getBiome(pos).value().getWaterFogColor() : 329011;
+						Minecraft.getInstance().world.getBiome(pos).getWaterFogColor() : 329011;
 					</#if>
 				</#if>
 			}, ${JavaModName}Blocks.${REGISTRYNAME}.get());

src/main/resources/forge-1.16.5/templates/fluid/fluidattributes.java.ftl

@@ -63,11 +63,11 @@ public class ${name}FluidAttributes extends FluidAttributes {
 		<#elseif data.tintType == "Water">
 			BiomeColors.getWaterColor(world, pos)
 		<#elseif data.tintType == "Sky">
-			Minecraft.getInstance().world.getBiome(pos).value().getSkyColor()
+			Minecraft.getInstance().world.getBiome(pos).getSkyColor()
 		<#elseif data.tintType == "Fog">
-			Minecraft.getInstance().world.getBiome(pos).value().getFogColor()
+			Minecraft.getInstance().world.getBiome(pos).getFogColor()
 		<#else>
-			Minecraft.getInstance().world.getBiome(pos).value().getWaterFogColor()
+			Minecraft.getInstance().world.getBiome(pos).getWaterFogColor()
 		</#if> | 0xFF000000;
 	}
 	</#if>

src/main/resources/forge-1.16.5/templates/plant/plant.java.ftl

@@ -368,11 +368,11 @@ public class ${name}Block extends ${getPlantClass(data.plantType)}Block
 					<#elseif data.tintType == "Water">
 						BiomeColors.getWaterColor(world, pos) : -1;
 					<#elseif data.tintType == "Sky">
-						Minecraft.getInstance().level.getBiome(pos).value().getSkyColor() : 8562943;
+						Minecraft.getInstance().world.getBiome(pos).getSkyColor() : 8562943;
 					<#elseif data.tintType == "Fog">
-						Minecraft.getInstance().level.getBiome(pos).value().getFogColor() : 12638463;
+						Minecraft.getInstance().world.getBiome(pos).getFogColor() : 12638463;
 					<#else>
-						Minecraft.getInstance().level.getBiome(pos).value().getWaterFogColor() : 329011;
+						Minecraft.getInstance().world.getBiome(pos).getWaterFogColor() : 329011;
 					</#if>
 				</#if>
 			}, ${JavaModName}Blocks.${REGISTRYNAME}.get());

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

@@ -54,9 +54,9 @@
         <#elseif featureType == "configured_feature_reference">
 		        <#return featureConfig + nonHardcodedElements>
 		<#elseif placement == "">
-		        <#return generator.map(featureType, "features", 2) + '.withConfiguration(' + featureConfig + ')'>
+		        <#return generator.map(featureType, "features", 3) + '.withConfiguration(' + featureConfig + ')'>
 		<#else>
-		        <#return generator.map(featureType, "features", 2) + '.withConfiguration(' + featureConfig + ')' + nonHardcodedElements>
+		        <#return generator.map(featureType, "features", 3) + '.withConfiguration(' + featureConfig + ')' + nonHardcodedElements>
 		</#if>
 	</#if>
 </#function>