Skip to content

Commit

Permalink
Typo fixing (#4932, #5201)
Browse files Browse the repository at this point in the history
Also fixes the wrong translation key being used for the enchantment conversion titles

(cherry picked from commit 4356f5c)
  • Loading branch information
KnightMiner committed Sep 20, 2024
1 parent eeaf580 commit 27a0ba4
Show file tree
Hide file tree
Showing 32 changed files with 34 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public List<Component> getTooltipStrings(IDisplayModifierRecipe recipe, IRecipeS
if (count == 1) {
return Collections.singletonList(new TranslatableComponent(KEY_SLOT, slots.getType().getDisplayName()));
} else if (count > 1) {
return Collections.singletonList(new TranslatableComponent(KEY_SLOTS, slots, slots.getType().getDisplayName()));
return Collections.singletonList(new TranslatableComponent(KEY_SLOTS, slots.getCount(), slots.getType().getDisplayName()));
}
} else {
return TEXT_FREE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"more_text_space": true,
"effects": [
"No max level",
"Requires 1 ability slot"
"Requires 1 ability slot per level"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"modifier_id": "tconstruct:ambidextrous",
"text": [
{
"text": "Allows allows punching with the offhand. Offhand will receive all unarmed boosts applied to the main hand."
"text": "Allows punching with the offhand. Offhand will receive all unarmed boosts applied to the main hand."
}
],
"more_text_space": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"more_text_space": true,
"effects": [
"Maximum of 1 level",
"Requires 1 ability slot per level"
"Requires 1 ability slot"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"more_text_space": true,
"effects": [
"No max level",
"Requires 1 ability slot",
"Requires 1 ability slot per level",
"Fill by using tool on a fluid tank"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"more_text_space": true,
"effects": [
"No max level",
"Requires 1 ability slot"
"Requires 1 ability slot per level"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"more_text_space": true,
"effects": [
"No max level",
"Requires 1 ability slot",
"Requires 1 ability slot per level",
"Fill by using tool on a fluid tank"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"more_text_space": true,
"effects": [
"Maximum of 1 level",
"Requires 1 ability slot per level"
"Requires 1 ability slot"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"tool_filter": "tconstruct:modifiable/held",
"effects": [
"No max level",
"Requires 1 ability slot",
"Requires 1 ability slot per level",
"Fill by using tool on a fluid tank"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"text": "Allows shooting 2 additional arrows per level. Additional arrows location may vary based on the bow."
},
{
"text": "Must have additionall arrows in the inventory to fire them, if too few the bow will shoot fewer arrows.",
"text": "Must have additional arrows in the inventory to fire them, if too few the bow will shoot fewer arrows.",
"paragraph": true
}
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"title": "Armor Information",
"text": [
{ "text": "Armor is crafted in the Crafting Station instead of the Tinker Station or Anvil. All pieces start with 1 ability slot, but have varying number of upgrade and ability slots. Unlike tools, most modifiers require wearing the armor to be applicable." }
{ "text": "Armor is crafted in the Crafting Station instead of the Tinker Station or Anvil. All pieces start with 1 ability slot, but have a varying number of upgrade and defense slots. Unlike tools, holding the armor typically provides no effect; most modifiers require wearing the armor to be applicable." }
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"more_text_space": true,
"effects": [
"Can apply levels incrementally",
"Requires 1 defense slot"
"Requires 1 defense slot per level"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"more_text_space": true,
"effects": [
"Can apply levels incrementally",
"Requires 1 defense slot"
"Requires 1 defense slot per level"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"more_text_space": true,
"effects": [
"Can apply levels incrementally",
"Requires 1 defense slot"
"Requires 1 defense slot per level"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"more_text_space": true,
"effects": [
"Can apply levels incrementally",
"Requires 1 defense slot"
"Requires 1 defense slot per level"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"more_text_space": true,
"effects": [
"Can apply levels incrementally",
"Requires 1 defense slot"
"Requires 1 defense slot per level"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"more_text_space": true,
"effects": [
"Can apply levels incrementally",
"Requires 1 defense slot"
"Requires 1 defense slot per level"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"more_text_space": true,
"effects": [
"Can apply levels incrementally",
"Requires 1 defense slot"
"Requires 1 defense slot per level"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"more_text_space": true,
"effects": [
"Can apply levels incrementally",
"Requires 1 defense slot"
"Requires 1 defense slot per level"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"more_text_space": true,
"effects": [
"Can apply levels incrementally",
"Maximum of 5 levels",
"Requires 1 defense slot per level"
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"title": "Foreward",
"title": "Foreword",
"text": [
{
"text": "During my research into tool making, I noticed several authors have created partial lists of materials but there was no one complete list. This means in order to properly compare all the materials, it is necessary to switch between several volumes. This book is intended to solve that problem by indexing known materials from several different volumes into a single book."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"tool": "tconstruct:broad_axe",
"text": [
{ "text": "The Broad Axe can mine a single column of a tree, or 6 blocks in a vertical column." },
{ "text": "Expanders alternate between width and depth.", "paragraph": true }
{ "text": "Expanders alternate between increasing width and depth.", "paragraph": true }
],
"properties": [
"+5 Attack Damage",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"150% Attack Multiplier",
"1.0 Attack Speed",
"350% Durability Multiplier",
"Beheading II"
"Severing II"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"1.00 Arrow Velocity",
"0.75 Accuracy",
"Sums stats of both limbs",
"150% Durability"
"150% Durability Multiplier"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"tool": "tconstruct:scythe",
"text": [
{ "text": "The Scythe is a broad reaping tool, effective on plants or monsters in a 3x3x3 range." },
{ "text": "Expanders alternate between width/height and depth, while silky grants AOE shearing.", "paragraph": true }
{ "text": "Expanders alternate between increasing width/height and depth, while silky grants AOE shearing.", "paragraph": true }
],
"properties": [
"+1 Attack Damage",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"125% Attack Multiplier",
"0.85 Attack Speed",
"30% Mining Multiplier",
"500% Durability",
"500% Durability Multiplier",
"Piercing II"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"1.0 Draw Speed",
"1.00 Arrow Velocity",
"0.75 Accuracy",
"200% Durability"
"200% Durability Multiplier"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
],
"more_text_space": true,
"effects": [
"Requires 1 upgrade slot"
"Requires 1 upgrade slot per level"
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"title": "General upgrades",
"title": "General Upgrades",
"text": [
{ "text": "General modifiers are effective on multiple types of tools, including melee and harvest tools along with armor." },
{ "text": "Some modifiers are only to melee and harvest, so check the list of tools displayed.", "paragraph": true }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"text": "Abilities are powerful modifiers that drastically change a tool. Modifiers such as silky and autosmelt are notable as both change the effects of mining blocks, while dual wielding makes tools much easier to handle. "
},
{
"text": "Nearly all tools start with a single ability slot, and can only receive up to 1 more, so choose abilities wisely."
"text": "Nearly all tools start with a single ability slot, and can only receive up to 2 more, so choose abilities wisely."
},
{
"text": "Thruul M'Gon's Mighty Smelting has a full list of abilities available on tools, along with the Encyclopedia of Tinkering.",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"tool": "tconstruct:sky_staff",
"text": [
{ "text": "Skyslime staffs leave a lot of room for modification. Grants hire drawspeed at the cost of projectile power." }
{ "text": "Skyslime staffs leave a lot of room for modification. Grants higher drawspeed at the cost of projectile power." }
],
"properties": [
"Low Durability",
Expand Down
7 changes: 4 additions & 3 deletions src/main/resources/assets/tconstruct/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,7 @@
"material.tconstruct.iron.oxidized": "Raw Iron",
"material.tconstruct.iron.flavor": "Ironic. He could save others from death, but not himself.",
"material.tconstruct.iron.encyclopedia": "Causes mining blocks and hitting mobs to attract nearby items.",
"material.tconstruct.iron.ranged": "Causes firing arrows to attract nearby items to the holder.",
"material.tconstruct.iron.skull_flavor": "Violation of quarantine",
"material.tconstruct.iron.skull_encyclopedia": "Melee attacks copy all negative status effects from the wearer to the target",

Expand Down Expand Up @@ -2325,7 +2326,7 @@
"modifier.tconstruct.crumbling.mining_speed": "Crumbling Speed",
"modifier.tconstruct.crystalbound": "Crystalbound",
"modifier.tconstruct.crystalbound.flavor": "The way of the crystal is straight",
"modifier.tconstruct.crystalbound.description": "Tool gains bonus velocity, but arrow angle is restricted",
"modifier.tconstruct.crystalbound.description": "Bows gain bonus velocity, but arrow angle is restricted",
"modifier.tconstruct.lightweight": "Lightweight",
"modifier.tconstruct.lightweight.flavor": "Like a Shardblade!",
"modifier.tconstruct.lightweight.description": "Tool is incredibly light for its size, allowing you to attack, mine, and launch projectiles faster",
Expand Down Expand Up @@ -2924,9 +2925,9 @@
"advancements.tconstruct.smeltery.melter.title": "Basic Meltery",
"advancements.tconstruct.smeltery.melter.description": "Make a basic melting setup with a melter, a heater or tank, a casting basin, a casting table, and a faucet",
"advancements.tconstruct.smeltery.sand_casting.title": "Sand Casting",
"advancements.tconstruct.smeltery.sand_casting.description": "Make a basic disposable casts out of sand",
"advancements.tconstruct.smeltery.sand_casting.description": "Make a basic disposable cast out of sand",
"advancements.tconstruct.smeltery.gold_casting.title": "Shiny Casts",
"advancements.tconstruct.smeltery.gold_casting.description": "Make a reusable casts out of gold",
"advancements.tconstruct.smeltery.gold_casting.description": "Make a reusable cast out of gold",
"advancements.tconstruct.smeltery.cast_collector.title": "Cast Collector",
"advancements.tconstruct.smeltery.cast_collector.description": "Collect one of each gold cast",
"advancements.tconstruct.smeltery.mighty_smelting.title": "Smelting 201",
Expand Down

0 comments on commit 27a0ba4

Please sign in to comment.