mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
Battlesigns now properly reflect all projectiles, not just arrows.
This commit is contained in:
1 parent
6ea64191e1
commit
dc3a2b0ff7
3 files changed
+102
-26
No files matched your search
@@ -13,6 +13,7 @@ import net.minecraft.entity.projectile.EntityArrow;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.*;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.network.play.server.S14PacketEntity;
|
||||
import net.minecraft.util.*;
|
||||
import net.minecraft.world.EnumDifficulty;
|
||||
import net.minecraftforge.event.entity.living.*;
|
||||
@@ -26,6 +27,7 @@ import tconstruct.library.event.*;
|
||||
import tconstruct.library.tools.*;
|
||||
import tconstruct.util.ItemHelper;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
import tconstruct.util.network.MovementUpdatePacket;
|
||||
|
||||
public class TinkerToolEvents
|
||||
{
|
||||
@@ -225,35 +227,41 @@ public class TinkerToolEvents
|
||||
DamageSource source = event.source;
|
||||
if (!source.isUnblockable() && !source.isMagicDamage() && !source.isExplosion())
|
||||
{
|
||||
if (source instanceof EntityDamageSourceIndirect)
|
||||
if (source.isProjectile())
|
||||
{
|
||||
if (TConstruct.random.nextInt(3) == 0)
|
||||
{
|
||||
Entity attacker = source.getEntity();
|
||||
Entity projectile = ((EntityDamageSourceIndirect) source).getSourceOfDamage();
|
||||
projectile.motionX *= -1;
|
||||
projectile.motionZ *= -1;
|
||||
projectile.setDead();
|
||||
event.setCanceled(true);
|
||||
// no damage, hooraaay
|
||||
event.setCanceled(true);
|
||||
|
||||
if (projectile.getClass() == EntityArrow.class && !player.worldObj.isRemote)
|
||||
{
|
||||
EntityArrow reflection = null;
|
||||
if (attacker instanceof EntityLivingBase)
|
||||
reflection = new EntityArrow(player.worldObj, (EntityLivingBase) attacker, 0);
|
||||
else
|
||||
reflection = new EntityArrow(player.worldObj, player, 0);
|
||||
Entity projectile = source.getSourceOfDamage();
|
||||
|
||||
Vec3 look = player.getLookVec();
|
||||
reflection.posX = projectile.posX;
|
||||
reflection.posY = projectile.posY;
|
||||
reflection.posZ = projectile.posZ;
|
||||
reflection.motionX = (projectile.motionX + (look.xCoord * 8)) / 6;
|
||||
reflection.motionY = (projectile.motionY + (look.yCoord * 8)) / 6;
|
||||
reflection.motionZ = (projectile.motionZ + (look.zCoord * 8)) / 6;
|
||||
reflection.damage = ((EntityArrow) projectile).damage;
|
||||
player.worldObj.spawnEntityInWorld(reflection);
|
||||
}
|
||||
double speed = projectile.motionX*projectile.motionX + projectile.motionY*projectile.motionY + projectile.motionZ*projectile.motionZ;
|
||||
speed = Math.sqrt(speed);
|
||||
|
||||
Vec3 look = player.getLookVec();
|
||||
|
||||
// now we simply set the look vector with the speed and get our new vector!
|
||||
projectile.motionX = look.xCoord * speed;
|
||||
projectile.motionY = look.yCoord * speed;
|
||||
projectile.motionZ = look.zCoord * speed;
|
||||
|
||||
projectile.rotationYaw = (float)(Math.atan2(projectile.motionX, projectile.motionZ) * 180.0D / Math.PI);
|
||||
projectile.rotationPitch = (float)(Math.atan2(projectile.motionY, speed) * 180.0D / Math.PI);
|
||||
|
||||
// send the current status to the client
|
||||
TConstruct.packetPipeline.sendToAll(new MovementUpdatePacket(projectile));
|
||||
|
||||
if(projectile instanceof EntityArrow) {
|
||||
((EntityArrow) projectile).shootingEntity = player;
|
||||
|
||||
// the inverse is done when the event is cancelled in arrows etc.
|
||||
// we reverse it so it has no effect. yay
|
||||
projectile.motionX /= -0.10000000149011612D;
|
||||
projectile.motionY /= -0.10000000149011612D;
|
||||
projectile.motionZ /= -0.10000000149011612D;
|
||||
// projectile.rotationYaw -= 180.0F;
|
||||
// projectile.prevRotationYaw -= 180.0F;
|
||||
|
||||
// not needed at the client since it gets the absolute values sent
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
package tconstruct.util.network;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import mantle.common.network.AbstractPacket;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityList;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
||||
public class MovementUpdatePacket extends AbstractPacket {
|
||||
public int entityID;
|
||||
public double x;
|
||||
public double y;
|
||||
public double z;
|
||||
public float yaw;
|
||||
public float pitch;
|
||||
|
||||
public MovementUpdatePacket() {
|
||||
}
|
||||
|
||||
public MovementUpdatePacket(Entity entity) {
|
||||
this.entityID = entity.getEntityId();
|
||||
this.x = entity.motionX;
|
||||
this.y = entity.motionY;
|
||||
this.z = entity.motionZ;
|
||||
this.yaw = entity.rotationYaw;
|
||||
this.pitch = entity.rotationPitch;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void encodeInto(ChannelHandlerContext ctx, ByteBuf buffer) {
|
||||
buffer.writeInt(entityID);
|
||||
buffer.writeDouble(x);
|
||||
buffer.writeDouble(y);
|
||||
buffer.writeDouble(z);
|
||||
buffer.writeFloat(yaw);
|
||||
buffer.writeFloat(pitch);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void decodeInto(ChannelHandlerContext ctx, ByteBuf buffer) {
|
||||
this.entityID = buffer.readInt();
|
||||
this.x = buffer.readDouble();
|
||||
this.y = buffer.readDouble();
|
||||
this.z = buffer.readDouble();
|
||||
this.yaw = buffer.readFloat();
|
||||
this.pitch = buffer.readFloat();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleClientSide(EntityPlayer player) {
|
||||
Entity entity = player.worldObj.getEntityByID(entityID);
|
||||
if(entity != null) {
|
||||
entity.motionX = x;
|
||||
entity.motionY = y;
|
||||
entity.motionZ = z;
|
||||
entity.rotationYaw = yaw;
|
||||
entity.rotationPitch = pitch;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleServerSide(EntityPlayer player) {
|
||||
// only sent to client
|
||||
}
|
||||
}
|
||||
@@ -133,6 +133,8 @@ public class PacketPipeline extends MessageToMessageCodec<FMLProxyPacket, Abstra
|
||||
|
||||
registerPacket(BeltPacket.class);
|
||||
registerPacket(GogglePacket.class);
|
||||
|
||||
registerPacket(MovementUpdatePacket.class);
|
||||
}
|
||||
|
||||
// Method to call from FMLPostInitializationEvent
|
||||
|
||||
Reference in new issue
Block a user