From 2165ec04eaffb8846c52f1e420ea7b3c2199c658 Mon Sep 17 00:00:00 2001 From: Yannick Marcotte-Gourde Date: Mon, 16 Dec 2024 13:04:00 -0500 Subject: [PATCH] Tooltip fix (#54) --- src/main/java/team/chisel/Features.java | 20 +++++++++---------- .../resources/assets/chisel/lang/de_DE.lang | 2 +- .../resources/assets/chisel/lang/en_GB.lang | 2 +- .../resources/assets/chisel/lang/en_PT.lang | 2 +- .../resources/assets/chisel/lang/en_US.lang | 5 ++++- .../resources/assets/chisel/lang/fr_FR.lang | 2 +- .../resources/assets/chisel/lang/ko_KR.lang | 2 +- .../resources/assets/chisel/lang/ru_RU.lang | 2 +- .../resources/assets/chisel/lang/zh_CN.lang | 4 ++-- 9 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index 7fadd7db..24f482b4 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -2614,22 +2614,22 @@ public enum Features { .setCreativeTab(ChiselTabs.tabMetalChiselBlocks) .setHardness(2.0F) .setResistance(10F); - imperial.carverHelper.addVariation("tile.imperial.0.desc", 0, "military/imperialCamo"); - imperial.carverHelper.addVariation("tile.imperial.1.desc", 1, "military/imperialCamoSecluded"); - imperial.carverHelper.addVariation("tile.imperial.2.desc", 2, "military/imperialPlate"); - imperial.carverHelper.addVariation("tile.imperial.3.desc", 3, "military/imperialCautionWhite"); - imperial.carverHelper.addVariation("tile.imperial.4.desc", 4, "military/imperialCautionOrange"); + imperial.carverHelper.addVariation("tile.nation.0.desc", 0, "military/imperialCamo"); + imperial.carverHelper.addVariation("tile.nation.1.desc", 1, "military/imperialCamoSecluded"); + imperial.carverHelper.addVariation("tile.nation.2.desc", 2, "military/imperialPlate"); + imperial.carverHelper.addVariation("tile.nation.3.desc", 3, "military/imperialCautionWhite"); + imperial.carverHelper.addVariation("tile.nation.4.desc", 4, "military/imperialCautionOrange"); imperial.carverHelper.registerBlock(imperial, "nation"); BlockCarvable rebel = (BlockCarvable) new BlockCarvable(Material.rock) .setCreativeTab(ChiselTabs.tabMetalChiselBlocks) .setHardness(2.0F) .setResistance(10F); - rebel.carverHelper.addVariation("tile.rebel.0.desc", 0, "military/rebelCamo", 20); - rebel.carverHelper.addVariation("tile.rebel.1.desc", 1, "military/rebelCamoSecluded", 21); - rebel.carverHelper.addVariation("tile.rebel.2.desc", 2, "military/rebelPlate", 22); - rebel.carverHelper.addVariation("tile.rebel.3.desc", 3, "military/rebelCautionWhite", 23); - rebel.carverHelper.addVariation("tile.rebel.4.desc", 4, "military/rebelCautionRed", 24); + rebel.carverHelper.addVariation("tile.nation.0.desc", 0, "military/rebelCamo", 20); + rebel.carverHelper.addVariation("tile.nation.1.desc", 1, "military/rebelCamoSecluded", 21); + rebel.carverHelper.addVariation("tile.nation.2.desc", 2, "military/rebelPlate", 22); + rebel.carverHelper.addVariation("tile.nation.3.desc", 3, "military/rebelCautionWhite", 23); + rebel.carverHelper.addVariation("tile.nation.4.desc", 4, "military/rebelCautionRed", 24); rebel.carverHelper.registerBlock(rebel, "rebel"); imperial.carverHelper.registerVariations("military"); diff --git a/src/main/resources/assets/chisel/lang/de_DE.lang b/src/main/resources/assets/chisel/lang/de_DE.lang index 13912b50..b4321be8 100644 --- a/src/main/resources/assets/chisel/lang/de_DE.lang +++ b/src/main/resources/assets/chisel/lang/de_DE.lang @@ -133,7 +133,7 @@ tile.beacon.blue.desc=Blau leuchtendes Leuchtfeuer tile.beacon.brown.desc=Braun leuchtendes Leuchtfeuer tile.beacon.cyan.desc=Türkis leuchtendes Leuchtfeuer tile.beacon.green.desc=Grün leuchtendes Leuchtfeuer -tile.beacon.lightblue.desc=Hellblau leuchtendes Leuchtfeuer +tile.beacon.lightBlue.desc=Hellblau leuchtendes Leuchtfeuer tile.beacon.silver.desc=Hellgrau leuchtendes Leuchtfeuer tile.beacon.lime.desc=Hellgrün leuchtendes Leuchtfeuer tile.beacon.magenta.desc=Lila leuchtendes Leuchtfeuer diff --git a/src/main/resources/assets/chisel/lang/en_GB.lang b/src/main/resources/assets/chisel/lang/en_GB.lang index 38d65b3b..f15a0e56 100644 --- a/src/main/resources/assets/chisel/lang/en_GB.lang +++ b/src/main/resources/assets/chisel/lang/en_GB.lang @@ -134,7 +134,7 @@ tile.beacon.blue.desc=Blue Beamed Beacon tile.beacon.brown.desc=Brown Beamed Beacon tile.beacon.cyan.desc=Cyan Beamed Beacon tile.beacon.green.desc=Green Beamed Beacon -tile.beacon.lightblue.desc=Light Blue Beamed Beacon +tile.beacon.lightBlue.desc=Light Blue Beamed Beacon # Beacon tile.beacon.silver.desc=Light Grey Beamed Beacon tile.beacon.lime.desc=Lime Beamed Beacon diff --git a/src/main/resources/assets/chisel/lang/en_PT.lang b/src/main/resources/assets/chisel/lang/en_PT.lang index 05ab3204..31c8e0ee 100644 --- a/src/main/resources/assets/chisel/lang/en_PT.lang +++ b/src/main/resources/assets/chisel/lang/en_PT.lang @@ -134,7 +134,7 @@ tile.beacon.blue.desc=Blue Beamed Beacon tile.beacon.brown.desc=Brown Beamed Beacon tile.beacon.cyan.desc=Cyan Beamed Beacon tile.beacon.green.desc=Green Beamed Beacon -tile.beacon.lightblue.desc=Light Blue Beamed Beacon +tile.beacon.lightBlue.desc=Light Blue Beamed Beacon tile.beacon.silver.desc=Light Gray Beamed Beacon tile.beacon.lime.desc=Lime Beamed Beacon tile.beacon.magenta.desc=Magenta Beamed Beacon diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 27b3dc83..56e9a5ac 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -138,7 +138,7 @@ tile.beacon.blue.desc=Blue Beamed Beacon tile.beacon.brown.desc=Brown Beamed Beacon tile.beacon.cyan.desc=Cyan Beamed Beacon tile.beacon.green.desc=Green Beamed Beacon -tile.beacon.lightblue.desc=Light Blue Beamed Beacon +tile.beacon.lightBlue.desc=Light Blue Beamed Beacon tile.beacon.silver.desc=Light Gray Beamed Beacon tile.beacon.lime.desc=Lime Beamed Beacon tile.beacon.magenta.desc=Magenta Beamed Beacon @@ -949,6 +949,9 @@ tile.dirt.9.desc=Horizontal Dirt tile.dirt.10.desc=Vertical Dirt tile.dirt.11.desc=Dirt Layers tile.dirt.12.desc=Crumbling Dirt +tile.dirt.13.desc=Jumbled Dirt +tile.dirt.14.desc=Tilled Dirt +tile.dirt.15.desc=Large Dirt Tile #Ice tile.chisel.ice.name=Ice diff --git a/src/main/resources/assets/chisel/lang/fr_FR.lang b/src/main/resources/assets/chisel/lang/fr_FR.lang index 18dde4cc..4cc13417 100644 --- a/src/main/resources/assets/chisel/lang/fr_FR.lang +++ b/src/main/resources/assets/chisel/lang/fr_FR.lang @@ -126,7 +126,7 @@ tile.beacon.blue.desc=Blue Beamed Beacon tile.beacon.brown.desc=Brown Beamed Beacon tile.beacon.cyan.desc=Cyan Beamed Beacon tile.beacon.green.desc=Green Beamed Beacon -tile.beacon.lightblue.desc=Light Blue Beamed Beacon +tile.beacon.lightBlue.desc=Light Blue Beamed Beacon tile.beacon.silver.desc=Light Gray Beamed Beacon tile.beacon.lime.desc=Lime Beamed Beacon tile.beacon.magenta.desc=Magenta Beamed Beacon diff --git a/src/main/resources/assets/chisel/lang/ko_KR.lang b/src/main/resources/assets/chisel/lang/ko_KR.lang index fad9d9e8..486e143d 100644 --- a/src/main/resources/assets/chisel/lang/ko_KR.lang +++ b/src/main/resources/assets/chisel/lang/ko_KR.lang @@ -125,7 +125,7 @@ tile.beacon.blue.desc=Blue Beamed Beacon tile.beacon.brown.desc=Brown Beamed Beacon tile.beacon.cyan.desc=Cyan Beamed Beacon tile.beacon.green.desc=Green Beamed Beacon -tile.beacon.lightblue.desc=Light Blue Beamed Beacon +tile.beacon.lightBlue.desc=Light Blue Beamed Beacon tile.beacon.silver.desc=Light Gray Beamed Beacon tile.beacon.lime.desc=Lime Beamed Beacon tile.beacon.magenta.desc=Magenta Beamed Beacon diff --git a/src/main/resources/assets/chisel/lang/ru_RU.lang b/src/main/resources/assets/chisel/lang/ru_RU.lang index 07921ceb..f95a1233 100644 --- a/src/main/resources/assets/chisel/lang/ru_RU.lang +++ b/src/main/resources/assets/chisel/lang/ru_RU.lang @@ -138,7 +138,7 @@ tile.beacon.blue.desc=Маяк с синем лучом tile.beacon.brown.desc=Маяк с коричневым лучом tile.beacon.cyan.desc=Маяк с бирюзовым лучом tile.beacon.green.desc=Маяк с зелёным лучом -tile.beacon.lightblue.desc=Маяк со голубым лучом +tile.beacon.lightBlue.desc=Маяк со голубым лучом tile.beacon.silver.desc=Маяк со светло-серым лучом tile.beacon.lime.desc=Маяк с лаймовым лучом tile.beacon.magenta.desc=Маяк с сиреневым лучом diff --git a/src/main/resources/assets/chisel/lang/zh_CN.lang b/src/main/resources/assets/chisel/lang/zh_CN.lang index 8dbad90d..ca7beada 100644 --- a/src/main/resources/assets/chisel/lang/zh_CN.lang +++ b/src/main/resources/assets/chisel/lang/zh_CN.lang @@ -136,7 +136,7 @@ tile.beacon.blue.desc=蓝色定向信标 tile.beacon.brown.desc=棕色定向信标 tile.beacon.cyan.desc=青色定向信标 tile.beacon.green.desc=绿色定向信标 -tile.beacon.lightblue.desc=淡蓝定向信标 +tile.beacon.lightBlue.desc=淡蓝定向信标 tile.beacon.silver.desc=淡灰定向信标 tile.beacon.lime.desc=黄绿定向信标 tile.beacon.magenta.desc=品红定向信标 @@ -1741,4 +1741,4 @@ container.chisel.mode=模式: container.chisel.mode.single=单个雕刻 container.chisel.mode.panel=范围雕刻 container.chisel.mode.column=竖向雕刻 -container.chisel.mode.row=横向雕刻 \ No newline at end of file +container.chisel.mode.row=横向雕刻