Skip to content

Commit d1cdc98

Browse files
author
Smartin
committed
- a couple translation fixes
1 parent d3127b0 commit d1cdc98

File tree

5 files changed

+37
-12
lines changed

5 files changed

+37
-12
lines changed

CHANGELOG.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
## v1.1.3 (1.20.1)
2-
- fixed issues were enchantments could not be applied to items
3-
- fixed compat issues with Entity Texture Features
42
- added Banner cosmetic support
3+
- expanded Lore Text to allow for Formatting
4+
- normalised module expansion and skin and synergy format to support "replace","remove" and "merge"
5+
- added Slot-types and Cosmetic sub-slot option for purely cosmetic modules
6+
- added Projectile Armor attribute
7+
- added Exhaustion attribute for passive food drain
8+
- added fabric swimspeed attribute to match forges
9+
- changing settings related to fallback-renderer now apply instantly without world reloading(on fabric)
10+
- fixed issues were enchantments could not be applied to items
11+
- fixed compatibility issues with Entity Texture Features
512
- fixed Bug were Buster skin would not load
6-
- fixed some Types and wordings within Translations
7-
- expanded Lore Text to allow for Formting
8-
- normalised module expansion and skin and synergy format to support "replace","remove" and "merge"
13+
- fixed some Typos and wordings within Translations
14+
- fixed arrow-part items not stacking correctly
15+
- fixed internal issues where slot rotation was not normalised correctly

common/src/main/java/smartin/miapi/client/gui/crafting/crafter/DetailView.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ public List<InteractAbleWidget> getButtons(SlotProperty.ModuleSlot slot, List<In
5555
SlotProperty.getSlots(slot.inSlot).forEach((id, childSlot) -> {
5656
if (childSlot.slotType.equals(slotType)) {
5757
getButtons(childSlot, buttons, nextLevel, slotType);
58-
} else {
59-
Miapi.LOGGER.info("disregard slot " + childSlot.slotType);
6058
}
6159
});
6260
}

