Generation of glowing mushrooms

igentuman · igentuman · commit 000451cd97a7 · 2024-12-30T07:04:08.000+01:00
diff --git a/src/generated/resources/assets/emi/lang/en_gb.json b/src/generated/resources/assets/emi/lang/en_gb.json
diff --git a/src/generated/resources/data/nuclearcraft/forge/biome_modifier/glowing_mushroom_biome_modifier.json b/src/generated/resources/data/nuclearcraft/forge/biome_modifier/glowing_mushroom_biome_modifier.json
@@ -0,0 +1,6 @@
+{
+  "type": "forge:add_features",
+  "biomes": "#minecraft:is_nether",
+  "features": "nuclearcraft:glowing_mushroom_placed",
+  "step": "underground_decoration"
+}
diff --git a/src/generated/resources/data/nuclearcraft/loot_tables/blocks/glowing_mushroom.json b/src/generated/resources/data/nuclearcraft/loot_tables/blocks/glowing_mushroom.json
@@ -0,0 +1,17 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "nuclearcraft:glowing_mushroom"
+        }
+      ],
+      "name": "block",
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "nuclearcraft:blocks/glowing_mushroom"
+}
diff --git a/src/generated/resources/data/nuclearcraft/worldgen/configured_feature/glowing_mushroom_feature.json b/src/generated/resources/data/nuclearcraft/worldgen/configured_feature/glowing_mushroom_feature.json
@@ -0,0 +1,48 @@
+{
+  "type": "minecraft:random_patch",
+  "config": {
+    "feature": {
+      "feature": {
+        "type": "minecraft:simple_block",
+        "config": {
+          "to_place": {
+            "type": "minecraft:simple_state_provider",
+            "state": {
+              "Name": "nuclearcraft:glowing_mushroom"
+            }
+          }
+        }
+      },
+      "placement": [
+        {
+          "type": "minecraft:block_predicate_filter",
+          "predicate": {
+            "type": "minecraft:all_of",
+            "predicates": [
+              {
+                "type": "minecraft:matching_blocks",
+                "blocks": "minecraft:air"
+              },
+              {
+                "type": "minecraft:matching_blocks",
+                "blocks": [
+                  "minecraft:soul_soil",
+                  "minecraft:soul_sand",
+                  "minecraft:glowstone"
+                ],
+                "offset": [
+                  0,
+                  -1,
+                  0
+                ]
+              }
+            ]
+          }
+        }
+      ]
+    },
+    "tries": 96,
+    "xz_spread": 7,
+    "y_spread": 3
+  }
+}
diff --git a/src/generated/resources/data/nuclearcraft/worldgen/placed_feature/glowing_mushroom_placed.json b/src/generated/resources/data/nuclearcraft/worldgen/placed_feature/glowing_mushroom_placed.json
@@ -0,0 +1,27 @@
+{
+  "feature": "nuclearcraft:glowing_mushroom_feature",
+  "placement": [
+    {
+      "type": "minecraft:rarity_filter",
+      "chance": 2
+    },
+    {
+      "type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:height_range",
+      "height": {
+        "type": "minecraft:uniform",
+        "max_inclusive": {
+          "below_top": 0
+        },
+        "min_inclusive": {
+          "above_bottom": 0
+        }
+      }
+    },
+    {
+      "type": "minecraft:biome"
+    }
+  ]
+}
diff --git a/src/main/java/igentuman/nc/block/GlowingMushroomBlock.java b/src/main/java/igentuman/nc/block/GlowingMushroomBlock.java
@@ -0,0 +1,30 @@
+package igentuman.nc.block;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.block.MushroomBlock;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.BlockState;
+
+public class GlowingMushroomBlock extends MushroomBlock {
+
+    public GlowingMushroomBlock(BlockBehaviour.Properties pProperties) {
+        super(pProperties, null);
+    }
+
+    @Override
+    public boolean isValidBonemealTarget(LevelReader pLevel, BlockPos pPos, BlockState pState, boolean pIsClient) {
+        return false;
+    }
+
+    public boolean isBonemealSuccess(Level pLevel, RandomSource pRandom, BlockPos pPos, BlockState pState) {
+        return false;
+    }
+
+    @Override
+    public void performBonemeal(ServerLevel pLevel, RandomSource pRandom, BlockPos pPos, BlockState pState) {
+    }
+}
diff --git a/src/main/java/igentuman/nc/datagen/NCLootTables.java b/src/main/java/igentuman/nc/datagen/NCLootTables.java
@@ -66,7 +66,7 @@ private void machines() {
         for(String name: NC_RF_AMPLIFIERS.keySet()) {
             add(NC_RF_AMPLIFIERS.get(name).get(), block -> createSimpleTable("block", NC_RF_AMPLIFIERS.get(name).get()));
         }
-      //  add(REDSTONE_DIMMER_BLOCK.get(), block -> createSimpleTable("block", REDSTONE_DIMMER_BLOCK.get()));
+        add(MUSHROOM_BLOCK.get(), block -> createSimpleTable("block", MUSHROOM_BLOCK.get()));
     }
 
     @Override
