Skip to content

Commit c6f8ea2

Browse files
LuziferSenpaiLuziferSenpai
committed
Alll CoiledMulti have now the .additionalDisplay from the original multis
1 parent c5c95fb commit c6f8ea2

8 files changed

Lines changed: 71 additions & 37 deletions

File tree

‎kubejs/startup_scripts/common/machines/multiblocks/intermediate_multiblocks/super_cracker.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
3232
.where("@", Predicates.controller(Predicates.blocks(definition.get())))
3333
.build())
3434
.workableCasingModel('gtceu:block/casings/solid/machine_casing_palladium_substation',
35-
'gtceu:block/multiblock/cracking_unit');
35+
'gtceu:block/multiblock/cracking_unit')
36+
.additionalDisplay(global.crackerOverclockDisplay);
3637

3738
});

‎kubejs/startup_scripts/common/machines/multiblocks/intermediate_multiblocks/super_implosion_compressor.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
3030
.where('@', Predicates.controller(Predicates.blocks(definition.get())))
3131
.build())
3232
.workableCasingModel('gtceu:block/casings/gcym/stress_proof_casing',
33-
'gtceu:block/multiblock/implosion_compressor');
33+
'gtceu:block/multiblock/implosion_compressor')
34+
.additionalDisplay(global.multiSmelterParallelDisplay);
3435

3536
});

‎kubejs/startup_scripts/common/machines/multiblocks/intermediate_multiblocks/super_pyrolyse.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
3636
.where("@", Predicates.controller(Predicates.blocks(definition.get())))
3737
.build())
3838
.workableCasingModel('gtceu:block/casings/solid/machine_casing_robust_tungstensteel',
39-
'gtceu:block/multiblock/pyrolyse_oven');
39+
'gtceu:block/multiblock/pyrolyse_oven')
40+
.additionalDisplay(global.pyrolyzeOvenOverclockDisplay);
4041

4142
});

‎kubejs/startup_scripts/common/machines/multiblocks/very_late_game_multis/abydos_multis/chemical_plant.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,16 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
2727
.where('F', Predicates.blocks('kubejs:peek_casing').setMinGlobalLimited(40)
2828
.or(Predicates.autoAbilities(definition.getRecipeTypes()))
2929
.or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1))
30-
.or(Predicates.abilities(PartAbility.PARALLEL_HATCH).setMaxGlobalLimited(1)))
30+
.or(Predicates.abilities(PartAbility.PARALLEL_HATCH).setMaxGlobalLimited(1)))
3131
.where('E', Predicates.blocks('kubejs:enriched_naquadah_engine_intake_casing'))
32-
.where('H', Predicates.blocks(GCYMBlocks.HEAT_VENT.get()))
32+
.where('H', Predicates.blocks(GCYMBlocks.HEAT_VENT.get()))
3333
.where('M', Predicates.heatingCoils())
3434
.where('P', Predicates.blocks(GTBlocks.CASING_POLYTETRAFLUOROETHYLENE_PIPE.get()))
3535
.where('T', Predicates.blocks('gtceu:tungsten_frame'))
3636
.where(' ', Predicates.any())
3737
.build())
3838
.workableCasingModel('kubejs:block/casings/basic/machine_casing_peek',
39-
'gtceu:block/multiblock/large_chemical_reactor');
39+
'gtceu:block/multiblock/large_chemical_reactor')
40+
.additionalDisplay(global.chemicalOverclockDisplay);
4041

4142
});

‎kubejs/startup_scripts/common/machines/multiblocks/very_late_game_multis/abydos_multis/limitless_smelter.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
2525
.where('@', Predicates.controller(Predicates.blocks(definition.get())))
2626
.build())
2727
.workableCasingModel('gtceu:block/casings/gcym/high_temperature_smelting_casing',
28-
'gtceu:block/machines/electric_furnace');
29-
28+
'gtceu:block/machines/electric_furnace')
29+
.additionalDisplay(global.multiSmelterParallelDisplay);
30+
3031
});

‎kubejs/startup_scripts/common/machines/multiblocks/very_late_game_multis/end_multis/atomic_materialization_plant.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
4242
.where('@', Predicates.controller(Predicates.blocks(definition.get())))
4343
.build())
4444
.workableCasingModel('kubejs:block/casings/end_multis/cattomolymer_casing',
45-
'gtceu:block/multiblock/large_chemical_reactor');
46-
45+
'gtceu:block/multiblock/large_chemical_reactor')
46+
.additionalDisplay(global.chemicalOverclockDisplay);
47+
4748
});

