Merge pull request #272 from FlansMods/Development

Development

Changelog

@@ -3,12 +3,19 @@
 ####           Changelog           ####
 ####                               ####
 #######################################
-=== v3.0.5 ===
+=== v3.1 ===
+Changes:
+- Updated to 1.6.4
 Fixes:
 - Fixed render issue with parachutes
+- Fixed MG42 and Browning Sounds
+- Fixed some plane movement issues
+- Fixed missing wheel rotations
+- Fixed grenade config reading
 Additions:
 - Added ICBM mod API
 - Added hook into Universal Electricity
+- Added: Flip for MG Models
 
 === v3.0 ===
 Changes:

build.properties

@@ -1,8 +1,8 @@
 #Flans Mod Version
-flansmod.version=3.0.4
+flansmod.version=3.1
 
 #Minecraft Version
-mc.version=1.6.2
+mc.version=1.6.4
 
 #Forge Versions
-forge.version=9.10.1.849
+forge.version=9.11.0.884

build.xml

@@ -160,6 +160,8 @@
 
 		<!-- Reset src dir to post-forge-install state -->
 		<delete dir="${mcpsrc.dir}/minecraft/co"/>
+		<delete dir="${mcpsrc.dir}/minecraft/icbm"/>
+		<delete dir="${mcpsrc.dir}/minecraft/universalelectricity"/>
 		<delete dir="${mcpsrc.dir}/minecraft/assets"/>
 		<delete file="${mcpsrc.dir}/minecraft/flansmod.png"/>
 		<delete file="${mcpsrc.dir}/minecraft/mcmod.info"/>

jars/Flan/WW2 Pack/guns/Browning.txt

@@ -17,7 +17,7 @@ Accuracy 6
 //Time in ticks between rounds
 ShootDelay 2
 //The length of the sound. 0 for a single shot sound. Other values are for looping sounds
-SoundLength 21
+//SoundLength 21
 //Whether or not to distort the sound. This works well for single shots but not for loops
 DistortSound False
 ShootSound BrowningShoot

jars/Flan/WW2 Pack/guns/MG42.txt

@@ -19,7 +19,7 @@ Accuracy 8
 ShootDelay 1
 ShootSound MG42Shoot
 //The length of the sound. 0 for a single shot sound. Other values are for looping sounds
-SoundLength 15
+//SoundLength 15
 DistortSound False
 ReloadSound MG42Reload
 Mode FullAuto

jars/Flan/WW2 Pack/vehicles/Panzer.txt

@@ -42,14 +42,14 @@ BarrelPosition 0 34 0
 //Secondary gun
 AddGun 8 34 8 turret mg42
 //Delays are in ticks or 1/20ths of seconds
-ShootDelay 5
+ShootDelay 1
 ShellDelay 110
 //Sounds
 StartSound Engine
 StartSoundLength 20
 EngineSound Engine
 EngineSoundLength 20
-ShootSound bullet
+ShootSound MG42Shoot
 ShellSound TankShell
 //Recipe
 //Each section of the plane may have many parts

jars/Flan/WW2 Pack/vehicles/Sherman.txt

@@ -42,14 +42,14 @@ Passengers 1
 Passenger 1 0 34 0 turret -360 360 -15 60 browning Browning
 BarrelPosition 0 34 0
 //Delays are in ticks or 1/20ths of seconds
-ShootDelay 5
+ShootDelay 2
 ShellDelay 100
 //Sounds
 StartSound Engine
 StartSoundLength 20
 EngineSound Engine
 EngineSoundLength 20
-ShootSound bullet
+ShootSound BrowningShoot
 ShellSound TankShell
 //Recipe
 //Each section of the plane may have many parts

src/minecraft/co/uk/flansmods/client/model/ModelMG.java

@@ -35,4 +35,23 @@ public void renderGun(float f, float f1, float f2, float f3, float f4, float f5,
 			ammoPart.render(f5);
 		}
 	}
