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
  • Loading branch information
KnightMiner committed Sep 16, 2024
1 parent bb2a63a commit 4356f5c
Show file tree
Hide file tree
Showing 36 changed files with 41 additions and 42 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ public List<Component> getTooltipStrings(IDisplayModifierRecipe recipe, IRecipeS
if (count == 1) {
return Collections.singletonList(Component.translatable(KEY_SLOT, slots.type().getDisplayName()));
} else if (count > 1) {
return Collections.singletonList(Component.translatable(KEY_SLOTS, slots, slots.type().getDisplayName()));
return Collections.singletonList(Component.translatable(KEY_SLOTS, slots.count(), slots.type().getDisplayName()));
}
} else {
return TEXT_FREE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* Shared logic for jagged and stonebound. Trait boosts attack damage as it lowers mining speed.
*/
public class DamageSpeedTradeModifier extends Modifier implements AttributesModifierHook, TooltipModifierHook, BreakSpeedModifierHook {
private static final Component MINING_SPEED = TConstruct.makeTranslation("modifier", "fake_attribute.mining_speed");
private static final Component MINING_SPEED = TConstruct.makeTranslation("armor_stat", "mining_speed");
private final float multiplier;
private final Lazy<UUID> uuid = Lazy.of(() -> UUID.nameUUIDFromBytes(getId().toString().getBytes()));
private final Lazy<String> attributeName = Lazy.of(() -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public class EnchantmentConvertingRecipe extends AbstractWorktableRecipe {
public EnchantmentConvertingRecipe(ResourceLocation id, String name, List<SizedIngredient> inputs, boolean matchBook, boolean returnInput, IJsonPredicate<ModifierId> modifierPredicate) {
super(id, inputs);
this.name = name;
this.title = Component.translatable(ModifierRemovalRecipe.BASE_KEY + "." + name);
this.title = Component.translatable(ExtractModifierRecipe.BASE_KEY + "." + name);
this.matchBook = matchBook;
this.returnInput = returnInput;
this.modifierPredicate = modifierPredicate;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/** Recipe that removes a modifier, placing it on a crystal for reapplication */
public class ExtractModifierRecipe extends ModifierRemovalRecipe {
private static final String BASE_KEY = TConstruct.makeTranslationKey("recipe", "extract_modifier");
public static final String BASE_KEY = TConstruct.makeTranslationKey("recipe", "extract_modifier");
private static final Component DESCRIPTION = TConstruct.makeTranslation("recipe", "extract_modifier.description");
private static final Component NO_MODIFIERS = TConstruct.makeTranslation("recipe", "extract_modifier.no_modifiers");

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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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. Armor have varying number of upgrade, defense, and ability slots based on the type; some types even have material traits. 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 @@ -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 @@ -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
14 changes: 7 additions & 7 deletions src/main/resources/assets/tconstruct/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -1530,7 +1530,7 @@
"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.armor": "Reduces damage from projectiles by 10% per level, and grants 5% projectile protection based on the max level.",
"material.tconstruct.iron.armor": "Reduces damage from projectiles by 10% per level, and grants 5% knockback resistance times the max level.",
"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 @@ -1622,7 +1622,7 @@
"material.tconstruct.manyullyn.flavor": "The metal that most Tinkers will never pronounce right. Also known as a star cutting material.",
"material.tconstruct.manyullyn.encyclopedia": "Grants +2 damage per level after 8 consecutive hits",
"material.tconstruct.manyullyn.ranged": "Arrows gain +1 damage per level (before velocity) after 8 consecutive arrow hits",
"material.tconstruct.manyullyn.armor": "Temporarily boosts melee damge by 1 after taking damage, capping at the total level across all armor",
"material.tconstruct.manyullyn.armor": "Temporarily boosts melee damage by 1 after taking damage, capping at the total level across all armor",

"material.tconstruct.hepatizon": "Hepatizon",
"material.tconstruct.hepatizon.flavor": "He-pa-ti-zon - boil it, mash it, put it in a stew.",
Expand Down Expand Up @@ -1728,7 +1728,7 @@
"material.tconstruct.silver.flavor": "You know, this tool isn't going to look so shiny in a few days.",
"material.tconstruct.silver.encyclopedia": "Gives +2.5 damage against undead per level",
"material.tconstruct.silver.ranged": "Gives +0.5 projectile power against undead per level",
"material.tconstruct.silver.armor": "Reduces dmage from undead by 5% per level",
"material.tconstruct.silver.armor": "Reduces damage from undead by 5% per level",

"material.tconstruct.whitestone": "Whitestone",
"material.tconstruct.whitestone.end": "End Stone",
Expand Down Expand Up @@ -1764,7 +1764,7 @@
"material.tconstruct.invar.flavor": "Resists both temperature and arrest.",
"material.tconstruct.invar.encyclopedia": "Grants +2.5 damage in biomes with neutral temperatures",
"material.tconstruct.invar.ranged": "Grants +0.15 accuracy in biomes with neutral temperatures",
"material.tconstruct.invar.armor": "Redudes damage by 5% per level in biomes with neutral temperatures",
"material.tconstruct.invar.armor": "Reduces damage by 5% per level in biomes with neutral temperatures",

"material.tconstruct.electrum": "Electrum",
"material.tconstruct.electrum.flavor": "Good for electronic components.",
Expand Down Expand Up @@ -2431,7 +2431,7 @@
"modifier.tconstruct.crystalbound.description": "Bows gain bonus velocity, but arrow angle is restricted",
"modifier.tconstruct.crystalstrike": "Crystalstrike",
"modifier.tconstruct.crystalstrike.flavor": "Speed of the crystal comes at a cost",
"modifier.tconstruct.crystalstrike.description": "Armor instead gains attack speed by restricting knockback angle",
"modifier.tconstruct.crystalstrike.description": "Increases attack speed but also restricts knockback angles",
"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 @@ -3077,9 +3077,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 4356f5c

Please sign in to comment.