From c3029fe107d6bc92ed85ddfa120728b2f33d4186 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 21 Feb 2019 19:27:34 +0200 Subject: [PATCH] Fix indentation. What the hell!? --- .../unicopia/entity/EntitySpell.java | 380 +++++++++--------- 1 file changed, 190 insertions(+), 190 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntitySpell.java b/src/main/java/com/minelittlepony/unicopia/entity/EntitySpell.java index c785e516..f261770c 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/EntitySpell.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/EntitySpell.java @@ -38,39 +38,39 @@ import net.minecraft.world.World; public class EntitySpell extends EntityCreature implements IMagicals, ICaster, IInAnimate { - private EntityLivingBase owner = null; + private EntityLivingBase owner = null; - public float hoverStart; + public float hoverStart; - private static final DataParameter LEVEL = EntityDataManager - .createKey(EntitySpell.class, DataSerializers.VARINT); + private static final DataParameter LEVEL = EntityDataManager + .createKey(EntitySpell.class, DataSerializers.VARINT); - private static final DataParameter OWNER = EntityDataManager - .createKey(EntitySpell.class, DataSerializers.STRING); + private static final DataParameter OWNER = EntityDataManager + .createKey(EntitySpell.class, DataSerializers.STRING); - private static final DataParameter EFFECT = EntityDataManager - .createKey(EntitySpell.class, DataSerializers.COMPOUND_TAG); + private static final DataParameter EFFECT = EntityDataManager + .createKey(EntitySpell.class, DataSerializers.COMPOUND_TAG); - private static final DataParameter AFFINITY = EntityDataManager - .createKey(EntitySpell.class, DataSerializers.VARINT); + private static final DataParameter AFFINITY = EntityDataManager + .createKey(EntitySpell.class, DataSerializers.VARINT); - private final EffectSync effectDelegate = new EffectSync<>(this, EFFECT); + private final EffectSync effectDelegate = new EffectSync<>(this, EFFECT); - public EntitySpell(World w) { - super(w); - setSize(0.6f, 0.25f); - hoverStart = (float)(Math.random() * Math.PI * 2.0D); - setRenderDistanceWeight(getRenderDistanceWeight() + 1); - preventEntitySpawning = false; - enablePersistence(); - } + public EntitySpell(World w) { + super(w); + setSize(0.6f, 0.25f); + hoverStart = (float)(Math.random() * Math.PI * 2.0D); + setRenderDistanceWeight(getRenderDistanceWeight() + 1); + preventEntitySpawning = false; + enablePersistence(); + } - @Override - public boolean isInRangeToRenderDist(double distance) { - if (getCurrentLevel() > 0) { - distance /= getCurrentLevel(); - } - return super.isInRangeToRenderDist(distance); + @Override + public boolean isInRangeToRenderDist(double distance) { + if (getCurrentLevel() > 0) { + distance /= getCurrentLevel(); + } + return super.isInRangeToRenderDist(distance); } @Override @@ -82,23 +82,23 @@ public class EntitySpell extends EntityCreature implements IMagicals, ICaster T getEffect(@Nullable Class type, boolean update) { + @Nullable + @Override + public T getEffect(@Nullable Class type, boolean update) { return effectDelegate.get(type, update); } @@ -107,27 +107,27 @@ public class EntitySpell extends EntityCreature implements IMagicals, ICaster 0) { - owner = world.getPlayerEntityByName(ownerName); - } + String ownerName = dataManager.get(OWNER); + if (ownerName != null && ownerName.length() > 0) { + owner = world.getPlayerEntityByName(ownerName); + } } return owner; } - protected void displayTick() { - if (hasEffect()) { - getEffect().render(this); - } - } + protected void displayTick() { + if (hasEffect()) { + getEffect().render(this); + } + } - @Override - public void onUpdate() { - if (world.isRemote) { - displayTick(); - } + @Override + public void onUpdate() { + if (world.isRemote) { + displayTick(); + } - if (!hasEffect()) { - setDead(); - } else { - if (getEffect().getDead()) { - setDead(); - onDeath(); - } else { - getEffect().update(this); - } + if (!hasEffect()) { + setDead(); + } else { + if (getEffect().getDead()) { + setDead(); + onDeath(); + } else { + getEffect().update(this); + } - if (getEffect().allowAI()) { - super.onUpdate(); - } - } + if (getEffect().allowAI()) { + super.onUpdate(); + } + } - if (overLevelCap()) { - if (world.rand.nextInt(10) == 0) { - spawnExplosionParticle(); - } + if (overLevelCap()) { + if (world.rand.nextInt(10) == 0) { + spawnExplosionParticle(); + } if (!world.isRemote && hasEffect()) { float exhaustionChance = getEffect().getExhaustion(this); @@ -222,86 +222,86 @@ public class EntitySpell extends EntityCreature implements IMagicals, ICaster getMaxLevel(); - } - - @Override - protected void updateFallState(double y, boolean onGround, IBlockState state, BlockPos pos) { - this.onGround = true; - //super.updateFallState(y, onGround = this.onGround = true, state, pos); } - @Override - public boolean attackEntityFrom(DamageSource source, float amount) { - if (!world.isRemote) { - setDead(); - onDeath(); - } - return false; - } + @Override + public void fall(float distance, float damageMultiplier) { - protected void onDeath() { - SoundType sound = SoundType.STONE; + } - world.playSound(posX, posY, posZ, sound.getBreakSound(), SoundCategory.NEUTRAL, sound.getVolume(), sound.getPitch(), true); + public boolean overLevelCap() { + return getCurrentLevel() > getMaxLevel(); + } - if (world.getGameRules().getBoolean("doTileDrops")) { - int level = getCurrentLevel(); + @Override + protected void updateFallState(double y, boolean onGround, IBlockState state, BlockPos pos) { + this.onGround = true; + //super.updateFallState(y, onGround = this.onGround = true, state, pos); + } - ItemStack stack = new ItemStack(getItem(), level + 1); - if (hasEffect()) { - SpellRegistry.instance().enchantStack(stack, getEffect().getName()); - } + @Override + public boolean attackEntityFrom(DamageSource source, float amount) { + if (!world.isRemote) { + setDead(); + onDeath(); + } + return false; + } - entityDropItem(stack, 0); - } - } + protected void onDeath() { + SoundType sound = SoundType.STONE; - @Override - public void setDead() { - if (hasEffect()) { - getEffect().setDead(); - } - super.setDead(); - } + world.playSound(posX, posY, posZ, sound.getBreakSound(), SoundCategory.NEUTRAL, sound.getVolume(), sound.getPitch(), true); - @Override - public EnumActionResult applyPlayerInteraction(EntityPlayer player, Vec3d vec, EnumHand hand) { - if (Predicates.MAGI.test(player)) { - ItemStack currentItem = player.getHeldItem(EnumHand.MAIN_HAND); + if (world.getGameRules().getBoolean("doTileDrops")) { + int level = getCurrentLevel(); - if (currentItem != null - && currentItem.getItem() instanceof ICastable - && ((ICastable)currentItem.getItem()).canFeed(this, currentItem) - && tryLevelUp(currentItem)) { + ItemStack stack = new ItemStack(getItem(), level + 1); + if (hasEffect()) { + SpellRegistry.instance().enchantStack(stack, getEffect().getName()); + } - if (!player.capabilities.isCreativeMode) { - currentItem.shrink(1); + entityDropItem(stack, 0); + } + } - if (currentItem.isEmpty()) { - player.renderBrokenItemStack(currentItem); - } - } + @Override + public void setDead() { + if (hasEffect()) { + getEffect().setDead(); + } + super.setDead(); + } - return EnumActionResult.SUCCESS; - } - } + @Override + public EnumActionResult applyPlayerInteraction(EntityPlayer player, Vec3d vec, EnumHand hand) { + if (Predicates.MAGI.test(player)) { + ItemStack currentItem = player.getHeldItem(EnumHand.MAIN_HAND); - return EnumActionResult.FAIL; - } + if (currentItem != null + && currentItem.getItem() instanceof ICastable + && ((ICastable)currentItem.getItem()).canFeed(this, currentItem) + && tryLevelUp(currentItem)) { + + if (!player.capabilities.isCreativeMode) { + currentItem.shrink(1); + + if (currentItem.isEmpty()) { + player.renderBrokenItemStack(currentItem); + } + } + + return EnumActionResult.SUCCESS; + } + } + + return EnumActionResult.FAIL; + } public boolean tryLevelUp(ItemStack stack) { if (hasEffect() && SpellRegistry.stackHasEnchantment(stack)) { @@ -319,51 +319,51 @@ public class EntitySpell extends EntityCreature implements IMagicals, ICaster