From 04e03cac07d2fe275ad92bb08d581f17f9fa2497 Mon Sep 17 00:00:00 2001
From: Aleksey <bulldog.seregin@gmail.com>
Date: Sat, 17 Apr 2021 11:57:31 +0300
Subject: [PATCH] A little more refactor

---
 .../java/ru/betterend/mixin/common/DimensionTypeMixin.java | 7 ++-----
 .../java/ru/betterend/mixin/common/TagLoaderMixin.java     | 4 +++-
 .../betterend/mixin/common/WeightedBiomePickerMixin.java   | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/ru/betterend/mixin/common/DimensionTypeMixin.java b/src/main/java/ru/betterend/mixin/common/DimensionTypeMixin.java
index b238b0db..982e906c 100644
--- a/src/main/java/ru/betterend/mixin/common/DimensionTypeMixin.java
+++ b/src/main/java/ru/betterend/mixin/common/DimensionTypeMixin.java
@@ -17,17 +17,14 @@ import ru.betterend.world.generator.GeneratorOptions;
 public class DimensionTypeMixin {
 	@Inject(method = "defaultEndGenerator", at = @At("HEAD"), cancellable = true)
 	private static void be_replaceGenerator(Registry<Biome> biomeRegistry, Registry<NoiseGeneratorSettings> chunkGeneratorSettingsRegistry, long seed, CallbackInfoReturnable<ChunkGenerator> info) {
-		info.setReturnValue(new NoiseBasedChunkGenerator(new BetterEndBiomeSource(biomeRegistry, seed), seed, () -> {
-			return (NoiseGeneratorSettings) chunkGeneratorSettingsRegistry.getOrThrow(NoiseGeneratorSettings.END);
-		}));
-		info.cancel();
+		info.setReturnValue(new NoiseBasedChunkGenerator(new BetterEndBiomeSource(biomeRegistry, seed), seed,
+				() -> chunkGeneratorSettingsRegistry.getOrThrow(NoiseGeneratorSettings.END)));
 	}
 	
 	@Inject(method = "createDragonFight", at = @At("HEAD"), cancellable = true)
 	private void be_hasEnderDragonFight(CallbackInfoReturnable<Boolean> info) {
 		if (!GeneratorOptions.hasDragonFights()) {
 			info.setReturnValue(false);
-			info.cancel();
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/ru/betterend/mixin/common/TagLoaderMixin.java b/src/main/java/ru/betterend/mixin/common/TagLoaderMixin.java
index b2d5354b..dc73a864 100644
--- a/src/main/java/ru/betterend/mixin/common/TagLoaderMixin.java
+++ b/src/main/java/ru/betterend/mixin/common/TagLoaderMixin.java
@@ -3,6 +3,8 @@ package ru.betterend.mixin.common;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
+
+import com.google.common.collect.Maps;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.tags.Tag;
@@ -23,7 +25,7 @@ public class TagLoaderMixin {
 	public void be_prepareReload(ResourceManager manager, Executor executor, CallbackInfoReturnable<CompletableFuture<Map<ResourceLocation, Tag.Builder>>> info) {
 		CompletableFuture<Map<ResourceLocation, Tag.Builder>> future = info.getReturnValue();
 		info.setReturnValue(CompletableFuture.supplyAsync(() -> {
-			Map<ResourceLocation, Tag.Builder> map = future.join();
+			Map<ResourceLocation, Tag.Builder> map = Maps.newHashMap(future.join());
 			TagHelper.apply(directory, map);
 			return map;
 		}, executor));
diff --git a/src/main/java/ru/betterend/mixin/common/WeightedBiomePickerMixin.java b/src/main/java/ru/betterend/mixin/common/WeightedBiomePickerMixin.java
index 7e07ce2c..da2c05e6 100644
--- a/src/main/java/ru/betterend/mixin/common/WeightedBiomePickerMixin.java
+++ b/src/main/java/ru/betterend/mixin/common/WeightedBiomePickerMixin.java
@@ -18,11 +18,11 @@ import ru.betterend.interfaces.IBiomeList;
 
 @Mixin(value = WeightedBiomePicker.class, remap = false)
 public class WeightedBiomePickerMixin implements IBiomeList {
-	private List<ResourceKey<Biome>> biomes = Lists.newArrayList();
+	private final List<ResourceKey<Biome>> biomes = Lists.newArrayList();
 	
 	@Inject(method = "addBiome", at = @At("TAIL"))
 	private void be_addBiome(final ResourceKey<Biome> biome, final double weight, CallbackInfo info) {
-		if (be_isCorrectPicker((WeightedBiomePicker) (Object) this)) {
+		if (be_isCorrectPicker(WeightedBiomePicker.class.cast(this))) {
 			biomes.add(biome);
 		}
 	}