Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

Commit af0f545

Browse files
committed
1.0.10f
- FIXED ENTITIES DROPS NOT SPAWNING - FIXED SERVER CONTENT-PACK�AUTO EXTRACTION - ADDED VZ.68 SKORPION
1 parent ed61564 commit af0f545

File tree

30 files changed

+13241
-48
lines changed

30 files changed

+13241
-48
lines changed

build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ archivesBaseName = 'modularwarfare'
2323

2424
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
2525

26+
compileJava.options.encoding = 'UTF-8'
27+
28+
tasks.withType(JavaCompile) {
29+
options.encoding = 'UTF-8'
30+
}
31+
2632
configurations {
2733
embed
2834
compile.extendsFrom(embed)

run/ModularWarfare/mod_config.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@
1717
"autoExtractContentpack": true,
1818
"killFeed": {
1919
"enableKillFeed": true,
20-
"universalDeathsMessage": false,
2120
"sendDefaultKillMessage": false,
2221
"messageDuration": 10,
2322
"messageList": [
24-
"§a{killer} §7killed §c{victim}",
25-
"§a{killer} §fdestroyed §c{victim}",
26-
"§a{killer} §fshoted §c{victim}"
23+
"\u0026a{killer} \u00267killed \u0026c{victim}",
24+
"\u0026a{killer} \u0026fdestroyed \u0026c{victim}",
25+
"\u0026a{killer} \u0026fshoted \u0026c{victim}"
2726
]
2827
},
29-
"dev_mode": false,
30-
"version": "1.0.9f"
28+
"dev_mode": true,
29+
"version": "1.0.10f"
3130
}

run/ModularWarfare/prototype-1.0.9f-contentpack.zip.current renamed to run/ModularWarfare/prototype-1.0.10f-contentpack.zip

12.9 MB
Binary file not shown.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"internalName": "prototype.vz68ammo",
3+
"displayName": "VZ.68 Mag 24rnd",
4+
"ammoCapacity": 24,
5+
"magazineCount": 1,
6+
"allowEmptyMagazines": true,
7+
"subAmmo": [
8+
"prototype.9x19"
9+
]
10+
}

run/ModularWarfare/prototype/assets/modularwarfare/lang/en_US.lang

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ item.prototype.spas12.name=SPAS12
1616
item.prototype.taurus.name=Taurus Raging Bull
1717
item.prototype.uzi.name=Mini-Uzi
1818
item.prototype.vss.name=VSS Vintorez
19+
item.prototype.vz68.name=VZ.68 Skorpion
1920
item.prototype.ak47ammo.name=AK47 Mag 30rnd
2021
item.prototype.ak74uammo.name=AK74u Mag 30rnd
2122
item.prototype.ak74ufastmag.name=AK74u Fast Mag 30rnd x2
@@ -32,6 +33,7 @@ item.prototype.p88ammo.name=P88 Mag 15rnd
3233
item.prototype.sksammo.name=SKS Stripper Clip 10rnd
3334
item.prototype.uziammo.name=UZI Mag 25rnd
3435
item.prototype.vssammo.name=VSS Mag 10rnd
36+
item.prototype.vz68ammo.name=VZ.68 Mag 24rnd
3537
item.prototype.acog_scope.name=Acog Scope
3638
item.prototype.ak47_suppressor.name=Mono. AK Suppressor
3739
item.prototype.ak74u_flashlight.name=AK47u Flashlight
@@ -57,8 +59,8 @@ item.prototype.tactical_vest_lv2_black.name=Tactical Vest Lv.2
5759
item.prototype.tactical_vest_lv2_green.name=Tactical Vest Lv.2
5860
item.prototype.tactical_vest_lv2_tan.name=Tactical Vest Lv.2
5961
item.prototype.uniform_legs.name=Uniform Pants
60-
item.prototype.uniform_feet.name=Uniform Boots
6162
item.prototype.uniform_chest.name=Uniform Chest
63+
item.prototype.uniform_feet.name=Uniform Boots
6264
item.prototype.vest.name=Vest
6365
item.prototype.12gauge.name=12 Gauge Shell
6466
item.prototype.12sluggauge.name=12 Slug Gauge Shot
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "modularwarfare:items/guns/prototype.vz68"
5+
},
6+
"display": {
7+
"thirdperson_lefthand": {
8+
"scale": [
9+
0.0,
10+
0.0,
11+
0.0
12+
]
13+
},
14+
"thirdperson_righthand": {
15+
"scale": [
16+
0.0,
17+
0.0,
18+
0.0
19+
]
20+
}
21+
}
22+
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "modularwarfare:items/ammo/prototype.vz68ammo"
5+
},
6+
"display": {
7+
"thirdperson_lefthand": {
8+
"scale": [
9+
0.4,
10+
0.4,
11+
0.4
12+
]
13+
},
14+
"thirdperson_righthand": {
15+
"scale": [
16+
0.4,
17+
0.4,
18+
0.4
19+
]
20+
}
21+
}
22+
}
10.2 KB
Loading

run/ModularWarfare/prototype/assets/modularwarfare/sounds.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,5 +382,20 @@
382382
"sounds": [
383383
"modularwarfare:taurus/click"
384384
]
385+
},
386+
"prototype.vz68.shoot": {
387+
"category": "player",
388+
"sounds": [
389+
"modularwarfare:vz68/shoot1",
390+
"modularwarfare:vz68/shoot2",
391+
"modularwarfare:vz68/shoot3",
392+
"modularwarfare:vz68/shoot4"
393+
]
394+
},
395+
"prototype.vz68.shoot.distant": {
396+
"category": "player",
397+
"sounds": [
398+
"modularwarfare:vz68/distant"
399+
]
385400
}
386401
}
Binary file not shown.

0 commit comments

Comments
 (0)