Merge pull request #431 from FlansMods/dev

merge v4.4.0 code

.gitignore

@@ -3,7 +3,12 @@ build/
 .project
 .gradle/
 .settings/
-eclipse/
+.idea/
+eclipse/*
 bin/
+out/
+*.iml
+*.ipr
+*.iws
 
 !eclipse/Flan/

build.bat

@@ -0,0 +1,2 @@
+gradlew build
+pause

build.gradle

@@ -17,15 +17,15 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "4.2.3"
+version = "4.4.0"
 group= "com.flansmod"
 archivesBaseName = "Flan's Mod"
 
 minecraft {
-    version = "1.7.2-10.12.1.1060"
+    version = "1.7.10-10.13.0.1180"
     assetDir = "eclipse/assets"
 
-    replace "@ALLOWED_VERSION@", "[4.2,)"
+    replace "@ALLOWED_VERSION@", "[4.4,4.5)"
     replace "@MC_VERSION@", project.minecraft.version
     replace "@VERSION@", project.version
     replaceIn "FlansMod.java"
@@ -54,55 +54,66 @@ processResources
 version = "${project.minecraft.version}-${project.version}"
 
 task modernWeapons(type: Jar) {
-    baseName = 'Modern Warfare'
-    appendix = 'Content Pack'
     from (zipTree("${destinationDir}/${archiveName}")) { include 'com/flansmod/client/model/mw/'}
     from 'eclipse/Flan/Modern Weapons Pack'
+    baseName = 'Modern Warfare'
+    appendix = 'Content Pack'
 }
 
 task nerf(type: Jar) {
-    baseName = 'Nerf'
-    appendix = 'Content Pack'
     from (zipTree("${destinationDir}/${archiveName}")) { include 'com/flansmod/client/model/nerf/'}
     from 'eclipse/Flan/Nerf Pack'
+    baseName = 'Nerf'
+    appendix = 'Content Pack'
 }
 
 task simpleParts(type: Jar) {
+    from 'eclipse/Flan/Parts Pack'
     baseName = 'Simple Parts'
     appendix = 'Content Pack'
-    from 'eclipse/Flan/Parts Pack'
 }
 
 task titan(type: Jar) {
-    baseName = 'Titan'
-    appendix = 'Content Pack'
     from (zipTree("${destinationDir}/${archiveName}")) { include 'com/flansmod/client/model/titan/'}
     from 'eclipse/Flan/Titan Pack'
+    baseName = 'Titan'
+    appendix = 'Content Pack'
 }
 
-task ww2(type: Jar) {
-    baseName = 'WW2'
+task mechaParts(type: Jar) {
+    from 'eclipse/Flan/Mecha Parts Pack'
+    baseName = 'Mecha Parts'
     appendix = 'Content Pack'
+}
+
+task ww2(type: Jar) {
     from (zipTree("${destinationDir}/${archiveName}")) { include 'com/flansmod/client/model/ww2/'}
     from 'eclipse/Flan/WW2 Pack'
+    baseName = 'WW2'
+    appendix = 'Content Pack'
 }
 
 task yeOlde(type: Jar) {
-    baseName = 'Ye Olde'
-    appendix = 'Content Pack'
     from (zipTree("${destinationDir}/${archiveName}")) { include 'com/flansmod/client/model/yeolde/'}
     from 'eclipse/Flan/Ye Olde Pack'
+    baseName = 'Ye Olde'
+    appendix = 'Content Pack'
 }
 
 task contentPacks() {
     dependsOn modernWeapons
     dependsOn nerf
     dependsOn simpleParts
+    dependsOn mechaParts
     dependsOn titan
     dependsOn ww2
     dependsOn yeOlde
 }
 
+task clearOutput(type: Delete) {
+    delete 'build/output/'
+}
+
 task outputJar(type: Jar) {
     destinationDir = new File("build/output/mods/")
     from (zipTree("build/libs/${archiveName}")) {
@@ -116,13 +127,15 @@ task outputJar(type: Jar) {
 
 task outputPacks(type: Copy) {
     from ('build/libs/') {
+        include "**/*${version}.jar"
         exclude "**/Flan's Mod*.jar"
     }
     into 'build/output/Flan/'
 }
 
 build {
     dependsOn contentPacks
+    dependsOn clearOutput
     dependsOn outputJar
     dependsOn outputPacks
 }

