From 7d23a162ee2206f6de16a63e4ae25fe27c04d12c Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 12 Oct 2021 19:20:36 +0200 Subject: [PATCH] Some refactoring --- .../{mixin/client => interfaces}/IStructureFeatures.java | 2 +- .../java/ru/bclib/mixin/client/StructureFeaturesMixin.java | 5 +++-- src/main/java/ru/bclib/world/biomes/BCLBiomeDef.java | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/main/java/ru/bclib/{mixin/client => interfaces}/IStructureFeatures.java (92%) diff --git a/src/main/java/ru/bclib/mixin/client/IStructureFeatures.java b/src/main/java/ru/bclib/interfaces/IStructureFeatures.java similarity index 92% rename from src/main/java/ru/bclib/mixin/client/IStructureFeatures.java rename to src/main/java/ru/bclib/interfaces/IStructureFeatures.java index 85e92535..11ac69be 100644 --- a/src/main/java/ru/bclib/mixin/client/IStructureFeatures.java +++ b/src/main/java/ru/bclib/interfaces/IStructureFeatures.java @@ -1,4 +1,4 @@ -package ru.bclib.mixin.client; +package ru.bclib.interfaces; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.biome.Biome; diff --git a/src/main/java/ru/bclib/mixin/client/StructureFeaturesMixin.java b/src/main/java/ru/bclib/mixin/client/StructureFeaturesMixin.java index b6d1064a..b37a0d77 100644 --- a/src/main/java/ru/bclib/mixin/client/StructureFeaturesMixin.java +++ b/src/main/java/ru/bclib/mixin/client/StructureFeaturesMixin.java @@ -8,6 +8,7 @@ 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 ru.bclib.interfaces.IStructureFeatures; import java.util.LinkedList; import java.util.List; @@ -15,9 +16,9 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; @Mixin(StructureFeatures.class) -public abstract class StructureFeaturesMixin implements IStructureFeatures{ +public abstract class StructureFeaturesMixin implements IStructureFeatures { @Inject(method="registerStructures", at=@At("TAIL")) - static void bclib_registerStructures(BiConsumer, ResourceKey> biConsumer, CallbackInfo ci){ + private static void bclib_registerStructures(BiConsumer, ResourceKey> biConsumer, CallbackInfo ci){ bclib_callbacks.forEach(consumer -> consumer.accept(biConsumer)); bclib_callbacks.clear(); } diff --git a/src/main/java/ru/bclib/world/biomes/BCLBiomeDef.java b/src/main/java/ru/bclib/world/biomes/BCLBiomeDef.java index e478e73f..7829322c 100644 --- a/src/main/java/ru/bclib/world/biomes/BCLBiomeDef.java +++ b/src/main/java/ru/bclib/world/biomes/BCLBiomeDef.java @@ -2,7 +2,6 @@ package ru.bclib.world.biomes; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.minecraft.core.Registry; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.data.BuiltinRegistries; @@ -36,7 +35,7 @@ import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilder; import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderBaseConfiguration; import net.minecraft.resources.ResourceKey; import ru.bclib.config.IdConfig; -import ru.bclib.mixin.client.IStructureFeatures; +import ru.bclib.interfaces.IStructureFeatures; import ru.bclib.util.ColorUtil; import ru.bclib.world.features.BCLFeature; import ru.bclib.world.structures.BCLStructureFeature;