From 39dda736af283f39659aa8785ba1c68f636ca75f Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 1 Dec 2021 04:58:13 +0100 Subject: [PATCH] Minor improvements --- src/main/java/ru/bclib/api/BiomeAPI.java | 11 ++++++++++ .../BiomeGenerationSettingsAccessor.java | 20 ------------------ .../common/FeatureDecoratorsAccessor.java | 9 -------- .../common/MobSpawnSettingsAccessor.java | 21 ------------------- 4 files changed, 11 insertions(+), 50 deletions(-) delete mode 100644 src/main/java/ru/bclib/mixin/common/BiomeGenerationSettingsAccessor.java delete mode 100644 src/main/java/ru/bclib/mixin/common/FeatureDecoratorsAccessor.java delete mode 100644 src/main/java/ru/bclib/mixin/common/MobSpawnSettingsAccessor.java diff --git a/src/main/java/ru/bclib/api/BiomeAPI.java b/src/main/java/ru/bclib/api/BiomeAPI.java index 982af38b..9b100b17 100644 --- a/src/main/java/ru/bclib/api/BiomeAPI.java +++ b/src/main/java/ru/bclib/api/BiomeAPI.java @@ -419,6 +419,17 @@ public class BiomeAPI { }); } + /** + * Adds new features to existing biome. + * @param biome {@link Biome} to add features in. + * @param feature {@link ConfiguredFeature} to add. + * + */ + public static void addBiomeFeature(Biome biome, BCLFeature feature) { + addBiomeFeature(biome, feature.getPlacedFeature(), feature.getFeatureStep()); + } + + /** * Adds new features to existing biome. * @param biome {@link Biome} to add features in. diff --git a/src/main/java/ru/bclib/mixin/common/BiomeGenerationSettingsAccessor.java b/src/main/java/ru/bclib/mixin/common/BiomeGenerationSettingsAccessor.java deleted file mode 100644 index 9bdcd76c..00000000 --- a/src/main/java/ru/bclib/mixin/common/BiomeGenerationSettingsAccessor.java +++ /dev/null @@ -1,20 +0,0 @@ -package ru.bclib.mixin.common; - -import net.minecraft.world.level.biome.BiomeGenerationSettings; -import net.minecraft.world.level.levelgen.placement.PlacedFeature; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Mutable; -import org.spongepowered.asm.mixin.gen.Accessor; - -import java.util.List; -import java.util.function.Supplier; - -@Mixin(BiomeGenerationSettings.class) -public interface BiomeGenerationSettingsAccessor { - @Accessor("features") - List>> bcl_getFeatures(); - - @Accessor("features") - @Mutable - void bcl_setFeatures(List>> value); -} diff --git a/src/main/java/ru/bclib/mixin/common/FeatureDecoratorsAccessor.java b/src/main/java/ru/bclib/mixin/common/FeatureDecoratorsAccessor.java deleted file mode 100644 index e5bc92f3..00000000 --- a/src/main/java/ru/bclib/mixin/common/FeatureDecoratorsAccessor.java +++ /dev/null @@ -1,9 +0,0 @@ -package ru.bclib.mixin.common; - -import org.spongepowered.asm.mixin.Mixin; - -@Mixin(targets = "net.minecraft.data.worldgen.Features$Decorators") -public interface FeatureDecoratorsAccessor { - /*@Accessor("HEIGHTMAP_SQUARE") - ConfiguredDecorator bclib_getHeightmapSquare();*/ -} diff --git a/src/main/java/ru/bclib/mixin/common/MobSpawnSettingsAccessor.java b/src/main/java/ru/bclib/mixin/common/MobSpawnSettingsAccessor.java deleted file mode 100644 index e3491b73..00000000 --- a/src/main/java/ru/bclib/mixin/common/MobSpawnSettingsAccessor.java +++ /dev/null @@ -1,21 +0,0 @@ -package ru.bclib.mixin.common; - -import net.minecraft.util.random.WeightedRandomList; -import net.minecraft.world.entity.MobCategory; -import net.minecraft.world.level.biome.MobSpawnSettings; -import net.minecraft.world.level.biome.MobSpawnSettings.SpawnerData; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Mutable; -import org.spongepowered.asm.mixin.gen.Accessor; - -import java.util.Map; - -@Mixin(MobSpawnSettings.class) -public interface MobSpawnSettingsAccessor { - @Accessor("spawners") - Map> bcl_getSpawners(); - - @Accessor("spawners") - @Mutable - void bcl_setSpawners(Map> spawners); -}