Skip to content

Commit 9160155

Browse files
trulynotrulyno
authored
Merge pull request #488 from StarT-Dev-Team/ModifierTooltip
ModifierTooltip
2 parents 627d550 + dcd2766 commit 9160155

81 files changed

Lines changed: 1135 additions & 1232 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎kubejs/assets/gtceu/lang/en_us.json‎

Lines changed: 22 additions & 161 deletions
Large diffs are not rendered by default.

‎kubejs/assets/kubejs/lang/en_us.json‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -667,25 +667,8 @@
667667
"block.kubejs.galvanized_steel_casing": "Galvanized Steel Casing",
668668

669669
"block.kubejs.added_by_StarT.tooltip": "§8§oAdded by Star Technology",
670-
"block.kubejs.batch.tooltip": "Has §eBatching",
671-
"block.kubejs.paraBatch.tooltip": "Can use §3Parallel Hatches§r and has §eBatching",
672-
"block.kubejs.subBatch.tooltip": "Has §cSubtick Parallels§r and §eBatching",
673-
"block.kubejs.pocBatch.tooltip": "Has §6Perfect Overclock§r and §eBatching",
674-
"block.kubejs.throughBatch.tooltip": "Has §bThroughput Boosting§r and §eBatching",
675-
"block.kubejs.coilBatch.tooltip": "Has §bCoil Parallels§r and §eBatching",
676-
"block.kubejs.paraLayered.tooltip": "Can use §3Parallel Hatches§r and has §9Layered Inputs§r",
677-
"block.kubejs.paraSubBatch.tooltip": "Can use §3Parallel Hatches§r and has §cSubtick Parallels§r and §eBatching",
678-
"block.kubejs.paraPocBatch.tooltip": "Can use §3Parallel Hatches§r and has §6Perfect Overclock§r and §eBatching",
679-
"block.kubejs.subThroughBatch.tooltip": "Has §cSubtick Parallels§r, §bThroughput Boosting§r and §eBatching",
680-
"block.kubejs.threadSubBatch.tooltip": "Has §5Threading§r, §cSubtick Parallels§r and §eBatching",
681-
"block.kubejs.paraSubBulkBatch.tooltip": "Can use §3Parallel Hatches§r and has §cSubtick Parallels§r, §2Bulking§r, and §8Batching",
682-
"block.kubejs.paraSubAssBatch.tooltip": "Can use §3Parallel Hatches§r and has §cSubtick Parallels§r, §9Assembly Line Logic§r and §eBatching",
683-
"block.kubejs.paraSubThroughBatch.tooltip": "Can use §3Parallel Hatches§r and has §cSubtick Parallels§r, §bThroughput Boosting§r and §eBatching",
684-
"block.kubejs.paraThreadBulkBatch.tooltip": "Can use §3Parallel Hatches§r and has §5Threading§r, §2Bulking§r, and §eBatching",
685-
"block.kubejs.subAssThroughBatch.tooltip": "Has §cSubtick Parallels§r, §9Assembly Line Logic§r, §bThroughput Boosting§r and §eBatching",
686-
"block.kubejs.paraSubBulkThroughBatch.tooltip": "Can use §3Parallel Hatches§r and has §cSubtick Parallels§r, §2Bulking§r, §bThroughput Boosting§r and §eBatching",
687-
"block.kubejs.paraPocSubBulkThroughBatch.tooltip": "Can use §3Parallel Hatches§r and has §6Perfect Overclock§r, §cSubtick Parallels§r, §2Bulking§r, §bThroughput Boosting§r and §eBatching",
688-
"block.kubejs.paraThreadSubBulkBatch.tooltip": "Can use §3Parallel Hatches§r and has §5Threading§r, §cSubtick Parallels§r, §2Bulking§r and §eBatching",
670+
"block.kubejs.threading.tooltip": "Has §5Threading§r",
671+
"block.kubejs.only_one_2a_hatch.tooltip": "§fAccepts Exactly §6One §f2§eA §fEnergy Hatch.",
689672

690673
"item.kubejs.basic_neutron_reflector" : "Basic Neutron Reflector",
691674
"item.kubejs.basic_neutron_reflector.tooltip" : "§7Used for \"Simple\" Fusion Reactions",

‎kubejs/client_scripts/common/addedByStarT.js‎

