From 6de85769e91725de6c1eb9bfdd7b9c7d2c9971e4 Mon Sep 17 00:00:00 2001 From: gnembon Date: Mon, 10 Feb 2020 02:04:43 -0400 Subject: [PATCH] mapping --- gradle.properties | 2 +- src/main/java/carpet/helpers/FeatureGenerator.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3a54c635..b5a93893 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html minecraft_version=20w06a - yarn_mappings=20w06a+build.6 + yarn_mappings=20w06a+build.15 loader_version=0.7.8+build.184 # Mod Properties diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java index fa58d84f..39ec70f3 100644 --- a/src/main/java/carpet/helpers/FeatureGenerator.java +++ b/src/main/java/carpet/helpers/FeatureGenerator.java @@ -35,7 +35,7 @@ import net.minecraft.world.gen.feature.ShipwreckFeatureConfig; import net.minecraft.world.gen.feature.StructureFeature; import net.minecraft.world.gen.feature.VillageFeatureConfig; import net.minecraft.world.gen.foliage.BlobFoliagePlacer; -import net.minecraft.world.gen.stateprovider.SimpleStateProvider; +import net.minecraft.world.gen.stateprovider.SimpleBlockStateProvider; import java.util.Arrays; import java.util.Collections; @@ -206,7 +206,7 @@ public class FeatureGenerator put("village_savanna", gridCustomStructure(Feature.VILLAGE, new VillageFeatureConfig("village/savanna/town_centers", 6), Biomes.PLAINS)); put("village_taiga", gridCustomStructure(Feature.VILLAGE, new VillageFeatureConfig("village/taiga/town_centers", 6), Biomes.PLAINS)); put("village_snowy", gridCustomStructure(Feature.VILLAGE, new VillageFeatureConfig("village/snowy/town_centers", 6), Biomes.PLAINS)); - put("nether_fossil", ((StructureFeatureInterface)Feature.field_22190)::gridAnywhere); + put("nether_fossil", ((StructureFeatureInterface)Feature.NETHER_FOSSIL)::gridAnywhere); }}; @@ -216,8 +216,8 @@ public class FeatureGenerator put("oak", simpleTree(DefaultBiomeFeatures.OAK_TREE_CONFIG)); put("oak_beehive", simpleTree( (new BranchedTreeFeatureConfig.Builder( - new SimpleStateProvider(Blocks.OAK_LOG.getDefaultState()), - new SimpleStateProvider(Blocks.OAK_LEAVES.getDefaultState()), + new SimpleBlockStateProvider(Blocks.OAK_LOG.getDefaultState()), + new SimpleBlockStateProvider(Blocks.OAK_LEAVES.getDefaultState()), new BlobFoliagePlacer(2, 0)) ).baseHeight(4).heightRandA(2).foliageHeight(3).noVines() .treeDecorators(ImmutableList.of(new BeehiveTreeDecorator(1.0F))).build() @@ -225,8 +225,8 @@ public class FeatureGenerator put("oak_large", simplePlop(Feature.FANCY_TREE.configure(DefaultBiomeFeatures.FANCY_TREE_CONFIG))); put("oak_large_beehive", simplePlop(Feature.FANCY_TREE.configure( (new BranchedTreeFeatureConfig.Builder( - new SimpleStateProvider(Blocks.OAK_LOG.getDefaultState()), - new SimpleStateProvider(Blocks.OAK_LEAVES.getDefaultState()), + new SimpleBlockStateProvider(Blocks.OAK_LOG.getDefaultState()), + new SimpleBlockStateProvider(Blocks.OAK_LEAVES.getDefaultState()), new BlobFoliagePlacer(0, 0)) ).treeDecorators(ImmutableList.of(new BeehiveTreeDecorator(1.0F))).build() ))); @@ -331,7 +331,7 @@ public class FeatureGenerator put("village_savanna", spawnCustomStructure(Feature.VILLAGE, new VillageFeatureConfig("village/savanna/town_centers", 6), Biomes.PLAINS)); put("village_taiga", spawnCustomStructure(Feature.VILLAGE, new VillageFeatureConfig("village/taiga/town_centers", 6), Biomes.PLAINS)); put("village_snowy", spawnCustomStructure(Feature.VILLAGE, new VillageFeatureConfig("village/snowy/town_centers", 6), Biomes.PLAINS)); - put("nether_fossil", ((StructureFeatureInterface)Feature.field_22190)::plopAnywhere); + put("nether_fossil", ((StructureFeatureInterface)Feature.NETHER_FOSSIL)::plopAnywhere); }}; }