Biome features changes

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

@@ -49,7 +49,7 @@ public abstract class BiomeMixin {
 					features.add(Lists.newArrayList(list));
 				});
 				
-				FeatureRegistry.registerGlobals(features);
+				FeatureRegistry.registerBiomeFeatures(biome, features);
 				StructureRegistry.registerBiomeStructures(biome, structures);
 				
 				accessor.setFeatures(features);

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

@@ -1,35 +0,0 @@
-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);
-		this.features.forEach(supplierList -> {
-			mutableFeatures.add(Lists.newArrayList(supplierList));
-		});
-		this.features = mutableFeatures;
-	}*/
-}

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

@@ -1,9 +1,5 @@
 package ru.betterend.registry;
 
-import net.minecraft.world.gen.GenerationStep.Feature;
-import ru.betterend.world.structures.EndStructureFeature;
-import ru.betterend.world.structures.features.StructureMountain;
-
 public class DefaultBiomeFeatureRegistry {
 	//public static final EndStructureFeature MOUNTAINS = new EndStructureFeature("mountains", new StructureMountain(), Feature.RAW_GENERATION, 3, 2);
 }

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

@@ -5,6 +5,7 @@ import java.util.function.Supplier;
 
 import com.google.common.collect.Lists;
 
+import net.minecraft.world.biome.Biome;
 import net.minecraft.world.gen.feature.ConfiguredFeature;
 import ru.betterend.world.features.BlueVineFeature;
 import ru.betterend.world.features.DoublePlantFeature;
@@ -19,8 +20,6 @@ import ru.betterend.world.features.UnderwaterPlantFeature;
 import ru.betterend.world.features.VineFeature;
 
 public class FeatureRegistry {
-	private final static List<EndFeature> GLOBAL_FEATURES = Lists.newArrayList();
-	
 	// Trees //
 	public static final EndFeature MOSSY_GLOWSHROOM = new EndFeature("mossy_glowshroom", new MossyGlowshroomFeature(), 3);
 	public static final EndFeature PYTHADENDRON_TREE = new EndFeature("pythadendron_tree", new PythadendronTreeFeature(), 2);
@@ -48,27 +47,25 @@ public class FeatureRegistry {
 	public static final EndFeature VIOLECITE_LAYER = EndFeature.makeLayerFeature("violecite_layer", BlockRegistry.VIOLECITE, 15, 4, 96, 8);
 	public static final EndFeature FLAVOLITE_LAYER = EndFeature.makeLayerFeature("flavolite_layer", BlockRegistry.FLAVOLITE, 12, 4, 96, 6);
 	
-	public static void registerGlobals(List<List<Supplier<ConfiguredFeature<?, ?>>>> features) {
+	public static void registerBiomeFeatures(Biome biome, List<List<Supplier<ConfiguredFeature<?, ?>>>> features) {
-		GLOBAL_FEATURES.forEach(feature -> {
+		addFeature(FLAVOLITE_LAYER, features);
-			int index = feature.getFeatureStep().ordinal();
+		addFeature(ENDER_ORE, features);
-			if (features.size() > index) {
+	}
-				features.get(index).add(() -> {
+	
-					return feature.getFeatureConfigured();
+	private static void addFeature(EndFeature feature, List<List<Supplier<ConfiguredFeature<?, ?>>>> features) {
-				});
+		int index = feature.getFeatureStep().ordinal();
-			} else {
+		if (features.size() > index) {
-				List<Supplier<ConfiguredFeature<?, ?>>> newFeature = Lists.newArrayList();
+			features.get(index).add(() -> {
-				newFeature.add(() -> {
+				return feature.getFeatureConfigured();
-					return feature.getFeatureConfigured();
+			});
-				});
+		} else {
-				features.add(newFeature);
+			List<Supplier<ConfiguredFeature<?, ?>>> newFeature = Lists.newArrayList();
-			}
+			newFeature.add(() -> {
-		});
+				return feature.getFeatureConfigured();
+			});
+			features.add(newFeature);
+		}
 	}
 	
 	public static void register() {}
-	
-	static {
-		GLOBAL_FEATURES.add(FLAVOLITE_LAYER);
-		GLOBAL_FEATURES.add(ENDER_ORE);
-	}
 }

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

@@ -1,16 +1,12 @@
 package ru.betterend.registry;
 
 import java.util.Collection;
-import java.util.List;
 import java.util.function.Supplier;
 
-import com.google.common.collect.Lists;
-
 import net.minecraft.structure.StructurePieceType;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.gen.GenerationStep.Feature;
-import net.minecraft.world.gen.feature.ConfiguredFeature;
 import net.minecraft.world.gen.feature.ConfiguredStructureFeature;
 import ru.betterend.BetterEnd;
 import ru.betterend.world.structures.EndStructureFeature;