Skip to content

Commit 46a708a

Browse files
committed
- langs and final adjsutments
1 parent 9f991ce commit 46a708a

File tree

9 files changed

+68
-25
lines changed

9 files changed

+68
-25
lines changed

common/src/main/resources/assets/miapi/lang/en_us.json

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@
9898
"miapi.stat.mining.level.hoe.description": "Mining Speed and Level for Blocks like Hay Bales",
9999
"miapi.stat.durability": "Durability",
100100
"miapi.stat.durability.description": "Item Durability",
101+
"miapi.stat.water_drag":"Water Drag",
102+
"miapi.stat.water_drag.description":"How fast the arrow slows underwater, higher is better",
103+
"miapi.stat.air_drag":"Air Drag",
104+
"miapi.stat.air_drag.description":"How fast the arrow slows underwater, higher is better",
101105

102106
"miapi.material_stat.color": "Color",
103107
"miapi.material_stat.flexibility": "Flexibility",
@@ -185,6 +189,14 @@
185189
"miapi.material.metal.iron": "Iron ",
186190
"miapi.material.metal.netherite": "Netherite ",
187191

192+
"miapi.material.custom.chorus_fruit": "Chorus Fruit ",
193+
"miapi.material.custom.lightning_rod": "Lighting Rod ",
194+
"miapi.material.custom.ender_pearl": "Ender Pearl ",
195+
"miapi.material.custom.gunpowder": "Gunpowder ",
196+
"miapi.material.custom.ice": "Ice ",
197+
"miapi.material.custom.potion": "Potion ",
198+
"miapi.material.custom.tnt": "TNT ",
199+
188200
"block.miapi.modular_work_bench": "Modular Workbench",
189201

190202
"miapi.module.empty": "Empty Slot",
@@ -339,15 +351,25 @@
339351
"miapi.module.arrow_head_normal.description": "The Front piece of an arrow, determins how an Arrow Impacts a Target.",
340352
"miapi.module.arrow_head_normal.short_description": "The Head of an Arrow.",
341353

354+
"miapi.module.arrow_head_custom": "Custom Arrow Head",
355+
"miapi.module.arrow_head_custom.name": "[translation.[material.translation]]Arrow Head",
356+
"miapi.module.arrow_head_custom.description": "A custom arrow Head, highly dependant on the used Material.",
357+
"miapi.module.arrow_head_custom.short_description": "The Head of an Arrow.",
358+
342359
"miapi.module.arrow_shaft_normal": "Arrow Shaft",
343360
"miapi.module.arrow_shaft_normal.name": "[translation.[material.translation]]Arrow Shaft",
344361
"miapi.module.arrow_shaft_normal.description": "Shaft of an arrow, determins weight speed and impact of an Arrow",
345362
"miapi.module.arrow_shaft_normal.short_description": "The Shaft of an Arrow.",
346363

347-
"miapi.module.arrow_tail_normal": "Arrow Fletching",
348-
"miapi.module.arrow_tail_normal.name": "[translation.[material.translation]]Arrow Fletching",
349-
"miapi.module.arrow_tail_normal.description": "Fletching of an arrow, Impacts the flight characteristics of an Arrow",
350-
"miapi.module.arrow_tail_normal.short_description": "Fletching of an arrow.",
364+
"miapi.module.arrow_fletching_normal": "Arrow Fletching",
365+
"miapi.module.arrow_fletching_normal.name": "[translation.[material.translation]]Arrow Fletching",
366+
"miapi.module.arrow_fletching_normal.description": "Fletching of an arrow, Impacts the flight characteristics of an Arrow",
367+
"miapi.module.arrow_fletching_normal.short_description": "Fletching of an arrow.",
368+
369+
"miapi.module.arrow_fins_normal": "Arrow Fins",
370+
"miapi.module.arrow_fins_normal.name": "[translation.[material.translation]]Arrow Fins",
371+
"miapi.module.arrow_fins_normal.description": "Fins for an arrow, allows the arrow to travel better underwater",
372+
"miapi.module.arrow_fins_normal.short_description": "Fins of an arrow.",
351373

352374
"miapi.modular_arrow":"[translation.[material.translation]]Arrow",
353375

