Merge pull request 'Release 1.20.1/v1.1.1' (#48) from 1.20.1/dev into 1.20.1/main

Reviewed-on: #48

build.gradle

@@ -26,7 +26,7 @@ base {
 }
 
 java {
-    toolchain.languageVersion = JavaLanguageVersion.of(8)
+    toolchain.languageVersion = JavaLanguageVersion.of(17)
 }
 
 minecraft {

gradle.properties

@@ -4,17 +4,17 @@ org.gradle.daemon=false
 mod_id=firefly_bush_backport
 mod_name=Firefly Bush Backport
 mod_license=All Rights Reserved
-mod_version=1.0.0
+mod_version=1.1.0
 mod_group_id=dev.micle
 mod_authors=Micle
 mod_description=Firefly bush backport from 1.21.5.
 
-minecraft_version=1.16.5
+minecraft_version=1.20.1
-minecraft_version_range=[1.16.5,1.17)
+minecraft_version_range=[1.20.1,1.21)
 
-forge_version=36.2.42
+forge_version=47.4.0
-forge_version_range=[36,)
+forge_version_range=[47,)
-loader_version_range=[36,)
+loader_version_range=[47,)
 
 mapping_channel=parchment
-mapping_version=2022.03.06
+mapping_version=2023.09.03

src/generated/resources/assets/firefly_bush_backport/models/block/firefly_bush.json

@@ -1,5 +1,6 @@
 {
   "parent": "firefly_bush_backport:block/cross_emissive",
+  "render_type": "minecraft:cutout",
   "textures": {
     "cross": "firefly_bush_backport:block/firefly_bush",
     "cross_emissive": "firefly_bush_backport:block/firefly_bush_emissive"

src/generated/resources/assets/firefly_bush_backport/sounds.json

@@ -1,6 +1,5 @@
 {
   "block.firefly_bush.idle": {
-    "subtitle": "sound.firefly_bush_backport.block.firefly_bush.idle",
     "sounds": [
       {
         "name": "firefly_bush_backport:block/firefly_bush/firefly_bush1",
@@ -50,6 +49,7 @@
         "name": "firefly_bush_backport:block/firefly_bush/firefly_bush11",
         "volume": 4.0
       }
-    ]
+    ],
+    "subtitle": "sound.firefly_bush_backport.block.firefly_bush.idle"
   }
 }

src/generated/resources/data/firefly_bush_backport/forge/biome_modifier/add_patch_firefly_bush_near_water.json

@@ -0,0 +1,6 @@
+{
+  "type": "forge:add_features",
+  "biomes": "#minecraft:is_overworld",
+  "features": "firefly_bush_backport:patch_firefly_bush_near_water",
+  "step": "vegetal_decoration"
+}

src/generated/resources/data/firefly_bush_backport/forge/biome_modifier/add_patch_firefly_bush_near_water_swamp.json

@@ -0,0 +1,6 @@
+{
+  "type": "forge:add_features",
+  "biomes": "#forge:is_swamp",
+  "features": "firefly_bush_backport:patch_firefly_bush_near_water_swamp",
+  "step": "vegetal_decoration"
+}

src/generated/resources/data/firefly_bush_backport/forge/biome_modifier/add_patch_firefly_bush_swamp.json

@@ -0,0 +1,6 @@
+{
+  "type": "forge:add_features",
+  "biomes": "#forge:is_swamp",
+  "features": "firefly_bush_backport:patch_firefly_bush_swamp",
+  "step": "vegetal_decoration"
+}

src/generated/resources/data/firefly_bush_backport/forge/biome_modifier/remove_patch_firefly_bush_near_water.json

@@ -0,0 +1,6 @@
+{
+  "type": "forge:remove_features",
+  "biomes": "#forge:is_swamp",
+  "features": "firefly_bush_backport:patch_firefly_bush_near_water",
+  "steps": "vegetal_decoration"
+}

src/generated/resources/data/firefly_bush_backport/loot_tables/blocks/firefly_bush.json

@@ -2,18 +2,20 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
       "entries": [
         {
           "type": "minecraft:item",
           "name": "firefly_bush_backport:firefly_bush"
         }
       ],
-      "conditions": [
+      "rolls": 1.0
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
     }
-  ]
+  ],
+  "random_sequence": "firefly_bush_backport:blocks/firefly_bush"
 }

src/generated/resources/data/firefly_bush_backport/worldgen/configured_feature/patch_firefly_bush.json

@@ -0,0 +1,30 @@
+{
+  "type": "minecraft:random_patch",
+  "config": {
+    "feature": {
+      "feature": {
+        "type": "minecraft:simple_block",
+        "config": {
+          "to_place": {
+            "type": "minecraft:simple_state_provider",
+            "state": {
+              "Name": "firefly_bush_backport:firefly_bush"
+            }
+          }
+        }
+      },
+      "placement": [
+        {
+          "type": "minecraft:block_predicate_filter",
+          "predicate": {
+            "type": "minecraft:matching_blocks",
+            "blocks": "minecraft:air"
+          }
+        }
+      ]
+    },
+    "tries": 20,
+    "xz_spread": 4,
+    "y_spread": 3
+  }
+}

src/generated/resources/data/firefly_bush_backport/worldgen/placed_feature/patch_firefly_bush_near_water.json