‎kubejs/startup_scripts/common/machines/multiblocks/very_late_game_multis/end_multis/incomprehensible_chemical_reactor.js‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
44
.rotationState(RotationState.NON_Y_AXIS)
55
.machine((holder) => new $CoiledMulti(holder))
66
.recipeTypes(['large_chemical_reactor'])
7-
.recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH, GTRecipeModifiers.CHEMICAL_REACTOR_OVERCLOCK , $StarTRecipeModifiers.THROUGHPUT_BOOSTING, $StarTRecipeModifiers.BULK_PROCESSING, GTRecipeModifiers.BATCH_MODE])
7+
.recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH, GTRecipeModifiers.CHEMICAL_REACTOR_OVERCLOCK, $StarTRecipeModifiers.THROUGHPUT_BOOSTING, $StarTRecipeModifiers.BULK_PROCESSING, GTRecipeModifiers.BATCH_MODE])
88
.appearanceBlock(() => Block.getBlock('kubejs:cattomolymer_casing'))
99
.pattern(definition => FactoryBlockPattern.start()
10-
.aisle(' BBCCCBB', ' DBBBBBD', ' BEBEBEB', ' BCBCBCB', ' BEBEBEB', ' DBBBBBD', ' BBCCCBB')
11-
.aisle('BBFBB BBBBBBB', 'B B BG G GB', ' D D EG G GE', ' E CG G GC', ' D D EG G GE', 'B B BG G GB', 'BBFBB BBBBBBB')
12-
.aisle('BBBBB CBBBBBC', ' HHH B B', 'DHHHD B G G B', ' HGH B B', 'DHHHD B G G B', ' HHH B B', 'BBBBB CBBBBBC')
13-
.aisle('FBCBF CBBBBBC', ' HGH BG G GB', ' HGH EG G GE', 'EGGGGGGGG G GC', ' HGH EG G GE', ' HGH BG G GB', 'FBCBF CBBBBBC')
14-
.aisle('BBBBB CBBBBBC', ' HHH B B', 'DHHHD B G G B', ' HGH B B', 'DHHHD B G G B', ' HHH B B', 'BBBBB CBBBBBC')
15-
.aisle('BBFBB BBBBBBB', 'B B BG G GB', ' D D EG G GE', ' E CG G GC', ' D D EG G GE', 'B B BG G GB', 'BBFBB BBBBBBB')
16-
.aisle(' BBCCCBB', ' DBBBBBD', ' BEBEBEB', ' BCB@BCB', ' BEBEBEB', ' DBBBBBD', ' BBCCCBB')
10+
.aisle(' BBCCCBB', ' DBBBBBD', ' BEBEBEB', ' BCBCBCB', ' BEBEBEB', ' DBBBBBD', ' BBCCCBB')
11+
.aisle('BBFBB BBBBBBB', 'B B BG G GB', ' D D EG G GE', ' E CG G GC', ' D D EG G GE', 'B B BG G GB', 'BBFBB BBBBBBB')
12+
.aisle('BBBBB CBBBBBC', ' HHH B B', 'DHHHD B G G B', ' HGH B B', 'DHHHD B G G B', ' HHH B B', 'BBBBB CBBBBBC')
13+
.aisle('FBCBF CBBBBBC', ' HGH BG G GB', ' HGH EG G GE', 'EGGGGGGGG G GC', ' HGH EG G GE', ' HGH BG G GB', 'FBCBF CBBBBBC')
14+
.aisle('BBBBB CBBBBBC', ' HHH B B', 'DHHHD B G G B', ' HGH B B', 'DHHHD B G G B', ' HHH B B', 'BBBBB CBBBBBC')
15+
.aisle('BBFBB BBBBBBB', 'B B BG G GB', ' D D EG G GE', ' E CG G GC', ' D D EG G GE', 'B B BG G GB', 'BBFBB BBBBBBB')
16+
.aisle(' BBCCCBB', ' DBBBBBD', ' BEBEBEB', ' BCB@BCB', ' BEBEBEB', ' DBBBBBD', ' BBCCCBB')
1717
.where(' ', Predicates.any())
1818
.where('B', Predicates.blocks('kubejs:cattomolymer_casing')
1919
.or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setMaxGlobalLimited(8).setPreviewCount(0))
@@ -32,6 +32,7 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
3232
.where('@', Predicates.controller(Predicates.blocks(definition.get())))
3333
.build())
3434
.workableCasingModel('kubejs:block/casings/end_multis/cattomolymer_casing',
35-
'gtceu:block/multiblock/large_chemical_reactor');
36-
35+
'gtceu:block/multiblock/large_chemical_reactor')
36+
.additionalDisplay(global.chemicalOverclockDisplay);
37+
3738
});

