diff --git a/build.gradle b/build.gradle index 82e85fd..6b7bde1 100644 --- a/build.gradle +++ b/build.gradle @@ -64,9 +64,9 @@ task buildInfo { version = project.buildInfo.revision minecraft { - version = "1.10.2-12.18.2.2147" + version = "1.10.2-12.18.3.2202" runDir = "run" - mappings = "snapshot_20161101" + mappings = "stable_29" replace '@VERSION@', project.version } diff --git a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java index 41f66ad..ee9ad58 100644 --- a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java +++ b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java @@ -8,7 +8,8 @@ import slimeknights.tconstruct.library.materials.MaterialTypes; import slimeknights.tconstruct.library.traits.AbstractTrait; import static com.sosnitzka.taiga.Fluids.obsidioriteFluid; -import static slimeknights.tconstruct.tools.TinkerTraits.*; +import static slimeknights.tconstruct.tools.TinkerTraits.alien; +import static slimeknights.tconstruct.tools.TinkerTraits.crumbling; public class MaterialTraits { diff --git a/src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java index ebd4d75..1cf329f 100644 --- a/src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java +++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockLignite.java @@ -22,7 +22,7 @@ public class BlockLignite extends BasicBlock { Random rand = world instanceof World ? ((World) world).rand : new Random(); int r = RANDOM.nextInt(11); if (r > 7) { - return MathHelper.getRandomIntegerInRange(rand, 0, 10) + fortune; + return MathHelper.getInt(rand, 0, 10) + fortune; } else return 0; } 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 56e89f5..3445672 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); diff --git a/src/main/java/com/sosnitzka/taiga/util/EntityAIPermanentPanic.java b/src/main/java/com/sosnitzka/taiga/util/EntityAIPermanentPanic.java index 4b9bf30..6d73c0a 100644 --- a/src/main/java/com/sosnitzka/taiga/util/EntityAIPermanentPanic.java +++ b/src/main/java/com/sosnitzka/taiga/util/EntityAIPermanentPanic.java @@ -38,7 +38,7 @@ public class EntityAIPermanentPanic extends EntityAIBase { this.randPosZ = vec3d.zCoord; if (this.theEntityCreature.isBurning()) { - BlockPos blockpos = this.getRandPos(this.theEntityCreature.worldObj, this.theEntityCreature, 5, 4); + BlockPos blockpos = this.getRandPos(this.theEntityCreature.world, this.theEntityCreature, 5, 4); if (blockpos != null) { this.randPosX = (double) blockpos.getX(); diff --git a/src/main/java/com/sosnitzka/taiga/util/Generator.java b/src/main/java/com/sosnitzka/taiga/util/Generator.java index 18bf42f..a7f53e1 100644 --- a/src/main/java/com/sosnitzka/taiga/util/Generator.java +++ b/src/main/java/com/sosnitzka/taiga/util/Generator.java @@ -217,7 +217,7 @@ public class Generator { for (int x = -t; x <= t; x++) { for (int y = -t; y <= t; y++) { for (int z = -t; z <= t; z++) { - if (MathHelper.sqrt_double(x * x + y * y + z * z) > t) { + if (MathHelper.sqrt(x * x + y * y + z * z) > t) { continue; } world.setBlockState(new BlockPos(cPos.getX() + x, cPos.getY() + y, cPos.getZ() + z), centerBlock); @@ -227,7 +227,7 @@ public class Generator { 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(cPos.getX() + x, cPos.getY() + y, cPos.getZ() + z); diff --git a/src/main/java/com/sosnitzka/taiga/world/WorldGenMinable.java b/src/main/java/com/sosnitzka/taiga/world/WorldGenMinable.java index 06f5a7f..db9c7a4 100644 --- a/src/main/java/com/sosnitzka/taiga/world/WorldGenMinable.java +++ b/src/main/java/com/sosnitzka/taiga/world/WorldGenMinable.java @@ -50,12 +50,12 @@ public class WorldGenMinable extends net.minecraft.world.gen.feature.WorldGenMin double d9 = rand.nextDouble() * (double) this.numberOfBlocks / 16.0D; double d10 = (double) (MathHelper.sin((float) Math.PI * f1) + 1.0F) * d9 + 1.0D; double d11 = (double) (MathHelper.sin((float) Math.PI * f1) + 1.0F) * d9 + 1.0D; - int j = MathHelper.floor_double(d6 - d10 / 2.0D); - int k = MathHelper.floor_double(d7 - d11 / 2.0D); - int l = MathHelper.floor_double(d8 - d10 / 2.0D); - int i1 = MathHelper.floor_double(d6 + d10 / 2.0D); - int j1 = MathHelper.floor_double(d7 + d11 / 2.0D); - int k1 = MathHelper.floor_double(d8 + d10 / 2.0D); + int j = MathHelper.floor(d6 - d10 / 2.0D); + int k = MathHelper.floor(d7 - d11 / 2.0D); + int l = MathHelper.floor(d8 - d10 / 2.0D); + int i1 = MathHelper.floor(d6 + d10 / 2.0D); + int j1 = MathHelper.floor(d7 + d11 / 2.0D); + int k1 = MathHelper.floor(d8 + d10 / 2.0D); for (int l1 = j; l1 <= i1; ++l1) { double d12 = ((double) l1 + 0.5D - d6) / (d10 / 2.0D);