Skip to content

Commit

Permalink
Merge pull request AllTheMods#2543 from AllTheMods/Tooltips
Browse files Browse the repository at this point in the history
update tool tips
  • Loading branch information
Pdiddy973 authored Oct 9, 2021
2 parents 492f565 + 27c34da commit 638cbae
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 18 deletions.
2 changes: 0 additions & 2 deletions kubejs/client_scripts/jei_additions.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
onEvent('jei.add.items', e => {
utils.listOf(['dragonic', 'allthemodium', 'vibranium', 'unobtainium', 'soul_lava', 'netherite']).forEach(type => e.add([`resourcefulbees:${type}_bee_spawn_egg`]))

e.add([
'minecraft:dragon_egg',
'structurize:plain_oak_oak_timber_frame',
Expand Down
23 changes: 7 additions & 16 deletions kubejs/client_scripts/tooltips.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ onEvent('item.tooltip', e => {
utils.listOf(['controller', 'creative_controller', 'grid', 'crafting_grid', 'pattern_grid', 'fluid_grid', 'network_receiver', 'network_transmitter', 'relay', 'detector', 'security_manager', 'wireless_transmitter', 'disk_manipulator', 'crafter', 'crafter_manager', 'crafting_monitor'])
.forEach(refined => e.add(`refinedstorage:${refined}`, 'Right click or craft with a dye to color'))

creativeOnly.forEach(item => formattedTooltip(item, 'This item is only available in Creative mode', 'Lexxie'))
creativeOnly.forEach(item => formattedTooltip(item, 'This item is only available in Creative mode'))

formattedTooltip('pedestals:pedestal/stone333', 'Press show uses(default U) key on Colored Pallet to show different colored pedestals you can make')
formattedTooltip('creativewirelesstransmitter:creative_wireless_transmitter', 'Right click or craft with a dye to color')
Expand All @@ -56,12 +56,12 @@ onEvent('item.tooltip', e => {
formattedTooltip('zycraft:fluid_void', 'Voids any adjacent fluid (works with waterlogged blocks too).')
formattedTooltip('zycraft:zychorium_ice', 'Turns adjacent water to ice.')
formattedTooltip('zycraft:fabricator', 'Autocrafter that can push the results into adjacent fabricators.')
formattedTooltip('mekanism:creative_energy_cube', 'Will delete energy if not filled! Check JEI Info tab for more info on charging the cube', 'Lexxie')
formattedTooltip('mahoutsukai:caliburn', 'This item is obtained by throwing an enchanted sword into a lake created by the Power Consolidation ritual. The damage cap can be increased by throwing the sword back into the lake with an ATM Star', 'Lexxie')
formattedTooltip('mahoutsukai:morgan', 'This item is obtained by killing a tamed wolf with a Caliburn. The damage cap can be increased by throwing the sword back into the lake with an ATM Star', 'Lexxie')
formattedTooltip('craftingstation:crafting_station', 'Crafting Station Mk.II', 'Lexxie')
formattedTooltip('atmadditions:atm_star_shard', 'Check JEI Info page for more info', 'Lexxie')
formattedTooltip('appliedenergistics2:quantum_entangled_singularity', 'To make this, you must use Ender Pearls, not Ender Dust', 'AR.E')
formattedTooltip('mekanism:creative_energy_cube', 'Will delete energy if not filled! Check JEI Info tab for more info on charging the cube')
formattedTooltip('mahoutsukai:caliburn', 'This item is obtained by throwing an enchanted sword into a lake created by the Power Consolidation ritual. The damage cap can be increased by throwing the sword back into the lake with an ATM Star')
formattedTooltip('mahoutsukai:morgan', 'This item is obtained by killing a tamed wolf with a Caliburn. The damage cap can be increased by throwing the sword back into the lake with an ATM Star')
formattedTooltip('craftingstation:crafting_station', 'Crafting Station Mk.II')
formattedTooltip('atmadditions:atm_star_shard', 'Check JEI Info page for more info')
formattedTooltip('appliedenergistics2:quantum_entangled_singularity', 'To make this, you must use Ender Pearls, not Ender Dust')

//#region Pipez
//pipes
Expand All @@ -72,7 +72,6 @@ onEvent('item.tooltip', e => {
[Text.of('Advanced:').darkAqua(), ' ', Text.of('32').aqua(), ' ', Text.of('items/5t').darkAqua()],
[Text.of('Ultimate:').darkGray(), ' ', Text.of('64').gray(), ' ', Text.of('items/t').darkGray()],
[Text.of('Infinity:').darkPurple(), ' ', Text.of('2,147,483,647').lightPurple(), ' ', Text.of('items/t').darkPurple()],
Text.of(' - Lexxie').darkRed(),
])
e.add('pipez:fluid_pipe', [
[Text.of('Default:'), ' ', Text.of('50'), ' ', Text.of('mB/t')],
Expand All @@ -81,7 +80,6 @@ onEvent('item.tooltip', e => {
[Text.of('Advanced:').darkAqua(), ' ', Text.of('2,000').aqua(), ' ', Text.of('mB/t').darkAqua()],
[Text.of('Ultimate:').darkGray(), ' ', Text.of('10,000').gray(), ' ', Text.of('mB/t').darkGray()],
[Text.of('Infinity:').darkPurple(), ' ', Text.of('2,147,483,647').lightPurple(), ' ', Text.of('mB/t').darkPurple()],
Text.of(' - Lexxie').darkRed(),
])
e.add('pipez:gas_pipe', [
[Text.of('Default:'), ' ', Text.of('200'), ' ', Text.of('mB/t')],
Expand All @@ -90,7 +88,6 @@ onEvent('item.tooltip', e => {
[Text.of('Advanced:').darkAqua(), ' ', Text.of('8,000').aqua(), ' ', Text.of('mB/t').darkAqua()],
[Text.of('Ultimate:').darkGray(), ' ', Text.of('40,000').gray(), ' ', Text.of('mB/t').darkGray()],
[Text.of('Infinity:').darkPurple(), ' ', Text.of('2,147,483,647').lightPurple(), ' ', Text.of('mB/t').darkPurple()],
Text.of(' - Lexxie').darkRed(),
])
e.add('pipez:energy_pipe', [
[Text.of('Default:'), ' ', Text.of('256'), ' ', Text.of('FE/t')],
Expand All @@ -99,7 +96,6 @@ onEvent('item.tooltip', e => {
[Text.of('Advanced:').darkAqua(), ' ', Text.of('32,768').aqua(), ' ', Text.of('FE/t').darkAqua()],
[Text.of('Ultimate:').darkGray(), ' ', Text.of('131,072').gray(), ' ', Text.of('FE/t').darkGray()],
[Text.of('Infinity:').darkPurple(), ' ', Text.of('2,147,483,647').lightPurple(), ' ', Text.of('FE/t').darkPurple()],
Text.of(' - Lexxie').darkRed(),
])

//upgrades
Expand All @@ -108,35 +104,30 @@ onEvent('item.tooltip', e => {
[Text.of('Fluid:'), ' ', Text.of('100'), ' ', Text.of('mB/t')],
[Text.of('Gas:'), ' ', Text.of('400'), ' ', Text.of('mB/t')],
[Text.of('Energy:'), ' ', Text.of('1,024'), ' ', Text.of('FE/t')],
Text.of(' - Lexxie').darkRed(),
])
e.add('pipez:improved_upgrade', [
[Text.of('Item:').gold(), ' ', Text.of('16').yellow(), ' ', Text.of('items/t').gold()],
[Text.of('Fluid:').gold(), ' ', Text.of('500').yellow(), ' ', Text.of('mB/t').gold()],
[Text.of('Gas:').gold(), ' ', Text.of('2,000').yellow(), ' ', Text.of('mB/t').gold()],
[Text.of('Energy:').gold(), ' ', Text.of('8,192').yellow(), ' ', Text.of('FE/t').gold()],
Text.of(' - Lexxie').darkRed(),
])
e.add('pipez:advanced_upgrade', [
[Text.of('Item:').darkAqua(), ' ', Text.of('32').aqua(), ' ', Text.of('items/t').darkAqua()],
[Text.of('Fluid:').darkAqua(), ' ', Text.of('2,000').aqua(), ' ', Text.of('mB/t').darkAqua()],
[Text.of('Gas:').darkAqua(), ' ', Text.of('8,000').aqua(), ' ', Text.of('mB/t').darkAqua()],
[Text.of('Energy:').darkAqua(), ' ', Text.of('32,768').aqua(), ' ', Text.of('FE/t').darkAqua()],
Text.of(' - Lexxie').darkRed(),
])
e.add('pipez:ultimate_upgrade', [
[Text.of('Item:').darkGray(), ' ', Text.of('64').gray(), ' ', Text.of('items/t').darkGray()],
[Text.of('Fluid:').darkGray(), ' ', Text.of('10,000').gray(), ' ', Text.of('mB/t').darkGray()],
[Text.of('Gas:').darkGray(), ' ', Text.of('40,000').gray(), ' ', Text.of('mB/t').darkGray()],
[Text.of('Energy:').darkGray(), ' ', Text.of('131,072').gray(), ' ', Text.of('FE/t').darkGray()],
Text.of(' - Lexxie').darkRed(),
])
e.add('pipez:infinity_upgrade', [
[Text.of('Item:').darkPurple(), ' ', Text.of('2,147,483,647').lightPurple(), ' ', Text.of('items/t').darkPurple()],
[Text.of('Fluid:').darkPurple(), ' ', Text.of('2,147,483,647').lightPurple(), ' ', Text.of('mB/t').darkPurple()],
[Text.of('Gas:').darkPurple(), ' ', Text.of('2,147,483,647').lightPurple(), ' ', Text.of('mB/t').darkPurple()],
[Text.of('Energy:').darkPurple(), ' ', Text.of('2,147,483,647').lightPurple(), ' ', Text.of('FE/t').darkPurple()],
Text.of(' - Lexxie').darkRed(),
])
//#endregion
})

0 comments on commit 638cbae

Please sign in to comment.