From ad59f5b80de02ada4205abcfe6fafe172a795cac Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Sat, 24 Oct 2020 00:02:42 +0300
Subject: [PATCH] Removed DefaultBiomeCreatorMixin

---
 .../common/DefaultBiomeCreatorMixin.java      | 31 -------------------
 .../betterend/registry/FeatureRegistry.java   | 14 +++++----
 .../betterend/registry/StructureRegistry.java |  1 +
 .../resources/betterend.mixins.common.json    |  1 -
 4 files changed, 9 insertions(+), 38 deletions(-)
 delete mode 100644 src/main/java/ru/betterend/mixin/common/DefaultBiomeCreatorMixin.java

diff --git a/src/main/java/ru/betterend/mixin/common/DefaultBiomeCreatorMixin.java b/src/main/java/ru/betterend/mixin/common/DefaultBiomeCreatorMixin.java
deleted file mode 100644
index c3bbdf80..00000000
--- a/src/main/java/ru/betterend/mixin/common/DefaultBiomeCreatorMixin.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package ru.betterend.mixin.common;
-
-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.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 net.minecraft.world.gen.feature.ConfiguredFeatures;
-import net.minecraft.world.gen.surfacebuilder.ConfiguredSurfaceBuilders;
-
-@Mixin(DefaultBiomeCreator.class)
-public class DefaultBiomeCreatorMixin {
-	@Shadow
-	private static Biome composeEndSpawnSettings(GenerationSettings.Builder builder) {
-		return null;
-	};
-
-	@Inject(method = "createEndHighlands", at = @At("HEAD"), cancellable = true)
-	private static void createEndHighlands(CallbackInfoReturnable<Biome> info) {
-		GenerationSettings.Builder builder = (new GenerationSettings.Builder())
-				.surfaceBuilder(ConfiguredSurfaceBuilders.END)
-				.feature(GenerationStep.Feature.SURFACE_STRUCTURES, ConfiguredFeatures.END_GATEWAY);
-		info.setReturnValue(composeEndSpawnSettings(builder));
-		info.cancel();
-	}
-}
diff --git a/src/main/java/ru/betterend/registry/FeatureRegistry.java b/src/main/java/ru/betterend/registry/FeatureRegistry.java
index c2aa73bc..b0140432 100644
--- a/src/main/java/ru/betterend/registry/FeatureRegistry.java
+++ b/src/main/java/ru/betterend/registry/FeatureRegistry.java
@@ -7,6 +7,7 @@ import com.google.common.collect.Lists;
 
 import net.minecraft.util.Identifier;
 import net.minecraft.world.biome.Biome;
+import net.minecraft.world.gen.GenerationStep;
 import net.minecraft.world.gen.feature.ConfiguredFeature;
 import ru.betterend.blocks.RunedFlavolite;
 import ru.betterend.world.features.BlueVineFeature;
@@ -67,16 +68,17 @@ public class FeatureRegistry {
 	public static final EndPortalFeature END_PORTAL_ETERNAL = new EndPortalFeature(new DefaultEndPortalFeature(), (RunedFlavolite) BlockRegistry.FLAVOLITE_RUNED_ETERNAL);
 	
 	public static void registerBiomeFeatures(Identifier id, Biome biome, List<List<Supplier<ConfiguredFeature<?, ?>>>> features) {
+		if (id.getNamespace().equals("minecraft")) {
+			if (id.getPath().equals("end_highlands")) {
+				features.get(GenerationStep.Feature.VEGETAL_DECORATION.ordinal()).clear();
+				addFeature(ROUND_CAVE, features);
+			}
+		}
+		
 		addFeature(FLAVOLITE_LAYER, features);
 		addFeature(ENDER_ORE, features);
 		addFeature(ROUND_CAVE_RARE, features);
 		addFeature(CAVE_GRASS, features);
-		
-		if (id.getNamespace().equals("minecraft")) {
-			if (id.getPath().equals("end_highlands")) {
-				addFeature(ROUND_CAVE, features);
-			}
-		}
 	}
 	
 	private static void addFeature(EndFeature feature, List<List<Supplier<ConfiguredFeature<?, ?>>>> features) {
diff --git a/src/main/java/ru/betterend/registry/StructureRegistry.java b/src/main/java/ru/betterend/registry/StructureRegistry.java
index 219b489d..88d4f649 100644
--- a/src/main/java/ru/betterend/registry/StructureRegistry.java
+++ b/src/main/java/ru/betterend/registry/StructureRegistry.java
@@ -38,6 +38,7 @@ public class StructureRegistry {
 	public static void registerBiomeStructures(Identifier id, Biome biome, Collection<Supplier<ConfiguredStructureFeature<?, ?>>> structures) {
 		if (id.getNamespace().equals("minecraft")) {
 			if (id.getPath().equals("end_highlands")) {
+				structures.clear();
 				addStructure(MOUNTAIN, structures);
 			}
 		}
diff --git a/src/main/resources/betterend.mixins.common.json b/src/main/resources/betterend.mixins.common.json
index f116f6b4..46a6421f 100644
--- a/src/main/resources/betterend.mixins.common.json
+++ b/src/main/resources/betterend.mixins.common.json
@@ -7,7 +7,6 @@
 		"ServerPlayNetworkHandlerMixin",
 		"CraftingScreenHandlerMixin",
 		"GenerationSettingsAccessor",
-		"DefaultBiomeCreatorMixin",
 		"AnvilScreenHandlerMixin",
 		"ServerPlayerEntityMixin",
 		"ChorusPlantFeatureMixin",