Merge pull request #331 from FlansMods/Development

Development --> master

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+.metadata
 CHANGELOG
 LICENSE.txt
 Thumbs.db
@@ -29,6 +30,7 @@ Thumbs.db
 !/src/minecraft/flansmod.png
 !/src/minecraft/pack.mcmeta
 !/jars/Flan/
+!/LICENSE.txt
 
 *.bat
 *.sh

Changelog

@@ -3,6 +3,24 @@
 ####           Changelog           ####
 ####                               ####
 #######################################
+=== v4.0.1 ===
+Fixes:
+- Fixed gunbox and vehicle crafting table hardness
+- Fixed MGs and AA guns firing when clicking in inventory
+- Fixed sounds and movement with no fuel
+- Fixed vehiclesBreakBlocks command message
+- Added canBreakGlass to the TeamsManager save/load methods
+Additions:
+- Ability to limit mecha leg swing
+
+=== v4.0 ===
+I refuse to read through Flan's commits so we'll just assume only this happened.
+Additions:
+- Mechas
+- Mecha tools and upgrades
+- Some generalisations applied to driveables in order to allow mechas to extend them more easily
+- New official Titan Pack
+
 === v3.1.2 ===
 Fixes:
 - Settings for protections are saved/loaded now

build.properties

@@ -1,8 +1,8 @@
 #Flans Mod Version
-flansmod.version=3.1.2
+flansmod.version=4.1
 
 #Minecraft Version
 mc.version=1.6.4
 
 #Forge Versions
-forge.version=9.11.0.884
+forge.version=9.11.1.916

build.xml

@@ -92,7 +92,7 @@
 	</target>
 	<target name="copy-src" depends="clean-src">
 		<!-- Copy sources -->
-		<copy todir="${mcpsrc.dir}/minecraft" verbose="true">
+		<copy todir="${mcpsrc.dir}/minecraft" verbose="false">
 			<fileset dir="${src.dir}/minecraft"/>
 			<filterset>
 				<filter token="VERSION" value="${flansmod.version}" />
@@ -131,10 +131,30 @@
 		<!-- Reobfuscate -->
 		<exec dir="${mcp.dir}" executable="cmd" osfamily="windows">
 			<arg line="/c reobfuscate_srg.bat"/>
+			<redirector>
+				<outputfilterchain>
+					<linecontains negate="true">
+						<contains value="> New"/>
+					</linecontains>
+					<linecontains negate="true">
+						<contains value="> Outputted"/>
+					</linecontains>
+				</outputfilterchain>
+			</redirector>
 		</exec>
 
 		<exec dir="${mcp.dir}" executable="sh" osfamily="unix">
 			<arg value="reobfuscate_srg.sh"/>
+			<redirector>
+				<outputfilterchain>
+					<linecontains negate="true">
+						<contains value="> New"/>
+					</linecontains>
+					<linecontains negate="true">
+						<contains value="> Outputted"/>
+					</linecontains>
+				</outputfilterchain>
+			</redirector>
 		</exec>
 
 		<!-- Copy classes -->
@@ -143,20 +163,26 @@
 				<exclude name="**/nerf/**"/>
 				<exclude name="**/ww2/**"/>
 				<exclude name="**/yeolde/**"/>
+				<exclude name="**/mw/**"/>
+				<exclude name="**/titan/**"/>
 			</fileset>
 		</copy>
 
         <!-- Copy forge mod info files -->
         <copy todir="${classes.dir}">
             <fileset file="${src.dir}/minecraft/flansmod.png"/>
             <fileset file="${mcpsrc.dir}/minecraft/mcmod.info"/>
-			<fileset file="${mcpsrc.dir}/minecraft/pack.mcmeta"/>
         </copy>
 
 		<!-- Copy resources -->
 		<copy todir="${classes.dir}/assets">
 			<fileset dir="${resources.dir}"/>
 		</copy>