eclipse/Flan/Mecha Parts Pack/assets/flansmod/lang/de_DE.lang

@@ -0,0 +1,17 @@
+item.diamondCircularSaw.name=Diamantsäge
+item.diamondExcavator.name=Diamantschaufel
+item.diamondDrill.name=Diamantboherer
+item.ironCircularSaw.name=Eisensäge
+item.ironExcavator.name=Eisenschaufel
+item.ironDrill.name=Eisenbohrer
+item.advCPU.name=Fortschrittliche CPU
+item.advHydraulics.name=Fortschrittliche Hydraulik
+item.basicCPU.name=Basis CPU
+item.canister.name=Kanister
+item.hydraulics.name=Hydraulik
+item.mediumDiamondArm.name=Mittlerer Diamantarm
+item.mediumDiamondBody.name=Mittlerer Diamantkörper
+item.mediumDiamondLeg.name=Mittleres Diamantbein
+item.smallIronLeg.name=Kleines Eisenbein
+item.smallIronArm.name=Kleiner Eisenarm
+item.smallIronBody.name=Kleiner Eisenkörper

eclipse/Flan/Mecha Parts Pack/assets/flansmod/lang/en_US.lang

@@ -0,0 +1,17 @@
+item.diamondCircularSaw.name=Diamond Circular Saw
+item.diamondExcavator.name=Diamond Excavator
+item.diamondDrill.name=Diamond Drill
+item.ironCircularSaw.name=Iron Circular Saw
+item.ironExcavator.name=Iron Excavator
+item.ironDrill.name=Iron Drill
+item.advCPU.name=Advanced CPU
+item.advHydraulics.name=Advanced Hydraulics
+item.basicCPU.name=Basic CPU
+item.canister.name=Canister
+item.hydraulics.name=Hydraulics
+item.mediumDiamondArm.name=Medium Diamond Arm
+item.mediumDiamondBody.name=Medium Diamond Body
+item.mediumDiamondLeg.name=Medium Diamond Leg
+item.smallIronLeg.name=Small Iron Leg
+item.smallIronArm.name=Small Iron Arm
+item.smallIronBody.name=Small Iron Body

eclipse/Flan/Mecha Parts Pack/assets/flansmod/lang/ru_RU.lang

@@ -0,0 +1,17 @@
+item.diamondCircularSaw.name=Алмазная циркулярная пила
+item.diamondExcavator.name=Алмазная лопата
+item.diamondDrill.name=Алмазная дрель
+item.ironCircularSaw.name=Железная циркулярная пила
+item.ironExcavator.name=Железная лопата
+item.ironDrill.name=Железная дрель
+item.advCPU.name=Продвинутый процессор
+item.advHydraulics.name=Улучшенная гидравлика
+item.basicCPU.name=Обычный процессор
+item.canister.name=Бензобак
+item.hydraulics.name=Гидравлика
+item.mediumDiamondArm.name=Средняя алмазная рука
+item.mediumDiamondBody.name=Средний алмазный корпус
+item.mediumDiamondLeg.name=Средняя алмазная нога
+item.smallIronLeg.name=Маленькая железная нога
+item.smallIronArm.name=Маленькая железная рука
+item.smallIronBody.name=Маленький железный корпус

eclipse/Flan/Mecha Parts Pack/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+    "pack": {
+        "pack_format": 1,
+        "description": "Mecha Defaults"
+    }
+}

eclipse/Flan/Modern Weapons Pack/armorBoxes/MWArmourBox.txt

@@ -0,0 +1,25 @@
+Name Modern Warfare Armour Box
+ShortName mwArmour
+TopTexture ModernArmourBoxTop
+SideTexture ModernArmourBoxSide
+BottomTexture ModernArmourBoxTop
+Recipe W wood F fiberglass
+WWW
+FFF
+WWW
+//AddArmour
+AddArmour marines Marines
+marineHelmet cloth.8 5
+marineBody cloth.8 8
+marinePants cloth.8 7
+marineBoots cloth.4 4
+AddArmour spetsnaz Spetsnaz
+spetsnazHelmet cloth.13 5
+spetsnazBody cloth.7 8
+spetsnazPants cloth.13 7
+spetsnazBoots cloth.15 4
+AddArmour juggernaut Juggernaut
+juggernautHelmet cloth.13 5 iron 12 fiberglass 12 diamond 2
+juggernautBody cloth.13 8 iron 32 fiberglass 32 leather 16
+juggernautPants cloth.13 7 iron 18 fiberglass 18 leather 8
+juggernautBoots cloth.13 4 iron 8 fiberglass 8 string 8

