Show shifted tooltips in advanced tooltip mode

Required for CyclopsMC/IntegratedDynamics#1596

Author: rubensworks

loader-common/src/main/java/org/cyclops/cyclopscore/helper/IL10NHelpers.java

@@ -2,6 +2,7 @@
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
+import net.minecraft.world.item.TooltipFlag;
 
 import java.util.function.Consumer;
 
@@ -22,6 +23,11 @@ public default String getInfoPrefix() {
 
     public void addStatusInfo(Consumer<Component> tooltipAdder, boolean isEnabled, String statusPrefixKey);
 
-    public void addOptionalInfo(Consumer<Component> tooltipAdder, String prefix);
+    @Deprecated // TODO: rm in next major
+    public default void addOptionalInfo(Consumer<Component> tooltipAdder, String prefix) {
+        addOptionalInfo(tooltipAdder, prefix, TooltipFlag.NORMAL);
+    }
+
+    public void addOptionalInfo(Consumer<Component> tooltipAdder, String prefix, TooltipFlag tooltipFlag);
 
 }

loader-common/src/main/java/org/cyclops/cyclopscore/helper/L10NHelpersCommon.java

@@ -5,6 +5,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.Style;
 import net.minecraft.network.chat.TextColor;
+import net.minecraft.world.item.TooltipFlag;
 import org.cyclops.cyclopscore.Reference;
 
 import java.util.Arrays;
@@ -43,10 +44,10 @@ public void addStatusInfo(Consumer<Component> tooltipAdder, boolean isEnabled, S
     }
 
     @Override
-    public void addOptionalInfo(Consumer<Component> tooltipAdder, String prefix) {
+    public void addOptionalInfo(Consumer<Component> tooltipAdder, String prefix, TooltipFlag tooltipFlag) {
         String key = prefix + ".info";
         if (I18n.exists(key)) {
-            if (modHelpers.getMinecraftClientHelpers().isShifted()) {
+            if (tooltipFlag.isAdvanced() || modHelpers.getMinecraftClientHelpers().isShifted()) {
                 String localized = localize(key);
                 StringHelpers.splitLines(localized, getMaxTooltipLineLength(), getInfoPrefix())
                         .stream()

loader-fabric/src/main/java/org/cyclops/cyclopscore/item/ItemInformationProviderFabric.java

@@ -15,7 +15,7 @@
 public class ItemInformationProviderFabric extends ItemInformationProviderCommon {
     public static void onTooltip(ItemStack itemStack, Item.TooltipContext tooltipContext, TooltipFlag tooltipFlag, List<Component> lines) {
         if (ITEMS_INFO.contains(itemStack.getItem())) {
-            CyclopsCoreFabric._instance.getModHelpers().getL10NHelpers().addOptionalInfo(lines::add, itemStack.getItem().getDescriptionId());
+            CyclopsCoreFabric._instance.getModHelpers().getL10NHelpers().addOptionalInfo(lines::add, itemStack.getItem().getDescriptionId(), tooltipFlag);
         }
     }
 }

loader-forge/src/main/java/org/cyclops/cyclopscore/item/ItemInformationProviderForge.java

@@ -13,7 +13,7 @@ public class ItemInformationProviderForge extends ItemInformationProviderCommon
     public static void onTooltip(ItemTooltipEvent event) {
         ItemStack itemStack = event.getItemStack();
         if (ITEMS_INFO.contains(itemStack.getItem())) {
-            ModHelpersForge.INSTANCE.getL10NHelpers().addOptionalInfo(event.getToolTip()::add, itemStack.getItem().getDescriptionId());
+            ModHelpersForge.INSTANCE.getL10NHelpers().addOptionalInfo(event.getToolTip()::add, itemStack.getItem().getDescriptionId(), event.getFlags());
         }
     }
 

loader-neoforge/src/main/java/org/cyclops/cyclopscore/item/ItemInformationProviderNeoForge.java

@@ -13,7 +13,7 @@ public class ItemInformationProviderNeoForge extends ItemInformationProviderComm
     public static void onTooltip(ItemTooltipEvent event) {
         ItemStack itemStack = event.getItemStack();
         if (ITEMS_INFO.contains(itemStack.getItem())) {
-            ModHelpersNeoForge.INSTANCE.getL10NHelpers().addOptionalInfo(event.getToolTip()::add, itemStack.getItem().getDescriptionId());
+            ModHelpersNeoForge.INSTANCE.getL10NHelpers().addOptionalInfo(event.getToolTip()::add, itemStack.getItem().getDescriptionId(), event.getFlags());
         }
     }