From 8d27811a5db9d3160c9b918cb7898aafd5097734 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Mon, 19 Oct 2020 01:29:17 +0300 Subject: [PATCH] Small changes --- .../java/ru/betterend/mixin/common/DimensionTypeMixin.java | 7 ++++++- .../ru/betterend/world/generator/BetterEndBiomeSource.java | 4 ---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/ru/betterend/mixin/common/DimensionTypeMixin.java b/src/main/java/ru/betterend/mixin/common/DimensionTypeMixin.java index 50b27536..7c560ec6 100644 --- a/src/main/java/ru/betterend/mixin/common/DimensionTypeMixin.java +++ b/src/main/java/ru/betterend/mixin/common/DimensionTypeMixin.java @@ -11,13 +11,18 @@ import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.chunk.ChunkGeneratorSettings; import net.minecraft.world.gen.chunk.NoiseChunkGenerator; +import ru.betterend.registry.BlockTagRegistry; +import ru.betterend.util.FeaturesHelper; import ru.betterend.world.generator.BetterEndBiomeSource; -@Mixin(value = DimensionType.class, priority = 1) +@Mixin(value = DimensionType.class, priority = 100) public class DimensionTypeMixin { @Inject(method = "createEndGenerator", at = @At("HEAD"), cancellable = true) private static void replaceGenerator(Registry biomeRegistry, Registry chunkGeneratorSettingsRegistry, long seed, CallbackInfoReturnable info) { + BlockTagRegistry.addTerrainTags(biomeRegistry); + FeaturesHelper.addFeatures(biomeRegistry); + info.setReturnValue(new NoiseChunkGenerator(new BetterEndBiomeSource(biomeRegistry, seed), seed, () -> { return (ChunkGeneratorSettings) chunkGeneratorSettingsRegistry.getOrThrow(ChunkGeneratorSettings.END); })); diff --git a/src/main/java/ru/betterend/world/generator/BetterEndBiomeSource.java b/src/main/java/ru/betterend/world/generator/BetterEndBiomeSource.java index 31794461..b47505c9 100644 --- a/src/main/java/ru/betterend/world/generator/BetterEndBiomeSource.java +++ b/src/main/java/ru/betterend/world/generator/BetterEndBiomeSource.java @@ -17,8 +17,6 @@ import net.minecraft.world.biome.source.TheEndBiomeSource; import net.minecraft.world.gen.ChunkRandom; import ru.betterend.BetterEnd; import ru.betterend.registry.BiomeRegistry; -import ru.betterend.registry.BlockTagRegistry; -import ru.betterend.util.FeaturesHelper; import ru.betterend.world.biome.EndBiome; public class BetterEndBiomeSource extends BiomeSource { @@ -50,8 +48,6 @@ public class BetterEndBiomeSource extends BiomeSource { this.noise = new SimplexNoiseSampler(chunkRandom); BiomeRegistry.mutateRegistry(biomeRegistry); - BlockTagRegistry.addTerrainTags(biomeRegistry); - FeaturesHelper.addFeatures(biomeRegistry); } private static List getBiomes(Registry biomeRegistry) {