From 72e29223a1de97ce02f05c1a1d74ef2b2ce19f3a Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Wed, 1 Dec 2021 14:52:21 +0300
Subject: [PATCH] Small fix, cleanup

---
 .../java/ru/bclib/world/biomes/BCLBiome.java  | 10 ++++
 .../generator/map/hex/HexBiomeChunk.java      |  2 +-
 src/main/resources/bclib.mixins.client.json   | 14 ++---
 src/main/resources/bclib.mixins.common.json   | 59 +++++++++----------
 4 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/src/main/java/ru/bclib/world/biomes/BCLBiome.java b/src/main/java/ru/bclib/world/biomes/BCLBiome.java
index 19a345a2..59833b74 100644
--- a/src/main/java/ru/bclib/world/biomes/BCLBiome.java
+++ b/src/main/java/ru/bclib/world/biomes/BCLBiome.java
@@ -3,6 +3,7 @@ package ru.bclib.world.biomes;
 import com.google.common.collect.Maps;
 import net.minecraft.core.Registry;
 import net.minecraft.data.BuiltinRegistries;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.biome.Biome;
 import org.jetbrains.annotations.Nullable;
@@ -26,6 +27,14 @@ public class BCLBiome {
 	private float genChance = 1.0F;
 	private float edgeSize = 0.0F;
 	
+	/**
+	 * Create wrapper for existing biome using its {@link ResourceLocation} identifier.
+	 * @param biomeKey {@link ResourceKey} for the {@link Biome}.
+	 */
+	public BCLBiome(ResourceKey<Biome> biomeKey) {
+		this(biomeKey.location());
+	}
+	
 	/**
 	 * Create wrapper for existing biome using its {@link ResourceLocation} identifier.
 	 * @param biomeID {@link ResourceLocation} biome ID.
@@ -43,6 +52,7 @@ public class BCLBiome {
 	}
 	
 	public BCLBiome(ResourceLocation biomeID, Biome biome) {
+		this.subbiomes.add(this, 1.0F);
 		this.biomeID = biomeID;
 		this.biome = biome;
 	}
diff --git a/src/main/java/ru/bclib/world/generator/map/hex/HexBiomeChunk.java b/src/main/java/ru/bclib/world/generator/map/hex/HexBiomeChunk.java
index 57d46f79..fa737803 100644
--- a/src/main/java/ru/bclib/world/generator/map/hex/HexBiomeChunk.java
+++ b/src/main/java/ru/bclib/world/generator/map/hex/HexBiomeChunk.java
@@ -65,7 +65,7 @@ public class HexBiomeChunk {
 		}
 		
 		for (short index = 0; index < SIZE; index++) {
-			if (random.nextInt(4) == 0) {
+			if (outBuffer[index] != null && random.nextInt(4) == 0) {
 				circle(outBuffer, index, outBuffer[index].getSubBiome(random), outBuffer[index]);
 			}
 		}
diff --git a/src/main/resources/bclib.mixins.client.json b/src/main/resources/bclib.mixins.client.json
index d8d18a6d..b633a525 100644
--- a/src/main/resources/bclib.mixins.client.json
+++ b/src/main/resources/bclib.mixins.client.json
@@ -4,17 +4,17 @@
 	"package": "ru.bclib.mixin.client",
 	"compatibilityLevel": "JAVA_17",
 	"client": [
-		"AnvilScreenMixin",
+		"SimpleReloadableResourceManagerMixin",
+		"EnchantingTableBlockMixin",
 		"BackgroundRendererMixin",
 		"ClientRecipeBookMixin",
-		"EnchantingTableBlockMixin",
-		"GameMixin",
+		"ModelManagerMixin",
+		"TextureAtlasMixin",
+		"AnvilScreenMixin",
+		"ModelBakeryMixin",
 		"MinecraftMixin",
 		"GameMixin",
-		"ModelBakeryMixin",
-		"ModelManagerMixin",
-		"SimpleReloadableResourceManagerMixin",
-		"TextureAtlasMixin"
+		"GameMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1
diff --git a/src/main/resources/bclib.mixins.common.json b/src/main/resources/bclib.mixins.common.json
index a2ac975c..bb587aa9 100644
--- a/src/main/resources/bclib.mixins.common.json
+++ b/src/main/resources/bclib.mixins.common.json
@@ -4,41 +4,40 @@
 	"package": "ru.bclib.mixin.common",
 	"compatibilityLevel": "JAVA_17",
 	"mixins": [
-		"AnvilBlockMixin",
-		"AnvilMenuMixin",
-		"ChunkGeneratorMixin",
-		"BoneMealItemMixin",
+		"SimpleReloadableResourceManagerMixin",
+		"shears.DiggingEnchantmentMixin",
+		"LayerLightSectionStorageMixin",
+		"shears.TripWireBlockMixin",
+		"shears.BeehiveBlockMixin",
+		"shears.PumpkinBlockMixin",
+		"shears.MushroomCowMixin",
 		"ComposterBlockAccessor",
 		"PotionBrewingAccessor",
-		"RecipeManagerAccessor",
-		"CraftingMenuMixin",
-		"EnchantmentMenuMixin",
-		"LayerLightSectionStorageMixin",
-		"MainMixin",
-		"MinecraftServerMixin",
-		"PistonBaseBlockMixin",
-		"WorldGenRegionMixin",
-		"TheEndBiomeDataMixin",
-		"NetherBiomeDataMixin",
-		"RecipeManagerMixin",
-		"CraftingMenuMixin",
-		"BoneMealItemMixin",
-		"shears.SheepMixin",
-		"PortalShapeMixin",
 		"PotionBrewingAccessor",
 		"RecipeManagerAccessor",
-		"RecipeManagerMixin",
-		"ServerLevelMixin",
-		"SimpleReloadableResourceManagerMixin",
-		"TagLoaderMixin",
-		"WorldGenRegionMixin",
-		"shears.BeehiveBlockMixin",
-		"shears.DiggingEnchantmentMixin",
-		"shears.MushroomCowMixin",
-		"shears.PumpkinBlockMixin",
-		"shears.SheepMixin",
+		"RecipeManagerAccessor",
 		"shears.SnowGolemMixin",
-		"shears.TripWireBlockMixin"
+		"EnchantmentMenuMixin",
+		"MinecraftServerMixin",
+		"NetherBiomeDataMixin",
+		"PistonBaseBlockMixin",
+		"TheEndBiomeDataMixin",
+		"ChunkGeneratorMixin",
+		"WorldGenRegionMixin",
+		"WorldGenRegionMixin",
+		"RecipeManagerMixin",
+		"RecipeManagerMixin",
+		"BoneMealItemMixin",
+		"CraftingMenuMixin",
+		"CraftingMenuMixin",
+		"shears.SheepMixin",
+		"shears.SheepMixin",
+		"PortalShapeMixin",
+		"ServerLevelMixin",
+		"AnvilBlockMixin",
+		"AnvilMenuMixin",
+		"TagLoaderMixin",
+		"MainMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1