diff --git a/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java b/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java index 06dea056..b7d0885f 100644 --- a/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java +++ b/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java @@ -17,7 +17,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3i; import ru.betterend.client.ERenderLayer; import ru.betterend.client.IRenderTypeable; -import ru.betterend.util.IColorProvider; +import ru.betterend.interfaces.IColorProvider; import ru.betterend.util.MHelper; public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTypeable, IColorProvider { diff --git a/src/main/java/ru/betterend/entity/EntityEndSlime.java b/src/main/java/ru/betterend/entity/EntityEndSlime.java index 083457f8..e1698bce 100644 --- a/src/main/java/ru/betterend/entity/EntityEndSlime.java +++ b/src/main/java/ru/betterend/entity/EntityEndSlime.java @@ -25,8 +25,8 @@ import net.minecraft.world.LocalDifficulty; import net.minecraft.world.ServerWorldAccess; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; +import ru.betterend.interfaces.ISlime; import ru.betterend.registry.BiomeRegistry; -import ru.betterend.util.ISlime; public class EntityEndSlime extends SlimeEntity { private static final TrackedData MOSSY = DataTracker.registerData(EntityEndSlime.class, TrackedDataHandlerRegistry.BOOLEAN); diff --git a/src/main/java/ru/betterend/util/IColorProvider.java b/src/main/java/ru/betterend/interfaces/IColorProvider.java similarity index 86% rename from src/main/java/ru/betterend/util/IColorProvider.java rename to src/main/java/ru/betterend/interfaces/IColorProvider.java index 61f1982d..fb0a2101 100644 --- a/src/main/java/ru/betterend/util/IColorProvider.java +++ b/src/main/java/ru/betterend/interfaces/IColorProvider.java @@ -1,10 +1,10 @@ -package ru.betterend.util; - -import net.minecraft.client.color.block.BlockColorProvider; -import net.minecraft.client.color.item.ItemColorProvider; - -public interface IColorProvider { - BlockColorProvider getProvider(); - - ItemColorProvider getItemProvider(); -} +package ru.betterend.interfaces; + +import net.minecraft.client.color.block.BlockColorProvider; +import net.minecraft.client.color.item.ItemColorProvider; + +public interface IColorProvider { + BlockColorProvider getProvider(); + + ItemColorProvider getItemProvider(); +} diff --git a/src/main/java/ru/betterend/util/ISlime.java b/src/main/java/ru/betterend/interfaces/ISlime.java similarity index 70% rename from src/main/java/ru/betterend/util/ISlime.java rename to src/main/java/ru/betterend/interfaces/ISlime.java index 6e029f93..1ecacda2 100644 --- a/src/main/java/ru/betterend/util/ISlime.java +++ b/src/main/java/ru/betterend/interfaces/ISlime.java @@ -1,5 +1,5 @@ -package ru.betterend.util; - -public interface ISlime { - public void setSlimeSize(int size, boolean heal); -} +package ru.betterend.interfaces; + +public interface ISlime { + public void setSlimeSize(int size, boolean heal); +} diff --git a/src/main/java/ru/betterend/mixin/client/MinecraftClientMixin.java b/src/main/java/ru/betterend/mixin/client/MinecraftClientMixin.java index c30afd28..28a02e22 100644 --- a/src/main/java/ru/betterend/mixin/client/MinecraftClientMixin.java +++ b/src/main/java/ru/betterend/mixin/client/MinecraftClientMixin.java @@ -21,7 +21,7 @@ import net.minecraft.client.world.ClientWorld; import net.minecraft.sound.MusicSound; import net.minecraft.util.registry.Registry; import net.minecraft.world.World; -import ru.betterend.util.IColorProvider; +import ru.betterend.interfaces.IColorProvider; import ru.betterend.util.MHelper; @Mixin(MinecraftClient.class) diff --git a/src/main/java/ru/betterend/mixin/common/BiomeMixin.java b/src/main/java/ru/betterend/mixin/common/BiomeMixin.java index c17c13e6..79f6c626 100644 --- a/src/main/java/ru/betterend/mixin/common/BiomeMixin.java +++ b/src/main/java/ru/betterend/mixin/common/BiomeMixin.java @@ -6,9 +6,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.registry.Registry; import net.minecraft.world.ChunkRegion; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.GenerationSettings; @@ -16,7 +14,6 @@ import net.minecraft.world.gen.ChunkRandom; import net.minecraft.world.gen.StructureAccessor; import net.minecraft.world.gen.chunk.ChunkGenerator; -import ru.betterend.BetterEnd; import ru.betterend.registry.FeatureRegistry; @Mixin(Biome.class) @@ -31,9 +28,8 @@ public abstract class BiomeMixin { @Inject(method = "generateFeatureStep", at = @At("HEAD")) public void generateFeatureStep(StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, ChunkRegion region, long populationSeed, ChunkRandom random, BlockPos pos, CallbackInfo cinfo) { if (!injected) { - Identifier biomeId = region.toServerWorld().getRegistryManager().get(Registry.BIOME_KEY).getId(Biome.class.cast(this)); - if (biomeId != null && !biomeId.getNamespace().equals(BetterEnd.MOD_ID) && category.equals(Biome.Category.THEEND)) { - FeatureRegistry.registerGlobals(this.generationSettings.getFeatures()); + if (category.equals(Biome.Category.THEEND)) { + FeatureRegistry.registerGlobals(generationSettings.getFeatures()); } this.injected = true; } diff --git a/src/main/java/ru/betterend/mixin/common/SlimeEntityMixin.java b/src/main/java/ru/betterend/mixin/common/SlimeEntityMixin.java index 977c2e43..3f16413c 100644 --- a/src/main/java/ru/betterend/mixin/common/SlimeEntityMixin.java +++ b/src/main/java/ru/betterend/mixin/common/SlimeEntityMixin.java @@ -4,7 +4,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import net.minecraft.entity.mob.SlimeEntity; -import ru.betterend.util.ISlime; +import ru.betterend.interfaces.ISlime; @Mixin(SlimeEntity.class) public class SlimeEntityMixin implements ISlime { diff --git a/src/main/java/ru/betterend/registry/FeatureRegistry.java b/src/main/java/ru/betterend/registry/FeatureRegistry.java index 016bdd92..a2e74862 100644 --- a/src/main/java/ru/betterend/registry/FeatureRegistry.java +++ b/src/main/java/ru/betterend/registry/FeatureRegistry.java @@ -20,7 +20,7 @@ import ru.betterend.world.features.VineFeature; public class FeatureRegistry { - public final static List globalFeatures = Lists.newArrayList(); + private final static List globalFeatures = Lists.newArrayList(); // Trees // public static final EndFeature MOSSY_GLOWSHROOM = new EndFeature("mossy_glowshroom", new MossyGlowshroomFeature(), 3); @@ -50,9 +50,6 @@ public class FeatureRegistry { public static final EndFeature FLAVOLITE_LAYER = EndFeature.makeLayerFeature("flavolite_layer", BlockRegistry.FLAVOLITE, 12, 4, 96, 6); public static void registerGlobals(List>>> features) { - globalFeatures.add(FLAVOLITE_LAYER); - globalFeatures.add(ENDER_ORE); - globalFeatures.forEach(feature -> { int index = feature.getFeatureStep().ordinal(); if (features.size() > index) { @@ -70,4 +67,9 @@ public class FeatureRegistry { } public static void register() {} + + static { + globalFeatures.add(FLAVOLITE_LAYER); + globalFeatures.add(ENDER_ORE); + } } diff --git a/src/main/java/ru/betterend/util/BlocksHelper.java b/src/main/java/ru/betterend/util/BlocksHelper.java index 2ec56817..a4426937 100644 --- a/src/main/java/ru/betterend/util/BlocksHelper.java +++ b/src/main/java/ru/betterend/util/BlocksHelper.java @@ -8,7 +8,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.FallingBlock; -import net.minecraft.block.Material; import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.Property; import net.minecraft.tag.BlockTags; @@ -19,6 +18,7 @@ import net.minecraft.util.math.BlockPos.Mutable; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3i; import net.minecraft.world.WorldAccess; + import ru.betterend.blocks.BlockBlueVine; import ru.betterend.blocks.basis.BlockDoublePlant; import ru.betterend.blocks.basis.BlockGlowingFur; diff --git a/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java b/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java index bcd8f05c..1a0979ff 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java +++ b/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java @@ -18,9 +18,7 @@ public class BiomeChorusForest extends EndBiome { .setParticles(ParticleTypes.PORTAL, 0.01F) .setLoop(SoundRegistry.AMBIENT_CHORUS_FOREST) .setMusic(SoundRegistry.MUSIC_CHORUS_FOREST) - .addFeature(FeatureRegistry.ENDER_ORE) .addFeature(FeatureRegistry.VIOLECITE_LAYER) - .addFeature(FeatureRegistry.FLAVOLITE_LAYER) .addFeature(FeatureRegistry.RARE_END_LAKE) .addFeature(FeatureRegistry.PYTHADENDRON_TREE) .addFeature(FeatureRegistry.PYTHADENDRON_BUSH) diff --git a/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java b/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java index af8f5b95..bfdbd730 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java +++ b/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java @@ -20,8 +20,6 @@ public class BiomeFoggyMushroomland extends EndBiome { .setLoop(SoundRegistry.AMBIENT_FOGGY_MUSHROOMLAND) .setMusic(SoundRegistry.MUSIC_FOGGY_MUSHROOMLAND) .addStructureFeature(StructureRegistry.GIANT_MOSSY_GLOWSHROOM) - .addFeature(FeatureRegistry.ENDER_ORE) - .addFeature(FeatureRegistry.FLAVOLITE_LAYER) .addFeature(FeatureRegistry.END_LAKE) .addFeature(FeatureRegistry.MOSSY_GLOWSHROOM) .addFeature(FeatureRegistry.BLUE_VINE)