diff --git a/gradle.properties b/gradle.properties index 1a96e0c..79af33f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -48,7 +48,7 @@ mod_name=DRG Laser Pointer # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=GNU GPLv3 # The mod version. See https://semver.org/ -mod_version=1.1.0 +mod_version=1.1.1 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/main/java/com/linngdu664/drglaserpointer/item/LaserPointerItem.java b/src/main/java/com/linngdu664/drglaserpointer/item/LaserPointerItem.java index 41dcf96..bc9987d 100644 --- a/src/main/java/com/linngdu664/drglaserpointer/item/LaserPointerItem.java +++ b/src/main/java/com/linngdu664/drglaserpointer/item/LaserPointerItem.java @@ -4,6 +4,7 @@ import com.linngdu664.drglaserpointer.network.LaserPickBlockPayload; import com.linngdu664.drglaserpointer.network.LaserPickEntityPayload; import com.linngdu664.drglaserpointer.registry.ItemRegister; +import com.linngdu664.drglaserpointer.registry.KeyMappingRegister; import com.linngdu664.drglaserpointer.registry.NetworkRegister; import com.linngdu664.drglaserpointer.client.util.LaserPointerHitHelper; import net.minecraft.ChatFormatting; @@ -106,7 +107,8 @@ public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHa @Override public void appendHoverText(ItemStack pStack, @Nullable Level pLevel, List pTooltipComponents, TooltipFlag pIsAdvanced) { - pTooltipComponents.add(Component.translatable("laser_pointer.tooltip", Minecraft.getInstance().options.keyShift.getTranslatedKeyMessage()).withStyle(ChatFormatting.DARK_GRAY)); + pTooltipComponents.add(Component.translatable("laser_pointer.tooltip", Minecraft.getInstance().options.keyShift.getTranslatedKeyMessage()).withStyle(ChatFormatting.GRAY)); + pTooltipComponents.add(Component.translatable("laser_pointer.tooltip", KeyMappingRegister.SWITCH_TO_LASER_POINTER.getTranslatedKeyMessage()).withStyle(ChatFormatting.GRAY)); } public static int getLaserColorARGB(byte laserColor) { diff --git a/src/main/resources/assets/drglaserpointer/lang/ar_sa.json b/src/main/resources/assets/drglaserpointer/lang/ar_sa.json index 69c899a..c8e3c99 100644 --- a/src/main/resources/assets/drglaserpointer/lang/ar_sa.json +++ b/src/main/resources/assets/drglaserpointer/lang/ar_sa.json @@ -1,6 +1,7 @@ { "item.drglaserpointer.laser_pointer": "مؤشر الليزر", "laser_pointer.tooltip": "<%1$s+تمرير الفأرة> لتغيير اللون", + "laser_pointer1.tooltip": "<%1$s> التبديل إلى اليد", "tip.drglaserpointer.distance": "%1$s م", "tip.drglaserpointer.mark_key": "%1$s للعلامة", diff --git a/src/main/resources/assets/drglaserpointer/lang/de_de.json b/src/main/resources/assets/drglaserpointer/lang/de_de.json index 0b2bb3b..f081338 100644 --- a/src/main/resources/assets/drglaserpointer/lang/de_de.json +++ b/src/main/resources/assets/drglaserpointer/lang/de_de.json @@ -1,6 +1,7 @@ { "item.drglaserpointer.laser_pointer": "Laserpointer", "laser_pointer.tooltip": "<%1$s+Mausrad> Farbe wechseln", + "laser_pointer1.tooltip": "<%1$s> Wechsle zur Hand", "tip.drglaserpointer.distance": "%1$s m", "tip.drglaserpointer.mark_key": "%1$s zum Markieren", diff --git a/src/main/resources/assets/drglaserpointer/lang/en_us.json b/src/main/resources/assets/drglaserpointer/lang/en_us.json index 53b345e..084d17e 100644 --- a/src/main/resources/assets/drglaserpointer/lang/en_us.json +++ b/src/main/resources/assets/drglaserpointer/lang/en_us.json @@ -1,6 +1,7 @@ { "item.drglaserpointer.laser_pointer": "Laser Pointer", "laser_pointer.tooltip": "<%1$s+Mouse Scroll> switch color", + "laser_pointer1.tooltip": "<%1$s> Switch to hand", "tip.drglaserpointer.distance": "%1$s m", "tip.drglaserpointer.mark_key": "%1$s to mark", diff --git a/src/main/resources/assets/drglaserpointer/lang/es_es.json b/src/main/resources/assets/drglaserpointer/lang/es_es.json index 8c88bfd..21ce7a0 100644 --- a/src/main/resources/assets/drglaserpointer/lang/es_es.json +++ b/src/main/resources/assets/drglaserpointer/lang/es_es.json @@ -1,6 +1,7 @@ { "item.drglaserpointer.laser_pointer": "Puntero Láser", "laser_pointer.tooltip": "<%1$s+Desplazamiento del ratón> cambiar color", + "laser_pointer1.tooltip": "<%1$s> Cambiar a mano", "tip.drglaserpointer.distance": "%1$s m", "tip.drglaserpointer.mark_key": "%1$s para marcar", diff --git a/src/main/resources/assets/drglaserpointer/lang/fr_ca.json b/src/main/resources/assets/drglaserpointer/lang/fr_ca.json index de4e990..30f0d08 100644 --- a/src/main/resources/assets/drglaserpointer/lang/fr_ca.json +++ b/src/main/resources/assets/drglaserpointer/lang/fr_ca.json @@ -1,6 +1,7 @@ { "item.drglaserpointer.laser_pointer": "Pointeur Laser", "laser_pointer.tooltip": "<%1$s+Molette de la souris> changer de couleur", + "laser_pointer1.tooltip": "<%1$s> Passer à la main", "tip.drglaserpointer.distance": "%1$s m", "tip.drglaserpointer.mark_key": "%1$s pour marquer", diff --git a/src/main/resources/assets/drglaserpointer/lang/fr_fr.json b/src/main/resources/assets/drglaserpointer/lang/fr_fr.json index ac62e95..bd298d3 100644 --- a/src/main/resources/assets/drglaserpointer/lang/fr_fr.json +++ b/src/main/resources/assets/drglaserpointer/lang/fr_fr.json @@ -1,6 +1,7 @@ { "item.drglaserpointer.laser_pointer": "Pointeur Laser", "laser_pointer.tooltip": "<%1$s+Molette de la souris> changer de couleur", + "laser_pointer1.tooltip": "<%1$s> Passer à la main", "tip.drglaserpointer.distance": "%1$s m", "tip.drglaserpointer.mark_key": "%1$s pour marquer", diff --git a/src/main/resources/assets/drglaserpointer/lang/it_it.json b/src/main/resources/assets/drglaserpointer/lang/it_it.json index 333636a..747018d 100644 --- a/src/main/resources/assets/drglaserpointer/lang/it_it.json +++ b/src/main/resources/assets/drglaserpointer/lang/it_it.json @@ -1,6 +1,7 @@ { "item.drglaserpointer.laser_pointer": "Puntatore Laser", "laser_pointer.tooltip": "<%1$s+Scorrimento del mouse> cambia colore", + "laser_pointer1.tooltip": "<%1$s> Passa alla mano", "tip.drglaserpointer.distance": "%1$s m", "tip.drglaserpointer.mark_key": "%1$s per segnare", diff --git a/src/main/resources/assets/drglaserpointer/lang/ja_jp.json b/src/main/resources/assets/drglaserpointer/lang/ja_jp.json index 421b5aa..45ecac4 100644 --- a/src/main/resources/assets/drglaserpointer/lang/ja_jp.json +++ b/src/main/resources/assets/drglaserpointer/lang/ja_jp.json @@ -1,8 +1,9 @@ { "item.drglaserpointer.laser_pointer": "レーザーポインター", "laser_pointer.tooltip": "<%1$s+マウススクロール> 色を切り替える", + "laser_pointer1.tooltip": "<%1$s> 手に切り替える", - "tip.drglaserpointer.distance": "%1$s メートル", + "tip.drglaserpointer.distance": "%1$s m", "tip.drglaserpointer.mark_key": "%1$s でマーク", "tip.drglaserpointer.item_entity_name": "%1$s (アイテム)", diff --git a/src/main/resources/assets/drglaserpointer/lang/ko_kr.json b/src/main/resources/assets/drglaserpointer/lang/ko_kr.json index b16045c..1824f4c 100644 --- a/src/main/resources/assets/drglaserpointer/lang/ko_kr.json +++ b/src/main/resources/assets/drglaserpointer/lang/ko_kr.json @@ -1,6 +1,7 @@ { "item.drglaserpointer.laser_pointer": "레이저 포인터", "laser_pointer.tooltip": "<%1$s+마우스 스크롤> 색상 전환", + "laser_pointer1.tooltip": "<%1$s> 손으로 전환", "tip.drglaserpointer.distance": "%1$s m", "tip.drglaserpointer.mark_key": "%1$s로 표시", diff --git a/src/main/resources/assets/drglaserpointer/lang/lzh.json b/src/main/resources/assets/drglaserpointer/lang/lzh.json index ced743d..00be451 100644 --- a/src/main/resources/assets/drglaserpointer/lang/lzh.json +++ b/src/main/resources/assets/drglaserpointer/lang/lzh.json @@ -1,17 +1,18 @@ { "item.drglaserpointer.laser_pointer": "光指器", - "laser_pointer.tooltip": "<%1$s+鼠滚> 易色", + "laser_pointer.tooltip": "<%1$s+鼠滾> 易色", + "laser_pointer1.tooltip": "<%1$s> 易於手", "tip.drglaserpointer.distance": "%1$s 丈", - "tip.drglaserpointer.mark_key": "按%1$s以记", + "tip.drglaserpointer.mark_key": "按%1$s以記", "tip.drglaserpointer.item_entity_name": "%1$s (物)", - "advancements.drglaserpointer.root.title": "岩与石", - "advancements.drglaserpointer.root.description": "岩与石", + "advancements.drglaserpointer.root.title": "巖與石", + "advancements.drglaserpointer.root.description": "巖與石", "advancements.drglaserpointer.were_rich.title": "吾等富矣!", "advancements.drglaserpointer.were_rich.description": "是,是,汝富矣。行行好速行,吾受上司督促也!", "advancements.drglaserpointer.mushroom.title": "菌!", - "advancements.drglaserpointer.mushroom.description": "专注,队伍!勿言菌也!", + "advancements.drglaserpointer.mushroom.description": "專註,隊伍!勿言菌也!", "key.laserpointer.switch_to_laser_pointer": "切至光指器" } \ No newline at end of file diff --git a/src/main/resources/assets/drglaserpointer/lang/nl_nl.json b/src/main/resources/assets/drglaserpointer/lang/nl_nl.json index 6c82aa3..1b1df54 100644 --- a/src/main/resources/assets/drglaserpointer/lang/nl_nl.json +++ b/src/main/resources/assets/drglaserpointer/lang/nl_nl.json @@ -1,6 +1,7 @@ { "item.drglaserpointer.laser_pointer": "Laserpointer", "laser_pointer.tooltip": "<%1$s+Muis Scroll> wissel kleur", + "laser_pointer1.tooltip": "<%1$s> Schakel over naar hand", "tip.drglaserpointer.distance": "%1$s m", "tip.drglaserpointer.mark_key": "%1$s om te markeren", diff --git a/src/main/resources/assets/drglaserpointer/lang/pl_pl.json b/src/main/resources/assets/drglaserpointer/lang/pl_pl.json index ef68b9c..541ad51 100644 --- a/src/main/resources/assets/drglaserpointer/lang/pl_pl.json +++ b/src/main/resources/assets/drglaserpointer/lang/pl_pl.json @@ -1,6 +1,7 @@ { "item.drglaserpointer.laser_pointer": "Wskaźnik laserowy", "laser_pointer.tooltip": "<%1$s+Przewijanie myszką> zmiana koloru", + "laser_pointer1.tooltip": "<%1$s> Przełącz na rękę", "tip.drglaserpointer.distance": "%1$s m", "tip.drglaserpointer.mark_key": "%1$s, aby zaznaczyć", diff --git a/src/main/resources/assets/drglaserpointer/lang/ru_ru.json b/src/main/resources/assets/drglaserpointer/lang/ru_ru.json index 3199135..7ca68db 100644 --- a/src/main/resources/assets/drglaserpointer/lang/ru_ru.json +++ b/src/main/resources/assets/drglaserpointer/lang/ru_ru.json @@ -1,6 +1,7 @@ { "item.drglaserpointer.laser_pointer": "Лазерная указка", "laser_pointer.tooltip": "<%1$s+Прокрутка мыши> сменить цвет", + "laser_pointer1.tooltip": "<%1$s> Переключиться на руку", "tip.drglaserpointer.distance": "%1$s м", "tip.drglaserpointer.mark_key": "%1$s для отметки", diff --git a/src/main/resources/assets/drglaserpointer/lang/sv_se.json b/src/main/resources/assets/drglaserpointer/lang/sv_se.json index 12945be..e399beb 100644 --- a/src/main/resources/assets/drglaserpointer/lang/sv_se.json +++ b/src/main/resources/assets/drglaserpointer/lang/sv_se.json @@ -1,6 +1,7 @@ { "item.drglaserpointer.laser_pointer": "Laserpekare", "laser_pointer.tooltip": "<%1$s+Musscroll> byt färg", + "laser_pointer1.tooltip": "<%1$s> Byt till hand", "tip.drglaserpointer.distance": "%1$s m", "tip.drglaserpointer.mark_key": "%1$s för att markera", diff --git a/src/main/resources/assets/drglaserpointer/lang/zh_cn.json b/src/main/resources/assets/drglaserpointer/lang/zh_cn.json index 072a355..f557b55 100644 --- a/src/main/resources/assets/drglaserpointer/lang/zh_cn.json +++ b/src/main/resources/assets/drglaserpointer/lang/zh_cn.json @@ -1,6 +1,7 @@ { "item.drglaserpointer.laser_pointer": "激光指示器", "laser_pointer.tooltip": "<%1$s+鼠标滚轮> 切换颜色", + "laser_pointer1.tooltip": "<%1$s> 切换到手上", "tip.drglaserpointer.distance": "%1$s 米", "tip.drglaserpointer.mark_key": "按%1$s进行标记", diff --git a/src/main/resources/assets/drglaserpointer/lang/zh_hk.json b/src/main/resources/assets/drglaserpointer/lang/zh_hk.json index a77544b..923e1c2 100644 --- a/src/main/resources/assets/drglaserpointer/lang/zh_hk.json +++ b/src/main/resources/assets/drglaserpointer/lang/zh_hk.json @@ -1,6 +1,7 @@ { "item.drglaserpointer.laser_pointer": "雷射指示器", "laser_pointer.tooltip": "<%1$s+鼠標滾輪> 切換顏色", + "laser_pointer1.tooltip": "<%1$s> 切換到手上", "tip.drglaserpointer.distance": "%1$s 米", "tip.drglaserpointer.mark_key": "按%1$s進行標記", diff --git a/src/main/resources/assets/drglaserpointer/lang/zh_tw.json b/src/main/resources/assets/drglaserpointer/lang/zh_tw.json index a96ed98..29e2f50 100644 --- a/src/main/resources/assets/drglaserpointer/lang/zh_tw.json +++ b/src/main/resources/assets/drglaserpointer/lang/zh_tw.json @@ -1,6 +1,7 @@ { "item.drglaserpointer.laser_pointer": "雷射指示器", "laser_pointer.tooltip": "<%1$s+鼠標滾輪> 切換顏色", + "laser_pointer1.tooltip": "<%1$s> 切換到手上", "tip.drglaserpointer.distance": "%1$s 米", "tip.drglaserpointer.mark_key": "按%1$s進行標記",