eclipse/Flan/Modern Weapons Pack/armorFiles/JuggernautBody.txt

@@ -0,0 +1,7 @@
+Name Juggernaut Heavy Bodyarmour
+ShortName juggernautBody
+Icon JuggernautBody
+Colour 255 255 255
+Type Chest
+Defence 0.4
+ArmourTexture Juggernaut

eclipse/Flan/Modern Weapons Pack/armorFiles/JuggernautBoots.txt

@@ -0,0 +1,7 @@
+Name Juggernaut Heavy Boots
+ShortName juggernautBoots
+Icon JuggernautBoots
+Colour 255 255 255
+Type Boots
+Defence 0.1
+ArmourTexture Juggernaut

eclipse/Flan/Modern Weapons Pack/armorFiles/JuggernautHelmet.txt

@@ -0,0 +1,7 @@
+Name Juggernaut Heavy Helmet
+ShortName juggernautHelmet
+Icon JuggernautHelmet
+Colour 255 255 255
+Type Hat
+Defence 0.15
+ArmourTexture Juggernaut

eclipse/Flan/Modern Weapons Pack/armorFiles/JuggernautLegs.txt

@@ -0,0 +1,7 @@
+Name Juggernaut Heavy Trousers
+ShortName juggernautPants
+Icon JuggernautPants
+Colour 255 255 255
+Type Legs
+Defence 0.2
+ArmourTexture Juggernaut

eclipse/Flan/Modern Weapons Pack/assets/flansmod/lang/de_DE.lang

@@ -1,4 +1,4 @@
-modern.name=Modern Weapons Box
+tile.modern.name=Modern Weapons Box
 item.clayAndSand.name=Lehm und Sand Mischung
 item.fiberglass.name=Fiberglas
 item.marineHelmet.name=Marine Helm
@@ -11,7 +11,7 @@ item.spetsnazPants.name=Spetsnaz Hose
 item.spetsnazBoots.name=Spetsnaz Stiefel
 item.ak47.name=AK47
 item.ak47Ammo.name=AK47 Munition
-item.ak74.name=AK47
+item.ak74.name=AK74
 item.ak74Ammo.name=AK74 Munition
 item.barrett.name=Barrett .50 Cal
 item.barrettAmmo.name=Barrett Munition
@@ -73,4 +73,7 @@ item.c4.name=C4 Plastikspregstoffladung
 item.m67.name=M67 Granate
 item.c4Remote.name=C4 Fernzünder
 item.mwMedKit.name=Verbandsmaterial
-item.mwParachute.name=Fallschirm
+item.mwParachute.name=Fallschirm
+item.minigun.name=Minigun
+item.minigunAmmo.name=Minigun Munition
+item.minigunExplosiveAmmo.name=Minigun Explosiv Munition

eclipse/Flan/Modern Weapons Pack/assets/flansmod/lang/en_US.lang

@@ -1,10 +1,15 @@
-modern.name=Modern Weapons Box
+tile.modern.name=Modern Weapons Box
+tile.mwArmour.name=Modern Warfare Armour Box
 item.clayAndSand.name=Clay and Sand Mixture
 item.fiberglass.name=Fibreglass
 item.marineHelmet.name=Marine Helmet
 item.marineBody.name=Marine Jacket
 item.marinePants.name=Marine Trousers
 item.marineBoots.name=Marine Boots
+item.juggernautHelmet.name=Juggernaut Helmet
+item.juggernautBody.name=Juggernaut Body Armour
+item.juggernautPants.name=Juggernaut Leg Armour
+item.juggernautBoots.name=Juggernaut Boots
 item.spetsnazHelmet.name=Spetsnaz Helmet
 item.spetsnazBody.name=Spetsnaz Jacket
 item.spetsnazPants.name=Spetsnaz Trousers