‎kubejs/startup_scripts/utils/helpers/gt_helpers.js‎

Lines changed: 44 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,50 @@
11
// priority: 1000
22

33
global.getGtMaterial = (item) => {
4-
const ms = ChemicalHelper["getMaterialStack(net.minecraft.world.item.ItemStack)"](
5-
item instanceof Item ? item : Item.of(item)
6-
);
7-
if (!ms || ms.isEmpty()) return null;
8-
return ms;
4+
const ms = ChemicalHelper["getMaterialStack(net.minecraft.world.item.ItemStack)"](
5+
item instanceof Item ? item : Item.of(item)
6+
);
7+
if (!ms || ms.isEmpty()) return null;
8+
return ms;
99
};
1010

1111
global.coilMachineTempDisplay = (controller, components) => {
12-
if (controller instanceof $CoiledMulti && controller.isFormed()) {
13-
components.add(
14-
Component.translatable("gtceu.multiblock.blast_furnace.max_temperature",
15-
Component.literal("§c" +
16-
$FormattingUtil.formatNumbers(
17-
controller.getCoilType().getCoilTemperature() + 100 * Math.max(0, controller.getTier() - GTValues.MV)
18-
) + "K§r"
19-
)
20-
)
21-
);
22-
}
23-
};
12+
if (controller instanceof $CoiledMulti && controller.isFormed()) {
13+
components.add(
14+
Component.translatable("gtceu.multiblock.blast_furnace.max_temperature",
15+
Component.literal(`§c${$FormattingUtil.formatNumbers(controller.getCoilType().getCoilTemperature() + 100 * Math.max(0, controller.getTier() - GTValues.MV))}K§r`)
16+
)
17+
);
18+
}
19+
};
20+
21+
global.multiSmelterParallelDisplay = (controller, components) => {
22+
if (controller instanceof $CoiledMulti && controller.isFormed()) {
23+
components.add(Component.translatable("gtceu.multiblock.multi_furnace.heating_coil_level", controller.getCoilType().getLevel()));
24+
components.add(Component.translatable("gtceu.multiblock.multi_furnace.heating_coil_discount", controller.getCoilType().getEnergyDiscount()));
25+
}
26+
}
27+
28+
global.crackerOverclockDisplay = (controller, components) => {
29+
if (controller instanceof $CoiledMulti && controller.isFormed()) {
30+
const coilTier = controller.getCoilTier();
31+
const discount = coilTier > 9 ? (0.9 + (coilTier - 9) * 0.025) : coilTier * 0.1;
32+
33+
components.add(Component.translatable("gtceu.multiblock.cracking_unit.energy", $FormattingUtil.DECIMAL_FORMAT_0F.format((1.0 - discount) * 100.0)));
34+
}
35+
};
36+
37+
global.pyrolyzeOvenOverclockDisplay = (controller, components) => {
38+
if (controller instanceof $CoiledMulti && controller.isFormed()) {
39+
components.add(Component.translatable("gtceu.multiblock.pyrolyse_oven.speed", controller.getCoilTier() == 0 ? 75 : 50 * (controller.getCoilTier() + 1)));
40+
}
41+
};
42+
43+
global.chemicalOverclockDisplay = (controller, components) => {
44+
if (controller instanceof $CoiledMulti && controller.isFormed()) {
45+
const coilTier = controller.getCoilTier();
46+
47+
components.add(Component.translatable("gtceu.multiblock.chemical_reactor.speed", 75 + coilTier * 25));
48+
components.add(Component.translatable("gtceu.multiblock.chemical_reactor.energy", 100 - 5 * coilTier));
49+
}
50+
};

0 commit comments

Comments
 (0)