diff --git a/bin/GitUpdateSubs.bat b/bin/GitUpdateSubs.bat new file mode 100644 index 000000000..41cdf6b4d --- /dev/null +++ b/bin/GitUpdateSubs.bat @@ -0,0 +1,34 @@ + +cd ..\ +git submodule foreach git pull origin master +git commit -am "Updating Submodules" +git push origin master +cd ..\ +cd Assembly-Line +git submodule foreach git pull origin master +git commit -am "Updating Submodules" +git push origin master +cd ..\ +cd FarmTech +git submodule foreach git pull origin master +git commit -am "Updating Submodules" +git push origin master +cd ..\ +cd Fluid-Mechanics +git submodule foreach git pull origin master +git commit -am "Updating Submodules" +git push origin master +cd ..\ +cd GreaterProtection +git submodule foreach git pull origin master +git commit -am "Updating Submodules" +git push origin master +cd MechanizedMining +git submodule foreach git pull origin master +git commit -am "Updating Submodules" +git push origin master +cd ..\ +cd Empire-Engine +git submodule foreach git pull origin master +git commit -am "Updating Submodules" +git push origin master \ No newline at end of file diff --git a/build.xml b/build.xml index 56452c10d..8e69f69fe 100644 --- a/build.xml +++ b/build.xml @@ -6,9 +6,11 @@ - - - + + + + + @@ -40,7 +42,7 @@ - + @@ -56,6 +58,10 @@ + + + + @@ -88,35 +94,40 @@ - - + + - - - - - - + + + + + + - + - + - + - + + + + + + @@ -131,6 +142,9 @@ + + + diff --git a/src/dark/core/prefab/vehicles/EntityVehicle.java b/src/dark/core/prefab/vehicles/EntityVehicle.java index 100facd28..3564ab109 100644 --- a/src/dark/core/prefab/vehicles/EntityVehicle.java +++ b/src/dark/core/prefab/vehicles/EntityVehicle.java @@ -2,23 +2,21 @@ package dark.core.prefab.vehicles; import java.util.List; +import com.google.common.io.ByteArrayDataInput; + + import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatMessageComponent; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import com.google.common.io.ByteArrayDataInput; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.network.Player; -import dark.core.common.CoreRecipeLoader; import dark.core.helpers.MathHelper; import dark.core.interfaces.IControlReceiver; import dark.core.network.ISimplePacketReceiver; @@ -115,7 +113,18 @@ public abstract class EntityVehicle extends EntityAdvanced implements IControlRe public void onUpdate() { super.onUpdate(); + if (this.riddenByEntity instanceof EntityPlayer) + { + if (this.worldObj.isRemote) + { + ((EntityPlayer)this.riddenByEntity).sendChatToPlayer(ChatMessageComponent.createFromText("Client:RotationYaw: "+this.rotationYaw)); + } + else + { + ((EntityPlayer)this.riddenByEntity).sendChatToPlayer(ChatMessageComponent.createFromText("Server:RotationYaw: "+this.rotationYaw)); + } + } if (this.worldObj.isRemote) { this.worldObj.spawnParticle("mobSpell", this.posX, this.posY, this.posZ, 0, 0, 0); @@ -196,16 +205,17 @@ public abstract class EntityVehicle extends EntityAdvanced implements IControlRe this.motionY *= 0.949999988079071D; this.motionZ *= 0.9900000095367432D; } - - } - if (ticks % 5 == 0) - { - PacketManagerEntity.sendEntityUpdatePacket(this, this.worldObj.isRemote, "Desc", this.posX, this.posY, this.posZ, this.rotationYaw, this.rotationPitch, this.motionX, this.motionY, this.motionZ); - - if (!this.worldObj.isRemote) + if (ticks % 5 == 0) { - this.updateClients(); + if (worldObj.isRemote) + PacketManagerEntity.sendEntityUpdatePacket(this, this.worldObj.isRemote, "Desc", this.posX, this.posY, this.posZ, this.rotationYaw, this.rotationPitch, this.motionX, this.motionY, this.motionZ); + + if (!this.worldObj.isRemote) + { + this.updateClients(); + } } + } }