common/src/main/java/smartin/miapi/client/gui/crafting/statdisplay/DpsStatDisplay.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
public class DpsStatDisplay extends SingleStatDisplayDouble {
1313

1414
public DpsStatDisplay() {
15-
super(0, 0, 51, 19, (stack) -> Text.literal("DPS"), (stack) -> Text.empty());
15+
super(0, 0, 51, 19,
16+
(stack) -> Text.translatable("miapi.stat.dps"),
17+
(stack) -> Text.translatable("miapi.stat.dps.description"));
1618
this.maxValue = 25;
1719
}
1820

common/src/main/java/smartin/miapi/client/gui/crafting/statdisplay/StatListWidget.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,10 @@ public static void onReload() {
212212
.builder(EntityAttributes.GENERIC_ARMOR)
213213
.setTranslationKey("armor")
214214
.setMax(8).build());
215+
addStatDisplay(AttributeSingleDisplay
216+
.builder(AttributeRegistry.PROJECTILE_ARMOR)
217+
.setTranslationKey("projectile_armor")
218+
.setMax(8).build());
215219
addStatDisplay(AttributeSingleDisplay
216220
.builder(EntityAttributes.GENERIC_ARMOR_TOUGHNESS)
217221
.setTranslationKey("armor_toughness")
@@ -220,6 +224,11 @@ public static void onReload() {
220224
.builder(EntityAttributes.GENERIC_KNOCKBACK_RESISTANCE)
221225
.setTranslationKey("knockback_resistance")
222226
.setMax(1).build());
227+
addStatDisplay(AttributeSingleDisplay
228+
.builder(AttributeRegistry.SWIM_SPEED)
229+
.setTranslationKey("swim_speed")
230+
.setMax(1)
231+
.setMin(-1).build());
223232
addStatDisplay(AttributeSingleDisplay
224233
.builder(AttributeRegistry.ELYTRA_GLIDE_EFFICIENCY)
225234
.setTranslationKey("elytra_glide")

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
"miapi.attribute.name.projectile_accuracy": "Projectile Accuracy",
6969
"miapi.attribute.name.projectile_piercing": "Projectile Piercing",
7070
"miapi.attribute.name.projectile_crit_multiplier": "Projectile Critical Multiplier",
71+
"miapi.attribute.name.projectile_armor": "Projectile Armor",
7172
"miapi.attribute.name.bow_draw_time": "Bow draw Time",
7273
"miapi.attribute.name.elytra_turn_efficiency": "Elytra Turn Efficiency",
7374
"miapi.attribute.name.elytra_glide_efficiency": "Elytra Glide Efficiency",
@@ -120,9 +121,11 @@
120121
"miapi.stat.projectile_accuracy": "\uD83D\uDD31 Accuracy",
121122
"miapi.stat.projectile_accuracy.description": "Projectile Accuracy, higher is better",
122123
"miapi.stat.projectile_piercing": "\uD83D\uDD31 Piercing",
123-
"miapi.stat.projectile_piercing.description": "Armor Piercing of the arrow, every 5 levels it can pierce a Entity",
124+
"miapi.stat.projectile_piercing.description": "Armor Piercing of the arrow\n every 5 levels it can pierce a Entity",
124125
"miapi.stat.projectile_crit_multiplier": "\uD83D\uDD31 Critical",
125126
"miapi.stat.projectile_crit_multiplier.description": "Projectile Critical Damage multiplier",
127+
"miapi.stat.projectile_armor": "\uD83D\uDD31 Armor",
128+
"miapi.stat.projectile_armor.description": "Specific Armor against Projectile Damage\n similar to Projectile Protection",
126129
"miapi.stat.mining.level.pickaxe": "⛏ Mining",
127130
"miapi.stat.mining.level.pickaxe.description": "Mining Speed and Level for Blocks like Stone",
128131
"miapi.stat.mining.level.axe": "\uD83E\uDE93 Mining",
@@ -134,11 +137,11 @@
134137
"miapi.stat.durability": "Durability",
135138
"miapi.stat.durability.description": "Item Durability",
136139
"miapi.stat.water_drag": "\uD83C\uDF0A\uD83D\uDD31 Drag",
137-
"miapi.stat.water_drag.description": "How fast the arrow slows underwater, higher decreases acceleration",
140+
"miapi.stat.water_drag.description": "How fast the arrow slows underwater\n higher decreases acceleration",
138141
"miapi.stat.air_drag": "\uD83D\uDCA8\uD83D\uDD31 Drag",
139-
"miapi.stat.air_drag.description": "How fast the arrow slows in air, higher decreases acceleration",
142+
"miapi.stat.air_drag.description": "How fast the arrow slows in air\n higher decreases acceleration",
140143
"miapi.stat.bow_draw_time": "\uD83C\uDFF9 Draw Time",
141-
"miapi.stat.bow_draw_time.description": "Bow Draw time, lower is better, is in ticks, 20 = 1 seconde",
144+
"miapi.stat.bow_draw_time.description": "Bow Draw time\n lower is better\n is in ticks, 20 = 1 seconde",
142145
"miapi.stat.fracturing": "Fracturing",
143146
"miapi.stat.fracturing.description": "Fracturing increases Damage the lower the durability of the Item is",
144147
"miapi.stat.fortune": "Fortune",
@@ -169,6 +172,12 @@
169172
"miapi.stat.illagerBane.description": "Bonus Damage against raid-related Mobs",
170173
"miapi.stat.luminiousLearning": "Luminous Learning",
171174
"miapi.stat.luminiousLearning.description": "Increases Xp from Blockbreaking and Mob deaths",
175+
"miapi.stat.food_exhaustion": "Exhaustion",
176+
"miapi.stat.food_exhaustion.description": "Passive Food\n drain while wearing Equipment with this.",
177+
"miapi.stat.swim_speed": "Swim Speed",
178+
"miapi.stat.swim_speed.description": "How fast you swim.\n 0 means you cannot move\n 1 is default swim Speed",
179+
"miapi.stat.dps": "DPS",
180+
"miapi.stat.dps.description": "Damage per Second",
172181
"miapi.material_stat.color": "Color",
173182
"miapi.material_stat.flexibility": "Flexibility",
174183
"miapi.material_stat.density": "Density",

0 commit comments

Comments
 (0)