+
+		<!-- Copy license file -->
+        <copy todir="${classes.dir}">
+            <fileset file="LICENSE.txt"/>
+        </copy>
 
 		<!-- Reset src dir to post-forge-install state -->
 		<delete dir="${mcpsrc.dir}/minecraft/co"/>
@@ -254,6 +280,17 @@
 			<fileset dir="${reobfmodels.dir}/yeolde"/>
 		</copy>
 		<zip destfile="${packs.dir}/Ye Olde Pack.zip" basedir="${mcpflan.dir}/Ye Olde Pack"/>
+
+		<!-- Titan -->
+		<delete dir="${mcpflan.dir}/Titan Pack"/>
+		<mkdir dir="${mcpflan.dir}/Titan Pack/${packmodels.dir}/titan"/>
+		<copy todir="${mcpflan.dir}/Titan Pack">
+			<fileset dir="jars/Flan/Titan Pack"/>
+		</copy>
+		<copy todir="${mcpflan.dir}/Titan Pack/${packmodels.dir}/titan" failonerror="false">
+			<fileset dir="${reobfmodels.dir}/titan"/>
+		</copy>
+		<zip destfile="${packs.dir}/Titan Pack.zip" basedir="${mcpflan.dir}/Titan Pack"/>
 	</target>
 
 	<!-- Target for full releases -->

jars/Flan/Modern Weapons Pack/attachments/ACOGSight.txt

@@ -0,0 +1,31 @@
+Name ACOG Sight
+ShortName flanMWACOG
+Icon ACOGSight
+ItemID 23861
+//The type of attachment defines what slot in the gun it takes. Types are "generic", "barrel", "scope", "stock" and "grip"
+AttachmentType sights
+//If true, then this attachment will muffle all sounds from the gun. Needn't be a barrel attachment
+Silencer false
+//These multipliers stack between attachments and do what they say
+MeleeDamageMultiplier 1.0
+DamageMultiplier 1.0
+SpreadMultiplier 0.4
+RecoilMultiplier 0.8
+BulletSpeedMultiplier 1.0
+ReloadTimeMultiplier 1.0
+//These variables only come into effect if this is a scope
+//The ZoomLevel affects how much the view zooms in (note that this removes the model from the zooming animation and so is useless for iron sights)
+//The FOVZoomLevel affects how much the view narrows when zooming. Very useful for iron sights as it gives the illusion of zooming without killing off the model
+ZoomLevel 1.0
+FOVZoomLevel 2.0
+ZoomOverlay None
+//Model
+Model mw.ACOG
+Texture ACOGSight
+ModelScale 0.125
+//Recipe
+RecipeOutput 1
+Recipe R yellowDust F fiberglass G thinGlass
+FFF
+GRG
+FFF

jars/Flan/Modern Weapons Pack/attachments/Foregrip.txt

@@ -0,0 +1,30 @@
+Name Foregrip
+ShortName flanMWForegrip
+Icon Foregrip
+ItemID 23862
+//The type of attachment defines what slot in the gun it takes. Types are "generic", "barrel", "scope", "stock" and "grip"
+AttachmentType grip
+//If true, then this attachment will muffle all sounds from the gun. Needn't be a barrel attachment
+Silencer false
+//These multipliers stack between attachments and do what they say
+MeleeDamageMultiplier 1.0
+DamageMultiplier 1.0
+SpreadMultiplier 0.8
+RecoilMultiplier 0.5
+BulletSpeedMultiplier 1.0
+ReloadTimeMultiplier 1.0
+//These variables only come into effect if this is a scope
+//The ZoomLevel affects how much the view zooms in (note that this removes the model from the zooming animation and so is useless for iron sights)
+//The FOVZoomLevel affects how much the view narrows when zooming. Very useful for iron sights as it gives the illusion of zooming without killing off the model
+ZoomLevel 1.0
+FOVZoomLevel 1.0
+ZoomOverlay None
+//Model
+Model mw.Foregrip
+Texture Foregrip
+//Recipe
+RecipeOutput 1
+Recipe F fiberglass
+FFF
+ F 
+ F 

