Skip to content

ModifierTooltip #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trulyno merged 9 commits into from
May 1, 2026
Merged

ModifierTooltip #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a7c3534
ModifierTooltip prep
LuziferSenpai Apr 30, 2026
a9e04c6
Missing lang file
LuziferSenpai Apr 30, 2026
ec88380
Finished Rework
LuziferSenpai Apr 30, 2026
4965091
Removed not needed text
LuziferSenpai May 1, 2026
3166cae
Fixes
LuziferSenpai May 1, 2026
c1b496f
More Adjustments
LuziferSenpai May 1, 2026
76d829a
Merge branch 'Theta-1-Main' into ModifierTooltip
LuziferSenpai May 1, 2026
e3cd0c2
Ups forgot this one
LuziferSenpai May 1, 2026
dcd2766
Adjustments: https://discord.com/channels/1177211394039484477/1273197…
LuziferSenpai May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
183 changes: 22 additions & 161 deletions kubejs/assets/gtceu/lang/en_us.json
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 2 additions & 19 deletions kubejs/assets/kubejs/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,25 +667,8 @@
"block.kubejs.galvanized_steel_casing": "Galvanized Steel Casing",

"block.kubejs.added_by_StarT.tooltip": "§8§oAdded by Star Technology",
"block.kubejs.batch.tooltip": "Has §eBatching",
"block.kubejs.paraBatch.tooltip": "Can use §3Parallel Hatches§r and has §eBatching",
"block.kubejs.subBatch.tooltip": "Has §cSubtick Parallels§r and §eBatching",
"block.kubejs.pocBatch.tooltip": "Has §6Perfect Overclock§r and §eBatching",
"block.kubejs.throughBatch.tooltip": "Has §bThroughput Boosting§r and §eBatching",
"block.kubejs.coilBatch.tooltip": "Has §bCoil Parallels§r and §eBatching",
"block.kubejs.paraLayered.tooltip": "Can use §3Parallel Hatches§r and has §9Layered Inputs§r",
"block.kubejs.paraSubBatch.tooltip": "Can use §3Parallel Hatches§r and has §cSubtick Parallels§r and §eBatching",
"block.kubejs.paraPocBatch.tooltip": "Can use §3Parallel Hatches§r and has §6Perfect Overclock§r and §eBatching",
"block.kubejs.subThroughBatch.tooltip": "Has §cSubtick Parallels§r, §bThroughput Boosting§r and §eBatching",
"block.kubejs.threadSubBatch.tooltip": "Has §5Threading§r, §cSubtick Parallels§r and §eBatching",
"block.kubejs.paraSubBulkBatch.tooltip": "Can use §3Parallel Hatches§r and has §cSubtick Parallels§r, §2Bulking§r, and §8Batching",
"block.kubejs.paraSubAssBatch.tooltip": "Can use §3Parallel Hatches§r and has §cSubtick Parallels§r, §9Assembly Line Logic§r and §eBatching",
"block.kubejs.paraSubThroughBatch.tooltip": "Can use §3Parallel Hatches§r and has §cSubtick Parallels§r, §bThroughput Boosting§r and §eBatching",
"block.kubejs.paraThreadBulkBatch.tooltip": "Can use §3Parallel Hatches§r and has §5Threading§r, §2Bulking§r, and §eBatching",
"block.kubejs.subAssThroughBatch.tooltip": "Has §cSubtick Parallels§r, §9Assembly Line Logic§r, §bThroughput Boosting§r and §eBatching",
"block.kubejs.paraSubBulkThroughBatch.tooltip": "Can use §3Parallel Hatches§r and has §cSubtick Parallels§r, §2Bulking§r, §bThroughput Boosting§r and §eBatching",
"block.kubejs.paraPocSubBulkThroughBatch.tooltip": "Can use §3Parallel Hatches§r and has §6Perfect Overclock§r, §cSubtick Parallels§r, §2Bulking§r, §bThroughput Boosting§r and §eBatching",
"block.kubejs.paraThreadSubBulkBatch.tooltip": "Can use §3Parallel Hatches§r and has §5Threading§r, §cSubtick Parallels§r, §2Bulking§r and §eBatching",
"block.kubejs.threading.tooltip": "Has §5Threading§r",
"block.kubejs.only_one_2a_hatch.tooltip": "§fAccepts Exactly §6One §f2§eA §fEnergy Hatch.",

