From c6e31c2434bd3fa1ad1e9ff87168becb647cf482 Mon Sep 17 00:00:00 2001 From: flier268 Date: Fri, 11 Feb 2022 23:48:01 +0800 Subject: [PATCH] Add Mining Level and Composting Chance --- .../com/flier268/more_tooltips/ModConfig.java | 2 ++ .../more_tooltips/TooltipEventHandler.java | 31 +++++++++++++++++-- .../assets/more_tooltips/lang/en_us.json | 6 +++- .../assets/more_tooltips/lang/zh_tw.json | 6 +++- 4 files changed, 40 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/flier268/more_tooltips/ModConfig.java b/src/main/java/com/flier268/more_tooltips/ModConfig.java index 255c960..8026723 100644 --- a/src/main/java/com/flier268/more_tooltips/ModConfig.java +++ b/src/main/java/com/flier268/more_tooltips/ModConfig.java @@ -19,6 +19,8 @@ public class ModConfig implements ConfigData { public Options RepairCost = Options.onShift; public Options Enchantability = Options.onShift; public Options MiningLevel = Options.show; + public Options LightLevel = Options.show; + public Options CompostingChance = Options.show; public enum Options { hide, diff --git a/src/main/java/com/flier268/more_tooltips/TooltipEventHandler.java b/src/main/java/com/flier268/more_tooltips/TooltipEventHandler.java index 67b6b24..91ce443 100644 --- a/src/main/java/com/flier268/more_tooltips/TooltipEventHandler.java +++ b/src/main/java/com/flier268/more_tooltips/TooltipEventHandler.java @@ -1,7 +1,11 @@ package com.flier268.more_tooltips; +import java.text.DecimalFormat; +import java.util.Map; + import me.shedaniel.autoconfig.AutoConfig; import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback; +import net.minecraft.block.ComposterBlock; import net.minecraft.block.entity.AbstractFurnaceBlockEntity; import net.minecraft.client.gui.screen.Screen; import net.minecraft.item.FoodComponent; @@ -14,11 +18,9 @@ import net.minecraft.text.TextColor; import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; +import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import java.text.DecimalFormat; -import java.util.Map; - public class TooltipEventHandler { private static Map FuelTimeMap = null; @@ -42,6 +44,8 @@ public static void addMoreTooltip() { return; } Item item = itemStack.getItem(); + Identifier itemId = Registry.ITEM.getKey(item).get().getValue(); + // Tooltip - Burn Time if (config.BurnTime.isShown(isShiftDown, config.debug)) { if (ItemTags.getTagGroup().getTags().size() > 0) { @@ -140,6 +144,27 @@ public static void addMoreTooltip() { .fillStyle(DARK_GRAY)); } } + + // Tooltip - Light level + if (config.LightLevel.isShown(isShiftDown, config.debug)) { + int luminance = Registry.BLOCK.get(itemId).getDefaultState().getLuminance(); + if (luminance > 0) { + list.add(new TranslatableText("tooltip.more_tooltips.LightLevel") + .append(new LiteralText(" " + luminance)) + .fillStyle(DARK_GRAY)); + } + } + + // Tooltip - Composting chance + if (config.CompostingChance.isShown(isShiftDown, config.debug)) { + float chance = ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.getFloat(item); + if (chance > 0.0) { + list.add(new TranslatableText("tooltip.more_tooltips.CompostingChance") + .append(new LiteralText(" " + String.format("%.0f%%", chance * 100))) + .fillStyle(DARK_GRAY)); + } + } + if (isShiftDown && config.debug) list.add(new LiteralText("Powered by flier268").fillStyle(AQUA)); }); diff --git a/src/main/resources/assets/more_tooltips/lang/en_us.json b/src/main/resources/assets/more_tooltips/lang/en_us.json index 348dc4f..9353d5e 100644 --- a/src/main/resources/assets/more_tooltips/lang/en_us.json +++ b/src/main/resources/assets/more_tooltips/lang/en_us.json @@ -16,6 +16,8 @@ "text.autoconfig.more_tooltips.option.RepairCost": "Exp Cost when repair", "text.autoconfig.more_tooltips.option.Enchantability": "Enchantability of tool", "text.autoconfig.more_tooltips.option.MiningLevel": "Mining Level of tool", + "text.autoconfig.more_tooltips.option.CompostingChance": "Composting chance", + "text.autoconfig.more_tooltips.option.LightLevel": "Light Level", "_comment": "Tooltips", "tooltip.more_tooltips.burnTime": "Burn Time:", @@ -29,5 +31,7 @@ "tooltip.more_tooltips.translationKey": "Translation Key:", "tooltip.more_tooltips.RepairCost": "Repair Cost:", "tooltip.more_tooltips.Enchantability": "Enchantability:", - "tooltip.more_tooltips.MiningLevel": "Mining Level:" + "tooltip.more_tooltips.MiningLevel": "Mining Level:", + "tooltip.more_tooltips.CompostingChance": "Composting chance:", + "tooltip.more_tooltips.LightLevel": "Light Level:" } \ No newline at end of file diff --git a/src/main/resources/assets/more_tooltips/lang/zh_tw.json b/src/main/resources/assets/more_tooltips/lang/zh_tw.json index dce4bd4..9696ffd 100644 --- a/src/main/resources/assets/more_tooltips/lang/zh_tw.json +++ b/src/main/resources/assets/more_tooltips/lang/zh_tw.json @@ -16,6 +16,8 @@ "text.autoconfig.more_tooltips.option.RepairCost": "修復所需經驗", "text.autoconfig.more_tooltips.option.Enchantability": "附魔性", "text.autoconfig.more_tooltips.option.MiningLevel": "挖掘等級", + "text.autoconfig.more_tooltips.option.CompostingChance": "堆肥機率", + "text.autoconfig.more_tooltips.option.LightLevel": "亮度", "_comment": "Tooltips", "tooltip.more_tooltips.burnTime": "燃燒時間:", @@ -29,5 +31,7 @@ "tooltip.more_tooltips.translationKey": "語言文件ID:", "tooltip.more_tooltips.RepairCost": "修復需要經驗:", "tooltip.more_tooltips.Enchantability": "附魔性:", - "tooltip.more_tooltips.MiningLevel": "挖掘等級:" + "tooltip.more_tooltips.MiningLevel": "挖掘等級:", + "tooltip.more_tooltips.CompostingChance": "堆肥機率:", + "tooltip.more_tooltips.LightLevel": "亮度:" } \ No newline at end of file