jars/Flan/Modern Weapons Pack/attachments/RedDotSight.txt

@@ -0,0 +1,31 @@
+Name Red Dot Sight
+ShortName flanMWRedDot
+Icon RedDotSight
+ItemID 23860
+//The type of attachment defines what slot in the gun it takes. Types are "generic", "barrel", "scope", "stock" and "grip"
+AttachmentType sights
+//If true, then this attachment will muffle all sounds from the gun. Needn't be a barrel attachment
+Silencer false
+//These multipliers stack between attachments and do what they say
+MeleeDamageMultiplier 1.0
+DamageMultiplier 1.0
+SpreadMultiplier 0.5
+RecoilMultiplier 0.8
+BulletSpeedMultiplier 1.0
+ReloadTimeMultiplier 1.0
+//These variables only come into effect if this is a scope
+//The ZoomLevel affects how much the view zooms in (note that this removes the model from the zooming animation and so is useless for iron sights)
+//The FOVZoomLevel affects how much the view narrows when zooming. Very useful for iron sights as it gives the illusion of zooming without killing off the model
+ZoomLevel 1.0
+FOVZoomLevel 1.5
+ZoomOverlay None
+//Model
+Model mw.RedDot
+Texture RedDotSight
+ModelScale 0.125
+//Recipe
+RecipeOutput 1
+Recipe R redstone F fiberglass G thinGlass
+
+ RG
+FFF

jars/Flan/Modern Weapons Pack/attachments/Silencer.txt

@@ -0,0 +1,29 @@
+Name Silencer
+ShortName flanMWSilencer
+Icon Silencer
+ItemID 23859
+//The type of attachment defines what slot in the gun it takes. Types are "generic", "barrel", "scope", "stock" and "grip"
+AttachmentType barrel
+//If true, then this attachment will muffle all sounds from the gun. Needn't be a barrel attachment
+Silencer true
+//These multipliers stack between attachments and do what they say
+MeleeDamageMultiplier 1.0
+DamageMultiplier 0.8
+SpreadMultiplier 1.0
+RecoilMultiplier 1.0
+BulletSpeedMultiplier 0.9
+ReloadTimeMultiplier 1.0
+//These variables only come into effect if this is a scope
+//The ZoomLevel affects how much the view zooms in (note that this removes the model from the zooming animation and so is useless for iron sights)
+//The FOVZoomLevel affects how much the view narrows when zooming. Very useful for iron sights as it gives the illusion of zooming without killing off the model
+ZoomLevel 1.0
+FOVZoomLevel 1.0
+ZoomOverlay None
+//Model
+Model mw.Silencer
+Texture Silencer
+RecipeOutput 1
+Recipe W cloth F fiberglass
+FFF
+WWW
+FFF

jars/Flan/Modern Weapons Pack/bullets/BarrettExplosiveAmmo.txt

@@ -0,0 +1,30 @@
+Name Explosive Barrett .50cal Ammo
+ShortName barrettExplosiveAmmo
+Model Bullet
+//Colour of icon and model
+Colour 255 255 255
+ItemID 23863
+Icon BarrettExplosiveAmmo
+//How affected by gravity the bullet is
+FallSpeed 0.25
+//The maximum stack size
+MaxStackSize 3
+//The number of rounds each item has. Limited to 32000.
+RoundsPerItem 10
+//The damage multiplier caused by the bullet on hitting an entity
+Damage 2
+//Size of explosion caused
+Explosion 3
+//True if bullet explodes on hitting anything. Fuse denotes the maximum time it may spend in the air before detonating
+ExplodeOnImpact True
+Fuse 0
+FlakParticles 0
+//Amount of fire to spread on exploding; for each increment, it will increase the dimensions of the burning area by 2. i.e. 1 will burn a 3x3 square, 2 will burn a 5x5 square
+Fire 0
+BreaksGlass True
+//Size of box to check for entities to hit / detonate
+HitBoxSize 0.1
+HitSound bullet
+//Whether or not the bullet can travel through an entity having hit it
+Penetrates True
+SmokeTrail False