Lines changed: 19 additions & 77 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎kubejs/client_scripts/common/tooltips.js‎

Lines changed: 7 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -16,56 +16,12 @@ ItemEvents.tooltip(event => {
1616
});
1717

1818
let prefix;
19+
1920
addedByStarT.machines.forEach(machine => {
2021
prefix = (addedByStarT.isCore.includes(machine)) ? "start_core:" : "gtceu:";
2122

22-
addedByStarT.modifiers.forEach(modifier => {
23-
if (addedByStarT[modifier].includes(machine)) {
24-
event.add(prefix + machine, Text.translate(`block.kubejs.${modifier}.tooltip`));
25-
}
26-
});
27-
2823
event.add(prefix + machine, Text.translate(`block.kubejs.added_by_StarT.tooltip`));
29-
});
30-
31-
event.addAdvanced('gtceu:large_chemical_reactor', (item, advanced, text) => {
32-
text.add(2, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.2'));
33-
text.add(3, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.3'));
34-
text.add(4, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.4'));
35-
text.add(5, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.5'));
36-
text.add(6, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.6'));
37-
text.add(7, Text.translate('block.gtceu.coil_boosting_subtick.tooltip.1'));
38-
});
39-
40-
event.addAdvanced('gtceu:extreme_chemical_reactor', (item, advanced, text) => {
41-
text.add(2, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.2'));
42-
text.add(3, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.3'));
43-
text.add(4, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.4'));
44-
text.add(5, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.5'));
45-
text.add(6, Text.translate('block.gtceu.lcr_coil_mechanic.tooltip.6'));
46-
text.add(7, Text.translate('block.gtceu.coil_boosting_parallel_subtick.tooltip.1'));
47-
});
48-
49-
event.addAdvanced('gtceu:implosion_compressor', (item, advanced, text) => {
50-
text.add(2, Text.translate('block.gtceu.subtick.tooltip.1'));
51-
});
52-
53-
54-
event.addAdvanced('gtceu:distillation_tower', (item, advanced, text) => {
55-
text.add(2, Text.translate('block.gtceu.subtick.tooltip.1'));
56-
});
57-
58-
event.addAdvanced('gtceu:vacuum_freezer', (item, advanced, text) => {
59-
text.add(2, Text.translate('block.gtceu.subtick.tooltip.1'));
60-
});
61-
62-
event.addAdvanced('gtceu:assembly_line', (item, advanced, text) => {
63-
text.add(2, Text.translate('block.gtceu.subtick.tooltip.1'));
64-
});
65-
66-
event.addAdvanced('gtceu:multi_smelter', (item, advanced, text) => {
67-
text.add(2, Text.translate('block.gtceu.subtick_coil_parallel.tooltip.1'));
68-
});
24+
})
6925

7026
event.addAdvanced(/gtceu:.*_macerator/, (item, advanced, text) => {
7127
text.add(1, Text.translate('block.gtceu.macerators.tooltip.1'));
@@ -74,8 +30,8 @@ ItemEvents.tooltip(event => {
7430
event.addAdvanced('gtceu:ulv_fluid_input', (item, advanced, text) => {
7531
text.add(1, Text.translate('block.gtceu.ulv_fluid_input.tooltip.1'));
7632
text.add(2, Text.translate('block.gtceu.ulv_fluid_input.tooltip.2'));
77-
});
78-
33+
});
34+
7935
event.addAdvanced('gtceu:uhv_stabilization_module', (item, advanced, text) => {
8036
text.add(1, Text.of('Multiblock Sharing §4Disabled'));
8137
text.add(2, Text.of('Makes your Multiblocks extremely stable for mass assembly!'));
@@ -84,8 +40,7 @@ ItemEvents.tooltip(event => {
8440
});
8541

8642
event.addAdvanced('gtceu:large_maceration_tower', (item, advanced, text) => {
87-
text.remove(2);
88-
text.add(2, Text.translate('block.gtceu.large_maceration_tower.tooltip.1'));
43+
text.add(Text.translate('block.gtceu.large_maceration_tower.tooltip.1'));
8944
});
9045

9146
//Custom Colossal Chest Tooltips
@@ -106,8 +61,8 @@ ItemEvents.tooltip(event => {
10661
event.add(`gtceu:${name}`, Text.translate(`block.gtceu.theta2Removals.tooltip`));
10762
}
10863
});
109-
110-
for (let x=1; x<=8; x++) {
64+
65+
for (let x = 1; x <= 8; x++) {
11166
event.add(`solarflux:sp_${x}`, Text.translate(`block.solarflux.sp.tooltip`));
11267
}
11368
});

‎kubejs/startup_scripts/common/machines/multiblocks/ae2/me_circuit_assembler.js‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
33
.rotationState(RotationState.NON_Y_AXIS)
44
.recipeType('me_assembler')
55
.recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH, GTRecipeModifiers.OC_NON_PERFECT_SUBTICK, GTRecipeModifiers.BATCH_MODE])
6-
.appearanceBlock(() => Block.getBlock('kubejs:fluix_steel_casing'))
7-
.pattern(definition => FactoryBlockPattern.start()
8-
.aisle("AAFFFFFAA", "ACCCCCCCA", "AAFFFFFAA")
9-
.aisle("AEEEEEEEA", "FDDDDDDDF", "AAAABAAAA")
10-
.aisle("AFFAEAFFA", "ACCCDCCCA", "AFFABAFFA")
11-
.aisle(" A@A ", " CCC ", " AAA ")
12-
.where("@", Predicates.controller(Predicates.blocks(definition.get())))
13-
.where("A", Predicates.blocks("kubejs:fluix_steel_casing")
14-
.or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setMaxGlobalLimited(2))
15-
.or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setMaxGlobalLimited(2))
16-
.or(Predicates.abilities(PartAbility.EXPORT_ITEMS).setMaxGlobalLimited(2))
17-
.or(Predicates.abilities(PartAbility.PARALLEL_HATCH).setMaxGlobalLimited(1))
18-
.or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1))
19-
.or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMaxGlobalLimited(2)))
20-
.where("B", Predicates.blocks("gtceu:assembly_line_grating"))
21-
.where("C", Predicates.blocks("ae2:quartz_glass"))
22-
.where("D", Predicates.blocks("gtceu:high_power_casing"))
23-
.where("E", Predicates.blocks("gtceu:tungstensteel_pipe_casing"))
24-
.where("F", Predicates.blocks("gtceu:computer_heat_vent"))
25-
.where(" ", Predicates.any())
26-
.build())
27-
.workableCasingModel('kubejs:block/casings/basic/fluix_casing',
28-
'gtceu:block/machines/circuit_assembler');
6+
.appearanceBlock(() => Block.getBlock('kubejs:fluix_steel_casing'))
7+
.pattern(definition => FactoryBlockPattern.start()
8+
.aisle("AAFFFFFAA", "ACCCCCCCA", "AAFFFFFAA")
9+
.aisle("AEEEEEEEA", "FDDDDDDDF", "AAAABAAAA")
10+
.aisle("AFFAEAFFA", "ACCCDCCCA", "AFFABAFFA")
11+
.aisle(" A@A ", " CCC ", " AAA ")
12+
.where("@", Predicates.controller(Predicates.blocks(definition.get())))
13+
.where("A", Predicates.blocks("kubejs:fluix_steel_casing")
14+
.or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setMaxGlobalLimited(2))
15+
.or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setMaxGlobalLimited(2))
16+
.or(Predicates.abilities(PartAbility.EXPORT_ITEMS).setMaxGlobalLimited(2))
17+
.or(Predicates.abilities(PartAbility.PARALLEL_HATCH).setMaxGlobalLimited(1))
18+
.or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1))
19+
.or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMaxGlobalLimited(2)))
20+
.where("B", Predicates.blocks("gtceu:assembly_line_grating"))
21+
.where("C", Predicates.blocks("ae2:quartz_glass"))
22+
.where("D", Predicates.blocks("gtceu:high_power_casing"))
23+
.where("E", Predicates.blocks("gtceu:tungstensteel_pipe_casing"))
24+
.where("F", Predicates.blocks("gtceu:computer_heat_vent"))
25+
.where(" ", Predicates.any())
26+
.build())
27+
.workableCasingModel('kubejs:block/casings/basic/fluix_casing',
28+
'gtceu:block/machines/circuit_assembler');
2929
});

0 commit comments

Comments
 (0)