From ab7c7fc2dee4e7a4139b9c47a7acfd4b1aaa4e02 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Sat, 14 Jan 2017 09:09:33 +0100 Subject: updated forge and mappings, removed some images not in use --- src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java | 2 +- src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java | 2 +- src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java | 2 +- src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java | 2 +- src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java | 2 +- src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java | 2 +- src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/main/java/com/sosnitzka/taiga/traits') diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java index c0121ff..b621dcf 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java @@ -93,7 +93,7 @@ public class TraitCatcher extends AbstractTrait { if (ent != null) { ent.setPosition(pos.getX(), pos.getY(), pos.getZ()); // TODO: set to player view target - w.spawnEntityInWorld(ent); + w.spawnEntity(ent); event.getEntityPlayer().playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); data.mobClass = ""; data.mobName = ""; diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java index fed3c36..676c28f 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCongenial.java @@ -27,7 +27,7 @@ public class TraitCongenial extends AbstractTrait { @SubscribeEvent public void onEntityKill(LivingDeathEvent e) { - if (e.getSource().getEntity() instanceof EntityPlayer && !e.getSource().getEntity().worldObj.isRemote && e.getEntity() instanceof EntityCreature) { + if (e.getSource().getEntity() instanceof EntityPlayer && !e.getSource().getEntity().world.isRemote && e.getEntity() instanceof EntityCreature) { if (TinkerUtil.hasTrait(TagUtil.getTagSafe(((EntityPlayer) e.getSource().getEntity()).getHeldItemMainhand()), identifier)) { ItemStack tool = ((EntityPlayer) e.getSource().getEntity()).getHeldItemMainhand(); String name = e.getEntity().getName(); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java index eebd275..9c4b792 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java @@ -51,7 +51,7 @@ public class TraitCurvature extends AbstractTrait { event.getDrops().clear(); event.getWorld().setBlockState(cPos, mainstate); event.getHarvester().playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); - event.getHarvester().addChatComponentMessage(new TextComponentString("Teleported to: " + x + " " + y + " " + z)); + event.getHarvester().sendStatusMessage(new TextComponentString("Teleported to: " + x + " " + y + " " + z)); return; } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java index 3109dca..41c6618 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java @@ -62,7 +62,7 @@ public class TraitDecay extends TraitProgressiveStats { @Override public void onUpdate(ItemStack tool, World world, Entity entity, int itemSlot, boolean isSelected) { - if (entity instanceof FakePlayer || entity.worldObj.isRemote) { + if (entity instanceof FakePlayer || entity.world.isRemote) { return; } // every 3.6 seconds we distribute one stat. This means 1h = 1000 applications diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java b/src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java index de47dee..5678090 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitReviving.java @@ -41,7 +41,7 @@ public class TraitReviving extends AbstractTrait { ((EntitySkeleton) ent).setSkeletonType(((EntitySkeleton) e.getEntity()).getSkeletonType()); } ent.setPosition(pos.getX(), pos.getY(), pos.getZ()); - w.spawnEntityInWorld(ent); + w.spawnEntity(ent); e.getSource().getEntity().playSound(SoundEvents.AMBIENT_CAVE, 1.0F, 1.0F); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java index 5f0538a..08cd9c7 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java @@ -29,7 +29,7 @@ public class TraitSoulEater extends AbstractTrait { @SubscribeEvent public void onTargetKilled(LivingDeathEvent event) { if (event.getSource().getEntity() instanceof EntityPlayer && event.getEntity() instanceof EntityLiving) { - World w = event.getSource().getEntity().worldObj; + World w = event.getSource().getEntity().world; ItemStack tool = ((EntityPlayer) event.getSource().getEntity()).getHeldItemMainhand(); if (!w.isRemote && TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), identifier)) { NBTTagCompound tag = TagUtil.getExtraTag(tool); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java b/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java index 995582b..edfe1b9 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java @@ -32,7 +32,7 @@ public class TraitWhirl extends AbstractTrait { @Override public void onUpdate(ItemStack tool, World world, Entity entity, int itemSlot, boolean isSelected) { - if (entity instanceof FakePlayer || entity.worldObj.isRemote) { + if (entity instanceof FakePlayer || entity.world.isRemote) { return; } if (entity.ticksExisted % TICK_PER_STAT > 0) { @@ -61,7 +61,7 @@ public class TraitWhirl extends AbstractTrait { for (int x = -r; x <= r; x++) { for (int y = -r; y <= r; y++) { for (int z = -r; z <= r; z++) { - if (MathHelper.sqrt_double(x * x + y * y + z * z) > r) { + if (MathHelper.sqrt(x * x + y * y + z * z) > r) { continue; } BlockPos nPos = new BlockPos(event.getPos().getX() + x, event.getPos().getY() + y, event.getPos().getZ() + z); -- cgit v1.2.3