jars/Flan/Modern Weapons Pack/bullets/RPGAmmo.txt

@@ -1,7 +1,7 @@
 Name RPG Ammo
 ShortName rpgAmmo
-//TODO : Change model
-Model Bullet
+Model mw.RPGRocket
+Texture RPG
 //Colour of icon and model
 Colour 255 255 255
 ItemID 23849

jars/Flan/Modern Weapons Pack/bullets/W1200IncendiaryAmmo.txt

@@ -0,0 +1,30 @@
+Name Incendiary W1200 Ammo
+ShortName w1200IncendiaryAmmo
+Model Bullet
+//Colour of icon and model
+Colour 255 255 255
+ItemID 23864
+Icon W1200IncendiaryAmmo
+//How affected by gravity the bullet is
+FallSpeed 0.25
+//The maximum stack size
+MaxStackSize 4
+//The number of rounds each item has. Limited to 32000.
+RoundsPerItem 7
+//The damage multiplier caused by the bullet on hitting an entity
+Damage 1
+//Size of explosion caused
+Explosion 0
+//True if bullet explodes on hitting anything. Fuse denotes the maximum time it may spend in the air before detonating
+ExplodeOnImpact True
+Fuse 5
+FlakParticles 0
+//Amount of fire to spread on exploding; for each increment, it will increase the dimensions of the burning area by 2. i.e. 1 will burn a 3x3 square, 2 will burn a 5x5 square
+Fire 1
+BreaksGlass True
+//Size of box to check for entities to hit / detonate
+HitBoxSize 0.1
+HitSound bullet
+//Whether or not the bullet can travel through an entity having hit it
+Penetrates True
+SmokeTrail False

jars/Flan/Modern Weapons Pack/classes/MarineAssault1.txt

@@ -1,7 +1,7 @@
 Name Light Assault
 ShortName marineAssault1
-AddItem g36
-AddItem usp
+AddItem g36+flanMWACOG
+AddItem usp+flanMWSilencer
 AddItem m67 2
 AddItem mwKnife
 AddItem g36Ammo 3

jars/Flan/Modern Weapons Pack/classes/MarineMedic1.txt

@@ -1,6 +1,6 @@
 Name Medic
 ShortName marineMedic1
-AddItem m16a4
+AddItem m16a4+flanMWACOG
 AddItem m1911
 AddItem m67 2
 AddItem mwMedKit

jars/Flan/Modern Weapons Pack/classes/MarineMulti1.txt

@@ -1,7 +1,7 @@
 Name Assassin
 ShortName marineMulti1
 AddItem m21
-AddItem mp5
+AddItem mp5+flanMWRedDot+flanMWSilencer
 AddItem m67 2
 AddItem mwKnife
 AddItem m21Ammo 3

jars/Flan/Modern Weapons Pack/classes/MarineMulti2.txt

@@ -1,6 +1,6 @@
 Name Infiltrator
 ShortName marineMulti2
-AddItem g3
+AddItem g3+flanMWACOG
 AddItem uzi
 AddItem m67 2
 AddItem mwKnife

jars/Flan/Modern Weapons Pack/classes/MarineSniper1.txt

@@ -1,9 +1,9 @@
 Name Heavy Sniper
 ShortName marineSniper1
 AddItem barrett
-AddItem m9
+AddItem desertEagle
 AddItem m67 1
 AddItem mwKnife
 AddItem mwBinoculars
 AddItem barrettAmmo 3
-AddItem m9Ammo 2
+AddItem desertEagleAmmo 2