From 57548290e9b84862c000e0032c7e81c1b3add67a Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Fri, 15 Jan 2021 12:04:26 +0300 Subject: [PATCH] Entity class rename --- ...{EntityCubozoa.java => CubozoaEntity.java} | 14 ++-- ...ityDragonfly.java => DragonflyEntity.java} | 28 +++---- ...{EntityEndFish.java => EndFishEntity.java} | 12 +-- ...ntityEndSlime.java => EndSlimeEntity.java} | 84 +++++++++---------- ...dowWalker.java => ShadowWalkerEntity.java} | 12 +-- .../entity/{ => model}/BlockBenchModel.java | 2 +- ...tyCubozoa.java => CubozoaEntityModel.java} | 9 +- ...agonfly.java => DragonflyEntityModel.java} | 9 +- ...tyEndFish.java => EndFishEntityModel.java} | 9 +- .../entity/model/EndSlimeEntityModel.java | 4 +- .../entity/render/RendererEntityCubozoa.java | 16 ++-- .../render/RendererEntityDragonfly.java | 12 +-- .../entity/render/RendererEntityEndFish.java | 22 ++--- .../entity/render/RendererEntityEndSlime.java | 20 ++--- .../render/RendererEntityShadowWalker.java | 8 +- .../ru/betterend/registry/EndEntities.java | 30 +++---- 16 files changed, 144 insertions(+), 147 deletions(-) rename src/main/java/ru/betterend/entity/{EntityCubozoa.java => CubozoaEntity.java} (90%) rename src/main/java/ru/betterend/entity/{EntityDragonfly.java => DragonflyEntity.java} (81%) rename src/main/java/ru/betterend/entity/{EntityEndFish.java => EndFishEntity.java} (88%) rename src/main/java/ru/betterend/entity/{EntityEndSlime.java => EndSlimeEntity.java} (77%) rename src/main/java/ru/betterend/entity/{EntityShadowWalker.java => ShadowWalkerEntity.java} (88%) rename src/main/java/ru/betterend/entity/{ => model}/BlockBenchModel.java (91%) rename src/main/java/ru/betterend/entity/model/{ModelEntityCubozoa.java => CubozoaEntityModel.java} (90%) rename src/main/java/ru/betterend/entity/model/{ModelEntityDragonfly.java => DragonflyEntityModel.java} (90%) rename src/main/java/ru/betterend/entity/model/{ModelEntityEndFish.java => EndFishEntityModel.java} (88%) diff --git a/src/main/java/ru/betterend/entity/EntityCubozoa.java b/src/main/java/ru/betterend/entity/CubozoaEntity.java similarity index 90% rename from src/main/java/ru/betterend/entity/EntityCubozoa.java rename to src/main/java/ru/betterend/entity/CubozoaEntity.java index 25f79963..65a20bb9 100644 --- a/src/main/java/ru/betterend/entity/EntityCubozoa.java +++ b/src/main/java/ru/betterend/entity/CubozoaEntity.java @@ -38,12 +38,12 @@ import net.minecraft.world.World; import ru.betterend.registry.EndBiomes; import ru.betterend.registry.EndItems; -public class EntityCubozoa extends SchoolingFishEntity { +public class CubozoaEntity extends SchoolingFishEntity { public static final int VARIANTS = 2; - private static final TrackedData VARIANT = DataTracker.registerData(EntityCubozoa.class, TrackedDataHandlerRegistry.BYTE); - private static final TrackedData SCALE = DataTracker.registerData(EntityCubozoa.class, TrackedDataHandlerRegistry.BYTE); + private static final TrackedData VARIANT = DataTracker.registerData(CubozoaEntity.class, TrackedDataHandlerRegistry.BYTE); + private static final TrackedData SCALE = DataTracker.registerData(CubozoaEntity.class, TrackedDataHandlerRegistry.BYTE); - public EntityCubozoa(EntityType entityType, World world) { + public CubozoaEntity(EntityType entityType, World world) { super(entityType, world); } @@ -97,9 +97,9 @@ public class EntityCubozoa extends SchoolingFishEntity { return this.dataTracker.get(SCALE) / 32F + 0.75F; } - public static boolean canSpawn(EntityType type, ServerWorldAccess world, SpawnReason spawnReason, BlockPos pos, Random random) { + public static boolean canSpawn(EntityType type, ServerWorldAccess world, SpawnReason spawnReason, BlockPos pos, Random random) { Box box = new Box(pos).expand(16); - List list = world.getEntitiesByClass(EntityCubozoa.class, box, (entity) -> { + List list = world.getEntitiesByClass(CubozoaEntity.class, box, (entity) -> { return true; }); return list.size() < 9; @@ -141,7 +141,7 @@ public class EntityCubozoa extends SchoolingFishEntity { } static class CubozoaMoveControl extends MoveControl { - CubozoaMoveControl(EntityCubozoa owner) { + CubozoaMoveControl(CubozoaEntity owner) { super(owner); } diff --git a/src/main/java/ru/betterend/entity/EntityDragonfly.java b/src/main/java/ru/betterend/entity/DragonflyEntity.java similarity index 81% rename from src/main/java/ru/betterend/entity/EntityDragonfly.java rename to src/main/java/ru/betterend/entity/DragonflyEntity.java index f808e0d1..2cafb340 100644 --- a/src/main/java/ru/betterend/entity/EntityDragonfly.java +++ b/src/main/java/ru/betterend/entity/DragonflyEntity.java @@ -37,8 +37,8 @@ import ru.betterend.registry.EndSounds; import ru.betterend.util.BlocksHelper; import ru.betterend.util.MHelper; -public class EntityDragonfly extends AnimalEntity implements Flutterer { - public EntityDragonfly(EntityType entityType, World world) { +public class DragonflyEntity extends AnimalEntity implements Flutterer { + public DragonflyEntity(EntityType entityType, World world) { super(entityType, world); this.moveControl = new FlightMoveControl(this, 20, true); this.lookControl = new DragonflyLookControl(this); @@ -137,11 +137,11 @@ public class EntityDragonfly extends AnimalEntity implements Flutterer { } public boolean canStart() { - return EntityDragonfly.this.navigation.isIdle() && EntityDragonfly.this.random.nextInt(10) == 0; + return DragonflyEntity.this.navigation.isIdle() && DragonflyEntity.this.random.nextInt(10) == 0; } public boolean shouldContinue() { - return EntityDragonfly.this.navigation.isFollowingPath(); + return DragonflyEntity.this.navigation.isFollowingPath(); } public void start() { @@ -149,9 +149,9 @@ public class EntityDragonfly extends AnimalEntity implements Flutterer { if (vec3d != null) { BlockPos pos = new BlockPos(vec3d); try { - Path path = EntityDragonfly.this.navigation.findPathTo(pos, 1); + Path path = DragonflyEntity.this.navigation.findPathTo(pos, 1); if (path != null) { - EntityDragonfly.this.navigation.startMovingAlong(path, 1.0D); + DragonflyEntity.this.navigation.startMovingAlong(path, 1.0D); } } catch (Exception e) {} @@ -160,29 +160,29 @@ public class EntityDragonfly extends AnimalEntity implements Flutterer { } private Vec3d getRandomLocation() { - int h = BlocksHelper.downRay(EntityDragonfly.this.world, EntityDragonfly.this.getBlockPos(), 16); - Vec3d rotation = EntityDragonfly.this.getRotationVec(0.0F); - Vec3d airPos = TargetFinder.findAirTarget(EntityDragonfly.this, 8, 7, rotation, 1.5707964F, 2, 1); + int h = BlocksHelper.downRay(DragonflyEntity.this.world, DragonflyEntity.this.getBlockPos(), 16); + Vec3d rotation = DragonflyEntity.this.getRotationVec(0.0F); + Vec3d airPos = TargetFinder.findAirTarget(DragonflyEntity.this, 8, 7, rotation, 1.5707964F, 2, 1); if (airPos != null) { if (isInVoid(airPos)) { for (int i = 0; i < 8; i++) { - airPos = TargetFinder.findAirTarget(EntityDragonfly.this, 16, 7, rotation, MHelper.PI2, 2, 1); + airPos = TargetFinder.findAirTarget(DragonflyEntity.this, 16, 7, rotation, MHelper.PI2, 2, 1); if (airPos != null && !isInVoid(airPos)) { return airPos; } } return null; } - if (h > 5 && airPos.getY() >= EntityDragonfly.this.getBlockPos().getY()) { + if (h > 5 && airPos.getY() >= DragonflyEntity.this.getBlockPos().getY()) { airPos = new Vec3d(airPos.x, airPos.y - h * 0.5, airPos.z); } return airPos; } - return TargetFinder.findGroundTarget(EntityDragonfly.this, 8, 4, -2, rotation, 1.5707963705062866D); + return TargetFinder.findGroundTarget(DragonflyEntity.this, 8, 4, -2, rotation, 1.5707963705062866D); } private boolean isInVoid(Vec3d pos) { - int h = BlocksHelper.downRay(EntityDragonfly.this.world, new BlockPos(pos), 128); + int h = BlocksHelper.downRay(DragonflyEntity.this.world, new BlockPos(pos), 128); return h > 100; } } @@ -192,7 +192,7 @@ public class EntityDragonfly extends AnimalEntity implements Flutterer { return EndEntities.DRAGONFLY.create(world); } - public static boolean canSpawn(EntityType type, ServerWorldAccess world, SpawnReason spawnReason, BlockPos pos, Random random) { + public static boolean canSpawn(EntityType type, ServerWorldAccess world, SpawnReason spawnReason, BlockPos pos, Random random) { int y = world.getChunk(pos).sampleHeightmap(Type.WORLD_SURFACE, pos.getX() & 15, pos.getY() & 15); return y > 0 && pos.getY() >= y; } diff --git a/src/main/java/ru/betterend/entity/EntityEndFish.java b/src/main/java/ru/betterend/entity/EndFishEntity.java similarity index 88% rename from src/main/java/ru/betterend/entity/EntityEndFish.java rename to src/main/java/ru/betterend/entity/EndFishEntity.java index 27f74725..4b633a4d 100644 --- a/src/main/java/ru/betterend/entity/EntityEndFish.java +++ b/src/main/java/ru/betterend/entity/EndFishEntity.java @@ -29,14 +29,14 @@ import net.minecraft.world.World; import ru.betterend.registry.EndBiomes; import ru.betterend.registry.EndItems; -public class EntityEndFish extends SchoolingFishEntity { +public class EndFishEntity extends SchoolingFishEntity { public static final int VARIANTS_NORMAL = 5; public static final int VARIANTS_SULPHUR = 3; public static final int VARIANTS = VARIANTS_NORMAL + VARIANTS_SULPHUR; - private static final TrackedData VARIANT = DataTracker.registerData(EntityEndFish.class, TrackedDataHandlerRegistry.BYTE); - private static final TrackedData SCALE = DataTracker.registerData(EntityEndFish.class, TrackedDataHandlerRegistry.BYTE); + private static final TrackedData VARIANT = DataTracker.registerData(EndFishEntity.class, TrackedDataHandlerRegistry.BYTE); + private static final TrackedData SCALE = DataTracker.registerData(EndFishEntity.class, TrackedDataHandlerRegistry.BYTE); - public EntityEndFish(EntityType entityType, World world) { + public EndFishEntity(EntityType entityType, World world) { super(entityType, world); } @@ -126,9 +126,9 @@ public class EntityEndFish extends SchoolingFishEntity { return this.dataTracker.get(SCALE) / 32F + 0.75F; } - public static boolean canSpawn(EntityType type, ServerWorldAccess world, SpawnReason spawnReason, BlockPos pos, Random random) { + public static boolean canSpawn(EntityType type, ServerWorldAccess world, SpawnReason spawnReason, BlockPos pos, Random random) { Box box = new Box(pos).expand(16); - List list = world.getEntitiesByClass(EntityEndFish.class, box, (entity) -> { return true; }); + List list = world.getEntitiesByClass(EndFishEntity.class, box, (entity) -> { return true; }); return list.size() < 9; } diff --git a/src/main/java/ru/betterend/entity/EntityEndSlime.java b/src/main/java/ru/betterend/entity/EndSlimeEntity.java similarity index 77% rename from src/main/java/ru/betterend/entity/EntityEndSlime.java rename to src/main/java/ru/betterend/entity/EndSlimeEntity.java index a5eb3ba3..b9b6118c 100644 --- a/src/main/java/ru/betterend/entity/EntityEndSlime.java +++ b/src/main/java/ru/betterend/entity/EndSlimeEntity.java @@ -44,11 +44,11 @@ import ru.betterend.util.BlocksHelper; import ru.betterend.util.MHelper; import ru.betterend.world.biome.EndBiome; -public class EntityEndSlime extends SlimeEntity { - private static final TrackedData VARIANT = DataTracker.registerData(EntityEndSlime.class, TrackedDataHandlerRegistry.BYTE); +public class EndSlimeEntity extends SlimeEntity { + private static final TrackedData VARIANT = DataTracker.registerData(EndSlimeEntity.class, TrackedDataHandlerRegistry.BYTE); private static final Mutable POS = new Mutable(); - public EntityEndSlime(EntityType entityType, World world) { + public EndSlimeEntity(EntityType entityType, World world) { super(entityType, world); this.moveControl = new EndSlimeMoveControl(this); } @@ -128,7 +128,7 @@ public class EntityEndSlime extends SlimeEntity { for (int l = 0; l < k; ++l) { float g = ((float) (l % 2) - 0.5F) * f; float h = ((float) (l / 2) - 0.5F) * f; - EntityEndSlime slimeEntity = (EntityEndSlime) this.getType().create(this.world); + EndSlimeEntity slimeEntity = (EndSlimeEntity) this.getType().create(this.world); if (this.isPersistent()) { slimeEntity.setPersistent(); } @@ -198,7 +198,7 @@ public class EntityEndSlime extends SlimeEntity { return this.dataTracker.get(VARIANT) == 0; } - public static boolean canSpawn(EntityType type, ServerWorldAccess world, SpawnReason spawnReason, BlockPos pos, Random random) { + public static boolean canSpawn(EntityType type, ServerWorldAccess world, SpawnReason spawnReason, BlockPos pos, Random random) { return random.nextInt(16) == 0 || isPermanentBiome(world, pos) || (notManyEntities(world, pos, 32, 3) && isWaterNear(world, pos, 32, 8)); } @@ -209,7 +209,7 @@ public class EntityEndSlime extends SlimeEntity { private static boolean notManyEntities(ServerWorldAccess world, BlockPos pos, int radius, int maxCount) { Box box = new Box(pos).expand(radius); - List list = world.getEntitiesByClass(EntityEndSlime.class, box, (entity) -> { return true; }); + List list = world.getEntitiesByClass(EndSlimeEntity.class, box, (entity) -> { return true; }); return list.size() <= maxCount; } @@ -235,17 +235,17 @@ public class EntityEndSlime extends SlimeEntity { } public boolean canStart() { - if (EntityEndSlime.this.hasVehicle()) { + if (EndSlimeEntity.this.hasVehicle()) { return false; } - float yaw = EntityEndSlime.this.getHeadYaw(); - float speed = EntityEndSlime.this.getMovementSpeed(); + float yaw = EndSlimeEntity.this.getHeadYaw(); + float speed = EndSlimeEntity.this.getMovementSpeed(); if (speed > 0.1) { float dx = MathHelper.sin(-yaw * 0.017453292F); float dz = MathHelper.cos(-yaw * 0.017453292F); - BlockPos pos = EntityEndSlime.this.getBlockPos().add(dx * speed * 4, 0, dz * speed * 4); - int down = BlocksHelper.downRay(EntityEndSlime.this.world, pos, 16); + BlockPos pos = EndSlimeEntity.this.getBlockPos().add(dx * speed * 4, 0, dz * speed * 4); + int down = BlocksHelper.downRay(EndSlimeEntity.this.world, pos, 16); return down < 5; } @@ -253,28 +253,28 @@ public class EntityEndSlime extends SlimeEntity { } public void tick() { - ((EndSlimeMoveControl) EntityEndSlime.this.getMoveControl()).move(1.0D); + ((EndSlimeMoveControl) EndSlimeEntity.this.getMoveControl()).move(1.0D); } } class SwimmingGoal extends Goal { public SwimmingGoal() { this.setControls(EnumSet.of(Goal.Control.JUMP, Goal.Control.MOVE)); - EntityEndSlime.this.getNavigation().setCanSwim(true); + EndSlimeEntity.this.getNavigation().setCanSwim(true); } public boolean canStart() { - return (EntityEndSlime.this.isTouchingWater() - || EntityEndSlime.this.isInLava()) - && EntityEndSlime.this.getMoveControl() instanceof EndSlimeMoveControl; + return (EndSlimeEntity.this.isTouchingWater() + || EndSlimeEntity.this.isInLava()) + && EndSlimeEntity.this.getMoveControl() instanceof EndSlimeMoveControl; } public void tick() { - if (EntityEndSlime.this.getRandom().nextFloat() < 0.8F) { - EntityEndSlime.this.getJumpControl().setActive(); + if (EndSlimeEntity.this.getRandom().nextFloat() < 0.8F) { + EndSlimeEntity.this.getJumpControl().setActive(); } - ((EndSlimeMoveControl) EntityEndSlime.this.getMoveControl()).move(1.2D); + ((EndSlimeMoveControl) EndSlimeEntity.this.getMoveControl()).move(1.2D); } } @@ -287,21 +287,21 @@ public class EntityEndSlime extends SlimeEntity { } public boolean canStart() { - return EntityEndSlime.this.getTarget() == null - && (EntityEndSlime.this.onGround - || EntityEndSlime.this.isTouchingWater() - || EntityEndSlime.this.isInLava() - || EntityEndSlime.this.hasStatusEffect(StatusEffects.LEVITATION)) - && EntityEndSlime.this.getMoveControl() instanceof EndSlimeMoveControl; + return EndSlimeEntity.this.getTarget() == null + && (EndSlimeEntity.this.onGround + || EndSlimeEntity.this.isTouchingWater() + || EndSlimeEntity.this.isInLava() + || EndSlimeEntity.this.hasStatusEffect(StatusEffects.LEVITATION)) + && EndSlimeEntity.this.getMoveControl() instanceof EndSlimeMoveControl; } public void tick() { if (--this.timer <= 0) { - this.timer = 40 + EntityEndSlime.this.getRandom().nextInt(60); - this.targetYaw = (float) EntityEndSlime.this.getRandom().nextInt(360); + this.timer = 40 + EndSlimeEntity.this.getRandom().nextInt(60); + this.targetYaw = (float) EndSlimeEntity.this.getRandom().nextInt(360); } - ((EndSlimeMoveControl) EntityEndSlime.this.getMoveControl()).look(this.targetYaw, false); + ((EndSlimeMoveControl) EndSlimeEntity.this.getMoveControl()).look(this.targetYaw, false); } } @@ -313,7 +313,7 @@ public class EntityEndSlime extends SlimeEntity { } public boolean canStart() { - LivingEntity livingEntity = EntityEndSlime.this.getTarget(); + LivingEntity livingEntity = EndSlimeEntity.this.getTarget(); if (livingEntity == null) { return false; } @@ -321,7 +321,7 @@ public class EntityEndSlime extends SlimeEntity { return false; } else { - return livingEntity instanceof PlayerEntity && ((PlayerEntity) livingEntity).abilities.invulnerable ? false : EntityEndSlime.this.getMoveControl() instanceof EndSlimeMoveControl; + return livingEntity instanceof PlayerEntity && ((PlayerEntity) livingEntity).abilities.invulnerable ? false : EndSlimeEntity.this.getMoveControl() instanceof EndSlimeMoveControl; } } @@ -331,7 +331,7 @@ public class EntityEndSlime extends SlimeEntity { } public boolean shouldContinue() { - LivingEntity livingEntity = EntityEndSlime.this.getTarget(); + LivingEntity livingEntity = EndSlimeEntity.this.getTarget(); if (livingEntity == null) { return false; } @@ -347,8 +347,8 @@ public class EntityEndSlime extends SlimeEntity { } public void tick() { - EntityEndSlime.this.lookAtEntity(EntityEndSlime.this.getTarget(), 10.0F, 10.0F); - ((EndSlimeMoveControl) EntityEndSlime.this.getMoveControl()).look(EntityEndSlime.this.yaw, EntityEndSlime.this.canAttack()); + EndSlimeEntity.this.lookAtEntity(EndSlimeEntity.this.getTarget(), 10.0F, 10.0F); + ((EndSlimeMoveControl) EndSlimeEntity.this.getMoveControl()).look(EndSlimeEntity.this.yaw, EndSlimeEntity.this.canAttack()); } } @@ -357,7 +357,7 @@ public class EntityEndSlime extends SlimeEntity { private int ticksUntilJump; private boolean jumpOften; - public EndSlimeMoveControl(EntityEndSlime slime) { + public EndSlimeMoveControl(EndSlimeEntity slime) { super(slime); this.targetYaw = 180.0F * slime.yaw / 3.1415927F; } @@ -384,19 +384,19 @@ public class EntityEndSlime extends SlimeEntity { if (this.entity.isOnGround()) { this.entity.setMovementSpeed((float) (this.speed * this.entity.getAttributeValue(EntityAttributes.GENERIC_MOVEMENT_SPEED))); if (this.ticksUntilJump-- <= 0) { - this.ticksUntilJump = EntityEndSlime.this.getTicksUntilNextJump(); + this.ticksUntilJump = EndSlimeEntity.this.getTicksUntilNextJump(); if (this.jumpOften) { this.ticksUntilJump /= 3; } - EntityEndSlime.this.getJumpControl().setActive(); - if (EntityEndSlime.this.makesJumpSound()) { - EntityEndSlime.this.playSound(EntityEndSlime.this.getJumpSound(), EntityEndSlime.this.getSoundVolume(), getJumpSoundPitch()); + EndSlimeEntity.this.getJumpControl().setActive(); + if (EndSlimeEntity.this.makesJumpSound()) { + EndSlimeEntity.this.playSound(EndSlimeEntity.this.getJumpSound(), EndSlimeEntity.this.getSoundVolume(), getJumpSoundPitch()); } } else { - EntityEndSlime.this.sidewaysSpeed = 0.0F; - EntityEndSlime.this.forwardSpeed = 0.0F; + EndSlimeEntity.this.sidewaysSpeed = 0.0F; + EndSlimeEntity.this.forwardSpeed = 0.0F; this.entity.setMovementSpeed(0.0F); } } @@ -408,8 +408,8 @@ public class EntityEndSlime extends SlimeEntity { } private float getJumpSoundPitch() { - float f = EntityEndSlime.this.isSmall() ? 1.4F : 0.8F; - return ((EntityEndSlime.this.random.nextFloat() - EntityEndSlime.this.random.nextFloat()) * 0.2F + 1.0F) * f; + float f = EndSlimeEntity.this.isSmall() ? 1.4F : 0.8F; + return ((EndSlimeEntity.this.random.nextFloat() - EndSlimeEntity.this.random.nextFloat()) * 0.2F + 1.0F) * f; } } } diff --git a/src/main/java/ru/betterend/entity/EntityShadowWalker.java b/src/main/java/ru/betterend/entity/ShadowWalkerEntity.java similarity index 88% rename from src/main/java/ru/betterend/entity/EntityShadowWalker.java rename to src/main/java/ru/betterend/entity/ShadowWalkerEntity.java index b7d5d50c..d4108e07 100644 --- a/src/main/java/ru/betterend/entity/EntityShadowWalker.java +++ b/src/main/java/ru/betterend/entity/ShadowWalkerEntity.java @@ -29,8 +29,8 @@ import net.minecraft.world.World; import ru.betterend.registry.EndSounds; import ru.betterend.util.MHelper; -public class EntityShadowWalker extends HostileEntity { - public EntityShadowWalker(EntityType entityType, World world) { +public class ShadowWalkerEntity extends HostileEntity { + public ShadowWalkerEntity(EntityType entityType, World world) { super(entityType, world); } @@ -112,20 +112,20 @@ public class EntityShadowWalker extends HostileEntity { return attack; } - public static boolean canSpawn(EntityType type, ServerWorldAccess world, SpawnReason spawnReason, BlockPos pos, Random random) { + public static boolean canSpawn(EntityType type, ServerWorldAccess world, SpawnReason spawnReason, BlockPos pos, Random random) { if (HostileEntity.canSpawnInDark(type, world, spawnReason, pos, random)) { Box box = new Box(pos).expand(16); - List entities = world.getEntitiesByClass(EntityShadowWalker.class, box, (entity) -> { return true; }); + List entities = world.getEntitiesByClass(ShadowWalkerEntity.class, box, (entity) -> { return true; }); return entities.size() < 6; } return false; } private final class AttackGoal extends MeleeAttackGoal { - private final EntityShadowWalker walker; + private final ShadowWalkerEntity walker; private int ticks; - public AttackGoal(EntityShadowWalker walker, double speed, boolean pauseWhenMobIdle) { + public AttackGoal(ShadowWalkerEntity walker, double speed, boolean pauseWhenMobIdle) { super(walker, speed, pauseWhenMobIdle); this.walker = walker; } diff --git a/src/main/java/ru/betterend/entity/BlockBenchModel.java b/src/main/java/ru/betterend/entity/model/BlockBenchModel.java similarity index 91% rename from src/main/java/ru/betterend/entity/BlockBenchModel.java rename to src/main/java/ru/betterend/entity/model/BlockBenchModel.java index 0c3ad64b..f53dc212 100644 --- a/src/main/java/ru/betterend/entity/BlockBenchModel.java +++ b/src/main/java/ru/betterend/entity/model/BlockBenchModel.java @@ -1,4 +1,4 @@ -package ru.betterend.entity; +package ru.betterend.entity.model; import java.util.function.Function; diff --git a/src/main/java/ru/betterend/entity/model/ModelEntityCubozoa.java b/src/main/java/ru/betterend/entity/model/CubozoaEntityModel.java similarity index 90% rename from src/main/java/ru/betterend/entity/model/ModelEntityCubozoa.java rename to src/main/java/ru/betterend/entity/model/CubozoaEntityModel.java index 5207fde6..f9b7d5cd 100644 --- a/src/main/java/ru/betterend/entity/model/ModelEntityCubozoa.java +++ b/src/main/java/ru/betterend/entity/model/CubozoaEntityModel.java @@ -5,10 +5,9 @@ import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.MathHelper; -import ru.betterend.entity.BlockBenchModel; -import ru.betterend.entity.EntityCubozoa; +import ru.betterend.entity.CubozoaEntity; -public class ModelEntityCubozoa extends BlockBenchModel { +public class CubozoaEntityModel extends BlockBenchModel { private final ModelPart model; private final ModelPart main_cube_r1; private final ModelPart tentacle_center_1; @@ -22,7 +21,7 @@ public class ModelEntityCubozoa extends BlockBenchModel { private float scaleY; private float scaleXZ; - public ModelEntityCubozoa() { + public CubozoaEntityModel() { super(RenderLayer::getEntityTranslucent); textureWidth = 48; @@ -83,7 +82,7 @@ public class ModelEntityCubozoa extends BlockBenchModel { } @Override - public void setAngles(EntityCubozoa entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) { + public void setAngles(CubozoaEntity entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) { float sin = MathHelper.sin(animationProgress * 0.13F); scaleY = sin * 0.1F + 0.9F; scaleXZ = MathHelper.sin(animationProgress * 0.13F + 3.14F) * 0.1F + 0.9F; diff --git a/src/main/java/ru/betterend/entity/model/ModelEntityDragonfly.java b/src/main/java/ru/betterend/entity/model/DragonflyEntityModel.java similarity index 90% rename from src/main/java/ru/betterend/entity/model/ModelEntityDragonfly.java rename to src/main/java/ru/betterend/entity/model/DragonflyEntityModel.java index 764bb647..47acf4a6 100644 --- a/src/main/java/ru/betterend/entity/model/ModelEntityDragonfly.java +++ b/src/main/java/ru/betterend/entity/model/DragonflyEntityModel.java @@ -4,10 +4,9 @@ import net.minecraft.client.model.ModelPart; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; -import ru.betterend.entity.BlockBenchModel; -import ru.betterend.entity.EntityDragonfly; +import ru.betterend.entity.DragonflyEntity; -public class ModelEntityDragonfly extends BlockBenchModel { +public class DragonflyEntityModel extends BlockBenchModel { private final ModelPart model; private final ModelPart head; private final ModelPart tail; @@ -19,7 +18,7 @@ public class ModelEntityDragonfly extends BlockBenchModel { private final ModelPart legs_1; private final ModelPart legs_2; - public ModelEntityDragonfly() { + public DragonflyEntityModel() { super(RenderLayer::getEntityCutout); textureWidth = 64; @@ -82,7 +81,7 @@ public class ModelEntityDragonfly extends BlockBenchModel { @Override - public void setAngles(EntityDragonfly entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) { + public void setAngles(DragonflyEntity entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) { float progress = animationProgress * 2F; wing_1.roll = 0.3491F + (float) Math.sin(progress) * 0.3491F; diff --git a/src/main/java/ru/betterend/entity/model/ModelEntityEndFish.java b/src/main/java/ru/betterend/entity/model/EndFishEntityModel.java similarity index 88% rename from src/main/java/ru/betterend/entity/model/ModelEntityEndFish.java rename to src/main/java/ru/betterend/entity/model/EndFishEntityModel.java index 5e0019b2..c2a75cec 100644 --- a/src/main/java/ru/betterend/entity/model/ModelEntityEndFish.java +++ b/src/main/java/ru/betterend/entity/model/EndFishEntityModel.java @@ -4,10 +4,9 @@ import net.minecraft.client.model.ModelPart; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; -import ru.betterend.entity.BlockBenchModel; -import ru.betterend.entity.EntityEndFish; +import ru.betterend.entity.EndFishEntity; -public class ModelEntityEndFish extends BlockBenchModel { +public class EndFishEntityModel extends BlockBenchModel { private final ModelPart model; private final ModelPart fin_top; private final ModelPart fin_bottom; @@ -15,7 +14,7 @@ public class ModelEntityEndFish extends BlockBenchModel { private final ModelPart fin_right; private final ModelPart fin_left; - public ModelEntityEndFish() { + public EndFishEntityModel() { super(RenderLayer::getEntityCutout); textureWidth = 32; @@ -58,7 +57,7 @@ public class ModelEntityEndFish extends BlockBenchModel { @Override - public void setAngles(EntityEndFish entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) { + public void setAngles(EndFishEntity entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) { float s1 = (float) Math.sin(animationProgress * 0.1); float s2 = (float) Math.sin(animationProgress * 0.05); flipper.yaw = s1 * 0.3F; diff --git a/src/main/java/ru/betterend/entity/model/EndSlimeEntityModel.java b/src/main/java/ru/betterend/entity/model/EndSlimeEntityModel.java index 93a1897c..6725e790 100644 --- a/src/main/java/ru/betterend/entity/model/EndSlimeEntityModel.java +++ b/src/main/java/ru/betterend/entity/model/EndSlimeEntityModel.java @@ -7,10 +7,10 @@ import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.entity.model.CompositeEntityModel; import net.minecraft.client.util.math.MatrixStack; -import ru.betterend.entity.EntityEndSlime; +import ru.betterend.entity.EndSlimeEntity; import ru.betterend.util.MHelper; -public class EndSlimeEntityModel extends CompositeEntityModel { +public class EndSlimeEntityModel extends CompositeEntityModel { private final ModelPart flower; private final ModelPart crop; private final ModelPart innerCube; diff --git a/src/main/java/ru/betterend/entity/render/RendererEntityCubozoa.java b/src/main/java/ru/betterend/entity/render/RendererEntityCubozoa.java index 6e23c023..cf36a3be 100644 --- a/src/main/java/ru/betterend/entity/render/RendererEntityCubozoa.java +++ b/src/main/java/ru/betterend/entity/render/RendererEntityCubozoa.java @@ -10,23 +10,23 @@ import net.minecraft.client.render.entity.feature.EyesFeatureRenderer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Identifier; import ru.betterend.BetterEnd; -import ru.betterend.entity.EntityCubozoa; -import ru.betterend.entity.model.ModelEntityCubozoa; +import ru.betterend.entity.CubozoaEntity; +import ru.betterend.entity.model.CubozoaEntityModel; -public class RendererEntityCubozoa extends MobEntityRenderer { +public class RendererEntityCubozoa extends MobEntityRenderer { private static final Identifier[] TEXTURE = new Identifier[2]; private static final RenderLayer[] GLOW = new RenderLayer[2]; public RendererEntityCubozoa(EntityRenderDispatcher entityRenderDispatcher) { - super(entityRenderDispatcher, new ModelEntityCubozoa(), 0.5f); - this.addFeature(new EyesFeatureRenderer(this) { + super(entityRenderDispatcher, new CubozoaEntityModel(), 0.5f); + this.addFeature(new EyesFeatureRenderer(this) { @Override public RenderLayer getEyesTexture() { return GLOW[0]; } @Override - public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, EntityCubozoa entity, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch) { + public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CubozoaEntity entity, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch) { VertexConsumer vertexConsumer = vertexConsumers.getBuffer(GLOW[entity.getVariant()]); this.getContextModel().render(matrices, vertexConsumer, 15728640, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F); } @@ -34,13 +34,13 @@ public class RendererEntityCubozoa extends MobEntityRenderer { +public class RendererEntityDragonfly extends MobEntityRenderer { private static final Identifier TEXTURE = BetterEnd.makeID("textures/entity/dragonfly.png"); private static final RenderLayer GLOW = RenderLayer.getEyes(BetterEnd.makeID("textures/entity/dragonfly_glow.png")); public RendererEntityDragonfly(EntityRenderDispatcher entityRenderDispatcher) { - super(entityRenderDispatcher, new ModelEntityDragonfly(), 0.5f); - this.addFeature(new EyesFeatureRenderer(this) { + super(entityRenderDispatcher, new DragonflyEntityModel(), 0.5f); + this.addFeature(new EyesFeatureRenderer(this) { @Override public RenderLayer getEyesTexture() { return GLOW; @@ -24,7 +24,7 @@ public class RendererEntityDragonfly extends MobEntityRenderer { - private static final Identifier[] TEXTURE = new Identifier[EntityEndFish.VARIANTS]; - private static final RenderLayer[] GLOW = new RenderLayer[EntityEndFish.VARIANTS]; +public class RendererEntityEndFish extends MobEntityRenderer { + private static final Identifier[] TEXTURE = new Identifier[EndFishEntity.VARIANTS]; + private static final RenderLayer[] GLOW = new RenderLayer[EndFishEntity.VARIANTS]; public RendererEntityEndFish(EntityRenderDispatcher entityRenderDispatcher) { - super(entityRenderDispatcher, new ModelEntityEndFish(), 0.5f); - this.addFeature(new EyesFeatureRenderer(this) { + super(entityRenderDispatcher, new EndFishEntityModel(), 0.5f); + this.addFeature(new EyesFeatureRenderer(this) { @Override public RenderLayer getEyesTexture() { return GLOW[0]; } @Override - public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, EntityEndFish entity, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch) { + public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, EndFishEntity entity, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch) { VertexConsumer vertexConsumer = vertexConsumers.getBuffer(GLOW[entity.getVariant()]); this.getContextModel().render(matrices, vertexConsumer, 15728640, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F); } @@ -34,18 +34,18 @@ public class RendererEntityEndFish extends MobEntityRenderer> { +public class RendererEntityEndSlime extends MobEntityRenderer> { private static final Identifier TEXTURE[] = new Identifier[4]; private static final RenderLayer GLOW[] = new RenderLayer[4]; public RendererEntityEndSlime(EntityRenderDispatcher entityRenderDispatcher) { - super(entityRenderDispatcher, new EndSlimeEntityModel(false), 0.25F); - this.addFeature(new OverlayFeatureRenderer(this)); - this.addFeature(new EyesFeatureRenderer>(this) { + super(entityRenderDispatcher, new EndSlimeEntityModel(false), 0.25F); + this.addFeature(new OverlayFeatureRenderer(this)); + this.addFeature(new EyesFeatureRenderer>(this) { @Override public RenderLayer getEyesTexture() { return GLOW[0]; } @Override - public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, EntityEndSlime entity, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch) { + public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, EndSlimeEntity entity, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch) { VertexConsumer vertexConsumer = vertexConsumers.getBuffer(GLOW[entity.getSlimeType()]); this.getContextModel().render(matrices, vertexConsumer, 15728640, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F); if (entity.isLake()) { @@ -42,18 +42,18 @@ public class RendererEntityEndSlime extends MobEntityRenderer extends FeatureRenderer> { + private final class OverlayFeatureRenderer extends FeatureRenderer> { private final EndSlimeEntityModel modelOrdinal = new EndSlimeEntityModel(true); private final EndSlimeEntityModel modelLake = new EndSlimeEntityModel(true); diff --git a/src/main/java/ru/betterend/entity/render/RendererEntityShadowWalker.java b/src/main/java/ru/betterend/entity/render/RendererEntityShadowWalker.java index 6e3b8291..42ce3685 100644 --- a/src/main/java/ru/betterend/entity/render/RendererEntityShadowWalker.java +++ b/src/main/java/ru/betterend/entity/render/RendererEntityShadowWalker.java @@ -5,17 +5,17 @@ import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.render.entity.model.PlayerEntityModel; import net.minecraft.util.Identifier; import ru.betterend.BetterEnd; -import ru.betterend.entity.EntityShadowWalker; +import ru.betterend.entity.ShadowWalkerEntity; -public class RendererEntityShadowWalker extends BipedEntityRenderer> { +public class RendererEntityShadowWalker extends BipedEntityRenderer> { private static final Identifier TEXTURE = BetterEnd.makeID("textures/entity/shadow_walker.png"); public RendererEntityShadowWalker(EntityRenderDispatcher entityRenderDispatcher) { - super(entityRenderDispatcher, new PlayerEntityModel(0.0F, false), 0.5F); + super(entityRenderDispatcher, new PlayerEntityModel(0.0F, false), 0.5F); } @Override - public Identifier getTexture(EntityShadowWalker zombieEntity) { + public Identifier getTexture(ShadowWalkerEntity zombieEntity) { return TEXTURE; } } diff --git a/src/main/java/ru/betterend/registry/EndEntities.java b/src/main/java/ru/betterend/registry/EndEntities.java index 7e4b812e..60480491 100644 --- a/src/main/java/ru/betterend/registry/EndEntities.java +++ b/src/main/java/ru/betterend/registry/EndEntities.java @@ -13,27 +13,27 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; import ru.betterend.BetterEnd; import ru.betterend.config.Configs; -import ru.betterend.entity.EntityCubozoa; -import ru.betterend.entity.EntityDragonfly; -import ru.betterend.entity.EntityEndFish; -import ru.betterend.entity.EntityEndSlime; -import ru.betterend.entity.EntityShadowWalker; +import ru.betterend.entity.CubozoaEntity; +import ru.betterend.entity.DragonflyEntity; +import ru.betterend.entity.EndFishEntity; +import ru.betterend.entity.EndSlimeEntity; +import ru.betterend.entity.ShadowWalkerEntity; import ru.betterend.util.MHelper; import ru.betterend.util.SpawnHelper; public class EndEntities { - public static final EntityType DRAGONFLY = register("dragonfly", SpawnGroup.AMBIENT, 0.6F, 0.5F, EntityDragonfly::new, EntityDragonfly.createMobAttributes(), true, MHelper.color(32, 42, 176), MHelper.color(115, 225, 249)); - public static final EntityType END_SLIME = register("end_slime", SpawnGroup.MONSTER, 2F, 2F, EntityEndSlime::new, EntityEndSlime.createMobAttributes(), false, MHelper.color(28, 28, 28), MHelper.color(99, 11, 99)); - public static final EntityType END_FISH = register("end_fish", SpawnGroup.WATER_AMBIENT, 0.5F, 0.5F, EntityEndFish::new, EntityEndFish.createMobAttributes(), true, MHelper.color(3, 50, 76), MHelper.color(120, 206, 255)); - public static final EntityType SHADOW_WALKER = register("shadow_walker", SpawnGroup.MONSTER, 0.6F, 1.95F, EntityShadowWalker::new, EntityShadowWalker.createMobAttributes(), true, MHelper.color(30, 30, 30), MHelper.color(5, 5, 5)); - public static final EntityType CUBOZOA = register("cubozoa", SpawnGroup.WATER_AMBIENT, 0.6F, 1F, EntityCubozoa::new, EntityCubozoa.createMobAttributes(), true, MHelper.color(151, 77, 181), MHelper.color(93, 176, 238)); + public static final EntityType DRAGONFLY = register("dragonfly", SpawnGroup.AMBIENT, 0.6F, 0.5F, DragonflyEntity::new, DragonflyEntity.createMobAttributes(), true, MHelper.color(32, 42, 176), MHelper.color(115, 225, 249)); + public static final EntityType END_SLIME = register("end_slime", SpawnGroup.MONSTER, 2F, 2F, EndSlimeEntity::new, EndSlimeEntity.createMobAttributes(), false, MHelper.color(28, 28, 28), MHelper.color(99, 11, 99)); + public static final EntityType END_FISH = register("end_fish", SpawnGroup.WATER_AMBIENT, 0.5F, 0.5F, EndFishEntity::new, EndFishEntity.createMobAttributes(), true, MHelper.color(3, 50, 76), MHelper.color(120, 206, 255)); + public static final EntityType SHADOW_WALKER = register("shadow_walker", SpawnGroup.MONSTER, 0.6F, 1.95F, ShadowWalkerEntity::new, ShadowWalkerEntity.createMobAttributes(), true, MHelper.color(30, 30, 30), MHelper.color(5, 5, 5)); + public static final EntityType CUBOZOA = register("cubozoa", SpawnGroup.WATER_AMBIENT, 0.6F, 1F, CubozoaEntity::new, CubozoaEntity.createMobAttributes(), true, MHelper.color(151, 77, 181), MHelper.color(93, 176, 238)); public static void register() { - SpawnHelper.restrictionAir(DRAGONFLY, EntityDragonfly::canSpawn); - SpawnHelper.restrictionLand(END_SLIME, EntityEndSlime::canSpawn); - SpawnHelper.restrictionWater(END_FISH, EntityEndFish::canSpawn); - SpawnHelper.restrictionLand(SHADOW_WALKER, EntityShadowWalker::canSpawn); - SpawnHelper.restrictionWater(CUBOZOA, EntityCubozoa::canSpawn); + SpawnHelper.restrictionAir(DRAGONFLY, DragonflyEntity::canSpawn); + SpawnHelper.restrictionLand(END_SLIME, EndSlimeEntity::canSpawn); + SpawnHelper.restrictionWater(END_FISH, EndFishEntity::canSpawn); + SpawnHelper.restrictionLand(SHADOW_WALKER, ShadowWalkerEntity::canSpawn); + SpawnHelper.restrictionWater(CUBOZOA, CubozoaEntity::canSpawn); } protected static EntityType register(String name, SpawnGroup group, float width, float height, EntityFactory entity) {