1.18.1

[BoundingBoxOutlineReloaded.git] / src / main / java / com / irtimaled / bbor / client / interop / FlowerForestHelper.java

diff --git a/src/main/java/com/irtimaled/bbor/client/interop/FlowerForestHelper.java b/src/main/java/com/irtimaled/bbor/client/interop/FlowerForestHelper.java
index 1d64707817d4b13abb1b7db7bd8bf68d75f8666e..06c5cc890f6dc93ddde67a808b26c976d057b3b4 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/interop/FlowerForestHelper.java
+++ b/src/main/java/com/irtimaled/bbor/client/interop/FlowerForestHelper.java
@@ -1,3 +1,4 @@
+/*
 package com.irtimaled.bbor.client.interop;
 
 import com.irtimaled.bbor.client.config.ConfigManager;
@@ -6,11 +7,14 @@ import com.irtimaled.bbor.client.config.Setting;
 import com.irtimaled.bbor.common.models.Coords;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
-import net.minecraft.client.Minecraft;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.biome.Biomes;
-import net.minecraft.world.gen.feature.DecoratedFeatureConfig;
-import net.minecraft.world.gen.feature.FlowersFeature;
+import net.minecraft.util.registry.BuiltinRegistries;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.biome.BiomeKeys;
+import net.minecraft.world.gen.feature.ConfiguredFeature;
+import net.minecraft.world.gen.feature.FeatureConfig;
+import net.minecraft.world.gen.feature.FlowerFeature;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -20,7 +24,10 @@ public class FlowerForestHelper {
     private static final Random random = new Random();
 
     private static final Map<BlockState, Setting<HexColor>> flowerColorMap = new HashMap<>();
-    private static final FlowersFeature flowersFeature;
+    private static final FlowerFeature flowersFeature;
+    private static final FeatureConfig flowersConfig;
+
+    public static final Biome BIOME = BuiltinRegistries.BIOME.get(BiomeKeys.FLOWER_FOREST);
 
     static {
         flowerColorMap.put(Blocks.DANDELION.getDefaultState(), ConfigManager.colorFlowerForestDandelion);
@@ -34,15 +41,15 @@ public class FlowerForestHelper {
         flowerColorMap.put(Blocks.OXEYE_DAISY.getDefaultState(), ConfigManager.colorFlowerForestOxeyeDaisy);
         flowerColorMap.put(Blocks.CORNFLOWER.getDefaultState(), ConfigManager.colorFlowerForestCornflower);
         flowerColorMap.put(Blocks.LILY_OF_THE_VALLEY.getDefaultState(), ConfigManager.colorFlowerForestLilyOfTheValley);
-
-        DecoratedFeatureConfig config = (DecoratedFeatureConfig) Biomes.FLOWER_FOREST.getFlowers().get(0).config;
-        flowersFeature = (FlowersFeature) config.feature.feature;
+        ConfiguredFeature<?, ?> config = BIOME.getGenerationSettings().getFlowerFeatures().get(0);
+        flowersFeature = (FlowerFeature) config.feature;
+        flowersConfig = config.config;
     }
 
     public static Setting<HexColor> getFlowerColorAtPos(Coords coords) {
         int x = coords.getX();
         int z = coords.getZ();
-        BlockState blockState = flowersFeature.getRandomFlower(random, new BlockPos(x, coords.getY(), z));
+        BlockState blockState = flowersFeature.getFlowerState(random, new BlockPos(x, coords.getY(), z), flowersConfig);
         return flowerColorMap.get(blockState);
     }
 
@@ -51,6 +58,8 @@ public class FlowerForestHelper {
     }
 
     public static boolean canGrowFlower(int x, int y, int z) {
-        return Minecraft.getInstance().world.getBlockState(new BlockPos(x, y, z)).getBlock() == Blocks.GRASS_BLOCK;
+        return MinecraftClient.getInstance().world.getBlockState(new BlockPos(x, y, z)).getBlock() == Blocks.GRASS_BLOCK;
     }
 }
+
+ */
\ No newline at end of file