Merge branch 'master' of https://github.com/paulevsGitch/BetterEnd.git

src/main/java/ru/betterend/BetterEnd.java

@@ -29,9 +29,9 @@ public class BetterEnd implements ModInitializer {
 		FeatureRegistry.register();
 		BiomeRegistry.register();
 		BetterEndBiomeSource.register();
+		BlockTagRegistry.register();
 		CraftingRecipes.register();
 		AlloyingRecipes.register();
-		BlockTagRegistry.register();
 	}
 	
 	public static Identifier getResId(String path) {

src/main/java/ru/betterend/mixin/common/BiomeMixin.java

@@ -0,0 +1,54 @@
+package ru.betterend.mixin.common;
+
+import java.util.List;
+import java.util.function.Supplier;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import com.google.common.collect.Lists;
+
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.ChunkRegion;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.biome.GenerationSettings;
+import net.minecraft.world.gen.ChunkRandom;
+import net.minecraft.world.gen.StructureAccessor;
+import net.minecraft.world.gen.chunk.ChunkGenerator;
+import net.minecraft.world.gen.feature.ConfiguredFeature;
+import ru.betterend.registry.FeatureRegistry;
+
+@Mixin(Biome.class)
+public abstract class BiomeMixin {
+	
+	@Shadow
+	private Biome.Category category;
+	@Shadow
+	private GenerationSettings generationSettings;
+	private boolean injected = false;
+	
+	@Inject(method = "generateFeatureStep", at = @At("HEAD"))
+	public void generateFeatureStep(StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, ChunkRegion region, long populationSeed, ChunkRandom random, BlockPos pos, CallbackInfo cinfo) {
+		if (!injected) {
+			if (category.equals(Biome.Category.THEEND)) {
+				int index = FeatureRegistry.ENDER_ORE.getFeatureStep().ordinal();
+				List<List<Supplier<ConfiguredFeature<?, ?>>>> features = this.generationSettings.getFeatures();
+				if (features.size() > index) {
+					features.get(index).add(() -> {
+						return FeatureRegistry.ENDER_ORE.getFeatureConfigured();
+					});
+				} else {
+					List<Supplier<ConfiguredFeature<?, ?>>> feature = Lists.newArrayList();
+					feature.add(() -> {
+						return FeatureRegistry.ENDER_ORE.getFeatureConfigured();
+					});
+					features.add(feature);
+				}
+			}
+			this.injected = true;
+		}
+	}
+}

src/main/java/ru/betterend/mixin/common/DefaultBiomeCreatorMixin.java

@@ -8,6 +8,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.DefaultBiomeCreator;
 import net.minecraft.world.biome.GenerationSettings;
+import net.minecraft.world.gen.GenerationStep;
+
+import ru.betterend.BetterEnd;
+import ru.betterend.registry.FeatureRegistry;
 
 @Mixin(DefaultBiomeCreator.class)
 public abstract class DefaultBiomeCreatorMixin {

src/main/java/ru/betterend/mixin/common/GenerationSettingsMixin.java

@@ -0,0 +1,36 @@
+package ru.betterend.mixin.common;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import com.google.common.collect.Lists;
+
+import net.minecraft.world.biome.GenerationSettings;
+import net.minecraft.world.gen.GenerationStep;
+import net.minecraft.world.gen.carver.ConfiguredCarver;
+import net.minecraft.world.gen.feature.ConfiguredFeature;
+import net.minecraft.world.gen.feature.ConfiguredStructureFeature;
+import net.minecraft.world.gen.surfacebuilder.ConfiguredSurfaceBuilder;
+
+@Mixin(GenerationSettings.class)
+public abstract class GenerationSettingsMixin {
+	
+	@Shadow
+	private List<List<Supplier<ConfiguredFeature<?, ?>>>> features;
+	
+	@Inject(method = "<init>", at = @At("TAIL"))
+	void init(Supplier<ConfiguredSurfaceBuilder<?>> surfaceBuilder, Map<GenerationStep.Carver, List<Supplier<ConfiguredCarver<?>>>> carvers, List<List<Supplier<ConfiguredFeature<?, ?>>>> features, List<Supplier<ConfiguredStructureFeature<?, ?>>> structureFeatures, CallbackInfo cinfo) {
+		List<List<Supplier<ConfiguredFeature<?, ?>>>> mutableFeatures = Lists.newArrayList();
+		this.features.forEach(supplierList -> {
+			mutableFeatures.add(Lists.newArrayList(supplierList));
+		});
+		this.features = mutableFeatures;
+	}
+}

src/main/java/ru/betterend/recipe/AlloyingRecipes.java

@@ -2,6 +2,7 @@ package ru.betterend.recipe;
 
 import net.minecraft.block.Blocks;
 import net.minecraft.item.Items;
+
 import ru.betterend.registry.ItemRegistry;
 
 public class AlloyingRecipes {

src/main/java/ru/betterend/recipe/CraftingRecipes.java

@@ -5,6 +5,7 @@ import net.minecraft.block.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.Items;
 import net.minecraft.util.registry.Registry;
+
 import ru.betterend.registry.BlockRegistry;
 
 public class CraftingRecipes {

src/main/java/ru/betterend/registry/BiomeRegistry.java

@@ -12,6 +12,7 @@ import net.minecraft.util.registry.RegistryKey;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.Biome.Category;
 import net.minecraft.world.biome.BiomeKeys;
+
 import ru.betterend.world.biome.BiomeFoggyMushroomland;
 import ru.betterend.world.biome.EndBiome;
 import ru.betterend.world.generator.BiomePicker;

src/main/java/ru/betterend/registry/BlockTagRegistry.java

@@ -1,9 +1,11 @@
 package ru.betterend.registry;
 
 import net.fabricmc.fabric.api.tag.TagRegistry;
+
 import net.minecraft.block.Block;
 import net.minecraft.tag.Tag;
 import net.minecraft.tag.Tag.Identified;
+
 import ru.betterend.BetterEnd;
 import ru.betterend.util.TagHelper;
 

src/main/java/ru/betterend/registry/FeatureRegistry.java

@@ -7,7 +7,7 @@ import ru.betterend.world.features.MossyGlowshroomFeature;
 public class FeatureRegistry {
 	public static final EndFeature MOSSY_GLOWSHROOM = new EndFeature("mossy_glowshroom", new MossyGlowshroomFeature(), 1);
 	public static final EndFeature END_LAKE = EndFeature.makeLakeFeature("end_lake", new EndLakeFeature(), 100);
-	public static final EndFeature ENDER_ORE = EndFeature.makeOreFeature("ender_ore", BlockRegistry.ENDER_ORE, 2, 3, 0, 4, 128);
+	public static final EndFeature ENDER_ORE = EndFeature.makeOreFeature("ender_ore", BlockRegistry.ENDER_ORE, 6, 3, 0, 4, 96);
 	
 	public static void register() {}
 }

src/main/java/ru/betterend/registry/ItemRegistry.java

@@ -9,6 +9,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.Items;
 import net.minecraft.util.registry.Registry;
+
 import ru.betterend.BetterEnd;
 
 public class ItemRegistry {

src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java

@@ -11,8 +11,8 @@ public class BiomeFoggyMushroomland extends EndBiome {
 				.setWaterColor(119, 227, 250)
 				.setWaterFogColor(119, 227, 250)
 				.setSurface(BlockRegistry.END_MOSS, BlockRegistry.END_MYCELIUM)
+				.addFeature(FeatureRegistry.ENDER_ORE)
 				.addFeature(FeatureRegistry.END_LAKE)
-				.addFeature(FeatureRegistry.MOSSY_GLOWSHROOM)
-				.addFeature(FeatureRegistry.ENDER_ORE));
+				.addFeature(FeatureRegistry.MOSSY_GLOWSHROOM));
 	}
 }

src/main/java/ru/betterend/world/surface/DoubleBlockSurfaceBuilder.java

@@ -10,6 +10,7 @@ import net.minecraft.world.biome.Biome;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder;
 import net.minecraft.world.gen.surfacebuilder.TernarySurfaceConfig;
+
 import ru.betterend.noise.OpenSimplexNoise;
 import ru.betterend.util.MHelper;
 

src/main/resources/betterend.mixins.common.json

@@ -10,6 +10,8 @@
 		"TagGroupLoaderMixin",
 		"CraftingScreenHandlerMixin",
 		"DefaultBiomeCreatorMixin",
+		"GenerationSettingsMixin",
+		"BiomeMixin",
 		"TagAccessor"
 	],
 	"injectors": {