@@ -0,0 +1,90 @@
+{
+  "feature": "firefly_bush_backport:patch_firefly_bush",
+  "placement": [
+    {
+      "type": "minecraft:count",
+      "count": 2
+    },
+    {
+      "type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:heightmap",
+      "heightmap": "MOTION_BLOCKING_NO_LEAVES"
+    },
+    {
+      "type": "minecraft:biome"
+    },
+    {
+      "type": "minecraft:block_predicate_filter",
+      "predicate": {
+        "type": "minecraft:all_of",
+        "predicates": [
+          {
+            "type": "minecraft:matching_blocks",
+            "blocks": "minecraft:air"
+          },
+          {
+            "type": "minecraft:would_survive",
+            "state": {
+              "Name": "firefly_bush_backport:firefly_bush"
+            }
+          },
+          {
+            "type": "minecraft:any_of",
+            "predicates": [
+              {
+                "type": "minecraft:matching_fluids",
+                "fluids": [
+                  "minecraft:water",
+                  "minecraft:flowing_water"
+                ],
+                "offset": [
+                  1,
+                  -1,
+                  0
+                ]
+              },
+              {
+                "type": "minecraft:matching_fluids",
+                "fluids": [
+                  "minecraft:water",
+                  "minecraft:flowing_water"
+                ],
+                "offset": [
+                  -1,
+                  -1,
+                  0
+                ]
+              },
+              {
+                "type": "minecraft:matching_fluids",
+                "fluids": [
+                  "minecraft:water",
+                  "minecraft:flowing_water"
+                ],
+                "offset": [
+                  0,
+                  -1,
+                  1
+                ]
+              },
+              {
+                "type": "minecraft:matching_fluids",
+                "fluids": [
+                  "minecraft:water",
+                  "minecraft:flowing_water"
+                ],
+                "offset": [
+                  0,
+                  -1,
+                  -1
+                ]
+              }
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}

src/generated/resources/data/firefly_bush_backport/worldgen/placed_feature/patch_firefly_bush_near_water_swamp.json

@@ -0,0 +1,90 @@
+{
+  "feature": "firefly_bush_backport:patch_firefly_bush",
+  "placement": [
+    {
+      "type": "minecraft:count",
+      "count": 3
+    },
+    {
+      "type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:heightmap",
+      "heightmap": "MOTION_BLOCKING"
+    },
+    {
+      "type": "minecraft:biome"
+    },
+    {
+      "type": "minecraft:block_predicate_filter",
+      "predicate": {
+        "type": "minecraft:all_of",
+        "predicates": [
+          {
+            "type": "minecraft:matching_blocks",
+            "blocks": "minecraft:air"
+          },
+          {
+            "type": "minecraft:would_survive",
+            "state": {
+              "Name": "firefly_bush_backport:firefly_bush"
+            }
+          },
+          {
+            "type": "minecraft:any_of",
+            "predicates": [
+              {
+                "type": "minecraft:matching_fluids",
+                "fluids": [
+                  "minecraft:water",
+                  "minecraft:flowing_water"
+                ],
+                "offset": [
+                  1,
+                  -1,
+                  0
+                ]
+              },
+              {
+                "type": "minecraft:matching_fluids",
+                "fluids": [
+                  "minecraft:water",
+                  "minecraft:flowing_water"
+                ],
+                "offset": [
+                  -1,
+                  -1,
+                  0
+                ]
+              },
+              {
+                "type": "minecraft:matching_fluids",
+                "fluids": [
+                  "minecraft:water",
+                  "minecraft:flowing_water"
+                ],
+                "offset": [
+                  0,
+                  -1,
+                  1
+                ]
+              },
+              {
+                "type": "minecraft:matching_fluids",
+                "fluids": [
+                  "minecraft:water",
+                  "minecraft:flowing_water"
+                ],
+                "offset": [
+                  0,
+                  -1,
+                  -1
+                ]
+              }
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}

src/generated/resources/data/firefly_bush_backport/worldgen/placed_feature/patch_firefly_bush_swamp.json

@@ -0,0 +1,19 @@
+{
+  "feature": "firefly_bush_backport:patch_firefly_bush",
+  "placement": [
+    {
+      "type": "minecraft:rarity_filter",
+      "chance": 8
+    },
+    {
+      "type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:heightmap",
+      "heightmap": "MOTION_BLOCKING"
+    },
+    {
+      "type": "minecraft:biome"
+    }
+  ]
+}

src/generated/resources/data/minecraft/tags/blocks/replaceable_by_trees.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "firefly_bush_backport:firefly_bush"
+  ]
+}

src/main/java/dev/micle/firefly_bush_backport/FireflyBushBackport.java

@@ -1,24 +1,30 @@
 package dev.micle.firefly_bush_backport;
 
+import com.mojang.logging.LogUtils;
 import dev.micle.firefly_bush_backport.proxy.IProxy;
 import dev.micle.firefly_bush_backport.proxy.Proxy;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import org.apache.logging.log4j.LogManager;
+import org.slf4j.Logger;
-import org.apache.logging.log4j.Logger;
 
 @Mod(FireflyBushBackport.MOD_ID)
 public class FireflyBushBackport {
     public static final String MOD_ID = "firefly_bush_backport";
-    public static final Logger LOGGER = LogManager.getLogger(MOD_ID);
+    public static final Logger LOGGER = LogUtils.getLogger();
     private static FMLJavaModLoadingContext fmlJavaModLoadingContext;
     private static IProxy proxy;
 
-    public FireflyBushBackport() {
+    public FireflyBushBackport(FMLJavaModLoadingContext context) {
+        fmlJavaModLoadingContext = context;
+
         proxy = DistExecutor.safeRunForDist(
                 () -> Proxy.Client::new,
                 () -> Proxy.Server::new
         );
     }
+
+    public static FMLJavaModLoadingContext getFMLJavaModLoadingContext() {
+        return fmlJavaModLoadingContext;
+    }
 }

src/main/java/dev/micle/firefly_bush_backport/block/FireflyBushBlock.java

@@ -3,40 +3,36 @@ package dev.micle.firefly_bush_backport.block;
 import dev.micle.firefly_bush_backport.config.Config;
 import dev.micle.firefly_bush_backport.particle.ModParticles;
 import dev.micle.firefly_bush_backport.sound.ModSounds;
-import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import net.minecraft.core.BlockPos;
-import net.minecraft.block.BlockState;
+import net.minecraft.core.Direction;
-import net.minecraft.block.Blocks;
+import net.minecraft.server.level.ServerLevel;
-import net.minecraft.block.BushBlock;
+import net.minecraft.sounds.SoundSource;
-import net.minecraft.block.IGrowable;
+import net.minecraft.util.RandomSource;
-import net.minecraft.util.Direction;
+import net.minecraft.world.level.Level;
-import net.minecraft.util.SoundCategory;
+import net.minecraft.world.level.LevelReader;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.level.block.BonemealableBlock;
-import net.minecraft.world.IBlockReader;
+import net.minecraft.world.level.block.BushBlock;
-import net.minecraft.world.IWorldReader;
+import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.World;
+import net.minecraft.world.level.levelgen.Heightmap;
-import net.minecraft.world.gen.Heightmap;
-import net.minecraft.world.server.ServerWorld;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 import java.util.List;
 import java.util.Optional;
-import java.util.Random;
-import java.util.stream.Collectors;
 
-public class FireflyBushBlock extends BushBlock implements IGrowable {
+public class FireflyBushBlock extends BushBlock implements BonemealableBlock {
     public FireflyBushBlock(Properties properties) {
         super(properties);
     }
 
     @Override
     @ParametersAreNonnullByDefault
-    public void animateTick(BlockState blockState, World level, BlockPos blockPos, Random randomSource) {
+    public void animateTick(BlockState blockState, Level level, BlockPos blockPos, RandomSource randomSource) {
         if (randomSource.nextInt(Config.Client.bushFireflyAmbientSoundChanceOneIn.get()) == 0 && (
                 Config.Client.bushExtraAlwaysPlayAmbientSound.get() ||
-                (isMoonVisible(level) && level.getHeight(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, blockPos.getX(), blockPos.getZ()) <= blockPos.getY())
+                (isMoonVisible(level) && level.getHeight(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, blockPos.getX(), blockPos.getZ()) <= blockPos.getY())
             )) {
             level.playLocalSound(
-                    blockPos.getX(), blockPos.getY(), blockPos.getZ(), ModSounds.FIREFLY_BUSH_IDLE.get(), SoundCategory.AMBIENT, 1.0F, 1.0F, false
+                    blockPos, ModSounds.FIREFLY_BUSH_IDLE.get(), SoundSource.AMBIENT, 1.0F, 1.0F, false
             );
         }
 
@@ -51,7 +47,7 @@ public class FireflyBushBlock extends BushBlock implements IGrowable {
         }
     }
 
-    public boolean isMoonVisible(World level) {
+    public boolean isMoonVisible(Level level) {
         if (!level.dimensionType().natural()) {
             return false;
         } else {
@@ -62,47 +58,37 @@ public class FireflyBushBlock extends BushBlock implements IGrowable {
 
     @Override
     @ParametersAreNonnullByDefault
-    public boolean isValidBonemealTarget(IBlockReader level, BlockPos blockPos, BlockState blockState, boolean isClient) {
+    public boolean isValidBonemealTarget(LevelReader level, BlockPos blockPos, BlockState blockState, boolean isClient) {
         return hasSpreadableNeighbourPos(level, blockPos, blockState);
     }
 
     @Override
     @ParametersAreNonnullByDefault
-    public boolean isBonemealSuccess(World level, Random randomSource, BlockPos blockPos, BlockState blockState) {
+    public boolean isBonemealSuccess(Level level, RandomSource randomSource, BlockPos blockPos, BlockState blockState) {
         return true;
     }
 
     @Override
     @ParametersAreNonnullByDefault
-    public void performBonemeal(ServerWorld level, Random randomSource, BlockPos blockPos, BlockState blockState) {
+    public void performBonemeal(ServerLevel level, RandomSource randomSource, BlockPos blockPos, BlockState blockState) {
         findSpreadableNeighbourPos(level, blockPos, blockState).ifPresent(x -> level.setBlockAndUpdate(x, this.defaultBlockState()));
     }
 
-    private static boolean hasSpreadableNeighbourPos(IBlockReader levelReader, BlockPos blockPos, BlockState blockState) {
+    static boolean hasSpreadableNeighbourPos(LevelReader levelReader, BlockPos blockPos, BlockState blockState) {
-        return getSpreadableNeighbourPos(Direction.Plane.HORIZONTAL.stream().collect(Collectors.toList()), levelReader, blockPos, blockState).isPresent();
+        return getSpreadableNeighbourPos(Direction.Plane.HORIZONTAL.stream().toList(), levelReader, blockPos, blockState).isPresent();
     }
 
-    private static Optional<BlockPos> findSpreadableNeighbourPos(World level, BlockPos blockPos, BlockState blockState) {
+    static Optional<BlockPos> findSpreadableNeighbourPos(Level level, BlockPos blockPos, BlockState blockState) {
-        return getSpreadableNeighbourPos(shuffledCopy(Direction.Plane.HORIZONTAL.stream().toArray(Direction[]::new), level.random), level, blockPos, blockState);
+        return getSpreadableNeighbourPos(Direction.Plane.HORIZONTAL.shuffledCopy(level.random), level, blockPos, blockState);
     }
 
-    private static Optional<BlockPos> getSpreadableNeighbourPos(List<Direction> directions, IBlockReader levelReader, BlockPos blockPos, BlockState blockState) {
+    static Optional<BlockPos> getSpreadableNeighbourPos(List<Direction> directions, LevelReader levelReader, BlockPos blockPos, BlockState blockState) {
         for (Direction direction : directions) {
             BlockPos blockPosDirection = blockPos.relative(direction);
-            if (levelReader.getBlockState(blockPosDirection).is(Blocks.AIR) && blockState.canSurvive((IWorldReader) levelReader, blockPosDirection)) {
+            if (levelReader.isEmptyBlock(blockPosDirection) && blockState.canSurvive(levelReader, blockPosDirection)) {
                 return Optional.of(blockPosDirection);
             }
         }
         return Optional.empty();
     }
-
-    private static <T> List<T> shuffledCopy(T[] array, Random random) {
-        ObjectArrayList<T> objectArrayList = new ObjectArrayList<>(array);
-        int i = objectArrayList.size();
-        for (int j = i; j > 1; --j) {
-            int k = random.nextInt(j);
-            objectArrayList.set(j - 1, objectArrayList.set(k, objectArrayList.get(j - 1)));
-        }
-        return objectArrayList;
-    }
 }

src/main/java/dev/micle/firefly_bush_backport/block/ModBlocks.java

@@ -1,25 +1,28 @@
 package dev.micle.firefly_bush_backport.block;
 
 import dev.micle.firefly_bush_backport.FireflyBushBackport;
-import net.minecraft.block.AbstractBlock;
+import net.minecraft.world.level.block.Block;
-import net.minecraft.block.Block;
+import net.minecraft.world.level.block.SoundType;
-import net.minecraft.block.SoundType;
+import net.minecraft.world.level.block.state.BlockBehaviour;
-import net.minecraft.block.material.Material;
+import net.minecraft.world.level.material.MapColor;
-import net.minecraft.block.material.MaterialColor;
+import net.minecraft.world.level.material.PushReaction;
 import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegistryObject;
 
 public class ModBlocks {
     public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, FireflyBushBackport.MOD_ID);
     
     public static RegistryObject<Block> FIREFLY_BUSH = BLOCKS.register("firefly_bush",
-            () -> new FireflyBushBlock(AbstractBlock.Properties.of(Material.PLANT, MaterialColor.PLANT)
+            () -> new FireflyBushBlock(BlockBehaviour.Properties.of()
+                    .mapColor(MapColor.PLANT)
+                    .ignitedByLava()
                     .lightLevel(blockState -> 2)
                     .noCollission()
                     .instabreak()
-                    .sound(SoundType.SWEET_BERRY_BUSH))
+                    .sound(SoundType.SWEET_BERRY_BUSH)
+                    .pushReaction(PushReaction.DESTROY))
     );
 
     public static void register(IEventBus modEventBus) {

src/main/java/dev/micle/firefly_bush_backport/config/Config.java

@@ -1,18 +1,17 @@
 package dev.micle.firefly_bush_backport.config;
 
 import dev.micle.firefly_bush_backport.FireflyBushBackport;
-import net.minecraft.util.WeightedList;
+import net.minecraft.util.random.SimpleWeightedRandomList;
+import net.minecraft.world.level.Level;
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.config.ModConfig;
+import net.minecraftforge.fml.event.config.ModConfigEvent;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.awt.*;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Mod.EventBusSubscriber(modid = FireflyBushBackport.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
 public final class Config {
@@ -38,11 +37,13 @@ public final class Config {
     }
 
     public static void register() {
-        ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, CLIENT_SPEC);
+        FireflyBushBackport.getFMLJavaModLoadingContext().registerConfig(ModConfig.Type.CLIENT, CLIENT_SPEC);
+        FireflyBushBackport.getFMLJavaModLoadingContext().registerConfig(ModConfig.Type.COMMON, COMMON_SPEC);
+        FireflyBushBackport.getFMLJavaModLoadingContext().registerConfig(ModConfig.Type.SERVER, SERVER_SPEC);
     }
 
     @SubscribeEvent
-    public static void onConfigReloadEvent(ModConfig.ModConfigEvent event) {
+    public static void onConfigReloadEvent(ModConfigEvent event) {
         if (event.getConfig().getSpec() == CLIENT_SPEC) {
             Client.onConfigReload();
         } else if (event.getConfig().getSpec() == COMMON_SPEC) {
@@ -73,7 +74,7 @@ public final class Config {
         public static ForgeConfigSpec.DoubleValue particleExtraScale;
         public static ForgeConfigSpec.DoubleValue particleExtraBrightness;
         private static ForgeConfigSpec.ConfigValue<List<? extends String>> particleExtraColors;
-        public static WeightedList<Color> particleExtraColorsWeightedList;
+        public static SimpleWeightedRandomList<Color> particleExtraColorsWeightedList;
 
         Client(ForgeConfigSpec.Builder builder) {
             builder.comment("Settings for the firefly bush.").push("bush");
@@ -84,7 +85,7 @@ public final class Config {
             bushFireflyVerticalRange = builder
                     .defineInRange("bushFireflyVerticalRange", 5.0, 0, Double.MAX_VALUE);
             bushFireflySpawnMaxBrightnessLevel = builder
-                    .defineInRange("bushFireflySpawnMaxBrightnessLevel", 13, 0, 15);
+                    .defineInRange("bushFireflySpawnMaxBrightnessLevel", 13, 0, Level.MAX_BRIGHTNESS);
             bushFireflyAmbientSoundChanceOneIn = builder
                     .defineInRange("bushFireflyAmbientSoundChanceOneIn", 30, 0, Integer.MAX_VALUE);
 
@@ -119,17 +120,18 @@ public final class Config {
                     .defineInRange("particleExtraBrightness", 255.0, 0, 255);
             particleExtraColors = builder
                     .comment("List of color hex values and their weight. Format: '<color_hex>,<weight>'")
-                    .defineList("particleExtraColors", Stream.of("#ffffff,1").collect(Collectors.toList()), Client::isValidColorEntry);
+                    .defineList("particleExtraColors", List.of("#ffffff,1"), Client::isValidColorEntry);
             builder.pop();
             builder.pop();
         }
 
         private static void onConfigReload() {
-            particleExtraColorsWeightedList = new WeightedList<>();
+            SimpleWeightedRandomList.Builder<Color> particleExtraColorsWeightedListBuilder = SimpleWeightedRandomList.builder();
             for (String entry : particleExtraColors.get()) {
                 String[] splitEntry = entry.split(",");
-                particleExtraColorsWeightedList.add(Color.decode(splitEntry[0]), Integer.parseInt(splitEntry[1]));
+                particleExtraColorsWeightedListBuilder.add(Color.decode(splitEntry[0]), Integer.parseInt(splitEntry[1]));
             }
+            particleExtraColorsWeightedList = particleExtraColorsWeightedListBuilder.build();
         }
 
         private static boolean isValidColorEntry(Object entry) {

src/main/java/dev/micle/firefly_bush_backport/data/DataGenerators.java

@@ -4,12 +4,17 @@ import dev.micle.firefly_bush_backport.FireflyBushBackport;
 import dev.micle.firefly_bush_backport.data.client.ModBlockStateProvider;
 import dev.micle.firefly_bush_backport.data.client.ModItemModelProvider;
 import dev.micle.firefly_bush_backport.data.client.ModSoundDefinitionsProvider;
-import dev.micle.firefly_bush_backport.data.loot.ModLootTableProvider;
+import dev.micle.firefly_bush_backport.data.server.ModBlockTagsProvider;
+import dev.micle.firefly_bush_backport.data.server.ModLootTableProvider;
+import dev.micle.firefly_bush_backport.data.server.ModWorldGenProvider;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.data.DataGenerator;
 import net.minecraftforge.common.data.ExistingFileHelper;
+import net.minecraftforge.data.event.GatherDataEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.GatherDataEvent;
+
+import java.util.concurrent.CompletableFuture;
 
 @Mod.EventBusSubscriber(modid = FireflyBushBackport.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
 public class DataGenerators {
@@ -17,11 +22,14 @@ public class DataGenerators {
     public static void gatherData(GatherDataEvent event) {
         DataGenerator generator = event.getGenerator();
         ExistingFileHelper existingFileHelper = event.getExistingFileHelper();
+        CompletableFuture<HolderLookup.Provider> lookupProvider = event.getLookupProvider();
 
-        generator.addProvider(new ModBlockStateProvider(generator, existingFileHelper));
+        generator.addProvider(event.includeClient(), new ModBlockStateProvider(generator, existingFileHelper));
-        generator.addProvider(new ModItemModelProvider(generator, existingFileHelper));
+        generator.addProvider(event.includeClient(), new ModItemModelProvider(generator, existingFileHelper));
-        generator.addProvider(new ModSoundDefinitionsProvider(generator, existingFileHelper));
+        generator.addProvider(event.includeClient(), new ModSoundDefinitionsProvider(generator, existingFileHelper));
 
-        generator.addProvider(new ModLootTableProvider(generator));
+        generator.addProvider(event.includeServer(), new ModBlockTagsProvider(generator, lookupProvider, existingFileHelper));
+        generator.addProvider(event.includeServer(), new ModLootTableProvider(generator));
+        generator.addProvider(event.includeServer(), new ModWorldGenProvider(generator, lookupProvider));
     }
 }

src/main/java/dev/micle/firefly_bush_backport/data/client/ModBlockStateProvider.java

@@ -2,18 +2,18 @@ package dev.micle.firefly_bush_backport.data.client;
 
 import dev.micle.firefly_bush_backport.FireflyBushBackport;
 import dev.micle.firefly_bush_backport.block.ModBlocks;
-import net.minecraft.block.Block;
 import net.minecraft.data.DataGenerator;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.Block;
 import net.minecraftforge.client.model.generators.BlockStateProvider;
 import net.minecraftforge.common.data.ExistingFileHelper;
-import net.minecraftforge.fml.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 
 import java.util.Objects;
 
 public class ModBlockStateProvider extends BlockStateProvider {
     public ModBlockStateProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) {
-        super(generator, FireflyBushBackport.MOD_ID, existingFileHelper);
+        super(generator.getPackOutput(), FireflyBushBackport.MOD_ID, existingFileHelper);
     }
 
     @Override
@@ -24,9 +24,10 @@ public class ModBlockStateProvider extends BlockStateProvider {
     private void crossEmissiveBlock(RegistryObject<Block> block) {
         String name = Objects.requireNonNull(block.getId()).getPath();
         simpleBlock(block.get(), models()
-                .withExistingParent(name, new ResourceLocation(FireflyBushBackport.MOD_ID, "block/cross_emissive"))
+                .withExistingParent(name, ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, "block/cross_emissive"))
                 .texture("cross", "block/" + name)
                 .texture("cross_emissive", "block/" + name + "_emissive")
+                .renderType("cutout")
         );
     }
 }

src/main/java/dev/micle/firefly_bush_backport/data/client/ModItemModelProvider.java

@@ -2,21 +2,21 @@ package dev.micle.firefly_bush_backport.data.client;
 
 import dev.micle.firefly_bush_backport.FireflyBushBackport;
 import dev.micle.firefly_bush_backport.block.ModBlocks;
-import net.minecraft.block.Block;
 import net.minecraft.data.DataGenerator;
-import net.minecraft.item.Items;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.block.Block;
 import net.minecraftforge.client.model.generators.ItemModelBuilder;
 import net.minecraftforge.client.model.generators.ItemModelProvider;
 import net.minecraftforge.client.model.generators.ModelFile;
 import net.minecraftforge.common.data.ExistingFileHelper;
-import net.minecraftforge.fml.RegistryObject;
 import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegistryObject;
 
 import java.util.Objects;
 
 public class ModItemModelProvider extends ItemModelProvider {
     public ModItemModelProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) {
-        super(generator, FireflyBushBackport.MOD_ID, existingFileHelper);
+        super(generator.getPackOutput(), FireflyBushBackport.MOD_ID, existingFileHelper);
     }
 
     @Override

src/main/java/dev/micle/firefly_bush_backport/data/client/ModSoundDefinitionsProvider.java

@@ -3,13 +3,13 @@ package dev.micle.firefly_bush_backport.data.client;
 import dev.micle.firefly_bush_backport.FireflyBushBackport;
 import dev.micle.firefly_bush_backport.sound.ModSounds;
 import net.minecraft.data.DataGenerator;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.common.data.ExistingFileHelper;
 import net.minecraftforge.common.data.SoundDefinitionsProvider;
 
 public class ModSoundDefinitionsProvider extends SoundDefinitionsProvider {
     public ModSoundDefinitionsProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) {
-        super(generator, FireflyBushBackport.MOD_ID, existingFileHelper);
+        super(generator.getPackOutput(), FireflyBushBackport.MOD_ID, existingFileHelper);
     }
 
     @Override
@@ -17,31 +17,31 @@ public class ModSoundDefinitionsProvider extends SoundDefinitionsProvider {
         add(ModSounds.FIREFLY_BUSH_IDLE, definition()
                 .subtitle("sound." + FireflyBushBackport.MOD_ID + ".block.firefly_bush.idle")
                 .with(
-                        sound(new ResourceLocation(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush1"))
+                        sound(ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush1"))
                                 .volume(4),
-                        sound(new ResourceLocation(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush2"))
+                        sound(ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush2"))
                                 .volume(4),
-                        sound(new ResourceLocation(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush3"))
+                        sound(ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush3"))
                                 .volume(4),
-                        sound(new ResourceLocation(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush4"))
+                        sound(ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush4"))
                                 .volume(4),
-                        sound(new ResourceLocation(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush5"))
+                        sound(ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush5"))
                                 .volume(4),
-                        sound(new ResourceLocation(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush6"))
+                        sound(ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush6"))
                                 .volume(4),
-                        sound(new ResourceLocation(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush7"))
+                        sound(ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush7"))
                                 .volume(4)
                                 .weight(2),
-                        sound(new ResourceLocation(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush8"))
+                        sound(ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush8"))
                                 .volume(4)
                                 .weight(2),
-                        sound(new ResourceLocation(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush9"))
+                        sound(ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush9"))
                                 .volume(4)
                                 .weight(2),
-                        sound(new ResourceLocation(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush10"))
+                        sound(ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush10"))
                                 .volume(4)
                                 .weight(2),
-                        sound(new ResourceLocation(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush11"))
+                        sound(ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, "block/firefly_bush/firefly_bush11"))
                                 .volume(4)
                 )
         );

src/main/java/dev/micle/firefly_bush_backport/data/loot/ModBlockLootTableProvider.java

@@ -1,23 +1,26 @@
 package dev.micle.firefly_bush_backport.data.loot;
 
-import dev.micle.firefly_bush_backport.FireflyBushBackport;
 import dev.micle.firefly_bush_backport.block.ModBlocks;
-import net.minecraft.block.Block;
+import net.minecraft.data.loot.BlockLootSubProvider;
-import net.minecraft.data.loot.BlockLootTables;
+import net.minecraft.world.flag.FeatureFlags;
-import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraft.world.level.block.Block;
+import net.minecraftforge.registries.RegistryObject;
+import org.jetbrains.annotations.NotNull;
 
-import java.util.stream.Collectors;
+import java.util.Set;
 
-public class ModBlockLootTableProvider extends BlockLootTables {
+public class ModBlockLootTableProvider extends BlockLootSubProvider {
-    @Override
+    public ModBlockLootTableProvider() {
-    protected void addTables() {
+        super(Set.of(), FeatureFlags.REGISTRY.allFlags());
-        dropSelf(ModBlocks.FIREFLY_BUSH.get());
     }
 
     @Override
-    protected Iterable<Block> getKnownBlocks() {
+    protected void generate() {
-        return ForgeRegistries.BLOCKS.getValues().stream()
+        this.dropSelf(ModBlocks.FIREFLY_BUSH.get());
-                .filter(block -> FireflyBushBackport.MOD_ID.equals(block.getRegistryName().getNamespace()))
+    }
-                .collect(Collectors.toSet());
+
+    @Override
+    protected @NotNull Iterable<Block> getKnownBlocks() {
+        return ModBlocks.BLOCKS.getEntries().stream().map(RegistryObject::get)::iterator;
     }
 }

src/main/java/dev/micle/firefly_bush_backport/data/loot/ModLootTableProvider.java

@@ -1,38 +0,0 @@
-package dev.micle.firefly_bush_backport.data.loot;
-
-import com.google.common.collect.ImmutableList;
-import com.mojang.datafixers.util.Pair;
-import dev.micle.firefly_bush_backport.FireflyBushBackport;
-import net.minecraft.data.DataGenerator;
-import net.minecraft.data.LootTableProvider;
-import net.minecraft.loot.*;
-import net.minecraft.util.ResourceLocation;
-
-import java.util.List;
-import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-public class ModLootTableProvider extends LootTableProvider {
-    public ModLootTableProvider(DataGenerator generator) {
-        super(generator);
-    }
-
-    @Override
-    public String getName() {
-        return new ResourceLocation(FireflyBushBackport.MOD_ID, "loot_tables").toString();
-    }
-
-    @Override
-    protected List<Pair<Supplier<Consumer<BiConsumer<ResourceLocation, LootTable.Builder>>>, LootParameterSet>> getTables() {
-        return ImmutableList.of(
-                Pair.of(ModBlockLootTableProvider::new, LootParameterSets.BLOCK)
-        );
-    }
-
-    @Override
-    protected void validate(Map<ResourceLocation, LootTable> map, ValidationTracker validationTracker) {
-        map.forEach((id, table) -> LootTableManager.validate(validationTracker, id, table));
-    }
-}

src/main/java/dev/micle/firefly_bush_backport/data/server/ModBlockTagsProvider.java

@@ -0,0 +1,25 @@
+package dev.micle.firefly_bush_backport.data.server;
+
+import dev.micle.firefly_bush_backport.FireflyBushBackport;
+import dev.micle.firefly_bush_backport.block.ModBlocks;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.data.DataGenerator;
+import net.minecraft.tags.BlockTags;
+import net.minecraftforge.common.data.BlockTagsProvider;
+import net.minecraftforge.common.data.ExistingFileHelper;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+import java.util.concurrent.CompletableFuture;
+
+public class ModBlockTagsProvider extends BlockTagsProvider {
+    public ModBlockTagsProvider(DataGenerator generator, CompletableFuture<HolderLookup.Provider> lookupProvider, ExistingFileHelper existingFileHelper) {
+        super(generator.getPackOutput(), lookupProvider, FireflyBushBackport.MOD_ID, existingFileHelper);
+    }
+
+    @Override
+    @ParametersAreNonnullByDefault
+    protected void addTags(HolderLookup.Provider pProvider) {
+        this.tag(BlockTags.REPLACEABLE_BY_TREES)
+                .add(ModBlocks.FIREFLY_BUSH.get());
+    }
+}

src/main/java/dev/micle/firefly_bush_backport/data/server/ModLootTableProvider.java

@@ -0,0 +1,17 @@
+package dev.micle.firefly_bush_backport.data.server;
+
+import dev.micle.firefly_bush_backport.data.loot.ModBlockLootTableProvider;
+import net.minecraft.data.DataGenerator;
+import net.minecraft.data.loot.LootTableProvider;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
+
+import java.util.List;
+import java.util.Set;
+
+public class ModLootTableProvider extends LootTableProvider {
+    public ModLootTableProvider(DataGenerator generator) {
+        super(generator.getPackOutput(), Set.of(), List.of(
+            new LootTableProvider.SubProviderEntry(ModBlockLootTableProvider::new, LootContextParamSets.BLOCK)
+        ));
+    }
+}

src/main/java/dev/micle/firefly_bush_backport/data/server/ModWorldGenProvider.java

@@ -0,0 +1,26 @@
+package dev.micle.firefly_bush_backport.data.server;
+
+import dev.micle.firefly_bush_backport.FireflyBushBackport;
+import dev.micle.firefly_bush_backport.worldgen.ModBiomeModifiers;
+import dev.micle.firefly_bush_backport.worldgen.ModConfiguredFeatures;
+import dev.micle.firefly_bush_backport.worldgen.ModPlacedFeatures;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.core.RegistrySetBuilder;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.data.DataGenerator;
+import net.minecraftforge.common.data.DatapackBuiltinEntriesProvider;
+import net.minecraftforge.registries.ForgeRegistries;
+
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+
+public class ModWorldGenProvider extends DatapackBuiltinEntriesProvider {
+    public static final RegistrySetBuilder BUILDER = new RegistrySetBuilder()
+            .add(Registries.CONFIGURED_FEATURE, ModConfiguredFeatures::bootstrap)
+            .add(Registries.PLACED_FEATURE, ModPlacedFeatures::bootstrap)
+            .add(ForgeRegistries.Keys.BIOME_MODIFIERS, ModBiomeModifiers::bootstrap);
+
+    public ModWorldGenProvider(DataGenerator generator, CompletableFuture<HolderLookup.Provider> registries) {
+        super(generator.getPackOutput(), registries, BUILDER, Set.of(FireflyBushBackport.MOD_ID));
+    }
+}

src/main/java/dev/micle/firefly_bush_backport/event/OnBiomeLoadingEventHandler.java

@@ -1,19 +0,0 @@
-package dev.micle.firefly_bush_backport.event;
-
-import dev.micle.firefly_bush_backport.worldgen.ModConfiguredFeatures;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.gen.GenerationStage;
-import net.minecraftforge.event.world.BiomeLoadingEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-
-public class OnBiomeLoadingEventHandler {
-    @SubscribeEvent
-    public void onBiomeLoadingEvent(final BiomeLoadingEvent event) {
-        if (event.getCategory() == Biome.Category.SWAMP) {
-            event.getGeneration().addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, ModConfiguredFeatures.PLACED_PATCH_FIREFLY_BUSH_SWAMP);
-            event.getGeneration().addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, ModConfiguredFeatures.PLACED_PATCH_FIREFLY_BUSH_NEAR_WATER_SWAMP);
-        } else if (event.getCategory() != Biome.Category.THEEND && event.getCategory() != Biome.Category.NETHER) {
-            event.getGeneration().addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, ModConfiguredFeatures.PLACED_PATCH_FIREFLY_BUSH_NEAR_WATER);
-        }
-    }
-}

src/main/java/dev/micle/firefly_bush_backport/event/OnWandererTradesEventHandler.java

@@ -1,14 +1,14 @@
 package dev.micle.firefly_bush_backport.event;
 
 import dev.micle.firefly_bush_backport.item.ModItems;
-import net.minecraft.item.ItemStack;
+import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.common.BasicTrade;
+import net.minecraftforge.common.BasicItemListing;
 import net.minecraftforge.event.village.WandererTradesEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 public class OnWandererTradesEventHandler {
     @SubscribeEvent
     public void onWandererTradesEvent(WandererTradesEvent event) {
-        event.getGenericTrades().add(new BasicTrade(3, new ItemStack(ModItems.FIREFLY_BUSH.get(), 1), 12, 1));
+        event.getGenericTrades().add(new BasicItemListing(3, new ItemStack(ModItems.FIREFLY_BUSH.get(), 1), 12, 1));
     }
 }

src/main/java/dev/micle/firefly_bush_backport/item/ModItems.java

@@ -2,14 +2,13 @@ package dev.micle.firefly_bush_backport.item;
 
 import dev.micle.firefly_bush_backport.FireflyBushBackport;
 import dev.micle.firefly_bush_backport.block.ModBlocks;
-import dev.micle.firefly_bush_backport.tab.ModCreativeModeTabs;
+import net.minecraft.world.item.BlockItem;
-import net.minecraft.block.Block;
+import net.minecraft.world.item.Item;
-import net.minecraft.item.BlockItem;
+import net.minecraft.world.level.block.Block;
-import net.minecraft.item.Item;
 import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegistryObject;
 
 import java.util.Objects;
 
@@ -23,6 +22,6 @@ public class ModItems {
     }
 
     private static RegistryObject<BlockItem> registerBlock(RegistryObject<Block> block) {
-        return ITEMS.register(Objects.requireNonNull(block.getId()).getPath(), () -> new BlockItem(block.get(), new Item.Properties().tab(ModCreativeModeTabs.MAIN_TAB)));
+        return ITEMS.register(Objects.requireNonNull(block.getId()).getPath(), () -> new BlockItem(block.get(), new Item.Properties()));
     }
 }

src/main/java/dev/micle/firefly_bush_backport/particle/FireflyParticle.java

@@ -1,32 +1,22 @@
 package dev.micle.firefly_bush_backport.particle;
 
 import dev.micle.firefly_bush_backport.config.Config;
-import net.minecraft.block.Blocks;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.particle.*;
-import net.minecraft.client.world.ClientWorld;
+import net.minecraft.core.BlockPos;
-import net.minecraft.entity.Entity;
+import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraft.particles.BasicParticleType;
+import net.minecraft.util.Mth;
-import net.minecraft.util.ReuseableStream;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.shapes.ISelectionContext;
-import net.minecraft.util.math.vector.Vector3d;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 import java.awt.*;
-import java.util.Random;
+import java.util.Optional;
-import java.util.stream.Stream;
 
 @OnlyIn(Dist.CLIENT)
-public class FireflyParticle extends SpriteTexturedParticle {
+public class FireflyParticle extends TextureSheetParticle {
-    private static final double MAXIMUM_COLLISION_VELOCITY_SQUARED = MathHelper.square(100.00F);
+    protected FireflyParticle(ClientLevel clientLevel, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) {
-    private boolean stoppedByCollision;
-    private final float friction;
-    private final boolean speedUpWhenYMotionIsBlocked;
-
-    protected FireflyParticle(ClientWorld clientLevel, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) {
         super(clientLevel, x, y, z, xSpeed, ySpeed, zSpeed);
         this.speedUpWhenYMotionIsBlocked = true;
         this.friction = Config.Client.particleExtraFriction.get().floatValue();
@@ -37,8 +27,8 @@ public class FireflyParticle extends SpriteTexturedParticle {
     }
 
     @Override
-    public IParticleRenderType getRenderType() {
+    public @NotNull ParticleRenderType getRenderType() {
-        return IParticleRenderType.PARTICLE_SHEET_TRANSLUCENT;
+        return ParticleRenderType.PARTICLE_SHEET_TRANSLUCENT;
     }
 
     @Override
@@ -59,34 +49,13 @@ public class FireflyParticle extends SpriteTexturedParticle {
     }
 
     private float getLifetimeProgress(float age) {
-        return MathHelper.clamp(age / this.lifetime, 0.0F, 1.0F);
+        return Mth.clamp(age / this.lifetime, 0.0F, 1.0F);
     }
 
     @Override
     public void tick() {
-        this.xo = this.x;
+        super.tick();
-        this.yo = this.y;
+        if (!this.level.getBlockState(BlockPos.containing(this.x, this.y, this.z)).isAir()) {
-        this.zo = this.z;
-        if (this.age++ >= this.lifetime) {
-            this.remove();
-        } else {
-            this.yd -= 0.04D * (double) this.gravity;
-            this.move(this.xd, this.yd, this.zd);
-            if (this.speedUpWhenYMotionIsBlocked && this.y == this.yd) {
-                this.xd *= 1.1D;
-                this.zd *= 1.1D;
-            }
-
-            this.xd *= this.friction;
-            this.yd *= this.friction;
-            this.zd *= this.friction;
-            if (this.onGround) {
-                this.xd *= 0.7F;
-                this.zd *= 0.7F;
-            }
-        }
-
-        if (!this.level.getBlockState(new BlockPos(this.x, this.y, this.z)).is(Blocks.AIR)) {
             this.remove();
         } else {
             this.setAlpha(getFadeAmount(this.getLifetimeProgress(this.age),
@@ -99,57 +68,18 @@ public class FireflyParticle extends SpriteTexturedParticle {
         }
     }
 
-    @Override
-    public void move(double pX, double pY, double pZ) {
-        if (!this.stoppedByCollision) {
-            double d0 = pX;
-            double d1 = pY;
-            double d2 = pZ;
-            if (this.hasPhysics && (pX != 0.0D || pY != 0.0D || pZ != 0.0D) && pX * pX + pY * pY + pZ * pZ < MAXIMUM_COLLISION_VELOCITY_SQUARED) {
-                Vector3d vec3 = Entity.collideBoundingBoxHeuristically((Entity) null, new Vector3d(pX, pY, pZ), this.getBoundingBox(), this.level, ISelectionContext.empty(), new ReuseableStream<>(Stream.empty()));
-                pX = vec3.x;
-                pY = vec3.y;
-                pZ = vec3.z;
-            }
-
-            if (pX != 0.0D || pY != 0.0D || pZ != 0.0D) {
-                this.setBoundingBox(this.getBoundingBox().move(pX, pY, pZ));
-                this.setLocationFromBoundingbox();
-            }
-
-            if (Math.abs(d1) >= (double) 1.0E-5F && Math.abs(pY) < (double) 1.0E-5F) {
-                this.stoppedByCollision = true;
-            }
-
-            this.onGround = d1 != pY && d1 < 0.00;
-            if (d0 != pX) {
-                this.xd = 0.0D;
-            }
-
-            if (d2 != pZ) {
-                this.zd = 0.0D;
-            }
-        }
-    }
-
-    private void setParticleSpeed(double xd, double yd, double zd) {
-        this.xd = xd;
-        this.yd = yd;
-        this.zd = zd;
-    }
-
     @OnlyIn(Dist.CLIENT)
-    public static class FireflyProvider implements IParticleFactory<BasicParticleType> {
+    public static class FireflyProvider implements ParticleProvider<SimpleParticleType> {
-        private final IAnimatedSprite sprite;
+        private final SpriteSet sprite;
 
-        public FireflyProvider(IAnimatedSprite spriteSet) {
+        public FireflyProvider(SpriteSet spriteSet) {
             this.sprite = spriteSet;
         }
 
         @ParametersAreNonnullByDefault
         public Particle createParticle(
-                BasicParticleType simpleParticleType,
+                SimpleParticleType simpleParticleType,
-                ClientWorld clientLevel,
+                ClientLevel clientLevel,
                 double x,
                 double y,
                 double z,
@@ -166,21 +96,19 @@ public class FireflyParticle extends SpriteTexturedParticle {
                     clientLevel.random.nextBoolean() ? ySpeed : -ySpeed,
                     0.5 - clientLevel.random.nextDouble()
             );
-            fireflyParticle.setLifetime(nextIntBetweenInclusive(
+            fireflyParticle.setLifetime(clientLevel.random.nextIntBetweenInclusive(
-                    clientLevel.random, Config.Client.particleMinLifetime.get(), Config.Client.particleMaxLifetime.get()
+                    Config.Client.particleMinLifetime.get(), Config.Client.particleMaxLifetime.get()
             ));
             fireflyParticle.scale(1.5F);
             fireflyParticle.pickSprite(this.sprite);
             fireflyParticle.setAlpha(0.0F);
 
-            Color color = Config.Client.particleExtraColorsWeightedList.getOne(clientLevel.random);
+            Optional<Color> optionalColor = Config.Client.particleExtraColorsWeightedList.getRandomValue(clientLevel.random);
-            fireflyParticle.setColor(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F);
+            optionalColor.ifPresent(color ->
+                    fireflyParticle.setColor(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F)
+            );
 
             return fireflyParticle;
         }
-
-        private int nextIntBetweenInclusive(Random random, int low, int high) {
-            return random.nextInt(high - low + 1) + low;
-        }
     }
 }

src/main/java/dev/micle/firefly_bush_backport/particle/ModParticles.java

@@ -1,18 +1,18 @@
 package dev.micle.firefly_bush_backport.particle;
 
 import dev.micle.firefly_bush_backport.FireflyBushBackport;
-import net.minecraft.particles.BasicParticleType;
+import net.minecraft.core.particles.ParticleType;
-import net.minecraft.particles.ParticleType;
+import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegistryObject;
 
 public class ModParticles {
     public static final DeferredRegister<ParticleType<?>> PARTICLE_TYPES = DeferredRegister.create(ForgeRegistries.PARTICLE_TYPES, FireflyBushBackport.MOD_ID);
 
-    public static final RegistryObject<BasicParticleType> FIREFLY = PARTICLE_TYPES.register("firefly",
+    public static final RegistryObject<SimpleParticleType> FIREFLY = PARTICLE_TYPES.register("firefly",
-            () -> new BasicParticleType(false));
+            () -> new SimpleParticleType(false));
 
     public static void register(IEventBus modEventBus) {
         PARTICLE_TYPES.register(modEventBus);

src/main/java/dev/micle/firefly_bush_backport/proxy/IProxy.java

@@ -1,11 +1,11 @@
 package dev.micle.firefly_bush_backport.proxy;
 
-import net.minecraft.client.world.ClientWorld;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.Level;
 
 public interface IProxy {
     MinecraftServer getServer();
-    PlayerEntity getClientPlayer();
+    Player getClientPlayer();
-    ClientWorld getClientLevel();
+    Level getClientLevel();
 }

src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java

@@ -1,43 +1,40 @@
 package dev.micle.firefly_bush_backport.proxy;
 
+import dev.micle.firefly_bush_backport.FireflyBushBackport;
 import dev.micle.firefly_bush_backport.block.ModBlocks;
 import dev.micle.firefly_bush_backport.config.Config;
-import dev.micle.firefly_bush_backport.event.OnBiomeLoadingEventHandler;
 import dev.micle.firefly_bush_backport.event.OnWandererTradesEventHandler;
+import dev.micle.firefly_bush_backport.tab.ModCreativeModeTabs;
 import dev.micle.firefly_bush_backport.item.ModItems;
 import dev.micle.firefly_bush_backport.particle.FireflyParticle;
 import dev.micle.firefly_bush_backport.particle.ModParticles;
 import dev.micle.firefly_bush_backport.sound.ModSounds;
-import dev.micle.firefly_bush_backport.tab.ModCreativeModeTabs;
-import net.minecraft.block.ComposterBlock;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.RenderTypeLookup;
-import net.minecraft.client.world.ClientWorld;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.ComposterBlock;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.client.event.ParticleFactoryRegisterEvent;
+import net.minecraftforge.client.event.RegisterParticleProvidersEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.AddReloadListenerEvent;
+import net.minecraftforge.event.server.ServerStartedEvent;
+import net.minecraftforge.event.server.ServerStoppingEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.event.lifecycle.*;
-import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
-import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
 public class Proxy implements IProxy {
     private static MinecraftServer server = null;
 
     // Common setup
     public Proxy() {
-        IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
+        IEventBus modEventBus = FireflyBushBackport.getFMLJavaModLoadingContext().getModEventBus();
 
         Config.register();
         ModBlocks.register(modEventBus);
         ModItems.register(modEventBus);
-        ModCreativeModeTabs.register();
+        ModCreativeModeTabs.register(modEventBus);
         ModSounds.register(modEventBus);
         ModParticles.register(modEventBus);
 
@@ -53,7 +50,6 @@ public class Proxy implements IProxy {
 
         // Register event handlers
         MinecraftForge.EVENT_BUS.register(new OnWandererTradesEventHandler());
-        MinecraftForge.EVENT_BUS.register(new OnBiomeLoadingEventHandler());
     }
 
     private static void setup(FMLCommonSetupEvent event) {
@@ -66,11 +62,11 @@ public class Proxy implements IProxy {
 
     private static void onAddReloadListeners(AddReloadListenerEvent event) {}
 
-    private static void serverStarted(FMLServerStartedEvent event) {
+    private static void serverStarted(ServerStartedEvent event) {
         server = event.getServer();
     }
 
-    private static void serverStopping(FMLServerStoppingEvent event) {
+    private static void serverStopping(ServerStoppingEvent event) {
         server = null;
     }
 
@@ -80,19 +76,19 @@ public class Proxy implements IProxy {
     }
 
     @Override
-    public PlayerEntity getClientPlayer() {
+    public Player getClientPlayer() {
         return null;
     }
 
     @Override
-    public ClientWorld getClientLevel() {
+    public Level getClientLevel() {
         return null;
     }
 
     // Client setup
     public static class Client extends Proxy {
         public Client() {
-            IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
+            IEventBus modEventBus = FireflyBushBackport.getFMLJavaModLoadingContext().getModEventBus();
 
             // Register mod event bus listeners
             modEventBus.addListener(Client::setup);
@@ -100,25 +96,23 @@ public class Proxy implements IProxy {
             modEventBus.addListener(Client::registerParticleFactories);
         }
 
-        private static void setup(FMLClientSetupEvent event) {
+        private static void setup(FMLClientSetupEvent event) {}
-            RenderTypeLookup.setRenderLayer(ModBlocks.FIREFLY_BUSH.get(), RenderType.cutout());
-        }
 
         private static void postSetup(FMLLoadCompleteEvent event) {}
 
-        private static void registerParticleFactories(ParticleFactoryRegisterEvent event) {
+        private static void registerParticleFactories(RegisterParticleProvidersEvent event) {
-            Minecraft.getInstance().particleEngine.register(ModParticles.FIREFLY.get(), FireflyParticle.FireflyProvider::new);
+            event.registerSpriteSet(ModParticles.FIREFLY.get(), FireflyParticle.FireflyProvider::new);
         }
 
         @Override
         @OnlyIn(Dist.CLIENT)
-        public PlayerEntity getClientPlayer() {
+        public Player getClientPlayer() {
             return Minecraft.getInstance().player;
         }
 
         @Override
         @OnlyIn(Dist.CLIENT)
-        public ClientWorld getClientLevel() {
+        public Level getClientLevel() {
             return Minecraft.getInstance().level;
         }
     }
@@ -127,7 +121,7 @@ public class Proxy implements IProxy {
     public static class Server extends Proxy {
         public Server() {
             // Register mod event bus listeners
-            IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
+            IEventBus modEventBus = FireflyBushBackport.getFMLJavaModLoadingContext().getModEventBus();
             modEventBus.addListener(Server::setup);
         }
 

src/main/java/dev/micle/firefly_bush_backport/sound/ModSounds.java

@@ -1,12 +1,12 @@
 package dev.micle.firefly_bush_backport.sound;
 
 import dev.micle.firefly_bush_backport.FireflyBushBackport;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.SoundEvent;
+import net.minecraft.sounds.SoundEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegistryObject;
 
 public class ModSounds {
     public static final DeferredRegister<SoundEvent> SOUND_EVENTS = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, FireflyBushBackport.MOD_ID);
@@ -18,6 +18,6 @@ public class ModSounds {
     }
 
     private static RegistryObject<SoundEvent> registerSoundEvent(String name) {
-        return SOUND_EVENTS.register(name, () -> new SoundEvent(new ResourceLocation(FireflyBushBackport.MOD_ID, name)));
+        return SOUND_EVENTS.register(name, () -> SoundEvent.createVariableRangeEvent(ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, name)));
     }
 }

src/main/java/dev/micle/firefly_bush_backport/tab/ModCreativeModeTabs.java

@@ -2,24 +2,27 @@ package dev.micle.firefly_bush_backport.tab;
 
 import dev.micle.firefly_bush_backport.FireflyBushBackport;
 import dev.micle.firefly_bush_backport.block.ModBlocks;
-import net.minecraft.item.ItemGroup;
+import net.minecraft.core.registries.Registries;
-import net.minecraft.item.ItemStack;
+import net.minecraft.network.chat.Component;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.util.text.ITextComponent;
+import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraft.util.text.TranslationTextComponent;
+import net.minecraftforge.registries.DeferredRegister;
+import net.minecraftforge.registries.RegistryObject;
 
 public class ModCreativeModeTabs {
-    public static final ItemGroup MAIN_TAB = new ItemGroup(new ResourceLocation(FireflyBushBackport.MOD_ID, "main").toString()) {
+    public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, FireflyBushBackport.MOD_ID);
-        @Override
-        public ItemStack makeIcon() {
-            return ModBlocks.FIREFLY_BUSH.get().asItem().getDefaultInstance();
-        }
 
-        @Override
+    public static final RegistryObject<CreativeModeTab> MAIN_TAB = CREATIVE_MODE_TABS.register( "main",
-        public ITextComponent getDisplayName() {
+            () -> CreativeModeTab.builder()
-            return new TranslationTextComponent(String.format("itemGroup.%s.main", FireflyBushBackport.MOD_ID));
+                    .title(Component.translatable(String.format("itemGroup.%s.main", FireflyBushBackport.MOD_ID)))
-        }
+                    .icon(ModBlocks.FIREFLY_BUSH.get().asItem()::getDefaultInstance)
-    };
+                    .displayItems((itemDisplayParams, output) -> {
+                        output.accept(ModBlocks.FIREFLY_BUSH.get());
+                    })
+                    .build()
+    );
 
-    public static void register() {}
+    public static void register(IEventBus modEventBus) {
+        CREATIVE_MODE_TABS.register(modEventBus);
+    }
 }

src/main/java/dev/micle/firefly_bush_backport/worldgen/ModBiomeModifiers.java

@@ -0,0 +1,59 @@
+package dev.micle.firefly_bush_backport.worldgen;
+
+import dev.micle.firefly_bush_backport.FireflyBushBackport;
+import net.minecraft.core.HolderGetter;
+import net.minecraft.core.HolderSet;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.data.worldgen.BootstapContext;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.BiomeTags;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.levelgen.GenerationStep;
+import net.minecraft.world.level.levelgen.placement.PlacedFeature;
+import net.minecraftforge.common.Tags;
+import net.minecraftforge.common.world.BiomeModifier;
+import net.minecraftforge.common.world.ForgeBiomeModifiers;
+import net.minecraftforge.registries.ForgeRegistries;
+
+import java.util.Set;
+
+public class ModBiomeModifiers {
+    public static final ResourceKey<BiomeModifier> ADD_PATCH_FIREFLY_BUSH_SWAMP = registerKey("add_patch_firefly_bush_swamp");
+    public static final ResourceKey<BiomeModifier> ADD_PATCH_FIREFLY_BUSH_NEAR_WATER_SWAMP = registerKey("add_patch_firefly_bush_near_water_swamp");
+    public static final ResourceKey<BiomeModifier> ADD_PATCH_FIREFLY_BUSH_NEAR_WATER = registerKey("add_patch_firefly_bush_near_water");
+    public static final ResourceKey<BiomeModifier> REMOVE_PATCH_FIREFLY_BUSH_NEAR_WATER = registerKey("remove_patch_firefly_bush_near_water");
+
+    public static void bootstrap(BootstapContext<BiomeModifier> context) {
+        HolderGetter<PlacedFeature> placedFeatures = context.lookup(Registries.PLACED_FEATURE);
+        HolderGetter<Biome> biomes = context.lookup(Registries.BIOME);
+
+        context.register(ADD_PATCH_FIREFLY_BUSH_SWAMP, new ForgeBiomeModifiers.AddFeaturesBiomeModifier(
+                biomes.getOrThrow(Tags.Biomes.IS_SWAMP),
+                HolderSet.direct(placedFeatures.getOrThrow(ModPlacedFeatures.PATCH_FIREFLY_BUSH_SWAMP_PLACED_KEY)),
+                GenerationStep.Decoration.VEGETAL_DECORATION
+        ));
+
+        context.register(ADD_PATCH_FIREFLY_BUSH_NEAR_WATER_SWAMP, new ForgeBiomeModifiers.AddFeaturesBiomeModifier(
+                biomes.getOrThrow(Tags.Biomes.IS_SWAMP),
+                HolderSet.direct(placedFeatures.getOrThrow(ModPlacedFeatures.PATCH_FIREFLY_BUSH_NEAR_WATER_SWAMP_PLACED_KEY)),
+                GenerationStep.Decoration.VEGETAL_DECORATION
+        ));
+
+        context.register(ADD_PATCH_FIREFLY_BUSH_NEAR_WATER, new ForgeBiomeModifiers.AddFeaturesBiomeModifier(
+                biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
+                HolderSet.direct(placedFeatures.getOrThrow(ModPlacedFeatures.PATCH_FIREFLY_BUSH_NEAR_WATER_PLACED_KEY)),
+                GenerationStep.Decoration.VEGETAL_DECORATION
+        ));
+
+        context.register(REMOVE_PATCH_FIREFLY_BUSH_NEAR_WATER, new ForgeBiomeModifiers.RemoveFeaturesBiomeModifier(
+                biomes.getOrThrow(Tags.Biomes.IS_SWAMP),
+                HolderSet.direct(placedFeatures.getOrThrow(ModPlacedFeatures.PATCH_FIREFLY_BUSH_NEAR_WATER_PLACED_KEY)),
+                Set.of(GenerationStep.Decoration.VEGETAL_DECORATION)
+        ));
+    }
+
+    private static ResourceKey<BiomeModifier> registerKey(String name) {
+        return ResourceKey.create(ForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, name));
+    }
+}

src/main/java/dev/micle/firefly_bush_backport/worldgen/ModConfiguredFeatures.java

@@ -2,43 +2,43 @@ package dev.micle.firefly_bush_backport.worldgen;
 
 import dev.micle.firefly_bush_backport.FireflyBushBackport;
 import dev.micle.firefly_bush_backport.block.ModBlocks;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.core.registries.Registries;
-import net.minecraft.util.registry.Registry;
+import net.minecraft.data.worldgen.BootstapContext;
-import net.minecraft.util.registry.WorldGenRegistries;
+import net.minecraft.data.worldgen.placement.PlacementUtils;
-import net.minecraft.world.gen.blockplacer.SimpleBlockPlacer;
+import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.gen.blockstateprovider.SimpleBlockStateProvider;
+import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.gen.feature.*;
+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.RandomPatchConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration;
+import net.minecraft.world.level.levelgen.feature.stateproviders.SimpleStateProvider;
 
 public class ModConfiguredFeatures {
-    private static final BlockClusterFeatureConfig.Builder CONFIG_PATCH_FIREFLY_BUSH = new BlockClusterFeatureConfig.Builder(
+    public static final ResourceKey<ConfiguredFeature<?, ?>> PATCH_FIREFLY_BUSH_KEY = registerKey("patch_firefly_bush");
-            new SimpleBlockStateProvider(ModBlocks.FIREFLY_BUSH.get().defaultBlockState()), new SimpleBlockPlacer()
-    ).tries(20).xspread(4).yspread(3).zspread(4);
 
-    public static final ConfiguredFeature<?, ?> CONFIGURED_PATCH_FIREFLY_BUSH = create("patch_firefly_bush", Feature.RANDOM_PATCH.configured(
+    public static void bootstrap(BootstapContext<ConfiguredFeature<?, ?>> context) {
-            CONFIG_PATCH_FIREFLY_BUSH.build()
+        register(context, PATCH_FIREFLY_BUSH_KEY, Feature.RANDOM_PATCH, new RandomPatchConfiguration(
-    ));
+                20,
+                4,
+                3,
+                PlacementUtils.onlyWhenEmpty(
+                        Feature.SIMPLE_BLOCK,
+                        new SimpleBlockConfiguration(
+                                SimpleStateProvider.simple(ModBlocks.FIREFLY_BUSH.get())
+                        )
+                )
+        ));
+    }
 
-    public static final ConfiguredFeature<?, ?> CONFIGURED_PATCH_FIREFLY_BUSH_NEAR_WATER = create("patch_firefly_bush", Feature.RANDOM_PATCH.configured(
+    public static ResourceKey<ConfiguredFeature<?, ?>> registerKey(String name) {
-            CONFIG_PATCH_FIREFLY_BUSH.needWater().build()
+        return ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, name));
-    ));
+    }
 
-    public static final ConfiguredFeature<?, ?> PLACED_PATCH_FIREFLY_BUSH_SWAMP = create("patch_firefly_bush_swamp", CONFIGURED_PATCH_FIREFLY_BUSH
+    private static <FC extends FeatureConfiguration, F extends Feature<FC>> void register(
-            .chance(8)
+            BootstapContext<ConfiguredFeature<?, ?>> context,
-            .decorated(Features.Placements.HEIGHTMAP_SQUARE)
+            ResourceKey<ConfiguredFeature<?, ?>> key, F feature, FC configuration
-    );
+    ) {
-
+        context.register(key, new ConfiguredFeature<>(feature, configuration));
-    public static final ConfiguredFeature<?, ?> PLACED_PATCH_FIREFLY_BUSH_NEAR_WATER_SWAMP = create("patch_firefly_bush_near_water_swamp", CONFIGURED_PATCH_FIREFLY_BUSH_NEAR_WATER
-            .count(3)
-            .decorated(Features.Placements.HEIGHTMAP_SQUARE)
-    );
-
-    public static final ConfiguredFeature<?, ?> PLACED_PATCH_FIREFLY_BUSH_NEAR_WATER = create("patch_firefly_bush_near_water", CONFIGURED_PATCH_FIREFLY_BUSH_NEAR_WATER
-            .count(2)
-            .decorated(Features.Placements.TOP_SOLID_HEIGHTMAP_SQUARE)
-    );
-
-    private static <FC extends IFeatureConfig, F extends Feature<FC>, CF extends ConfiguredFeature<FC, F>> CF create(String id, CF configuredFeature) {
-        Registry.register(WorldGenRegistries.CONFIGURED_FEATURE, new ResourceLocation(FireflyBushBackport.MOD_ID, id), configuredFeature);
-        return configuredFeature;
     }
 }

src/main/java/dev/micle/firefly_bush_backport/worldgen/ModPlacedFeatures.java

@@ -0,0 +1,79 @@
+package dev.micle.firefly_bush_backport.worldgen;
+
+import dev.micle.firefly_bush_backport.FireflyBushBackport;
+import dev.micle.firefly_bush_backport.block.ModBlocks;
+import net.minecraft.core.Holder;
+import net.minecraft.core.HolderGetter;
+import net.minecraft.core.Vec3i;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.data.worldgen.BootstapContext;
+import net.minecraft.data.worldgen.placement.PlacementUtils;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.levelgen.Heightmap;
+import net.minecraft.world.level.levelgen.blockpredicates.BlockPredicate;
+import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
+import net.minecraft.world.level.levelgen.placement.*;
+import net.minecraft.world.level.material.Fluids;
+
+import java.util.List;
+
+public class ModPlacedFeatures {
+    public static final ResourceKey<PlacedFeature> PATCH_FIREFLY_BUSH_SWAMP_PLACED_KEY = registerKey("patch_firefly_bush_swamp");
+    public static final ResourceKey<PlacedFeature> PATCH_FIREFLY_BUSH_NEAR_WATER_SWAMP_PLACED_KEY = registerKey("patch_firefly_bush_near_water_swamp");
+    public static final ResourceKey<PlacedFeature> PATCH_FIREFLY_BUSH_NEAR_WATER_PLACED_KEY = registerKey("patch_firefly_bush_near_water");
+
+    public static void bootstrap(BootstapContext<PlacedFeature> context) {
+        HolderGetter<ConfiguredFeature<?, ?>> configuredFeatures = context.lookup(Registries.CONFIGURED_FEATURE);
+
+        register(context, PATCH_FIREFLY_BUSH_SWAMP_PLACED_KEY, configuredFeatures.getOrThrow(ModConfiguredFeatures.PATCH_FIREFLY_BUSH_KEY), List.of(
+                RarityFilter.onAverageOnceEvery(8),
+                InSquarePlacement.spread(),
+                PlacementUtils.HEIGHTMAP,
+                BiomeFilter.biome()
+        ));
+
+        register(context, PATCH_FIREFLY_BUSH_NEAR_WATER_SWAMP_PLACED_KEY, configuredFeatures.getOrThrow(ModConfiguredFeatures.PATCH_FIREFLY_BUSH_KEY), List.of(
+                CountPlacement.of(3),
+                InSquarePlacement.spread(),
+                PlacementUtils.HEIGHTMAP,
+                BiomeFilter.biome(),
+                BlockPredicateFilter.forPredicate(BlockPredicate.allOf(
+                        BlockPredicate.matchesBlocks(Blocks.AIR),
+                        BlockPredicate.wouldSurvive(ModBlocks.FIREFLY_BUSH.get().defaultBlockState(), Vec3i.ZERO),
+                        BlockPredicate.anyOf(
+                                BlockPredicate.matchesFluids(new Vec3i(1, -1, 0), List.of(Fluids.WATER, Fluids.FLOWING_WATER)),
+                                BlockPredicate.matchesFluids(new Vec3i(-1, -1, 0), List.of(Fluids.WATER, Fluids.FLOWING_WATER)),
+                                BlockPredicate.matchesFluids(new Vec3i(0, -1, 1), List.of(Fluids.WATER, Fluids.FLOWING_WATER)),
+                                BlockPredicate.matchesFluids(new Vec3i(0, -1, -1), List.of(Fluids.WATER, Fluids.FLOWING_WATER))
+                        )
+                ))
+        ));
+
+        register(context, PATCH_FIREFLY_BUSH_NEAR_WATER_PLACED_KEY, configuredFeatures.getOrThrow(ModConfiguredFeatures.PATCH_FIREFLY_BUSH_KEY), List.of(
+                CountPlacement.of(2),
+                InSquarePlacement.spread(),
+                HeightmapPlacement.onHeightmap(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES),
+                BiomeFilter.biome(),
+                BlockPredicateFilter.forPredicate(BlockPredicate.allOf(
+                        BlockPredicate.matchesBlocks(Blocks.AIR),
+                        BlockPredicate.wouldSurvive(ModBlocks.FIREFLY_BUSH.get().defaultBlockState(), Vec3i.ZERO),
+                        BlockPredicate.anyOf(
+                                BlockPredicate.matchesFluids(new Vec3i(1, -1, 0), List.of(Fluids.WATER, Fluids.FLOWING_WATER)),
+                                BlockPredicate.matchesFluids(new Vec3i(-1, -1, 0), List.of(Fluids.WATER, Fluids.FLOWING_WATER)),
+                                BlockPredicate.matchesFluids(new Vec3i(0, -1, 1), List.of(Fluids.WATER, Fluids.FLOWING_WATER)),
+                                BlockPredicate.matchesFluids(new Vec3i(0, -1, -1), List.of(Fluids.WATER, Fluids.FLOWING_WATER))
+                        )
+                ))
+        ));
+    }
+
+    private static ResourceKey<PlacedFeature> registerKey(String name) {
+        return ResourceKey.create(Registries.PLACED_FEATURE, ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, name));
+    }
+
+    private static void register(BootstapContext<PlacedFeature> context, ResourceKey<PlacedFeature> key, Holder<ConfiguredFeature<?, ?>> configuration, List<PlacementModifier> modifiers) {
+        context.register(key, new PlacedFeature(configuration, List.copyOf(modifiers)));
+    }
+}