From f507ba54746ecc1b42b5fd53fc3077507d4a41b8 Mon Sep 17 00:00:00 2001 From: dfsek Date: Wed, 23 Mar 2022 21:40:40 -0700 Subject: [PATCH] remove ConfiguredStructureFeaturesMixin --- .../ConfiguredStructureFeaturesMixin.java | 44 ------------------- .../src/main/resources/terra.mixins.json | 1 - 2 files changed, 45 deletions(-) delete mode 100644 platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/ConfiguredStructureFeaturesMixin.java diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/ConfiguredStructureFeaturesMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/ConfiguredStructureFeaturesMixin.java deleted file mode 100644 index 39c812023..000000000 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/ConfiguredStructureFeaturesMixin.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.dfsek.terra.fabric.mixin; - -import net.minecraft.util.registry.RegistryKey; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.feature.ConfiguredStructureFeature; -import net.minecraft.world.gen.feature.ConfiguredStructureFeatures; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import java.util.Set; -import java.util.function.BiConsumer; - -import com.dfsek.terra.fabric.util.FabricUtil; - - -@Mixin(ConfiguredStructureFeatures.class) -public class ConfiguredStructureFeaturesMixin { - @Inject(method = "register(Ljava/util/function/BiConsumer;Lnet/minecraft/world/gen/feature/ConfiguredStructureFeature;" + - "Lnet/minecraft/util/registry/RegistryKey;)V", - at = @At("HEAD")) - private static void addStructuresToTerraBiomes(BiConsumer, RegistryKey> registrar, - ConfiguredStructureFeature feature, - RegistryKey biome, - CallbackInfo ci) { - if(FabricUtil.getTerraVanillaBiomes().containsKey(biome)) { - FabricUtil.getTerraVanillaBiomes().get(biome).forEach(biomeRegistryKey -> registrar.accept(feature, biomeRegistryKey)); - } - } - - @Inject(method = "register(Ljava/util/function/BiConsumer;Lnet/minecraft/world/gen/feature/ConfiguredStructureFeature;Ljava/util/Set;" + - ")V", - at = @At("HEAD")) - private static void addStructuresToTerraBiomes(BiConsumer, RegistryKey> registrar, - ConfiguredStructureFeature feature, Set> biomes, - CallbackInfo ci) { - biomes.forEach(biome -> { - if(FabricUtil.getTerraVanillaBiomes().containsKey(biome)) { - FabricUtil.getTerraVanillaBiomes().get(biome).forEach(biomeRegistryKey -> registrar.accept(feature, biomeRegistryKey)); - } - }); - } -} diff --git a/platforms/fabric/src/main/resources/terra.mixins.json b/platforms/fabric/src/main/resources/terra.mixins.json index c198a779f..5487f4406 100644 --- a/platforms/fabric/src/main/resources/terra.mixins.json +++ b/platforms/fabric/src/main/resources/terra.mixins.json @@ -4,7 +4,6 @@ "package": "com.dfsek.terra.fabric.mixin", "compatibilityLevel": "JAVA_16", "mixins": [ - "ConfiguredStructureFeaturesMixin", "ServerWorldMixin", "access.BiomeEffectsAccessor", "access.MobSpawnerLogicAccessor",