From e6707b2ddd6e691be25ad8a3c3dcf77ca5a56c29 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Mon, 23 Dec 2019 17:21:33 +0300 Subject: [PATCH] Active\Inactive tooltip moved to RC. --- .../tool/industrial/IndustrialChainsawItem.java | 6 +----- .../tool/industrial/IndustrialDrillItem.java | 6 +----- .../industrial/IndustrialJackhammerItem.java | 2 +- .../items/tool/industrial/NanosaberItem.java | 17 ++++++----------- 4 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/main/java/techreborn/items/tool/industrial/IndustrialChainsawItem.java b/src/main/java/techreborn/items/tool/industrial/IndustrialChainsawItem.java index 6b351a91e..47ecfc84e 100644 --- a/src/main/java/techreborn/items/tool/industrial/IndustrialChainsawItem.java +++ b/src/main/java/techreborn/items/tool/industrial/IndustrialChainsawItem.java @@ -164,11 +164,7 @@ public class IndustrialChainsawItem extends ChainsawItem { @Environment(EnvType.CLIENT) @Override public void appendTooltip(ItemStack stack, @Nullable World worldIn, List tooltip, TooltipContext flagIn) { - if (!ItemUtils.isActive(stack)) { - tooltip.add(new LiteralText(Formatting.YELLOW + "Shear: " + Formatting.RED + StringUtils.t("techreborn.message.nanosaberInactive"))); - } else { - tooltip.add(new LiteralText(Formatting.YELLOW + "Shear: " + Formatting.GREEN + StringUtils.t("techreborn.message.nanosaberActive"))); - } + ItemUtils.buildActiveTooltip(stack, tooltip); } @Override diff --git a/src/main/java/techreborn/items/tool/industrial/IndustrialDrillItem.java b/src/main/java/techreborn/items/tool/industrial/IndustrialDrillItem.java index 9c9275fdc..e283b89c2 100644 --- a/src/main/java/techreborn/items/tool/industrial/IndustrialDrillItem.java +++ b/src/main/java/techreborn/items/tool/industrial/IndustrialDrillItem.java @@ -216,11 +216,7 @@ public class IndustrialDrillItem extends DrillItem { @Environment(EnvType.CLIENT) @Override public void appendTooltip(ItemStack stack, @Nullable World worldIn, List tooltip, TooltipContext flagIn) { - if (!ItemUtils.isActive(stack)) { - tooltip.add(new LiteralText(Formatting.YELLOW + "Shear: " + Formatting.RED + StringUtils.t("techreborn.message.nanosaberInactive"))); - } else { - tooltip.add(new LiteralText(Formatting.YELLOW + "Shear: " + Formatting.GREEN + StringUtils.t("techreborn.message.nanosaberActive"))); - } + ItemUtils.buildActiveTooltip(stack, tooltip); } @Environment(EnvType.CLIENT) diff --git a/src/main/java/techreborn/items/tool/industrial/IndustrialJackhammerItem.java b/src/main/java/techreborn/items/tool/industrial/IndustrialJackhammerItem.java index 38ea40156..7b56bebfb 100644 --- a/src/main/java/techreborn/items/tool/industrial/IndustrialJackhammerItem.java +++ b/src/main/java/techreborn/items/tool/industrial/IndustrialJackhammerItem.java @@ -39,7 +39,7 @@ public class IndustrialJackhammerItem extends JackhammerItem { // 4M FE max charge with 1k charge rate public IndustrialJackhammerItem() { - super(ToolMaterials.IRON, TechRebornConfig.industrialJackhammerCharge); + super(ToolMaterials.DIAMOND, TechRebornConfig.industrialJackhammerCharge); this.cost = 250; this.transferLimit = 1000; } diff --git a/src/main/java/techreborn/items/tool/industrial/NanosaberItem.java b/src/main/java/techreborn/items/tool/industrial/NanosaberItem.java index a22f32215..3fe5ab391 100644 --- a/src/main/java/techreborn/items/tool/industrial/NanosaberItem.java +++ b/src/main/java/techreborn/items/tool/industrial/NanosaberItem.java @@ -38,7 +38,6 @@ import net.minecraft.item.*; import net.minecraft.nbt.CompoundTag; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import net.minecraft.util.*; import net.minecraft.world.World; import reborncore.api.items.ItemStackModifiers; @@ -123,7 +122,7 @@ public class NanosaberItem extends SwordItem implements EnergyHolder, ItemDurabi + Formatting.GOLD + StringUtils.t("techreborn.message.nanosaberActive"))); } } else { - stack.getTag().putBoolean("isActive", false); + stack.getOrCreateTag().putBoolean("isActive", false); if (world.isClient) { ChatUtils.sendNoSpamMessages(MessageIDs.nanosaberID, new LiteralText( Formatting.GRAY + StringUtils.t("techreborn.message.setTo") + " " @@ -144,7 +143,7 @@ public class NanosaberItem extends SwordItem implements EnergyHolder, ItemDurabi Formatting.GRAY + StringUtils.t("techreborn.message.nanosaberEnergyError") + " " + Formatting.GOLD + StringUtils.t("techreborn.message.nanosaberDeactivating"))); } - stack.getTag().putBoolean("isActive", false); + stack.getOrCreateTag().putBoolean("isActive", false); } } @@ -177,16 +176,16 @@ public class NanosaberItem extends SwordItem implements EnergyHolder, ItemDurabi } ItemStack inactiveUncharged = new ItemStack(this); inactiveUncharged.setTag(new CompoundTag()); - inactiveUncharged.getTag().putBoolean("isActive", false); + inactiveUncharged.getOrCreateTag().putBoolean("isActive", false); ItemStack inactiveCharged = new ItemStack(TRContent.NANOSABER); inactiveCharged.setTag(new CompoundTag()); - inactiveCharged.getTag().putBoolean("isActive", false); + inactiveCharged.getOrCreateTag().putBoolean("isActive", false); Energy.of(inactiveCharged).set(Energy.of(inactiveCharged).getMaxStored()); ItemStack activeCharged = new ItemStack(TRContent.NANOSABER); activeCharged.setTag(new CompoundTag()); - activeCharged.getTag().putBoolean("isActive", true); + activeCharged.getOrCreateTag().putBoolean("isActive", true); Energy.of(activeCharged).set(Energy.of(activeCharged).getMaxStored()); itemList.add(inactiveUncharged); @@ -197,11 +196,7 @@ public class NanosaberItem extends SwordItem implements EnergyHolder, ItemDurabi @Environment(EnvType.CLIENT) @Override public void appendTooltip(ItemStack stack, @Nullable World worldIn, List tooltip, TooltipContext flagIn) { - if (!ItemUtils.isActive(stack)) { - tooltip.add(new TranslatableText("techreborn.message.nanosaberInactive").formatted(Formatting.GRAY)); - } else { - tooltip.add(new TranslatableText("techreborn.message.nanosaberActive").formatted(Formatting.GRAY)); - } + ItemUtils.buildActiveTooltip(stack, tooltip); } // IEnergyItemInfo