+
+	public void flipAll()
+	{
+		for(int i = 0; i < bipodModel.length; i++)
+		{
+			bipodModel[i].doMirror(false, true, true);
+			bipodModel[i].setRotationPoint(bipodModel[i].rotationPointX, - bipodModel[i].rotationPointY, - bipodModel[i].rotationPointZ);
+		}
+		for(int i = 0; i < gunModel.length; i++)
+		{
+			gunModel[i].doMirror(false, true, true);
+			gunModel[i].setRotationPoint(gunModel[i].rotationPointX, - gunModel[i].rotationPointY, - gunModel[i].rotationPointZ);
+		}
+		for(int i = 0; i < ammoModel.length; i++)
+		{
+			ammoModel[i].doMirror(false, true, true);
+			ammoModel[i].setRotationPoint(ammoModel[i].rotationPointX, - ammoModel[i].rotationPointY, - ammoModel[i].rotationPointZ);
+		}
+	}	
 }

src/minecraft/co/uk/flansmods/client/model/ModelVehicle.java

@@ -109,7 +109,7 @@ public void render(float f5, EntityVehicle vehicle, float f)
         {
 			for(int i = 0; i < backWheelModel.length; i++)
 			{
-				backWheelModel[i].rotateAngleY = -vehicle.wheelsYaw * 3.14159265F / 180F * 3F;
+				backWheelModel[i].rotateAngleZ = rotateWheels ? -vehicle.wheelsAngle : 0;
 				backWheelModel[i].render(f5);
 			}
         }
@@ -122,7 +122,7 @@ public void render(float f5, EntityVehicle vehicle, float f)
 			}
 			for(int i = 0; i < leftTrackWheelModels.length; i++)
 			{
-				leftTrackModel[i].rotateAngleY = -vehicle.wheelsYaw * 3.14159265F / 180F * 3F;
+				leftTrackModel[i].rotateAngleZ = rotateWheels ? -vehicle.wheelsAngle : 0;
 				leftTrackModel[i].render(f5);
 			}
         }
@@ -135,7 +135,7 @@ public void render(float f5, EntityVehicle vehicle, float f)
 			}
 			for(int i = 0; i < rightTrackWheelModels.length; i++)
 			{
-				rightTrackWheelModels[i].rotateAngleY = -vehicle.wheelsYaw * 3.14159265F / 180F * 3F;
+				rightTrackWheelModels[i].rotateAngleZ = rotateWheels ? -vehicle.wheelsAngle : 0;
 				rightTrackWheelModels[i].render(f5);
 			}
         }

src/minecraft/co/uk/flansmods/common/FlansMod.java

@@ -92,7 +92,7 @@
 		clientSideRequired = true,
 		serverSideRequired = false,
 		channels = {"flansmods"},
-	    versionBounds = "[3.0,3.1)",
+	    versionBounds = "[3.1,3.2)",
 	    clientPacketHandlerSpec = @SidedPacketHandler(channels = {"flansmods"}, packetHandler = co.uk.flansmods.client.network.FlanPacketClient.class ),
 	    serverPacketHandlerSpec = @SidedPacketHandler(channels = {"flansmods"}, packetHandler = co.uk.flansmods.common.network.FlanPacketCommon.class )
 		)

src/minecraft/co/uk/flansmods/common/guns/GrenadeType.java

@@ -164,12 +164,10 @@ protected void read(String[] split, TypeFile file)
 				explosionRadius = Float.parseFloat(split[1]);
 
 			if(split[0].equals("ExplosionDamageVsLiving"))
-				explosionRadius = Float.parseFloat(split[1]);
-			if(split[0].equals("ExplosionDamageVsLiving"))
-				explosionRadius = Float.parseFloat(split[1]);
-			if(split[0].equals("ExplosionDamageVsLiving"))
-				explosionRadius = Float.parseFloat(split[1]);
-
+				explosionDamageVsLiving = Float.parseFloat(split[1]);
+			if(split[0].equals("ExplosionDamageVsDrivable"))
+				explosionDamageVsDriveable = Float.parseFloat(split[1]);
+
 			if(split[0].equals("ExplosionBreaksBlocks"))
 				explosionBreaksBlocks = Boolean.parseBoolean(split[1].toLowerCase());
 			if(split[0].equals("DropItemOnDetonate"))