Added MM to the build path
For 1.7 update this will be changed to each mod building itself but for the moment this works
This commit is contained in:
Robert
parent
84a37bd1c5
commit
5178f52cf4
3 changed files with 88 additions and 30 deletions
34
bin/GitUpdateSubs.bat
Normal file
34
bin/GitUpdateSubs.bat
Normal file
|
|
@ -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
|
||||
46
build.xml
46
build.xml
|
|
@ -6,9 +6,11 @@
|
|||
<property environment="env" />
|
||||
<property name="file.core" value="Dark-CoreMachine_v${version.mod.major}.${version.mod.minor}.${version.mod.revis}.${env.BUILD_NUMBER}.jar" />
|
||||
<property name="file.fm" value="Dark-FluidMechanics_v${version.mod.major}.${version.mod.minor}.${version.mod.revis}.${env.BUILD_NUMBER}.jar" />
|
||||
<property name="file.al" value="Dark-AssemblyLine_v${version.mod.major}.${version.mod.minor}.${version.mod.revis}.${env.BUILD_NUMBER}.jar" />
|
||||
<property name="file.ft" value="Dark-FarmTech_v${version.mod.major}.${version.mod.minor}.${version.mod.revis}.${env.BUILD_NUMBER}.jar" />
|
||||
<property name="file.gs" value="Dark-GreaterSecurity_v${version.mod.major}.${version.mod.minor}.${version.mod.revis}.${env.BUILD_NUMBER}.jar" /> <property name="file.all" value="DarkBoxSet_v${version.mod.major}.${version.mod.minor}.${version.mod.revis}.${env.BUILD_NUMBER}.zip" />
|
||||
<property name="file.al" value="Dark-AssemblyLine_v${version.mod.major}.${version.mod.minor}.${version.mod.revis}.${env.BUILD_NUMBER}.jar" />
|
||||
<property name="file.ft" value="Dark-FarmTech_v${version.mod.major}.${version.mod.minor}.${version.mod.revis}.${env.BUILD_NUMBER}.jar" />
|
||||
<property name="file.gs" value="Dark-GreaterSecurity_v${version.mod.major}.${version.mod.minor}.${version.mod.revis}.${env.BUILD_NUMBER}.jar" />
|
||||
<property name="file.mm" value="Dark-MechanizedMining_v${version.mod.major}.${version.mod.minor}.${version.mod.revis}.${env.BUILD_NUMBER}.jar" />
|
||||
<property name="file.all" value="DarkBoxSet_v${version.mod.major}.${version.mod.minor}.${version.mod.revis}.${env.BUILD_NUMBER}.zip" />
|
||||
|
||||
<target name="build">
|
||||
|
||||
|
|
@ -40,7 +42,7 @@
|
|||
<exclude name=".git/**"/>
|
||||
<exclude name="**/*.xml"/>
|
||||
</fileset>
|
||||
<fileset dir="${dir.development}downloads/Assembly-Line/src/minecraft">
|
||||
<fileset dir="${dir.development}downloads/Assembly-Line/src">
|
||||
<exclude name=".git/**"/>
|
||||
<exclude name="**/*.xml"/>
|
||||
</fileset>
|
||||
|
|
@ -56,6 +58,10 @@
|
|||
<exclude name=".git/**"/>
|
||||
<exclude name="**/*.xml"/>
|
||||
</fileset>
|
||||
<fileset dir="${dir.development}downloads/MechanizedMining/src">
|
||||
<exclude name=".git/**"/>
|
||||
<exclude name="**/*.xml"/>
|
||||
</fileset>
|
||||
|
||||
</copy>
|
||||
|
||||
|
|
@ -88,35 +94,40 @@
|
|||
<!-- Copy compiled files into folders to be zipped -->
|
||||
<copy todir="core">
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="dark/core/" />
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="com/builtbroken/common/" />
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="dark/api/" />
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="com/builtbroken/common/" />
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="dark/api/" />
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="buildcraft/" />
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="dan200/" />
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="ic2/" />
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="org/" />
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="themalexpansion/" />
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="universalelectricity/" />
|
||||
<fileset dir="${dir.development}resources" excludes=".git/**" />
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="dan200/" />
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="ic2/" />
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="org/" />
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="themalexpansion/" />
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="universalelectricity/" />
|
||||
<fileset dir="${dir.development}resources" excludes=".git/**" />
|
||||
</copy>
|
||||
<copy todir="fm">
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="dark/fluid/" />
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="dark/mech/" />
|
||||
<fileset dir="${dir.development}downloads/Fluid-Mechanics/resources" excludes=".git/**" />
|
||||
<fileset dir="${dir.development}downloads/Fluid-Mechanics/resources" excludes=".git/**" />
|
||||
</copy>
|
||||
<copy todir="al">
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="dark/assembly/" />
|
||||
<fileset dir="${dir.development}downloads/Assembly-Line/resources" excludes=".git/**" />
|
||||
<fileset dir="${dir.development}downloads/Assembly-Line/resources" excludes=".git/**" />
|
||||
</copy>
|
||||
<copy todir="ft">
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="dark/farmtech/" />
|
||||
<fileset dir="${dir.development}downloads/FarmTech/resources" excludes=".git/**" />
|
||||
<fileset dir="${dir.development}downloads/FarmTech/resources" excludes=".git/**" />
|
||||
</copy>
|
||||
<copy todir="gs">
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="dark/security/" />
|
||||
<fileset dir="${dir.development}downloads/Greater-Security/resources" excludes=".git/**" />
|
||||
<fileset dir="${dir.development}downloads/Greater-Security/resources" excludes=".git/**" />
|
||||
</copy>
|
||||
<copy todir="mm">
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft" includes="dark/mining/" />
|
||||
<fileset dir="${dir.development}downloads/MechanizedMining/resources" excludes=".git/**" />
|
||||
</copy>
|
||||
|
||||
<copy todir="gs" file="LICENSE.txt" />
|
||||
<copy todir="mm" file="LICENSE.txt" />
|
||||
<copy todir="ft" file="LICENSE.txt" />
|
||||
<copy todir="al" file="LICENSE.txt" />
|
||||
<copy todir="fm" file="LICENSE.txt" />
|
||||
|
|
@ -131,6 +142,9 @@
|
|||
<jar destfile="output/${file.fm}">
|
||||
<fileset dir="fm" />
|
||||
</jar>
|
||||
<jar destfile="output/${file.mm}">
|
||||
<fileset dir="mm" />
|
||||
</jar>
|
||||
<jar destfile="output/${file.al}">
|
||||
<fileset dir="al" />
|
||||
</jar>
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue