From 226cd449fe4844b2b2c84cebdd6bfaf3cec9a313 Mon Sep 17 00:00:00 2001 From: Integer Limit <103940576+IntegerLimit@users.noreply.github.com> Date: Sat, 13 Jul 2024 19:32:07 +1000 Subject: [PATCH] Port Tooltips to Groovy + Fix Fluids in JEI (#796) [EXPAND] [[messages]] messageTitle = "Port Tooltips to Groovy (#796) messageBody = ''' [FEATURE] [DETAILS] detail = "Tooltips are now Localisable!" [DETAILS] ''' [[messages]] messageTitle = "Fix Fluids in JEI (#796)" messageBody = ''' [BUG] [DETAILS] details = [ "Fixes Some Fluids being Items in JEI", "Adds Information about Temperature to all Fluids", ] [DETAILS] ''' [EXPAND] --- manifest.json | 2 +- .../Main/General/Misc/fluids.groovy | 130 +++++++++++ .../Main/General/Misc/tooltips.groovy | 210 ++++++++++++++++++ overrides/resources/modpack/lang/en_us.lang | 98 ++++++-- overrides/scripts/AE2.zs | 27 --- overrides/scripts/AdvRocketry.zs | 5 - overrides/scripts/Alchemy.zs | 2 - overrides/scripts/AppliedEnergistics2.zs | 62 ++---- overrides/scripts/Darkutils.zs | 1 - overrides/scripts/Earlygame.zs | 11 - overrides/scripts/JEICleanup.zs | 10 +- overrides/scripts/Microverse.zs | 10 - overrides/scripts/ProjectRed.zs | 1 - overrides/scripts/_oreDict.zs | 10 - overrides/scripts/aa xu2.zs | 9 - overrides/scripts/dml.zs | 4 - overrides/scripts/normalmode.zs | 3 - overrides/scripts/xTones.zs | 1 - 18 files changed, 441 insertions(+), 155 deletions(-) create mode 100644 overrides/groovy/postInit/Post-Initial/Main/General/Misc/fluids.groovy create mode 100644 overrides/groovy/postInit/Post-Initial/Main/General/Misc/tooltips.groovy delete mode 100644 overrides/scripts/AE2.zs diff --git a/manifest.json b/manifest.json index f26bef7..3115fda 100644 --- a/manifest.json +++ b/manifest.json @@ -751,7 +751,7 @@ }, { "projectID": 932060, - "fileID": 5525146, + "fileID": 5525879, "required": true }, { diff --git a/overrides/groovy/postInit/Post-Initial/Main/General/Misc/fluids.groovy b/overrides/groovy/postInit/Post-Initial/Main/General/Misc/fluids.groovy new file mode 100644 index 0000000..c49b5bf --- /dev/null +++ b/overrides/groovy/postInit/Post-Initial/Main/General/Misc/fluids.groovy @@ -0,0 +1,130 @@ +import com.nomiceu.nomilabs.fluid.registry.LabsFluids +import gregtech.api.fluids.FluidState +import gregtech.api.util.FluidTooltipUtil +import mezz.jei.api.ingredients.VanillaTypes +import net.minecraft.item.ItemStack +import net.minecraftforge.fluids.Fluid +import net.minecraftforge.fluids.FluidStack +import net.minecraftforge.fluids.FluidUtil + +/* + * This File fixes Fluids being Items in JEI, as well as adding GT Tooltips to all Fluids. + * + * GT Tooltips are important as GT Pipe Temperature Constraints (Cryogenic, Max Temp, etc.), still apply to non-GT Fluids. + * + * Redstone (aka Destabilized Redstone) and Glowstone (aka Energized Glowstone) do not need tooltips added, as they have + * the same name as a GT material. + */ + +/* Thermal Foundation */ + +// Removals +hideFluidItemBucket(item('thermalfoundation:fluid_crude_oil'), fluid('crude_oil')) +hideFluidBucket(fluid('refined_oil')) +hideFluidBucket(fluid('coal')) +hideFluidBucket(fluid('refined_fuel')) +hideFluidBucket(fluid('sap')) +hideFluidBucket(fluid('syrup')) +hideFluidBucket(fluid('resin')) +hideFluidBucket(fluid('tree_oil')) +hideFluidBucket(fluid('biocrude')) +hideFluidBucket(fluid('refined_biofuel')) +hideFluidBucket(fluid('mushroom_stew')) +hideFluidBucket(fluid('experience')) +hideFluidBucket(fluid('potion')) +hideFluidBucket(fluid('potion_splash')) +hideFluidBucket(fluid('potion_lingering')) + +// Fixes (Without Tooltip) +fixItemFluid(item('thermalfoundation:fluid_redstone'), fluid('redstone')) +fixItemFluid(item('thermalfoundation:fluid_glowstone'), fluid('glowstone')) + +// Fixes (With Tooltip) +fixItemFluidTooltip(item('thermalfoundation:fluid_ender'), fluid('ender')) +fixItemFluidTooltip(item('thermalfoundation:fluid_pyrotheum'), fluid('pyrotheum')) +fixItemFluidTooltip(item('thermalfoundation:fluid_cryotheum'), fluid('cryotheum')) +fixItemFluidTooltip(item('thermalfoundation:fluid_aerotheum'), fluid('aerotheum'), FluidState.GAS) +fixItemFluidTooltip(item('thermalfoundation:fluid_petrotheum'), fluid('petrotheum')) +fixItemFluidTooltip(item('thermalfoundation:fluid_mana'), fluid('mana')) + +/* Nomi Labs */ + +// Tooltip Additions +for (Fluid labsFluid : LabsFluids.BLOCKS.keySet()) { + addFluidTooltip(new FluidStack(labsFluid, 1)) +} + +/* Advanced Rocketry */ + +// Removals +// Interestingly, there is no bucket form of Advanced Rocketry Fluids. +mods.jei.ingredient.hide(VanillaTypes.FLUID, fluid('rocketfuel')) +mods.jei.ingredient.hide(VanillaTypes.FLUID, fluid('enrichedlava')) + +/* Ender IO */ + +// Tooltip Additions +addFluidTooltip(fluid('nutrient_distillation')) +addFluidTooltip(fluid('ender_distillation')) +addFluidTooltip(fluid('vapor_of_levity'), FluidState.GAS) +addFluidTooltip(fluid('hootch')) +addFluidTooltip(fluid('fire_water')) +addFluidTooltip(fluid('xpjuice')) +addFluidTooltip(fluid('liquid_sunshine')) +addFluidTooltip(fluid('cloud_seed')) +addFluidTooltip(fluid('cloud_seed_concentrated')) + +/* Actually Additions */ + +// Fixes (With Tooltip) +fixItemFluidTooltip(item('actuallyadditions:block_canola_oil'), fluid('canolaoil')) +fixItemFluidTooltip(item('actuallyadditions:block_refined_canola_oil'), fluid('refinedcanolaoil')) +fixItemFluidTooltip(item('actuallyadditions:block_crystal_oil'), fluid('crystaloil')) +fixItemFluidTooltip(item('actuallyadditions:block_empowered_oil'), fluid('empoweredoil')) + +/* Util Functions */ + +/** + * Replaces 'Item Fluids', or fluids that are actually items in JEI, with actual fluid stacks. + */ +static void fixItemFluid(ItemStack itemForm, FluidStack fluidForm) { + mods.jei.ingredient.hide(itemForm) + mods.jei.ingredient.add(VanillaTypes.FLUID, fluidForm * 1000) +} + +/** + * Adds GT Tooltips to a fluid. Once added, cannot be removed via reloading. + * (To be replaced by a Labs one in a future version of Labs) + */ +static void addFluidTooltip(FluidStack fluidForm, FluidState type = FluidState.LIQUID) { + var existing = FluidTooltipUtil.getFluidTooltip(fluidForm.fluid) + + // Only Register if Not Already Registered (aka previous runs of this script) + // However, this is not reloadable. To be fixed in a future version of Labs. + if (existing != null && existing.isEmpty()) + FluidTooltipUtil.registerTooltip(fluidForm.fluid, FluidTooltipUtil.createFluidTooltip(null, fluidForm.fluid, type)) +} + +/** + * Does both of the above two util functions. + */ +static void fixItemFluidTooltip(ItemStack itemForm, FluidStack fluidForm, FluidState type = FluidState.LIQUID) { + fixItemFluid(itemForm, fluidForm) + addFluidTooltip(fluidForm, type) +} + +/** + * Hides the Item Form and Bucket of a Fluid in JEI. + */ +static void hideFluidItemBucket(ItemStack itemForm, FluidStack fluidForm) { + mods.jei.ingredient.hide(itemForm) + mods.jei.ingredient.hide(FluidUtil.getFilledBucket(fluidForm * 1000)) +} + +/** + * Hides the Fluid Form and Bucket of a Fluid in JEI. + */ +static void hideFluidBucket(FluidStack fluidForm) { + mods.jei.ingredient.hide(VanillaTypes.FLUID, fluidForm) + mods.jei.ingredient.hide(FluidUtil.getFilledBucket(fluidForm * 1000)) +} diff --git a/overrides/groovy/postInit/Post-Initial/Main/General/Misc/tooltips.groovy b/overrides/groovy/postInit/Post-Initial/Main/General/Misc/tooltips.groovy new file mode 100644 index 0000000..c6e5f08 --- /dev/null +++ b/overrides/groovy/postInit/Post-Initial/Main/General/Misc/tooltips.groovy @@ -0,0 +1,210 @@ +import appeng.core.AEConfig +import appeng.core.features.AEFeature +import com.nomiceu.nomilabs.util.LabsModeHelper +import net.minecraft.item.ItemStack + +import static com.nomiceu.nomilabs.groovy.GroovyHelpers.TooltipHelpers.* +import static com.nomiceu.nomilabs.groovy.GroovyHelpers.TranslationHelpers.* + +/* Actually Additions */ + +// Drill Core +addTooltip(item('actuallyadditions:item_misc', 16), translatable('nomiceu.tooltip.actuallyadditions.drill_core.1')) +if (LabsModeHelper.normal) { + addTooltip(item('actuallyadditions:item_misc', 16), [translatableEmpty(), translatable('nomiceu.tooltip.actuallyadditions.drill_core.2')]) +} + +// Canola +addTooltip(item('actuallyadditions:item_misc', 13), [ + translatable('nomiceu.tooltip.actuallyadditions.canola.1'), + translatable('nomiceu.tooltip.actuallyadditions.canola.2'), +]) + +// Canola Press +addTooltip(item('actuallyadditions:block_canola_press'), translatable('nomiceu.tooltip.actuallyadditions.canola_press')) + +// Knife +addTooltip(item('actuallyadditions:item_knife'), translatable('nomiceu.tooltip.actuallyadditions.knife')) + +// Solidified XP +if (LabsModeHelper.normal) { + addTooltip(item('actuallyadditions:item_solidified_experience'), [ + translatable('nomiceu.tooltip.actuallyadditions.solidifed_xp.normal.1'), + translatable('nomiceu.tooltip.actuallyadditions.solidifed_xp.normal.2'), + ]) +} else { + addTooltip(item('actuallyadditions:item_solidified_experience'), translatable('nomiceu.tooltip.actuallyadditions.solidifed_xp.expert')) +} + +/* Advanced Rocketry */ + +// Orbital Laser Drill +addTooltip(item('advancedrocketry:spacelaser'), [ + translatable('nomiceu.tooltip.advancedrocketry.orbital_laser_drill.1'), + translatable('nomiceu.tooltip.advancedrocketry.orbital_laser_drill.2'), + translatable('nomiceu.tooltip.advancedrocketry.orbital_laser_drill.3'), + translatableEmpty(), + translatable('nomiceu.tooltip.advancedrocketry.orbital_laser_drill.4'), + translatable('nomiceu.tooltip.advancedrocketry.orbital_laser_drill.5'), +]) + +// Basic Lens +addTooltip(item('advancedrocketry:lens'), translatable('nomiceu.tooltip.advancedrocketry.basic_lens')) + +/* AE2 & NAE2 */ + +// AE2 Wireless Crafting Terminal (Old Deprecated Items) +for (ItemStack deprecated : [item('ae2wtlib:infinity_booster_card'), item('wct:wct'), item('wct:magnet_card')]) { + addTooltip(deprecated, [ + translatable('nomiceu.tooltip.ae2.crafting_terminal_removal.1'), + translatable('nomiceu.tooltip.ae2.crafting_terminal_removal.2'), + translatable('nomiceu.tooltip.ae2.crafting_terminal_removal.3'), + ]) +} + +// Quantum Link Card +addTooltip(item('appliedenergistics2:material', 59), [ + translatable('nomiceu.tooltip.ae2.quantum_link_card.1'), + translatable('nomiceu.tooltip.ae2.quantum_link_card.2'), +]) + +// Pattern Expansion Card +addTooltip(item('appliedenergistics2:material', 58), translatable('nomiceu.tooltip.ae2.pattern_expansion_card')) + +// Crafting Card +addTooltip(item('appliedenergistics2:material', 53), translatable('nomiceu.tooltip.ae2.crafting_card')) + +// Acceleration Card +addTooltip(item('appliedenergistics2:material', 30), translatable('nomiceu.tooltip.ae2.acceleration_card')) + +// Magnet Card +addTooltip(item('appliedenergistics2:material', 60), translatable('nomiceu.tooltip.ae2.magnet_card')) + +// Inverter Card +addTooltip(item('appliedenergistics2:material', 30), translatable('nomiceu.tooltip.ae2.inverter_card')) + +// Fuzzy Card +addTooltip(item('appliedenergistics2:material', 29), translatable('nomiceu.tooltip.ae2.fuzzy_card')) + +// Capacity Card +addTooltip(item('appliedenergistics2:material', 27), translatable('nomiceu.tooltip.ae2.capacity_card')) + +// Redstone Card +addTooltip(item('appliedenergistics2:material', 26), translatable('nomiceu.tooltip.ae2.acceleration_card')) + +// Sticky Card +addTooltip(item('appliedenergistics2:material', 61), translatable('nomiceu.tooltip.ae2.sticky_card')) + +// Pure Certus Quartz +addTooltip(item('appliedenergistics2:material', 10), translatable('nomiceu.tooltip.ae2.pure_certus_quartz')) + +// Pure Nether Quartz +addTooltip(item('appliedenergistics2:material', 11), translatable('nomiceu.tooltip.ae2.pure_nether_quartz')) + +// Pure Fluix +addTooltip(item('appliedenergistics2:material', 12), translatable('nomiceu.tooltip.ae2.pure_fluix')) + +// Charged Certus +addTooltip(item('appliedenergistics2:material', 1), translatable('nomiceu.tooltip.ae2.charged_certus')) + +// P2P Tunnels +addTooltip(item('appliedenergistics2:part', 460), translatable('nomiceu.tooltip.ae2.p2p_me')) +addTooltip(item('appliedenergistics2:part', 469), translatable('nomiceu.tooltip.ae2.p2p_rf')) +addTooltip(item('appliedenergistics2:part', 463), translatable('nomiceu.tooltip.ae2.p2p_fluid')) +addTooltip(item('appliedenergistics2:part', 462), translatable('nomiceu.tooltip.ae2.p2p_item')) +addTooltip(item('appliedenergistics2:part', 467), translatable('nomiceu.tooltip.ae2.p2p_light')) +addTooltip(item('appliedenergistics2:part', 461), translatable('nomiceu.tooltip.ae2.p2p_redstone')) +addTooltip(item('appliedenergistics2:part', 470), translatable('nomiceu.tooltip.ae2.p2p_eu')) +addTooltip(item('nae2:part', 1), translatable('nomiceu.tooltip.ae2.p2p_interface')) + +// Dense Cables, Conduits, and Controller +// Only apply tooltip if channels not enabled (manually, by players) +if (!AEConfig.instance().isFeatureEnabled(AEFeature.CHANNELS)) { + // 20..36 = Covered Cables, 40..56 = Smart Cables, 60..76 = Dense Smart Cables, 500..516 = Dense Covered Cables + for (IntRange range : [20..36, 40..56, 60..76, 500..516]) { + for (int meta : range) { + addTooltip(item('appliedenergistics2:part', meta), [ + translatable('nomiceu.tooltip.ae2.channels_not_enabled'), + translatable('nomiceu.tooltip.ae2.dense'), + ]) + } + } + + // Dense Conduits + addTooltip(item('enderio:item_me_conduit', 1), [ + translatable('nomiceu.tooltip.ae2.channels_not_enabled'), + translatable('nomiceu.tooltip.ae2.dense'), + ]) + + // Controller + addTooltip(item('appliedenergistics2:controller'), [ + translatable('nomiceu.tooltip.ae2.channels_not_enabled'), + translatable('nomiceu.tooltip.ae2.controller'), + ]) +} + +// Facades +addTooltip(item('appliedenergistics2:facade'), translatable('nomiceu.tooltip.ae2.facade')) + +/* Dimensional Edibles */ + +// Island Cake +addTooltip(item('dimensionaledibles:island_cake'), [ + translatable('nomiceu.tooltip.dimensionaledibles.island_cake.1'), + translatable('nomiceu.tooltip.dimensionaledibles.island_cake.2'), +]) + +/* Dark Utils */ + +// Ender Tether +addTooltip(item('darkutils:ender_tether'), translatable('nomiceu.tooltip.darkutils.ender_tether')) + +/* Deep Mob Learning */ + +// Glitch Fragment +addTooltip(item('deepmoblearning:glitch_fragment'), translatable('nomiceu.tooltip.dml.glitch_fragment')) + +/* Thermal Expansion */ + +// Capacitors +for (int meta in 0..5) { + addTooltip(item('thermalexpansion:capacitor', meta), translatable('nomiceu.tooltip.thermalexpansion.capacitors')) +} + +/* GregTech */ + +// Prospectors +for (ItemStack prospector in [metaitem('prospector.lv'), metaitem('prospector.hv'), metaitem('prospector.luv')]) { + addTooltip(prospector, [ + translatableEmpty(), + translatable('nomiceu.tooltip.gregtech.prospector.1'), + translatable('nomiceu.tooltip.gregtech.prospector.2'), + translatable('nomiceu.tooltip.gregtech.prospector.3'), + translatable('nomiceu.tooltip.gregtech.prospector.4'), + ]) +} + +// Facades +addTooltip(metaitem('cover.facade'), [ + translatable('nomiceu.tooltip.gregtech.facade.1'), + translatable('nomiceu.tooltip.gregtech.facade.2'), +]) + +/* Extended Crafting */ + +// Omnium Trimmed Black Steel +clearTooltip(item('extendedcrafting:trimmed', 5)) +addTooltip(item('extendedcrafting:trimmed', 5), [ + translatable('nomiceu.tooltip.extendedcrafting.black_steel.omnium.1'), + translatable('nomiceu.tooltip.extendedcrafting.black_steel.omnium.2'), +]) + +/* Project Red */ + +// Transmission Wire +addTooltip(item('projectred-transmission:wire'), translatable('nomiceu.tooltip.projectred.wire')) + +/* XTones */ + +// Lamp +addTooltip(item('xtones:lamp_flat'), translatable('nomiceu.tooltip.xtones.lamp')) diff --git a/overrides/resources/modpack/lang/en_us.lang b/overrides/resources/modpack/lang/en_us.lang index 3d62dd5..444d6a2 100644 --- a/overrides/resources/modpack/lang/en_us.lang +++ b/overrides/resources/modpack/lang/en_us.lang @@ -1,16 +1,84 @@ -metaitem.circuit.energy_flow.name=Crystal Processor -metaitem.circuit.quantum_processor.name=§5Quantum Circuit -metaitem.circuit.nano_processor_assembly.name=Nanoprocessor -metaitem.circuit.nano_processor.name=Nanocircuit -metaitem.circuit.processor_assembly.name=Microprocessor -metaitem.circuit.basic_electronic.name=Electronic Circuit -metaitem.circuit.basic.name=Primitive Circuit -metaitem.quantumeye.name=Quantum Eye -metaitem.board.phenolic.name=Phenolic Substrate -metaitem.circuit.wetware_processor.name=Wetware Circuit -metaitem.circuit.wetware_assembly.name=Wetware Processor -metaitem.circuit.wetware_super_computer.name=Wetware Processor Array -metaitem.circuit.wetware_mainframe.name=Wetware Processor Mainframe -metaitem.quantumstar.name=§5Quantum Star +nomifactory.nonetherportals=Nether portals are disabled in §5Nomi-CEu§r. Follow the quest book to unlock §6Nether Cakes§r! -nomifactory.nonetherportals=Nether portals are disabled in §5Nomi-CEu§r. Follow the quest book to unlock §6Nether Cakes§r! \ No newline at end of file +# Tooltips + +# Actually Additions +nomiceu.tooltip.actuallyadditions.drill_core.1=§cAcquired by exploration of Lost Cities buildings or vanilla dungeons.§r +nomiceu.tooltip.actuallyadditions.drill_core.2=§cAlso can be purchased for Nomicoins!§r +nomiceu.tooltip.actuallyadditions.canola.1=§aCanola can be turned into Canola Oil via a Canola Press.§r +nomiceu.tooltip.actuallyadditions.canola.2=§aThis is a somewhat slow machine and requres RF to function.§r +nomiceu.tooltip.actuallyadditions.canola_press=§aTurns Canola into Canola Oil. Requires RF.§r +nomiceu.tooltip.actuallyadditions.knife=§cWhen making Hamburgers, make sure to place this in the Crafting Table last!§r +nomiceu.tooltip.actuallyadditions.solidifed_xp.normal.1=§aDrops from monsters, and can be made in§r +nomiceu.tooltip.actuallyadditions.solidifed_xp.normal.2=§aa Fluid Solidifier or Experience Solidifier.§r +nomiceu.tooltip.actuallyadditions.solidifed_xp.expert=§aMade in a Fluid Solidifier or Experience Solidifier.§r + +# Advanced Rocketry +nomiceu.tooltip.advancedrocketry.orbital_laser_drill.1=§7Glory to the PGS!§r +nomiceu.tooltip.advancedrocketry.orbital_laser_drill.2=§7Consult the AR Wiki for building instructions.§r +nomiceu.tooltip.advancedrocketry.orbital_laser_drill.3=§7Consumes §e1,000,000§r RF/t§r +nomiceu.tooltip.advancedrocketry.orbital_laser_drill.4=§cExtremely finicky. Use at your own risk.§r +nomiceu.tooltip.advancedrocketry.orbital_laser_drill.5=§cTry restarting your world if it isn't working.§r +nomiceu.tooltip.advancedrocketry.basic_lens=§7A basic lens, used for the Orbital Laser Drill.§r + +# AE2 & NAE2 +nomiceu.tooltip.ae2.crafting_terminal_removal.1=§cThis item is being removed.§r +nomiceu.tooltip.ae2.crafting_terminal_removal.2=§cA temperary conversion recipe has been added.§r +nomiceu.tooltip.ae2.crafting_terminal_removal.3=§cCheck JEI for more details.§r +nomiceu.tooltip.ae2.quantum_link_card.1=§eAllows wireless access from anywhere!§r +nomiceu.tooltip.ae2.quantum_link_card.2=§eCheck the Quest Book for more information.§r +nomiceu.tooltip.ae2.pattern_expansion_card=§eExpand your Interfaces' Pattern Capacity!§r +nomiceu.tooltip.ae2.crafting_card=§eAllows machines to craft items as they are used up, automatically.§r +nomiceu.tooltip.ae2.acceleration_card=§eSpeeds up your ME machines§r. +nomiceu.tooltip.ae2.magnet_card=§ePicks up items and puts them into your AE2 System.§r +nomiceu.tooltip.ae2.inverter_card=§eInverts your AE2 configurations!§r +nomiceu.tooltip.ae2.fuzzy_card=§eOnly handles items in a certain damage range.§r +nomiceu.tooltip.ae2.capacity_card=§eExpand your Import/Export buses!§r +nomiceu.tooltip.ae2.redstone_card=§eControl your ME machines... with Redstone!§r +nomiceu.tooltip.ae2.sticky_card=§eConfigured Items can ONLY go to that ME machine!§r +nomiceu.tooltip.ae2.pure_certus_quartz=§aMade in a Crystal Growth Chamber from a Certus Quartz Seed.§r +nomiceu.tooltip.ae2.pure_nether_quartz=§aMade in a Crystal Growth Chamber from a Nether Quartz Seed.§r +nomiceu.tooltip.ae2.pure_fluix=§aMade in a Crystal Growth Chamber from a Fluix Seed.§r +nomiceu.tooltip.ae2.charged_certus=§bObtained by charging with RF power in the AE2 Charger, or the Energetic Infuser.§r +nomiceu.tooltip.ae2.p2p_me=§aThe basis for all other P2P Tunnels.§r +nomiceu.tooltip.ae2.p2p_rf=§aMade by right-clicking a ME P2P Tunnel with an energy conduit.§r +nomiceu.tooltip.ae2.p2p_fluid=§aMade by right-clicking a ME P2P Tunnel with a bucket.§r +nomiceu.tooltip.ae2.p2p_item=§aMade by right-clicking a ME P2P Tunnel with a chest.§r +nomiceu.tooltip.ae2.p2p_light=§aMade by right-clicking a ME P2P Tunnel with a torch.§r +nomiceu.tooltip.ae2.p2p_redstone=§aMade by right-clicking a ME P2P Tunnel with redstone.§r +nomiceu.tooltip.ae2.p2p_eu=§aMade by right-clicking a ME P2P Tunnel with any GregTech wire or cable.§r +nomiceu.tooltip.ae2.p2p_interface=§aMade by right-clicking a ME P2P Tunnel with an interface.§r +nomiceu.tooltip.ae2.channels_not_enabled=Channels not enabled! +nomiceu.tooltip.ae2.controller=§bThe ME Controller reduces your AE2 system's power consumption!§r +nomiceu.tooltip.ae2.dense=§bFor decoration!§r +nomiceu.tooltip.ae2.facade=§3AE2 facades can be made from most non-tile-entities.§r + +# Dimensional Edibles +nomiceu.tooltip.dimensionaledibles.island_cake.1=§aUsed by Server Owners to send FTB Teams and Individuals to their Personal Islands!§r +nomiceu.tooltip.dimensionaledibles.island_cake.2=§aView the Server Information File on GitHub for more information!§r + +# Dark Utils +nomiceu.tooltip.darkutils.ender_tether=Blocks Endermen from teleporting. + +# Deep Mob Learning +nomiceu.tooltip.dml.glitch_fragment=§bObtained by crushing Glitch Hearts against Obsidian.§r + +# Thermal Expansion +nomiceu.tooltip.thermalexpansion.capacitors=§cCannot be discharged in GT Battery Buffers!§r + +# GregTech +nomiceu.tooltip.gregtech.prospector.1=§6§lUsage:§r +nomiceu.tooltip.gregtech.prospector.2=Grid squares = 1 chunk, up is north. +nomiceu.tooltip.gregtech.prospector.3=Click an ore in the sidebar to isolate it. +nomiceu.tooltip.gregtech.prospector.4=Use JEI to check the potential vein depth. +nomiceu.tooltip.gregtech.facade.1=§3GTCEu facades can be made from most non-tile-entities.§r +nomiceu.tooltip.gregtech.facade.2=§3They craft into different amounts based on the metal used!§r + +# Extended Crafting +nomiceu.tooltip.extendedcrafting.black_steel.omnium=§7Omnium Trimmed§r + +# Project Red +nomiceu.tooltip.projectred.wire=§eFor use with ProjectRed.§r + +# XTones +nomiceu.tooltip.xtones.lamp=§eRequires a redstone signal to light.§r diff --git a/overrides/scripts/AE2.zs b/overrides/scripts/AE2.zs deleted file mode 100644 index 0905bf7..0000000 --- a/overrides/scripts/AE2.zs +++ /dev/null @@ -1,27 +0,0 @@ -import mods.gregtech.recipe.RecipeMap; - -// Add Tooltips -.addTooltip(format.red("This is being removed. A temperary conversion recipe has been added. Check JEI for more details.")); -.addTooltip(format.red("This is being removed. A temperary conversion recipe has been added. Check JEI for more details.")); -.addTooltip(format.red("This is being removed. A temperary conversion recipe has been added. Check JEI for more details.")); - -// Tooltips -.addTooltip(format.yellow("Used with the Quantum Ring multiblock. Allows wireless access from anywhere. Check the Quest Book for more information.")); //quantum link card -.addTooltip(format.yellow("Used in interfaces. Allows you to put more patterns in an interface then normally allowed up to 4x the normal amount of patterns. Check the Quest Book for more information.")); //pattern expansion card -.addTooltip(format.yellow("Allows machines to craft items as they are used up automatically.")); //crafting card -.addTooltip(format.yellow("Speeds up various AE2 processes.")); //acceleration card -.addTooltip(format.yellow("When put in a wireless terminal, it will pick items off the floor and put them into your AE2 system based on your configuration.")); //magnet card -.addTooltip(format.yellow("Inverts AE2 configurations.")); //inverter card -.addTooltip(format.yellow("Only exports/imports/ items in a certain damage range.")); //fuzzy card -.addTooltip(format.yellow("Allows importing/exporting more then one type of item from a machine, one card is 4 slots, and cards is 9 slots.")); //capacity card -.addTooltip(format.yellow("Allows redstone control over ME machines.")); //redstone card -.addTooltip(format.yellow("Defines specific destinations for items in the ME system.")); //sticky card - - -.addTooltip(format.red("Made in a Crystal Growth Chamber from a Certus Quartz Seed.")); -.addTooltip(format.red("Made in a Crystal Growth Chamber from a Nether Quartz Seed.")); -.addTooltip(format.red("Made in a Crystal Growth Chamber from a Fluix Seed.")); -.addTooltip(format.aqua(format.italic("Obtained by charging with RF power in the AE2 Charger, or the Energetic Infuser."))); - -.addTooltip(format.green(format.italic("Made by right-clicking ME P2P Tunnel with any GregTech wire or cable."))); -.addTooltip(format.green(format.italic("The basis for all other P2P Tunnels."))); diff --git a/overrides/scripts/AdvRocketry.zs b/overrides/scripts/AdvRocketry.zs index 2ba306e..e1f52c3 100644 --- a/overrides/scripts/AdvRocketry.zs +++ b/overrides/scripts/AdvRocketry.zs @@ -900,15 +900,10 @@ makeExtremeRecipe5(, S: , W: , }); -.addTooltip(format.gray("Glory to the PGS!")); -.addTooltip(format.gray("Consult the AR Wiki for building instructions.")); -.addTooltip(format.gray("Consumes ") + format.yellow("1,000,000") + format.gray(" RF/t")); -.addTooltip(format.red("Extremely finicky. Use at your own risk. Try restarting your world if it isn't working.")); // Lens (for the drill) recipes.remove(); recipes.addShapeless(, []); -.addTooltip(format.gray("A basic lens, used for the Orbital Laser Drill.")); // Force Field Projector recipes.addShaped(, [ diff --git a/overrides/scripts/Alchemy.zs b/overrides/scripts/Alchemy.zs index 296fa84..b5a68ef 100644 --- a/overrides/scripts/Alchemy.zs +++ b/overrides/scripts/Alchemy.zs @@ -28,8 +28,6 @@ recipes.remove(); recipes.remove(); recipes.remove(); -.addTooltip(format.green("Used by Server Owners to send FTB Teams and Individuals to their Personal Islands! View the Server Information File on GitHub for more information!")); - //Cake Base recipes.addShaped(, [[, | , ], [ | , | , | ]]); diff --git a/overrides/scripts/AppliedEnergistics2.zs b/overrides/scripts/AppliedEnergistics2.zs index e6450d3..d086a4b 100644 --- a/overrides/scripts/AppliedEnergistics2.zs +++ b/overrides/scripts/AppliedEnergistics2.zs @@ -2,50 +2,20 @@ import scripts.common.makeShaped as makeShaped; -/* - P2P Tunnel tooltips. - */ -.addTooltip(format.green(format.italic( - "Made by right-clicking ME P2P Tunnel with an energy conduit."))); +// ME Controller +recipes.removeByRecipeName("appliedenergistics2:network/blocks/controller"); +makeShaped("me_controller", , + ["PFP", + "FAF", + "PFP"], + { F : , + P : , + A : }); -.addTooltip(format.green(format.italic( - "Made by right-clicking ME P2P Tunnel with a bucket."))); - -.addTooltip(format.green(format.italic( - "Made by right-clicking ME P2P Tunnel with a chest."))); - -.addTooltip(format.green(format.italic( - "Made by right-clicking ME P2P Tunnel with a torch."))); - -.addTooltip(format.green(format.italic( - "Made by right-clicking ME P2P Tunnel with redstone."))); - -/* - Channel-specific adjustments. - */ -if ( as bool) { - // ME Controller - recipes.removeByRecipeName("appliedenergistics2:network/blocks/controller"); - makeShaped("me_controller", , - ["PFP", - "FAF", - "PFP"], - { F : , - P : , - A : }); - - // Dense Conduit - assembler.recipeBuilder() - .inputs([ * 4, * 5]) - .outputs([ * 2]) - .duration(80) - .EUt(16) - .buildAndRegister(); -/* - Remove channel-specific items otherwise. - */ -} else { - mods.jei.JEI.removeAndHide(); - recipes.removeByRecipeName("appliedenergistics2:network/cables/smart_fluix"); - recipes.removeByRecipeName("appliedenergistics2:network/cables/dense_covered_fluix"); -} +// Dense Conduit +assembler.recipeBuilder() + .inputs([ * 4, * 5]) + .outputs([ * 2]) + .duration(80) + .EUt(16) + .buildAndRegister(); diff --git a/overrides/scripts/Darkutils.zs b/overrides/scripts/Darkutils.zs index bc19215..4929300 100644 --- a/overrides/scripts/Darkutils.zs +++ b/overrides/scripts/Darkutils.zs @@ -39,7 +39,6 @@ print("--- loading Darkutils.zs ---"); rh(); # Tweaks - .addTooltip("Blocks Endermen from teleporting"); recipes.remove(); recipes.addShapedMirrored("Ender Tether", , diff --git a/overrides/scripts/Earlygame.zs b/overrides/scripts/Earlygame.zs index e1230b1..cd20ef7 100644 --- a/overrides/scripts/Earlygame.zs +++ b/overrides/scripts/Earlygame.zs @@ -396,17 +396,6 @@ macerator.recipeBuilder() .EUt(8) .buildAndRegister();*/ -// Tooltips - -// Not needed because of better tooltips. -//.addTooltip(format.yellow("All GT Axes have Lumberaxe Functionality")); - -.addTooltip(format.red("Cannot be discharged in GT Battery Buffers")); -.addTooltip(format.red("Cannot be discharged in GT Battery Buffers")); -.addTooltip(format.red("Cannot be discharged in GT Battery Buffers")); -.addTooltip(format.red("Cannot be discharged in GT Battery Buffers")); -.addTooltip(format.red("Cannot be discharged in GT Battery Buffers")); -.addTooltip(format.red("Cannot be discharged in GT Battery Buffers")); .addTooltip(format.yellow("Grid squares correspond to 1 chunk, up is north\nClick a resource name in sidebar to highlight only it\nUse JEI to check potential vein depth")); .addTooltip(format.yellow("Grid squares correspond to 1 chunk, up is north\nClick a resource name in sidebar to highlight only it\nUse JEI to check potential vein depth")); .addTooltip(format.yellow("Grid squares correspond to 1 chunk, up is north\nClick a resource name in sidebar to highlight only it\nUse JEI to check potential vein depth")); diff --git a/overrides/scripts/JEICleanup.zs b/overrides/scripts/JEICleanup.zs index 4ead213..85bd06a 100644 --- a/overrides/scripts/JEICleanup.zs +++ b/overrides/scripts/JEICleanup.zs @@ -17,17 +17,9 @@ if(!isNull(ae2)) { for item in ae2Items { if(item.displayName has "Cable Facade") { - if(item.displayName has "Block of Neutronium") { - item.addTooltip(format.darkAqua("Facades can be crafted from most blocks, but are hidden from JEI to reduce clutter")); - } - else { + if(!(item.displayName has "Block of Neutronium")) { mods.jei.JEI.hide(item); } } } } - -//Adding a tooltop to the GTCEu facade -.withTag({Facade: {id: "minecraft:stone", Count: 1 as byte, Damage: 0 as short}}).addTooltip(format.darkAqua("GTCEu Cable facades can be made from most non-tile-entites, and craft into different amounts based on the metal used.")); - - diff --git a/overrides/scripts/Microverse.zs b/overrides/scripts/Microverse.zs index ebd3bf3..93af049 100644 --- a/overrides/scripts/Microverse.zs +++ b/overrides/scripts/Microverse.zs @@ -291,12 +291,6 @@ makeExtremeRecipe9(, W : } ); -.clearTooltip(); -.addTooltip("Block of Black Steel"); -.addTooltip( - format.gray( - format.italic("Omnium Trimmed"))); - recipes.removeByRecipeName("avaritia:items/resource/neutron_nugget"); @@ -320,10 +314,6 @@ makeShaped("of_aa_block_xp_solidifier", , { A : , B : } ); -.addTooltip( - format.green("Drops from monsters, and can be made in")); -.addTooltip( - format.green("a Fluid Solidifier or Experience Solidifier.")); // Solidified Experience solidifier.recipeBuilder() diff --git a/overrides/scripts/ProjectRed.zs b/overrides/scripts/ProjectRed.zs index 1bc0faa..0f494d0 100644 --- a/overrides/scripts/ProjectRed.zs +++ b/overrides/scripts/ProjectRed.zs @@ -32,7 +32,6 @@ for item in toRemove { } // Recipes -.addTooltip(format.yellow("For use with ProjectRed")); recipes.removeByRecipeName("projectred-transmission:red_alloy_wire"); recipes.addShapeless(, []); diff --git a/overrides/scripts/_oreDict.zs b/overrides/scripts/_oreDict.zs index 159217a..6e5b849 100644 --- a/overrides/scripts/_oreDict.zs +++ b/overrides/scripts/_oreDict.zs @@ -2819,16 +2819,6 @@ recipes.addShapeless(, []); //Thermal Coal Coke Decomposition recipes.addShapeless( * 9, []); -// Temporary recipe to convert endstone dusts -//recipes.addShapeless(.firstItem, []); -//.addTooltip(format.red("This item is obsolete and will be removed in the next update.")); -//.addTooltip(format.red("Please use the GregTech variant of Endstone Dust.")); - -// Temporary recipe to convert pulsating iron wire that is probably unnecessary anyway. -//recipes.addShapeless(.firstItem, []); -//.addTooltip(format.red("This item is obsolete and will be removed in the next update.")); -//.addTooltip(format.red("Please use the GregTech variant of Pulsating Iron Wire.")); - //neutronium plate exchange //recipes.addShapeless("of_exchange_neutronium_plate", // , diff --git a/overrides/scripts/aa xu2.zs b/overrides/scripts/aa xu2.zs index 2131d50..d87e526 100644 --- a/overrides/scripts/aa xu2.zs +++ b/overrides/scripts/aa xu2.zs @@ -427,9 +427,6 @@ recipes.addShaped(, [ //Drill Core recipes.remove(); -.addTooltip(format.red("Acquired by exploration of Lost Cities buildings or vanilla dungeons.")); -// Coin tooltip is done in normalmode.zs - // Canola Press recipes.removeByRecipeName("actuallyadditions:recipes132"); @@ -437,11 +434,5 @@ recipes.addShaped(, [ [, , ], [, null, ], [, , ]]); -.addTooltip(format.green("Turns Canola into Canola Oil. Requires RF.")); - - -.addTooltip(format.green("Canola can be turned into Canola Oil via a Canola Press. This is a somewhat slow machine and requres RF to function.")); - -.addTooltip(format.red("When making Hamburgers, make sure to place this in the Crafting Table last! Otherwise, Bio Mash will be created.")); print("--- ActuallyAdditions.zs initialized ---"); diff --git a/overrides/scripts/dml.zs b/overrides/scripts/dml.zs index 0bdfbe3..fb419e5 100644 --- a/overrides/scripts/dml.zs +++ b/overrides/scripts/dml.zs @@ -65,7 +65,3 @@ recipes.addShaped(, [ [null,null,null], [,,], [null,null,null]]); - -.addTooltip(format.aqua(format.italic( - "Obtained by crushing Glitch Hearts against Obsidian."))); - diff --git a/overrides/scripts/normalmode.zs b/overrides/scripts/normalmode.zs index 1f14e29..97a940e 100755 --- a/overrides/scripts/normalmode.zs +++ b/overrides/scripts/normalmode.zs @@ -672,9 +672,6 @@ mixer.recipeBuilder().inputs([ * 2,.addTooltip(format.red("Also can be purchased for Nomicoins.")); - // Removals // GT mods.jei.JEI.removeAndHide(); diff --git a/overrides/scripts/xTones.zs b/overrides/scripts/xTones.zs index 5c63485..9d04bea 100644 --- a/overrides/scripts/xTones.zs +++ b/overrides/scripts/xTones.zs @@ -6,4 +6,3 @@ recipes.addShaped(, [ [null, null, null], [, , ], [, , ]]); -.addTooltip(format.yellow("Requires a redstone signal to light."));