From 99ade39404ac59ec9b698dbefc46e2dcd1a5f1dc Mon Sep 17 00:00:00 2001 From: Aleksey Date: Mon, 12 Apr 2021 18:05:06 +0300 Subject: [PATCH] Continue --- src/main/java/ru/betterend/blocks/basis/AttachedBlock.java | 2 +- src/main/java/ru/betterend/entity/DragonflyEntity.java | 2 ++ src/main/java/ru/betterend/entity/EndSlimeEntity.java | 5 +++++ src/main/java/ru/betterend/entity/SilkMothEntity.java | 3 +++ .../ru/betterend/mixin/common/ChorusFlowerBlockMixin.java | 2 +- .../ru/betterend/mixin/common/ChorusPlantBlockMixin.java | 2 +- src/main/java/ru/betterend/registry/EndItems.java | 3 --- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/basis/AttachedBlock.java b/src/main/java/ru/betterend/blocks/basis/AttachedBlock.java index 6c0919cf..64f1f99a 100644 --- a/src/main/java/ru/betterend/blocks/basis/AttachedBlock.java +++ b/src/main/java/ru/betterend/blocks/basis/AttachedBlock.java @@ -19,7 +19,7 @@ import ru.betterend.util.BlocksHelper; public abstract class AttachedBlock extends BlockBaseNotFull { public static final DirectionProperty FACING = Properties.FACING; - public AttachedBlock(Properties settings) { + public AttachedBlock(net.minecraft.world.level.block.state.BlockBehaviour.Properties settings) { super(settings); this.setDefaultState(this.defaultBlockState().with(FACING, Direction.UP)); } diff --git a/src/main/java/ru/betterend/entity/DragonflyEntity.java b/src/main/java/ru/betterend/entity/DragonflyEntity.java index 8e31c418..c8519aa4 100644 --- a/src/main/java/ru/betterend/entity/DragonflyEntity.java +++ b/src/main/java/ru/betterend/entity/DragonflyEntity.java @@ -32,6 +32,8 @@ import net.minecraft.world.Heightmap.Type; import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.Level; import net.minecraft.world.WorldView; +import ru.betterend.entity.DragonflyEntity.DragonflyLookControl; +import ru.betterend.entity.DragonflyEntity.WanderAroundGoal; import ru.betterend.registry.EndEntities; import ru.betterend.registry.EndSounds; import ru.betterend.util.BlocksHelper; diff --git a/src/main/java/ru/betterend/entity/EndSlimeEntity.java b/src/main/java/ru/betterend/entity/EndSlimeEntity.java index aee640da..a8fcf67e 100644 --- a/src/main/java/ru/betterend/entity/EndSlimeEntity.java +++ b/src/main/java/ru/betterend/entity/EndSlimeEntity.java @@ -38,6 +38,11 @@ import net.minecraft.world.LocalDifficulty; import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.Level; import net.minecraft.world.level.biome.Biome; +import ru.betterend.entity.EndSlimeEntity.EndSlimeMoveControl; +import ru.betterend.entity.EndSlimeEntity.FaceTowardTargetGoal; +import ru.betterend.entity.EndSlimeEntity.MoveGoal; +import ru.betterend.entity.EndSlimeEntity.RandomLookGoal; +import ru.betterend.entity.EndSlimeEntity.SwimmingGoal; import ru.betterend.interfaces.ISlime; import ru.betterend.registry.EndBiomes; import ru.betterend.util.BlocksHelper; diff --git a/src/main/java/ru/betterend/entity/SilkMothEntity.java b/src/main/java/ru/betterend/entity/SilkMothEntity.java index 27309827..967f496c 100644 --- a/src/main/java/ru/betterend/entity/SilkMothEntity.java +++ b/src/main/java/ru/betterend/entity/SilkMothEntity.java @@ -47,6 +47,9 @@ import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.Level; import ru.betterend.BetterEnd; import ru.betterend.blocks.BlockProperties; +import ru.betterend.entity.SilkMothEntity.MothLookControl; +import ru.betterend.entity.SilkMothEntity.ReturnToHiveGoal; +import ru.betterend.entity.SilkMothEntity.WanderAroundGoal; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndEntities; import ru.betterend.registry.EndItems; diff --git a/src/main/java/ru/betterend/mixin/common/ChorusFlowerBlockMixin.java b/src/main/java/ru/betterend/mixin/common/ChorusFlowerBlockMixin.java index da3255b4..ac47da86 100644 --- a/src/main/java/ru/betterend/mixin/common/ChorusFlowerBlockMixin.java +++ b/src/main/java/ru/betterend/mixin/common/ChorusFlowerBlockMixin.java @@ -36,7 +36,7 @@ public abstract class ChorusFlowerBlockMixin extends Block { private static final VoxelShape SHAPE_FULL = Block.createCuboidShape(0, 0, 0, 16, 16, 16); private static final VoxelShape SHAPE_HALF = Block.createCuboidShape(0, 0, 0, 16, 4, 16); - public ChorusFlowerBlockMixin(Properties settings) { + public ChorusFlowerBlockMixin(net.minecraft.world.level.block.state.BlockBehaviour.Properties settings) { super(settings); } diff --git a/src/main/java/ru/betterend/mixin/common/ChorusPlantBlockMixin.java b/src/main/java/ru/betterend/mixin/common/ChorusPlantBlockMixin.java index ce3b77ad..99535afb 100644 --- a/src/main/java/ru/betterend/mixin/common/ChorusPlantBlockMixin.java +++ b/src/main/java/ru/betterend/mixin/common/ChorusPlantBlockMixin.java @@ -27,7 +27,7 @@ import ru.betterend.world.generator.GeneratorOptions; @Mixin(value = ChorusPlantBlock.class, priority = 100) public abstract class ChorusPlantBlockMixin extends Block { - public ChorusPlantBlockMixin(Properties settings) { + public ChorusPlantBlockMixin(net.minecraft.world.level.block.state.BlockBehaviour.Properties settings) { super(settings); } diff --git a/src/main/java/ru/betterend/registry/EndItems.java b/src/main/java/ru/betterend/registry/EndItems.java index 7e8f1f1e..cae4b4ed 100644 --- a/src/main/java/ru/betterend/registry/EndItems.java +++ b/src/main/java/ru/betterend/registry/EndItems.java @@ -18,11 +18,8 @@ import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.level.material.Fluids; import net.minecraft.world.item.Item.Properties; -import net.minecraft.world.item.TieredItem; -import net.minecraft.world.item.Tiers; import net.minecraft.tags.Tag; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Rarity; import net.minecraft.core.Direction; import net.minecraft.core.Registry; import ru.betterend.BetterEnd;