@@ -91,6 +91,7 @@ public void generate() {
         all.addAll(STORAGE_BLOCKS.values().stream().map(RegistryObject::get).toList());
         all.addAll(NC_ELECTROMAGNETS.values().stream().map(RegistryObject::get).toList());
         all.addAll(NC_RF_AMPLIFIERS.values().stream().map(RegistryObject::get).toList());
+        all.add(MUSHROOM_BLOCK.get());
         return all;
     }
 }
diff --git a/src/main/java/igentuman/nc/datagen/tags/NCBlockTags.java b/src/main/java/igentuman/nc/datagen/tags/NCBlockTags.java
@@ -87,6 +87,7 @@ private void ores() {
     private void blocks() {
         tag(BlockTags.MINEABLE_WITH_PICKAXE).add(REDSTONE_DIMMER_BLOCK.get());
         tag(BlockTags.NEEDS_IRON_TOOL).add(REDSTONE_DIMMER_BLOCK.get());
+
         for(String block: NCBlocks.NC_BLOCKS.keySet()) {
             tag(BlockTags.MINEABLE_WITH_PICKAXE).add(NCBlocks.NC_BLOCKS.get(block).get());
             tag(BlockTags.NEEDS_IRON_TOOL).add(NCBlocks.NC_BLOCKS.get(block).get());
diff --git a/src/main/java/igentuman/nc/setup/registration/CreativeTabs.java b/src/main/java/igentuman/nc/setup/registration/CreativeTabs.java
@@ -136,6 +136,7 @@ private static List<ItemStack> getItems()
         items.add(new ItemStack(MULTITOOL.get()));
         items.add(new ItemStack(GEIGER_COUNTER.get()));
         items.add(new ItemStack(LITHIUM_ION_CELL.get()));
+        items.add(new ItemStack(MUSHROOM_BLOCK.get()));
         return items;
     }
 
diff --git a/src/main/java/igentuman/nc/setup/registration/NCBlocks.java b/src/main/java/igentuman/nc/setup/registration/NCBlocks.java
@@ -52,7 +52,7 @@ public class NCBlocks {
     public static final RegistryObject<Item> REDSTONE_DIMMER_ITEM_BLOCK = fromBlock(REDSTONE_DIMMER_BLOCK);
     public static final RegistryObject<BlockEntityType<RedstoneDimmerBE>> REDSTONE_DIMMER_BE = BLOCK_ENTITIES.register("redstone_dimmer",
             () -> BlockEntityType.Builder.of(RedstoneDimmerBE::new, REDSTONE_DIMMER_BLOCK.get()).build(null));
-    public static final RegistryObject<Block> MUSHROOM_BLOCK = BLOCKS.register("glowing_mushroom", () -> new GrassBlock(
+    public static final RegistryObject<Block> MUSHROOM_BLOCK = BLOCKS.register("glowing_mushroom", () -> new GlowingMushroomBlock(
             BlockBehaviour.Properties.of().sound(SoundType.GRASS).noCollission().instabreak().randomTicks().lightLevel($ -> 10)
             ));
     public static final RegistryObject<MenuType<RedstoneDImmerContainer>> REDSTONE_DIMMER_CONTAINER = CONTAINERS.register("redstone_dimmer",
diff --git a/src/main/java/igentuman/nc/setup/registration/WorldGeneration.java b/src/main/java/igentuman/nc/setup/registration/WorldGeneration.java
@@ -1,5 +1,6 @@
 package igentuman.nc.setup.registration;
 
+import igentuman.nc.world.BiomeFilterNether;
 import igentuman.nc.world.OrePlacementModifier;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.registries.Registries;
@@ -30,6 +31,9 @@ public class WorldGeneration {
     public static final RegistryObject<PlacementModifierType<OrePlacementModifier>> NC_ORE_MODIFIER =
             PLACEMENT_MODIFIERS.register("nc_ore_modifier", () -> () -> OrePlacementModifier.CODEC);
 
+    public static final RegistryObject<PlacementModifierType<BiomeFilterNether>> VEGETATION_MODIFIER =
+            PLACEMENT_MODIFIERS.register("nc_vegetation_modifier", () -> () -> BiomeFilterNether.CODEC);
+
     private static ResourceKey<Biome> makeKey(String name) {
         return ResourceKey.create(Registries.BIOME, rl(name));
     }
diff --git a/src/main/java/igentuman/nc/world/BiomeFilterNether.java b/src/main/java/igentuman/nc/world/BiomeFilterNether.java
@@ -0,0 +1,48 @@
+package igentuman.nc.world;
+
+import com.mojang.serialization.Codec;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Holder;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.Biomes;
+import net.minecraft.world.level.levelgen.placement.PlacementContext;
+import net.minecraft.world.level.levelgen.placement.PlacementModifier;
+import net.minecraft.world.level.levelgen.placement.PlacementModifierType;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.stream.Stream;
+
+import static igentuman.nc.setup.registration.WorldGeneration.VEGETATION_MODIFIER;
+
+public class BiomeFilterNether extends PlacementModifier {
+
+    private static final BiomeFilterNether INSTANCE = new BiomeFilterNether();
+    public static Codec<BiomeFilterNether> CODEC = Codec.unit(() -> {
+        return INSTANCE;
+    });
+
+    private BiomeFilterNether() {
+    }
+
+    public static BiomeFilterNether biome() {
+        return INSTANCE;
+    }
+
+    @Override
+    public @NotNull Stream<BlockPos> getPositions(PlacementContext context, RandomSource randomSource, BlockPos pos) {
+        LevelReader level = context.getLevel();
+        Holder<Biome> biome = level.getBiome(pos);
+        if(biome.is(Biomes.NETHER_WASTES) || biome.is(Biomes.BASALT_DELTAS) || biome.is(Biomes.WARPED_FOREST)
+                || biome.is(Biomes.CRIMSON_FOREST) || biome.is(Biomes.SOUL_SAND_VALLEY)) {
+            return Stream.of(pos);
+        }
+        return Stream.empty();
+    }
+
+    public @NotNull PlacementModifierType<?> type() {
+        return VEGETATION_MODIFIER.get();
+    }
+}
diff --git a/src/main/java/igentuman/nc/world/NCBiomeModifier.java b/src/main/java/igentuman/nc/world/NCBiomeModifier.java
@@ -20,6 +20,7 @@
 
 import static igentuman.nc.NuclearCraft.MODID;
 import static igentuman.nc.NuclearCraft.rl;
+import static igentuman.nc.world.NCPlacedFeatures.PLACED_FEATURES;
 
 public class NCBiomeModifier {
 
@@ -30,6 +31,7 @@ private static HashMap<String, ResourceKey<BiomeModifier>> initBiomeModifiers()
         for(String name: Ores.all().keySet()) {
             map.put(name, registerKey(name + "_biome_modifier"));
         }
+        map.put("glowing_mushroom", registerKey("glowing_mushroom_biome_modifier"));
         return map;
     }
 
@@ -42,23 +44,27 @@ public static void bootstrap(BootstapContext<BiomeModifier> context) {
             if(ore.config().dimensions.contains(0)) {
                 context.register(BIOME_MODIFIERS.get(name), new ForgeBiomeModifiers.AddFeaturesBiomeModifier(
                         biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-                        HolderSet.direct(placedFeatures.getOrThrow(NCPlacedFeatures.PLACED_FEATURES.get(name))),
+                        HolderSet.direct(placedFeatures.getOrThrow(PLACED_FEATURES.get(name))),
                         GenerationStep.Decoration.UNDERGROUND_ORES));
             }
             if(ore.config().dimensions.contains(-1)) {
                 context.register(BIOME_MODIFIERS.get(name), new ForgeBiomeModifiers.AddFeaturesBiomeModifier(
                         biomes.getOrThrow(BiomeTags.IS_NETHER),
-                        HolderSet.direct(placedFeatures.getOrThrow(NCPlacedFeatures.PLACED_FEATURES.get(name))),
+                        HolderSet.direct(placedFeatures.getOrThrow(PLACED_FEATURES.get(name))),
                         GenerationStep.Decoration.UNDERGROUND_ORES));
             }
 
             if(ore.config().dimensions.contains(1)) {
                 context.register(BIOME_MODIFIERS.get(name), new ForgeBiomeModifiers.AddFeaturesBiomeModifier(
                         biomes.getOrThrow(BiomeTags.IS_END),
-                        HolderSet.direct(placedFeatures.getOrThrow(NCPlacedFeatures.PLACED_FEATURES.get(name))),
+                        HolderSet.direct(placedFeatures.getOrThrow(PLACED_FEATURES.get(name))),
                         GenerationStep.Decoration.UNDERGROUND_ORES));
             }
         }
+        context.register(BIOME_MODIFIERS.get("glowing_mushroom"), new ForgeBiomeModifiers.AddFeaturesBiomeModifier(
+                biomes.getOrThrow(BiomeTags.IS_NETHER),
+                HolderSet.direct(placedFeatures.getOrThrow(PLACED_FEATURES.get("glowing_mushroom"))),
+                GenerationStep.Decoration.UNDERGROUND_DECORATION));
     }
     private static ResourceKey<BiomeModifier> registerKey(String name) {
         return ResourceKey.create(ForgeRegistries.Keys.BIOME_MODIFIERS, rl(name));
diff --git a/src/main/java/igentuman/nc/world/NCConfiguredFeatures.java b/src/main/java/igentuman/nc/world/NCConfiguredFeatures.java
@@ -4,14 +4,16 @@
 import igentuman.nc.world.ore.NCOre;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.data.worldgen.BootstapContext;
+import net.minecraft.data.worldgen.features.FeatureUtils;
+import net.minecraft.data.worldgen.placement.PlacementUtils;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.world.level.levelgen.feature.Feature;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.*;
+import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider;
 import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest;
 import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest;
 import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest;
@@ -21,6 +23,8 @@
 import java.util.List;
 
 import static igentuman.nc.NuclearCraft.rl;
+import static igentuman.nc.setup.registration.NCBlocks.MUSHROOM_BLOCK;
+import static net.minecraft.world.level.block.Blocks.*;
 
 public class NCConfiguredFeatures {
 
@@ -31,6 +35,7 @@ private static HashMap<String, ResourceKey<ConfiguredFeature<?,?>>> initFeatures
         for(String name: Ores.all().keySet()) {
             features.put(name, registerKey(name + "_ore"));
         }
+        features.put("glowing_mushroom", registerKey("glowing_mushroom_feature"));
         return features;
     }
 
@@ -65,6 +70,12 @@ public static void bootstrap(BootstapContext<ConfiguredFeature<?, ?>> context) {
                         ore.block().defaultBlockState(), 9));
             }
         }
+        register(context, ORE_CONFIGURED_FEATURES.get("glowing_mushroom"), Feature.RANDOM_PATCH,
+                FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK,
+                        new SimpleBlockConfiguration(BlockStateProvider.simple(MUSHROOM_BLOCK.get())),
+                        List.of(SOUL_SOIL, SOUL_SAND, GLOWSTONE)
+                        )
+        );
     }
 
 
diff --git a/src/main/java/igentuman/nc/world/NCPlacedFeatures.java b/src/main/java/igentuman/nc/world/NCPlacedFeatures.java

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ private void machines() {`
`66`	`66`	`for(String name: NC_RF_AMPLIFIERS.keySet()) {`
`67`	`67`	`add(NC_RF_AMPLIFIERS.get(name).get(), block -> createSimpleTable("block", NC_RF_AMPLIFIERS.get(name).get()));`
`68`	`68`	`}`
`69`		`- // add(REDSTONE_DIMMER_BLOCK.get(), block -> createSimpleTable("block", REDSTONE_DIMMER_BLOCK.get()));`
	`69`	`+ add(MUSHROOM_BLOCK.get(), block -> createSimpleTable("block", MUSHROOM_BLOCK.get()));`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`@Override`
`@@ -91,6 +91,7 @@ public void generate() {`
`91`	`91`	`all.addAll(STORAGE_BLOCKS.values().stream().map(RegistryObject::get).toList());`
`92`	`92`	`all.addAll(NC_ELECTROMAGNETS.values().stream().map(RegistryObject::get).toList());`
`93`	`93`	`all.addAll(NC_RF_AMPLIFIERS.values().stream().map(RegistryObject::get).toList());`
	`94`	`+ all.add(MUSHROOM_BLOCK.get());`
`94`	`95`	`return all;`
`95`	`96`	`}`
`96`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,7 @@ private static List<ItemStack> getItems()`
`136`	`136`	`items.add(new ItemStack(MULTITOOL.get()));`
`137`	`137`	`items.add(new ItemStack(GEIGER_COUNTER.get()));`
`138`	`138`	`items.add(new ItemStack(LITHIUM_ION_CELL.get()));`
	`139`	`+ items.add(new ItemStack(MUSHROOM_BLOCK.get()));`
`139`	`140`	`return items;`
`140`	`141`	`}`
`141`	`142`