"item.kubejs.basic_neutron_reflector" : "Basic Neutron Reflector",
"item.kubejs.basic_neutron_reflector.tooltip" : "§7Used for \"Simple\" Fusion Reactions",
Expand Down
96 changes: 19 additions & 77 deletions kubejs/client_scripts/common/addedByStarT.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

59 changes: 7 additions & 52 deletions kubejs/client_scripts/common/tooltips.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,56 +16,12 @@ ItemEvents.tooltip(event => {
});

let prefix;

addedByStarT.machines.forEach(machine => {
prefix = (addedByStarT.isCore.includes(machine)) ? "start_core:" : "gtceu:";

addedByStarT.modifiers.forEach(modifier => {
if (addedByStarT[modifier].includes(machine)) {
event.add(prefix + machine, Text.translate(`block.kubejs.${modifier}.tooltip`));
}
});

event.add(prefix + machine, Text.translate(`block.kubejs.added_by_StarT.tooltip`));
});

event.addAdvanced('gtceu:large_chemical_reactor', (item, advanced, text) => {
text.add(2, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.2'));
text.add(3, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.3'));
text.add(4, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.4'));
text.add(5, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.5'));
text.add(6, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.6'));
text.add(7, Text.translate('block.gtceu.coil_boosting_subtick.tooltip.1'));
});

event.addAdvanced('gtceu:extreme_chemical_reactor', (item, advanced, text) => {
text.add(2, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.2'));
text.add(3, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.3'));
text.add(4, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.4'));
text.add(5, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.5'));
text.add(6, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.6'));
text.add(7, Text.translate('block.gtceu.coil_boosting_parallel_subtick.tooltip.1'));
});

event.addAdvanced('gtceu:implosion_compressor', (item, advanced, text) => {
text.add(2, Text.translate('block.gtceu.subtick.tooltip.1'));
});


event.addAdvanced('gtceu:distillation_tower', (item, advanced, text) => {
text.add(2, Text.translate('block.gtceu.subtick.tooltip.1'));
});

event.addAdvanced('gtceu:vacuum_freezer', (item, advanced, text) => {
text.add(2, Text.translate('block.gtceu.subtick.tooltip.1'));
});

event.addAdvanced('gtceu:assembly_line', (item, advanced, text) => {
text.add(2, Text.translate('block.gtceu.subtick.tooltip.1'));
});

event.addAdvanced('gtceu:multi_smelter', (item, advanced, text) => {
text.add(2, Text.translate('block.gtceu.subtick_coil_parallel.tooltip.1'));
});
})

event.addAdvanced(/gtceu:.*_macerator/, (item, advanced, text) => {
text.add(1, Text.translate('block.gtceu.macerators.tooltip.1'));
Expand All @@ -74,8 +30,8 @@ ItemEvents.tooltip(event => {
event.addAdvanced('gtceu:ulv_fluid_input', (item, advanced, text) => {
text.add(1, Text.translate('block.gtceu.ulv_fluid_input.tooltip.1'));
text.add(2, Text.translate('block.gtceu.ulv_fluid_input.tooltip.2'));
});
});

event.addAdvanced('gtceu:uhv_stabilization_module', (item, advanced, text) => {
text.add(1, Text.of('Multiblock Sharing §4Disabled'));
text.add(2, Text.of('Makes your Multiblocks extremely stable for mass assembly!'));
Expand All @@ -84,8 +40,7 @@ ItemEvents.tooltip(event => {
});

event.addAdvanced('gtceu:large_maceration_tower', (item, advanced, text) => {
text.remove(2);
text.add(2, Text.translate('block.gtceu.large_maceration_tower.tooltip.1'));
text.add(Text.translate('block.gtceu.large_maceration_tower.tooltip.1'));
});

//Custom Colossal Chest Tooltips
Expand All @@ -106,8 +61,8 @@ ItemEvents.tooltip(event => {
event.add(`gtceu:${name}`, Text.translate(`block.gtceu.theta2Removals.tooltip`));
}
});
for (let x=1; x<=8; x++) {

for (let x = 1; x <= 8; x++) {
event.add(`solarflux:sp_${x}`, Text.translate(`block.solarflux.sp.tooltip`));
}
});
46 changes: 23 additions & 23 deletions kubejs/startup_scripts/common/machines/multiblocks/ae2/me_circuit_assembler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
.rotationState(RotationState.NON_Y_AXIS)
.recipeType('me_assembler')
.recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH, GTRecipeModifiers.OC_NON_PERFECT_SUBTICK, GTRecipeModifiers.BATCH_MODE])
.appearanceBlock(() => Block.getBlock('kubejs:fluix_steel_casing'))
.pattern(definition => FactoryBlockPattern.start()
.aisle("AAFFFFFAA", "ACCCCCCCA", "AAFFFFFAA")
.aisle("AEEEEEEEA", "FDDDDDDDF", "AAAABAAAA")
.aisle("AFFAEAFFA", "ACCCDCCCA", "AFFABAFFA")
.aisle(" A@A ", " CCC ", " AAA ")
.where("@", Predicates.controller(Predicates.blocks(definition.get())))
.where("A", Predicates.blocks("kubejs:fluix_steel_casing")
.or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setMaxGlobalLimited(2))
.or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setMaxGlobalLimited(2))
.or(Predicates.abilities(PartAbility.EXPORT_ITEMS).setMaxGlobalLimited(2))
.or(Predicates.abilities(PartAbility.PARALLEL_HATCH).setMaxGlobalLimited(1))
.or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1))
.or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMaxGlobalLimited(2)))
.where("B", Predicates.blocks("gtceu:assembly_line_grating"))
.where("C", Predicates.blocks("ae2:quartz_glass"))
.where("D", Predicates.blocks("gtceu:high_power_casing"))
.where("E", Predicates.blocks("gtceu:tungstensteel_pipe_casing"))
.where("F", Predicates.blocks("gtceu:computer_heat_vent"))
.where(" ", Predicates.any())
.build())
.workableCasingModel('kubejs:block/casings/basic/fluix_casing',
'gtceu:block/machines/circuit_assembler');
.appearanceBlock(() => Block.getBlock('kubejs:fluix_steel_casing'))
.pattern(definition => FactoryBlockPattern.start()
.aisle("AAFFFFFAA", "ACCCCCCCA", "AAFFFFFAA")
.aisle("AEEEEEEEA", "FDDDDDDDF", "AAAABAAAA")
.aisle("AFFAEAFFA", "ACCCDCCCA", "AFFABAFFA")
.aisle(" A@A ", " CCC ", " AAA ")
.where("@", Predicates.controller(Predicates.blocks(definition.get())))
.where("A", Predicates.blocks("kubejs:fluix_steel_casing")
.or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setMaxGlobalLimited(2))
.or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setMaxGlobalLimited(2))
.or(Predicates.abilities(PartAbility.EXPORT_ITEMS).setMaxGlobalLimited(2))
.or(Predicates.abilities(PartAbility.PARALLEL_HATCH).setMaxGlobalLimited(1))
.or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1))
.or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMaxGlobalLimited(2)))
.where("B", Predicates.blocks("gtceu:assembly_line_grating"))
.where("C", Predicates.blocks("ae2:quartz_glass"))
.where("D", Predicates.blocks("gtceu:high_power_casing"))
.where("E", Predicates.blocks("gtceu:tungstensteel_pipe_casing"))
.where("F", Predicates.blocks("gtceu:computer_heat_vent"))
.where(" ", Predicates.any())
.build())
.workableCasingModel('kubejs:block/casings/basic/fluix_casing',
'gtceu:block/machines/circuit_assembler');
});
Loading
Loading