@@ -361,6 +383,21 @@
361383
"miapi.module.bow_arms_normal.description": "The Arms of a Bow, impacts the draw behaviour of the Bow",
362384
"miapi.module.bow_arms_normal.short_description": "The Arms of a Bow",
363385

386+
"miapi.module.bow_arms_long": "Long Bow Arms",
387+
"miapi.module.bow_arms_long.name": "Long [translation.[material.translation]]Bow",
388+
"miapi.module.bow_arms_long.description": "Long Bow, the most powerfull bow, sacrificing accuracy for raw power",
389+
"miapi.module.bow_arms_long.short_description": "Long Bow Arms",
390+
391+
"miapi.module.bow_arms_recurve": "Recurve Bow Arms",
392+
"miapi.module.bow_arms_recurve.name": "Recurve [translation.[material.translation]]Bow",
393+
"miapi.module.bow_arms_recurve.description": "Recurve Bow arms, aimed to provide a balance between power and accuracy",
394+
"miapi.module.bow_arms_recurve.short_description": "Recurved Bow arms",
395+
396+
"miapi.module.bow_arms_short": "Short Bow Arms",
397+
"miapi.module.bow_arms_short.name": "Short [translation.[material.translation]]Bow",
398+
"miapi.module.bow_arms_short.description": "Short arms, quick draw time, but not that powerfull",
399+
"miapi.module.bow_arms_short.short_description": "Short Arms for Bow",
400+
364401
"miapi.module.bow_string_normal": "Bow String",
365402
"miapi.module.bow_string_normal.name": "[translation.[material.translation]]Bow String",
366403
"miapi.module.bow_string_normal.description": "String of a Bow",

common/src/main/resources/data/miapi/materials/custom/copper_rod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"key": "lightning_rod",
3-
"translation": "miapi.material.custom.copper_rod",
3+
"translation": "miapi.material.custom.lightning_rod",
44
"icon": "textures/item/copper_rod.png",
55
"items": [
66
{

common/src/main/resources/data/miapi/materials/custom/egg.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

common/src/main/resources/data/miapi/modules/bow/arm/long_bow_arms.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,7 @@
9595
"bone"
9696
],
9797
"cost": 2
98-
}
98+
},
99+
"displayName": "miapi.module.bow_arms_long.name",
100+
"itemId": "miapi:modular_bow"
99101
}

common/src/main/resources/data/miapi/modules/bow/arm/normal_bow_arms.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,7 @@
8282
"bone"
8383
],
8484
"cost": 2
85-
}
85+
},
86+
"displayName": "miapi.module.bow_arms_normal.name",
87+
"itemId": "miapi:modular_bow"
8688
}

common/src/main/resources/data/miapi/modules/bow/arm/recurve_bow_arms.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,7 @@
8282
"bone"
8383
],
8484
"cost": 2
85-
}
85+
},
86+
"displayName": "miapi.module.bow_arms_recurve.name",
87+
"itemId": "miapi:modular_bow"
8688
}

common/src/main/resources/data/miapi/modules/bow/arm/short_bow_arms.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,7 @@
8282
"bone"
8383
],
8484
"cost": 2
85-
}
85+
},
86+
"displayName": "miapi.module.bow_arms_short.name",
87+
"itemId": "miapi:modular_bow"
8688
}

common/src/main/resources/data/miapi/modules/bow/handle/normal_bow_handle.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,12 @@
174174
}
175175
}
176176
},
177+
"enchantments": {
178+
"allowed": [
179+
"miapi:basic",
180+
"miapi:bow"
181+
]
182+
},
177183
"allowedMaterial": {
178184
"allowedMaterials": [
179185
"wood",

common/src/main/resources/data/miapi/synergies/bow/bow.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@
22
"type": "tag",
33
"bow_arms": {
44
"condition": {
5-
"type": "otherModule",
5+
"type": "not",
66
"condition": {
7-
"type": "tag",
8-
"tag": "bow_string"
7+
"type": "otherModule",
8+
"condition": {
9+
"type": "tag",
10+
"tag": "bow_string"
11+
}
912
}
1013
},
1114
"properties": {
12-
"displayName": "miapi.module.bow_arms_normal.name",
13-
"itemId": "miapi:modular_bow"
15+
"displayName": "miapi.module.bow_handle_normal.name",
16+
"itemId": "miapi:modular_bow_part"
1417
}
1518
}
1619
}

0 commit comments

Comments
 (0)