From 0f980518c4bfd448b20946a19260a4d900bb76c3 Mon Sep 17 00:00:00 2001
From: Integer Limit <103940576+IntegerLimit@users.noreply.github.com>
Date: Tue, 9 Apr 2024 14:06:17 +1000
Subject: [PATCH] Remove Double or Unneeded Tooltips on Custom Items (#715)

Fixes #714

The Eternal Catalyst Tooltip has been implemented in https://github.com/Nomi-CEu/Nomi-Labs/blob/main/src/main/java/com/nomiceu/nomilabs/item/registry/register/LabsEndgame.java#L17.

The Ultimate Gem and Generator tooltips, which specify that their recipe is shapeless, is not needed, as a shapeless icon is shown in the JEI pages for their recipes.

/* Git Stuff */

[BUG]
[IGNORE]
checks = { compareNot = "1.7-alpha-3" }
[IGNORE]

[FIXUP]
[[fixes]]
sha = "2f6ca989e7522039fb49d62fa4e64f00d152d2b5"
mode = "ADDITION"
newBody = "[QOL]"

[[fixes]]
sha = "bd58b9072f45d647734ae66168cbd27bf9b2f220"
newTitle = "Update GT and Related Mods for 1.7"
newBody = '''
[EXPAND]
[[messages]]
  messageTitle = "Update GT to 2.8+, add Nomi Labs"
  messageBody = """
    [BREAKING]
    [DETAILS]
    details = [
      \"**Please DO NOT revert any saves that have been loaded in this release to 1.7-alpha-2a or prior! (Including 1.6.1b & 1.6.1a!)**\",
      \"**Lots of Recipes have been moved to the Assembly Line, and now require Assembly Line Research.**\",
      \"Adds Assembly Line Research\",
      \"Adds ME Hatches and Buses, for combining Multiblocks with AE Networks\",
      \"Adds Filtered Output Hatches\",
      \"Adds EU Multiblock Power Storage\",
      \"Adds Multiblock Transformer and Laser Power Transfer\",
      \"Adds Long Distance Pipes\",
      \"Creating Waypoints in the Prospector\",
      \"Fixing many Bugs\",
      \"And many more!\"
    ]
    [DETAILS]
    [PRIORITY]
    priority = 10
    [PRIORITY]
  """

[[messages]]
  messageTitle = "Multiblock Changes"
  messageBody = """
    [BREAKING]
    [DETAILS]
    details = [
      \"**Multiblock Overclocking Logic has Changed.**\",
      [
        \"The Maximum Voltage of a Recipe a Multiblock can run, for 1A, 4A and 16A Energy Hatches, is dependent on the Tier of its Hatches.\",
        \"You can increase the Maximum Voltage by 1, for 1A, 4A and 16A Energy Hatches, by Adding Another Hatch.\",
        \"However, the Maximum Overclock Voltage still takes into account the Amperage and Voltage, and retains its previous behaviour (4 Amps = +1 Voltage).\",
      ],
      \"Multiblocks accept a new **maximum** of 2 Energy Hatches. GCYM Machines only accept **1**.\",
      \"All Custom Multiblocks, such as Naquadah Reactors and Multiverse Projectors, now have **minimum casing requirements** and a **maintenance hatch**.\",
      \"Some Custom Multiblocks now have Distinct Mode\",
      \"All Custom Multiblocks now have custom Front Overlays\",
      \"Reworked & Improved Multiblock UIs\"
    ]
    [DETAILS]
    [PRIORITY]
    priority = 5
    [PRIORITY]
  """

[EXPAND]
'''
[FIXUP]
---
 overrides/scripts/extendedcrafting.zs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/overrides/scripts/extendedcrafting.zs b/overrides/scripts/extendedcrafting.zs
index c9b9542..6d7055b 100644
--- a/overrides/scripts/extendedcrafting.zs
+++ b/overrides/scripts/extendedcrafting.zs
@@ -453,7 +453,6 @@ makeExtremeRecipe9(<nomilabs:eternalcatalyst>,
       J : <moreplates:empowered_palis_gear>,
       K : <moreplates:empowered_restonia_gear>,
       L : <moreplates:empowered_void_gear> });
-<nomilabs:eternalcatalyst>.addTooltip(format.darkGray(format.italic("Gaze into the Abyss...")));
 
 
 ////////////////////////// Infinity Ingot ///////////////////////
@@ -522,8 +521,6 @@ mods.extendedcrafting.TableCrafting.addShapeless(<nomilabs:ultimate_gem>,
      <redstonearsenal:material:160>,
      <minecraft:diamond>,
      <thermalfoundation:material:895>]);
-<nomilabs:ultimate_gem>.addTooltip(format.yellow("Recipe is shapeless."));
-
 
 
 
@@ -869,7 +866,6 @@ mods.extendedcrafting.TableCrafting.addShapeless(<nomilabs:ultimate_generator>,
 <meta_tile_entity:large_turbine.steam>, <meta_tile_entity:steam_turbine.lv>, xu13, xu12, xu11, xu10, xu09, <meta_tile_entity:gas_turbine.hv>, <meta_tile_entity:large_turbine.plasma>,
 <solarflux:solar_panel_1>, <solarflux:solar_panel_4>, <meta_tile_entity:steam_turbine.mv>, <meta_tile_entity:steam_turbine.hv>, <meta_tile_entity:large_turbine.gas>, <meta_tile_entity:gas_turbine.lv>, <meta_tile_entity:gas_turbine.mv>, <solarflux:solar_panel_chaotic>, <solarflux:solar_panel_draconic>,
 <solarflux:solar_panel_2>, <solarflux:solar_panel_3>, <solarflux:solar_panel_5>, <solarflux:solar_panel_6>, <extrautils2:passivegenerator>, <solarflux:solar_panel_7>, <solarflux:solar_panel_8>, <solarflux:solar_panel_wyvern>, <solarflux:solar_panel_neutronium>]);
-<nomilabs:ultimate_generator>.addTooltip(format.yellow("Recipe is shapeless."));
 
 
 //Ultimate Power Storage