@@ -74,3 +79,6 @@ item.m67.name=M67 Grenade
 item.c4Remote.name=C4 Remote
 item.mwMedKit.name=Medkit
 item.mwParachute.name=Parachute
+item.minigun.name=Minigun
+item.minigunAmmo.name=Minigun Ammo
+item.minigunExplosiveAmmo.name=Minigun Explosive Ammo

eclipse/Flan/Modern Weapons Pack/assets/flansmod/lang/ru_RU.lang

@@ -1,21 +1,26 @@
-modern.name=Ящик с современным оружием
+tile.modern.name=Ящик с современным оружием
+tile.mwArmour.name=Ящик с современной броней
 item.clayAndSand.name=Смесь песка и глины
 item.fiberglass.name=Стекловолокно
 item.marineHelmet.name=Шлем морпехов
-item.marineBody.name=Бронежилет морпехов
-item.marinePants.name=Штаны морпехов
+item.marineBody.name=Жилет морпехов
+item.marinePants.name=Брюки морпехов
 item.marineBoots.name=Ботинки морпехов
+item.juggernautHelmet.name=Шлем джаггернаута
+item.juggernautBody.name=Бронежилет джаггернаута
+item.juggernautPants.name=Поножи джаггернаута
+item.juggernautBoots.name=Ботинки джаггернаута
 item.spetsnazHelmet.name=Шлем спецназа
-item.spetsnazBody.name=Бронежилет спецназа
-item.spetsnazPants.name=Штаны спецназа
+item.spetsnazBody.name=Жилет спецназа
+item.spetsnazPants.name=Брюки спецназа
 item.spetsnazBoots.name=Ботинки спецназа
 item.ak47.name=АК47
 item.ak47Ammo.name=Боеприпасы АК47
 item.ak74.name=АК74
 item.ak74Ammo.name=Боеприпасы АК74
 item.barrett.name=Barrett .50 Cal
 item.barrettAmmo.name=Боеприпасы Barrett
-item.barrettExplosiveAmmo.name=Фугасные боеприпасы Barrett
+item.barrettExplosiveAmmo.name=Разрывные боеприпасы Barrett
 item.mwBinoculars.name=Бинокль
 item.desertEagle.name=Desert Eagle
 item.desertEagleAmmo.name=Боеприпасы Desert Eagle
@@ -54,7 +59,7 @@ item.r700Ammo.name=Боеприпасы R700
 item.rpd.name=РПД
 item.rpdAmmo.name=Боеприпасы РПД
 item.rpg.name=РПГ-7
-item.rpgAmmo.name=Ракета РПГ-7
+item.rpgAmmo.name=Снаряд РПГ-7
 item.skorpion.name=Скорпион
 item.skorpionAmmo.name=Боеприпасы для Скорпиона
 item.usp.name=USP .45
@@ -69,8 +74,11 @@ item.flanMWForegrip.name=Рукоятка
 item.flanMWRedDot.name=Коллиматорный прицел
 item.flanMWSilencer.name=Глушитель
 item.claymore.name=M18 Claymore
-item.c4.name=Взрывпакет C4
+item.c4.name=Взрывчатка C4
 item.m67.name=Граната M67
-item.c4Remote.name=Пульт C4
+item.c4Remote.name=Детонатор C4
 item.mwMedKit.name=Аптечка
 item.mwParachute.name=Парашют
+item.minigun.name=Миниган
+item.minigunAmmo.name=Боеприпасы Минигана
+item.minigunExplosiveAmmo.name=Разрывные боеприпасы Минигана

eclipse/Flan/Modern Weapons Pack/assets/flansmod/sounds.json

@@ -202,5 +202,20 @@
 	"W1200Shoot": {
 		"category" : "player",
 		"sounds" : [ "flansmod:W1200Shoot" ]
+	},
+
+	"MinigunWarmup": {
+		"category" : "player",
+		"sounds" : [ "flansmod:MinigunWarmup" ]
+	},
+
+	"MinigunSpin": {
+		"category" : "player",
+		"sounds" : [ "flansmod:MinigunSpin" ]
+	},
+
+	"MinigunCooldown": {
+		"category" : "player",
+		"sounds" : [ "flansmod:MinigunCooldown" ]
 	}
 }