From 54202bbc515120741e4a4550948d39a9d48646fd Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Mon, 25 Apr 2022 23:24:22 +0300 Subject: [PATCH] Cleanup --- .../ru/betterend/blocks/AuroraCrystalBlock.java | 5 +++-- .../ru/betterend/blocks/EndstoneDustBlock.java | 1 - .../blocks/entities/PedestalBlockEntity.java | 14 +++++--------- .../integration/byg/biomes/OldBulbisGardens.java | 4 ---- .../byg/features/OldBulbisTreeFeature.java | 1 - .../java/ru/betterend/item/tool/EndHammerItem.java | 3 ++- .../mixin/common/ChorusFlowerBlockMixin.java | 1 - .../ru/betterend/mixin/common/NoiseChunkMixin.java | 10 ++++++---- .../betterend/mixin/common/ServerLevelMixin.java | 2 -- .../betterend/recipe/builders/AlloyingRecipe.java | 1 - .../java/ru/betterend/registry/EndFeatures.java | 2 -- .../java/ru/betterend/registry/EndStructures.java | 1 - .../java/ru/betterend/rituals/InfusionRitual.java | 2 +- .../java/ru/betterend/util/StructureErode.java | 3 +-- .../world/biome/cave/EmptyEndCaveBiome.java | 2 -- .../betterend/world/biome/cave/EndCaveBiome.java | 1 - .../world/features/BiomeIslandFeature.java | 2 -- .../world/structures/piece/BasePiece.java | 2 +- .../world/structures/piece/MountainPiece.java | 2 +- 19 files changed, 20 insertions(+), 39 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java b/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java index 7f7c2f94..6ab2fca3 100644 --- a/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java +++ b/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java @@ -1,7 +1,7 @@ package ru.betterend.blocks; import com.google.common.collect.Lists; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.client.color.block.BlockColor; import net.minecraft.client.color.item.ItemColor; import net.minecraft.core.BlockPos; @@ -19,7 +19,6 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import ru.bclib.api.tag.CommonItemTags; import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.CustomColorProvider; import ru.bclib.interfaces.RenderLayerProvider; @@ -31,6 +30,8 @@ import ru.betterend.registry.EndItems; import java.util.List; +; + public class AuroraCrystalBlock extends AbstractGlassBlock implements RenderLayerProvider, CustomColorProvider, AddMineablePickaxe, AddMineableHammer { public static final Vec3i[] COLORS; private static final int MIN_DROP = 1; diff --git a/src/main/java/ru/betterend/blocks/EndstoneDustBlock.java b/src/main/java/ru/betterend/blocks/EndstoneDustBlock.java index 4508d8e6..f3ef4737 100644 --- a/src/main/java/ru/betterend/blocks/EndstoneDustBlock.java +++ b/src/main/java/ru/betterend/blocks/EndstoneDustBlock.java @@ -15,7 +15,6 @@ import net.minecraft.world.level.storage.loot.LootContext; import ru.bclib.api.tag.NamedCommonBlockTags; import ru.bclib.api.tag.TagAPI.TagLocation; import ru.bclib.interfaces.TagProvider; -import ru.bclib.interfaces.tools.AddMineableShears; import ru.bclib.interfaces.tools.AddMineableShovel; import ru.bclib.util.ColorUtil; diff --git a/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java b/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java index 52a62b05..650a3d25 100644 --- a/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java +++ b/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java @@ -83,18 +83,14 @@ public class PedestalBlockEntity extends BlockEntity implements Container { @Override public void setChanged() { - if (level != null && !level.isClientSide) { + if (level != null && !level.isClientSide()) { BlockState state = level.getBlockState(worldPosition); if (state.getBlock() instanceof PedestalBlock) { - BlockState trueState = state.setValue(PedestalBlock.HAS_ITEM, !isEmpty()); - if (activeItem.getItem() == EndItems.ETERNAL_CRYSTAL) { - trueState = trueState.setValue(PedestalBlock.HAS_LIGHT, true); - } - else { - trueState = trueState.setValue(PedestalBlock.HAS_LIGHT, false); - } - level.setBlockAndUpdate(worldPosition, trueState); + state = state.setValue(PedestalBlock.HAS_ITEM, !isEmpty()); + state = state.setValue(PedestalBlock.HAS_LIGHT, activeItem.getItem() == EndItems.ETERNAL_CRYSTAL); } + level.setBlockAndUpdate(worldPosition, state); + level.blockEntityChanged(worldPosition); } super.setChanged(); } diff --git a/src/main/java/ru/betterend/integration/byg/biomes/OldBulbisGardens.java b/src/main/java/ru/betterend/integration/byg/biomes/OldBulbisGardens.java index bd4dc8ee..5a1f4524 100644 --- a/src/main/java/ru/betterend/integration/byg/biomes/OldBulbisGardens.java +++ b/src/main/java/ru/betterend/integration/byg/biomes/OldBulbisGardens.java @@ -2,10 +2,7 @@ package ru.betterend.integration.byg.biomes; import net.minecraft.core.Holder; import net.minecraft.core.HolderSet; -import net.minecraft.core.Registry; import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.data.BuiltinRegistries; -import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Mob; @@ -18,7 +15,6 @@ import net.minecraft.world.level.levelgen.GenerationStep.Decoration; import net.minecraft.world.level.levelgen.placement.PlacedFeature; import ru.bclib.BCLib; import ru.bclib.api.biomes.BCLBiomeBuilder; -import ru.betterend.BetterEnd; import ru.betterend.integration.Integrations; import ru.betterend.integration.byg.features.BYGFeatures; import ru.betterend.registry.EndFeatures; diff --git a/src/main/java/ru/betterend/integration/byg/features/OldBulbisTreeFeature.java b/src/main/java/ru/betterend/integration/byg/features/OldBulbisTreeFeature.java index 2f05a6b1..66a35454 100644 --- a/src/main/java/ru/betterend/integration/byg/features/OldBulbisTreeFeature.java +++ b/src/main/java/ru/betterend/integration/byg/features/OldBulbisTreeFeature.java @@ -12,7 +12,6 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import net.minecraft.world.level.material.Material; import net.minecraft.world.phys.AABB; import ru.bclib.api.tag.CommonBlockTags; -import ru.bclib.api.tag.TagAPI; import ru.bclib.sdf.SDF; import ru.bclib.sdf.operator.SDFDisplacement; import ru.bclib.sdf.operator.SDFSubtraction; diff --git a/src/main/java/ru/betterend/item/tool/EndHammerItem.java b/src/main/java/ru/betterend/item/tool/EndHammerItem.java index 2cd42bcf..60e4e4e5 100644 --- a/src/main/java/ru/betterend/item/tool/EndHammerItem.java +++ b/src/main/java/ru/betterend/item/tool/EndHammerItem.java @@ -25,7 +25,8 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; -import ru.bclib.api.tag.*; +import ru.bclib.api.tag.CommonBlockTags; +import ru.bclib.api.tag.NamedCommonItemTags; import ru.bclib.api.tag.TagAPI.TagLocation; import ru.bclib.client.models.ModelsHelper; import ru.bclib.interfaces.ItemModelProvider; diff --git a/src/main/java/ru/betterend/mixin/common/ChorusFlowerBlockMixin.java b/src/main/java/ru/betterend/mixin/common/ChorusFlowerBlockMixin.java index 8aa684f3..95da65ed 100644 --- a/src/main/java/ru/betterend/mixin/common/ChorusFlowerBlockMixin.java +++ b/src/main/java/ru/betterend/mixin/common/ChorusFlowerBlockMixin.java @@ -21,7 +21,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import ru.bclib.api.tag.CommonBlockTags; -import ru.bclib.api.tag.TagAPI; import ru.bclib.util.BlocksHelper; import ru.betterend.registry.EndBlocks; import ru.betterend.world.generator.GeneratorOptions; diff --git a/src/main/java/ru/betterend/mixin/common/NoiseChunkMixin.java b/src/main/java/ru/betterend/mixin/common/NoiseChunkMixin.java index 03bfd035..215178c4 100644 --- a/src/main/java/ru/betterend/mixin/common/NoiseChunkMixin.java +++ b/src/main/java/ru/betterend/mixin/common/NoiseChunkMixin.java @@ -1,8 +1,11 @@ package ru.betterend.mixin.common; -import net.minecraft.data.BuiltinRegistries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.world.level.levelgen.*; +import net.minecraft.world.level.levelgen.Aquifer; +import net.minecraft.world.level.levelgen.DensityFunctions; +import net.minecraft.world.level.levelgen.NoiseChunk; +import net.minecraft.world.level.levelgen.NoiseGeneratorSettings; +import net.minecraft.world.level.levelgen.NoiseRouter; +import net.minecraft.world.level.levelgen.NoiseSettings; import net.minecraft.world.level.levelgen.blending.Blender; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -14,7 +17,6 @@ import ru.betterend.interfaces.BETargetChecker; import ru.betterend.world.generator.TerrainGenerator; import java.util.List; -import java.util.Objects; @Mixin(NoiseChunk.class) public class NoiseChunkMixin implements BETargetChecker { diff --git a/src/main/java/ru/betterend/mixin/common/ServerLevelMixin.java b/src/main/java/ru/betterend/mixin/common/ServerLevelMixin.java index d4aa24ac..f294a242 100644 --- a/src/main/java/ru/betterend/mixin/common/ServerLevelMixin.java +++ b/src/main/java/ru/betterend/mixin/common/ServerLevelMixin.java @@ -8,7 +8,6 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.progress.ChunkProgressListener; import net.minecraft.util.profiling.ProfilerFiller; -import net.minecraft.world.level.CustomSpawner; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; @@ -16,7 +15,6 @@ import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.dimension.DimensionType; import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator; import net.minecraft.world.level.levelgen.NoiseGeneratorSettings; -import net.minecraft.world.level.storage.LevelStorageSource; import net.minecraft.world.level.storage.LevelStorageSource.LevelStorageAccess; import net.minecraft.world.level.storage.ServerLevelData; import net.minecraft.world.level.storage.WritableLevelData; diff --git a/src/main/java/ru/betterend/recipe/builders/AlloyingRecipe.java b/src/main/java/ru/betterend/recipe/builders/AlloyingRecipe.java index fcc0ddb8..3838c14d 100644 --- a/src/main/java/ru/betterend/recipe/builders/AlloyingRecipe.java +++ b/src/main/java/ru/betterend/recipe/builders/AlloyingRecipe.java @@ -7,7 +7,6 @@ import net.fabricmc.api.Environment; import net.minecraft.core.NonNullList; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.Tag; import net.minecraft.tags.TagKey; import net.minecraft.util.GsonHelper; import net.minecraft.world.Container; diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index 8eddc0d9..07ad5d4d 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -14,12 +14,10 @@ import net.minecraft.world.level.levelgen.GenerationStep; import net.minecraft.world.level.levelgen.GenerationStep.Decoration; import net.minecraft.world.level.levelgen.VerticalAnchor; import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; import net.minecraft.world.level.levelgen.placement.CountPlacement; import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; import net.minecraft.world.level.levelgen.placement.PlacedFeature; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; import ru.bclib.api.biomes.BCLBiomeBuilder; import ru.bclib.api.biomes.BiomeAPI; import ru.bclib.api.features.BCLCommonFeatures; diff --git a/src/main/java/ru/betterend/registry/EndStructures.java b/src/main/java/ru/betterend/registry/EndStructures.java index bf2cdb65..6cb5d09d 100644 --- a/src/main/java/ru/betterend/registry/EndStructures.java +++ b/src/main/java/ru/betterend/registry/EndStructures.java @@ -6,7 +6,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.levelgen.GenerationStep.Decoration; import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceType; -import ru.bclib.api.biomes.BiomeAPI; import ru.bclib.api.tag.TagAPI; import ru.bclib.world.structures.BCLStructureFeature; import ru.betterend.BetterEnd; diff --git a/src/main/java/ru/betterend/rituals/InfusionRitual.java b/src/main/java/ru/betterend/rituals/InfusionRitual.java index 47eaf977..70b88fd8 100644 --- a/src/main/java/ru/betterend/rituals/InfusionRitual.java +++ b/src/main/java/ru/betterend/rituals/InfusionRitual.java @@ -151,7 +151,7 @@ public class InfusionRitual implements Container { } public boolean isValid() { - if (world == null || world.isClientSide || worldPos == null || input == null) return false; + if (world == null || world.isClientSide() || worldPos == null || input == null) return false; return Arrays.stream(catalysts).noneMatch(Objects::isNull); } diff --git a/src/main/java/ru/betterend/util/StructureErode.java b/src/main/java/ru/betterend/util/StructureErode.java index 7e268a3a..2e5ec4c2 100644 --- a/src/main/java/ru/betterend/util/StructureErode.java +++ b/src/main/java/ru/betterend/util/StructureErode.java @@ -10,9 +10,8 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.structure.BoundingBox; import net.minecraft.world.level.material.Material; -import ru.bclib.api.tag.CommonBlockTags; -import ru.bclib.api.tag.TagAPI; import ru.bclib.api.biomes.BiomeAPI; +import ru.bclib.api.tag.CommonBlockTags; import ru.bclib.util.BlocksHelper; import ru.bclib.util.MHelper; diff --git a/src/main/java/ru/betterend/world/biome/cave/EmptyEndCaveBiome.java b/src/main/java/ru/betterend/world/biome/cave/EmptyEndCaveBiome.java index d6e1b52c..5556e898 100644 --- a/src/main/java/ru/betterend/world/biome/cave/EmptyEndCaveBiome.java +++ b/src/main/java/ru/betterend/world/biome/cave/EmptyEndCaveBiome.java @@ -7,8 +7,6 @@ import ru.bclib.world.biomes.BCLBiomeSettings; import ru.betterend.registry.EndFeatures; import ru.betterend.world.biome.EndBiome; -import java.util.function.BiFunction; - public class EmptyEndCaveBiome extends EndCaveBiome.Config { public static class Biome extends EndCaveBiome { public Biome(ResourceLocation biomeID, net.minecraft.world.level.biome.Biome biome, BCLBiomeSettings settings) { diff --git a/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java b/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java index 037b9443..db8807cd 100644 --- a/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java +++ b/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java @@ -11,7 +11,6 @@ import ru.bclib.api.biomes.BCLBiomeBuilder; import ru.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; import ru.bclib.api.biomes.BiomeAPI; import ru.bclib.api.features.BCLCommonFeatures; -import ru.bclib.api.features.BCLFeatureBuilder; import ru.bclib.util.WeightedList; import ru.bclib.world.biomes.BCLBiomeSettings; import ru.bclib.world.features.BCLFeature; diff --git a/src/main/java/ru/betterend/world/features/BiomeIslandFeature.java b/src/main/java/ru/betterend/world/features/BiomeIslandFeature.java index aef90be4..66cddb25 100644 --- a/src/main/java/ru/betterend/world/features/BiomeIslandFeature.java +++ b/src/main/java/ru/betterend/world/features/BiomeIslandFeature.java @@ -2,9 +2,7 @@ package ru.betterend.world.features; import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos.MutableBlockPos; -import net.minecraft.core.Holder; import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; diff --git a/src/main/java/ru/betterend/world/structures/piece/BasePiece.java b/src/main/java/ru/betterend/world/structures/piece/BasePiece.java index 56674ba0..88777eea 100644 --- a/src/main/java/ru/betterend/world/structures/piece/BasePiece.java +++ b/src/main/java/ru/betterend/world/structures/piece/BasePiece.java @@ -1,10 +1,10 @@ package ru.betterend.world.structures.piece; import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceType; import net.minecraft.world.level.levelgen.structure.BoundingBox; import net.minecraft.world.level.levelgen.structure.StructurePiece; import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceSerializationContext; +import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceType; public abstract class BasePiece extends StructurePiece { protected BasePiece(StructurePieceType type, int i, BoundingBox boundingBox) { diff --git a/src/main/java/ru/betterend/world/structures/piece/MountainPiece.java b/src/main/java/ru/betterend/world/structures/piece/MountainPiece.java index 07d1a5af..afcd9e54 100644 --- a/src/main/java/ru/betterend/world/structures/piece/MountainPiece.java +++ b/src/main/java/ru/betterend/world/structures/piece/MountainPiece.java @@ -11,8 +11,8 @@ import net.minecraft.util.Mth; import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.levelgen.Heightmap.Types; -import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceType; import net.minecraft.world.level.levelgen.structure.BoundingBox; +import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceType; import ru.bclib.api.biomes.BiomeAPI; import ru.bclib.util.MHelper; import ru.betterend.noise.OpenSimplexNoise;