From b9bd5ec17d207ea3cb827425f139825b8c6a54df Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 5 Feb 2020 18:24:01 -0400 Subject: [PATCH] 20w06a features --- .../java/carpet/helpers/FeatureGenerator.java | 16 ++++++++++++++++ src/main/java/carpet/utils/BlockInfo.java | 18 ++++++++++++++++++ .../resources/assets/carpet/scripts/overlay.sc | 3 +++ 3 files changed, 37 insertions(+) diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java index 3a9132dc..9ac18754 100644 --- a/src/main/java/carpet/helpers/FeatureGenerator.java +++ b/src/main/java/carpet/helpers/FeatureGenerator.java @@ -5,6 +5,7 @@ import carpet.fakes.StructureFeatureInterface; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import net.minecraft.block.Blocks; +import net.minecraft.class_4780; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; @@ -43,6 +44,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; public class FeatureGenerator { @@ -161,6 +163,7 @@ public class FeatureGenerator structureToFeature.put("Mineshaft", Arrays.asList("mineshaft", "mineshaft_mesa")); structureToFeature.put("Igloo", Collections.singletonList("igloo")); structureToFeature.put("Fortress", Collections.singletonList("fortress")); + structureToFeature.put("Nether_Fossil", Collections.singletonList("nether_fossil")); structureToFeature.forEach((key, value) -> value.forEach(el -> featureToStructure.put(el, key))); } @@ -204,6 +207,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); }}; @@ -282,6 +286,17 @@ public class FeatureGenerator :simplePlop(Feature.CORAL_CLAW).plop(w, p)); put("sea_pickle", simplePlop(Feature.SEA_PICKLE.configure( new SeaPickleFeatureConfig(20)))); put("boulder", simplePlop(Feature.FOREST_ROCK.configure( new BoulderFeatureConfig(Blocks.MOSSY_COBBLESTONE.getDefaultState(), 0)))); + put("crimson_fungi", simplePlop(Feature.HUGE_FUNGI.configure(DefaultBiomeFeatures.field_22052))); // crimson + put("warped_fungi", simplePlop(Feature.HUGE_FUNGI.configure(DefaultBiomeFeatures.field_22053))); // warped + put("nether_forest_vegatation", simplePlop(Feature.NETHER_FOREST_VEGETATION.configure(DefaultBiomeFeatures.field_22054))); + put("weeping_vines", simplePlop(Feature.WEEPING_VINES)); + put("basalt_pillar", simplePlop(Feature.BASALT_PILLAR)); + + + + + + //structures put("monument", ((StructureFeatureInterface)Feature.OCEAN_MONUMENT)::plopAnywhere); put("fortress", ((StructureFeatureInterface)Feature.NETHER_BRIDGE)::plopAnywhere); @@ -320,6 +335,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); }}; } diff --git a/src/main/java/carpet/utils/BlockInfo.java b/src/main/java/carpet/utils/BlockInfo.java index 30da08fd..043465b1 100644 --- a/src/main/java/carpet/utils/BlockInfo.java +++ b/src/main/java/carpet/utils/BlockInfo.java @@ -45,6 +45,23 @@ public class BlockInfo put(BlockSoundGroup.STEM , "stem" ); put(BlockSoundGroup.NETHER_WART , "wart" ); put(BlockSoundGroup.LANTERN , "lantern" ); + put(BlockSoundGroup.field_22152, "fungi_stem"); + put(BlockSoundGroup.field_22153, "nylium"); + put(BlockSoundGroup.field_22154, "fungi"); + put(BlockSoundGroup.field_22138, "roots"); + put(BlockSoundGroup.field_22139, "shroomlight"); + put(BlockSoundGroup.field_22140, "weeping_vines"); + put(BlockSoundGroup.field_22141, "soul_sand"); + put(BlockSoundGroup.field_22142, "soul_soil"); + put(BlockSoundGroup.field_22143, "basalt"); + put(BlockSoundGroup.field_22144, "wart"); + put(BlockSoundGroup.field_22145, "netherrack"); + put(BlockSoundGroup.field_22146, "nether_bricks"); + put(BlockSoundGroup.field_22147, "nether_sprouts"); + put(BlockSoundGroup.field_22148, "nether_ore"); + put(BlockSoundGroup.field_22149, "bone"); + put(BlockSoundGroup.field_22150, "netherite"); + put(BlockSoundGroup.field_22151, "ancient_debris"); }}; public static final Map mapColourName = new HashMap() {{ @@ -127,6 +144,7 @@ public class BlockInfo put(Material.SPONGE , "sponge" ); put(Material.SHULKER_BOX , "shulker" ); put(Material.WOOD , "wood" ); + put(Material.field_22223 , "nether_wood" ); put(Material.BAMBOO_SAPLING , "shoots" ); put(Material.BAMBOO , "bamboo" ); put(Material.WOOL , "wool" ); diff --git a/src/main/resources/assets/carpet/scripts/overlay.sc b/src/main/resources/assets/carpet/scripts/overlay.sc index 290a51f1..9df01c9d 100644 --- a/src/main/resources/assets/carpet/scripts/overlay.sc +++ b/src/main/resources/assets/carpet/scripts/overlay.sc @@ -39,8 +39,11 @@ treasure() -> __toggle('treasure', 'structures'); pillager_outpost() -> __toggle('pillager_outpost', 'structures'); mineshaft() -> __toggle('mineshaft', 'structures'); village() -> __toggle('village', 'structures'); +nether_fossil() -> __toggle('nether_fossil', 'structures'); + slime_chunks() -> __toggle('slime_chunks', 'chunks'); + clear() -> for(global_renderers, global_renderers:_:'tasks' = m() ); __toggle(feature, renderer) ->