diff --git a/kubejs/assets/create/models/block/blaze_burner/blaze_rods_large.obj b/kubejs/assets/create/models/block/blaze_burner/blaze_rods_large.obj new file mode 100644 index 000000000..93857794a --- /dev/null +++ b/kubejs/assets/create/models/block/blaze_burner/blaze_rods_large.obj @@ -0,0 +1,15 @@ +# Blender v3.1.2 OBJ File: 'Burner V3blend.blend' +# www.blender.org +mtllib blaze_rods.mtl +o cube +v 0 0 0 +v 0 0 0 +v 0 0 0 +v 0 0 0 +vt 0 0 +vt 0 0 +vt 0 0 +vt 0 0 +usemtl m_0 +s off +f 1/1/1 2/2/1 4/3/1 3/4/1 diff --git a/kubejs/assets/create/models/block/blaze_burner/blaze_rods_small.obj b/kubejs/assets/create/models/block/blaze_burner/blaze_rods_small.obj new file mode 100644 index 000000000..93857794a --- /dev/null +++ b/kubejs/assets/create/models/block/blaze_burner/blaze_rods_small.obj @@ -0,0 +1,15 @@ +# Blender v3.1.2 OBJ File: 'Burner V3blend.blend' +# www.blender.org +mtllib blaze_rods.mtl +o cube +v 0 0 0 +v 0 0 0 +v 0 0 0 +v 0 0 0 +vt 0 0 +vt 0 0 +vt 0 0 +vt 0 0 +usemtl m_0 +s off +f 1/1/1 2/2/1 4/3/1 3/4/1 diff --git a/kubejs/assets/create/textures/block/blaze_active.png b/kubejs/assets/create/textures/block/blaze_active.png new file mode 100644 index 000000000..4492673a6 Binary files /dev/null and b/kubejs/assets/create/textures/block/blaze_active.png differ diff --git a/kubejs/assets/create/textures/block/blaze_heater_brazier.png b/kubejs/assets/create/textures/block/blaze_heater_brazier.png new file mode 100644 index 000000000..8cb31cba5 Binary files /dev/null and b/kubejs/assets/create/textures/block/blaze_heater_brazier.png differ diff --git a/kubejs/assets/create/textures/block/blaze_idle.png b/kubejs/assets/create/textures/block/blaze_idle.png new file mode 100644 index 000000000..463ed8e89 Binary files /dev/null and b/kubejs/assets/create/textures/block/blaze_idle.png differ diff --git a/kubejs/assets/create/textures/block/blaze_inert.png b/kubejs/assets/create/textures/block/blaze_inert.png new file mode 100644 index 000000000..0ffeba545 Binary files /dev/null and b/kubejs/assets/create/textures/block/blaze_inert.png differ diff --git a/kubejs/assets/create/textures/block/blaze_super.png b/kubejs/assets/create/textures/block/blaze_super.png new file mode 100644 index 000000000..cf428504d Binary files /dev/null and b/kubejs/assets/create/textures/block/blaze_super.png differ diff --git a/kubejs/assets/create/textures/block/blaze_super_active.png b/kubejs/assets/create/textures/block/blaze_super_active.png new file mode 100644 index 000000000..854549b35 Binary files /dev/null and b/kubejs/assets/create/textures/block/blaze_super_active.png differ diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 0ae8ec39b..742a8085c 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -23,15 +23,23 @@ ItemEvents.tooltip(event => { event.addAdvanced(['firmalife:bucket/yeast_starter'], (item, advanced, text) => { text.add(1, [text.of('Created with dried fruit')]) }) - event.addAdvanced(['firmalife:beehive'], (item, advanced, text) => { + event.addAdvanced(['firmalife:beehive'], (item, advanced, text) => { text.add(1, [text.of('Needs to be filled with empty frames and surrounded by flowers to attract bees.')]) }) - event.addAdvanced(['gtceu:nether_dome'], (item, advanced, text) => { - text.add(1, text.of('Artificial enviroment to simulate the Nether.')), - text.add(2, text.of(`The interior is customizable! Check the multiblock preview in JEI.`)) - }) - event.addAdvanced(['gtceu:end_dome'], (item, advanced, text) => { - text.add(1, text.of('Artificial enviroment to simulate the End.')), - text.add(2, text.of(`The interior is customizable! Check the multiblock preview in JEI.`)) - }) + event.addAdvanced(['gtceu:alternator'], (item, advanced, text) => { + text.add(1, text.of('Generates 2A of the matching §6Kinetic Input Box§r and §6Dynamo Hatch§r.')), + text.add(2, text.of(`Select Circuit 1 for LV, 2 for MV, 3 for HV, and 4 for EV.`)), + text.add(3, text.of(`§cRequires 256 RPM to run.§r`)) + }) + event.addAdvanced(['create:blaze_burner'], (item, advanced, text) => { + text.add(1, text.of('§cSuperheat§r with Flawless and Exquisite coal gems.')) + }) + event.addAdvanced(['gtceu:nether_dome'], (item, advanced, text) => { + text.add(1, text.of('Artificial enviroment to simulate the Nether.')), + text.add(2, text.of(`The interior is customizable! Check the multiblock preview in JEI.`)) + }) + event.addAdvanced(['gtceu:end_dome'], (item, advanced, text) => { + text.add(1, text.of('Artificial enviroment to simulate the End.')), + text.add(2, text.of(`The interior is customizable! Check the multiblock preview in JEI.`)) + }) }) diff --git a/kubejs/data/create/tags/items/blaze_burner_fuel/regular.json b/kubejs/data/create/tags/items/blaze_burner_fuel/regular.json new file mode 100644 index 000000000..c8f47d1dc --- /dev/null +++ b/kubejs/data/create/tags/items/blaze_burner_fuel/regular.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "gtceu:poor_raw_coal", + "gtceu:coal_dust", + "gtceu:charcoal_dust", + "gtceu:raw_coal", + "gtceu:rich_raw_coal", + "gtceu:flawed_coal", + "gtceu:chipped_coal", + "gtceu:pure_coal_dust" + ] +} \ No newline at end of file diff --git a/kubejs/data/create/tags/items/blaze_burner_fuel/special.json b/kubejs/data/create/tags/items/blaze_burner_fuel/special.json new file mode 100644 index 000000000..bdad57f76 --- /dev/null +++ b/kubejs/data/create/tags/items/blaze_burner_fuel/special.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "gtceu:flawless_coal_gem", + "gtceu:exquisite_coal_gem" + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index bde528de3..7bb09e991 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1227,6 +1227,20 @@ const registerCreateRecipes = (event) => { .EUt(20) //#endregion + + //#region Blaze burner + + event.shaped('create:blaze_burner', [ + 'B B', + 'BAB', + 'CCC' + ], { + A: 'minecraft:coal_block', + B: 'tfc:metal/bars/blue_steel', + C: 'gtceu:blue_steel_plate', + }).id('tfg:create/shaped/blaze_burner') + + //#endregion // #region So-called "Shit Glass" diff --git a/kubejs/server_scripts/create_additions/recipes.js b/kubejs/server_scripts/create_additions/recipes.js index 7aaca654a..d902e2016 100644 --- a/kubejs/server_scripts/create_additions/recipes.js +++ b/kubejs/server_scripts/create_additions/recipes.js @@ -68,4 +68,4 @@ const registerCreateAdditionsRecipes = (event) => { .itemOutputs('4x createaddition:barbed_wire') .duration(200) .EUt(20) -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index d113b1c53..9666be059 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -6,6 +6,8 @@ const registerFirmaLifeRecipes = (event) => { event.remove({ id: 'firmalife:crafting/compost_tumbler' }) event.remove({ id: 'firmalife:crafting/pumping_station' }) + event.remove({ id: 'firmalife:crafting/pumping_station2' }) + event.remove({ id: 'firmalife:crafting/pumping_station3' }) // - Chromium diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 472a798c4..e3c64a36d 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1107,7 +1107,7 @@ const registerGTCEURecipes = (event) => { C: '#gtceu:circuits/mv', D: 'gtceu:solid_machine_casing' }).id('tfg:shaped/greenhouse') - + // Контроллер электрического генератора event.shaped('gtceu:alternator', [ 'ABA', @@ -1223,34 +1223,27 @@ const registerGTCEURecipes = (event) => { //#endregion //#region Рецепты электрического генератора - - event.recipes.gtceu.alternator('32_rpm_to_32_eu') - .inputStress(256) - .circuit(0) - .rpm(32) - .duration(2) - .EUt(-32) - event.recipes.gtceu.alternator('64_rpm_to_48_eu') - .inputStress(256) + event.recipes.gtceu.alternator('lv_alternator') + .inputStress(8192) .circuit(1) - .rpm(64) + .rpm(256) .duration(2) - .EUt(-48) + .outputEU(128) - event.recipes.gtceu.alternator('128_rpm_to_64_eu') - .inputStress(256) + event.recipes.gtceu.alternator('mv_alternator') + .inputStress(32768) .circuit(2) - .rpm(128) + .rpm(256) .duration(2) - .EUt(-64) + .outputEU(512) - event.recipes.gtceu.alternator('256_rpm_to_96_eu') - .inputStress(256) + event.recipes.gtceu.alternator('hv_alternator') + .inputStress(131072) .circuit(3) .rpm(256) .duration(2) - .EUt(-96) + .outputEU(2048) //#endregion diff --git a/kubejs/startup_scripts/create/constants.js b/kubejs/startup_scripts/create/constants.js index 90ab66cdb..de6cef8c8 100644 --- a/kubejs/startup_scripts/create/constants.js +++ b/kubejs/startup_scripts/create/constants.js @@ -449,7 +449,6 @@ global.CREATE_DISABLED_ITEMS = [ 'create:refined_radiance_casing', 'create:shadow_steel_casing', 'create:wooden_bracket', - 'create:blaze_burner', 'create:sand_paper', 'create:red_sand_paper', 'create:empty_blaze_burner', diff --git a/kubejs/startup_scripts/create_additions/constants.js b/kubejs/startup_scripts/create_additions/constants.js index 940a5fd71..6924e24b3 100644 --- a/kubejs/startup_scripts/create_additions/constants.js +++ b/kubejs/startup_scripts/create_additions/constants.js @@ -33,12 +33,12 @@ global.CREATE_ADDITIONS_DISABLED_ITEMS = [ 'createaddition:electrum_spool', 'createaddition:gold_spool', 'createaddition:biomass_pellet_block', - 'createaddition:electric_motor', - 'createaddition:alternator', 'createaddition:connector', - 'createaddition:redstone_relay', + 'createaddition:redstone_relay', + 'createaddition:alternator', + 'createaddition:electric_motor', 'createaddition:spool', 'createaddition:copper_spool', 'createaddition:festive_spool', 'createaddition:small_light_connector', -]; \ No newline at end of file +]; diff --git a/kubejs/startup_scripts/gtceu/items.js b/kubejs/startup_scripts/gtceu/items.js index 488cc5e9b..cbfba0a4f 100644 --- a/kubejs/startup_scripts/gtceu/items.js +++ b/kubejs/startup_scripts/gtceu/items.js @@ -3,4 +3,4 @@ const registerGTCEuItems = (event) => { event.create('tfg:unfinished_vacuum_tube', 'create:sequenced_assembly') event.create('tfg:unfinished_basic_electronic_circuit', 'create:sequenced_assembly') -} \ No newline at end of file +} diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index de2de707d..3911cfed7 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -15,7 +15,14 @@ const registerGTCEuMachines = (event) => { .aisle("CCCYCCC", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", " F ") .where('X', Predicates.blocks('ae2:quartz_glass')) .where('F', Predicates.frames('steel')) - .where('D', Predicates.blocks('tfc:dirt/silt').or(Predicates.blocks('tfc:dirt/loam')).or(Predicates.blocks('tfc:dirt/sandy_loam')).or(Predicates.blocks('tfc:dirt/silty_loam')).or(Predicates.blocks('tfc:grass/silt')).or(Predicates.blocks('tfc:grass/loam')).or(Predicates.blocks('tfc:grass/sandy_loam')).or(Predicates.blocks('tfc:grass/silty_loam'))) + .where('D', Predicates.blocks('tfc:dirt/silt') + .or(Predicates.blocks('tfc:dirt/loam')) + .or(Predicates.blocks('tfc:dirt/sandy_loam')) + .or(Predicates.blocks('tfc:dirt/silty_loam')) + .or(Predicates.blocks('tfc:grass/silt')) + .or(Predicates.blocks('tfc:grass/loam')) + .or(Predicates.blocks('tfc:grass/sandy_loam')) + .or(Predicates.blocks('tfc:grass/silty_loam'))) .where('C', Predicates.blocks('gtceu:steel_machine_casing').or(Predicates.autoAbilities(definition.getRecipeTypes()))) .where('#', Predicates.air()) .where(' ', Predicates.any()) @@ -24,22 +31,36 @@ const registerGTCEuMachines = (event) => { ) .workableCasingRenderer('gtceu:block/casings/solid/machine_casing_solid_steel', 'gtceu:block/multiblock/implosion_compressor', false) + event.create('alternator', 'multiblock') .rotationState(RotationState.NON_Y_AXIS) .recipeType('alternator') .pattern(definition => FactoryBlockPattern.start() - .aisle("CWC", "CWC", "#W#") - .aisle("CWC", "K#E", "CWC") - .aisle("CWI", "CWA", "#W#") + .aisle("CCC", "CKC", "#C#") + .aisle("WWW", "W#W", "WWW") + .aisle("CAC", "CEC", "#C#") .where('A', Predicates.controller(Predicates.blocks(definition.get()))) - .where('W', Predicates.blocks('gtceu:cupronickel_coil_block')) - .where("C", Predicates.blocks(GTBlocks.CASING_STEEL_SOLID.get())) + .where('W', Predicates.blocks(GTBlocks.COIL_CUPRONICKEL.get())) + .where("C", Predicates.blocks(GTBlocks.CASING_STEEL_SOLID.get()) + .or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setExactLimit(1))) .where('#', Predicates.any()) .where('K', Predicates.abilities(PartAbility.INPUT_KINETIC).setExactLimit(1)) .where('E', Predicates.abilities(PartAbility.OUTPUT_ENERGY).setExactLimit(1)) - .where('I', Predicates.abilities(PartAbility.IMPORT_ITEMS).setExactLimit(1)) .build() ) + .shapeInfo(controller => MultiblockShapeInfo.builder() + .aisle("CCC", "CkC", " C ") + .aisle("WWW", "W W", "WWW") + .aisle("iAC", "CeC", " C ") + .where('A', controller, Direction.SOUTH) + .where('C', GTBlocks.CASING_STEEL_SOLID.get()) + .where(' ', Block.getBlock('minecraft:air')) + .where('W', GTBlocks.COIL_CUPRONICKEL.get()) + .where('k', Block.getBlock('gtceu:lv_kinetic_input_box')) + .where('e', GTMachines.ENERGY_OUTPUT_HATCH[GTValues.LV], Direction.SOUTH) + .where('i', GTMachines.ITEM_IMPORT_BUS[GTValues.LV], Direction.SOUTH) + .build() + ) .workableCasingRenderer( "gtceu:block/casings/solid/machine_casing_solid_steel", "gtceu:block/multiblock/implosion_compressor", false @@ -48,7 +69,7 @@ const registerGTCEuMachines = (event) => { event.create('nether_dome', 'multiblock') .rotationState(RotationState.NON_Y_AXIS) .recipeType('nether_dome') - .appearanceBlock(GTBlocks.CASING_PTFE_INERT) + .appearanceBlock(GTBlocks.CASING_PTFE_INERT) .pattern(definition => FactoryBlockPattern.start() .aisle(" CCCCC ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " F ") .aisle("CBBBBBC", "Q#####Q", "Q#####Q", "Q#####Q", "QTTTTTQ", " QQQQQ ") @@ -203,4 +224,4 @@ const registerGTCEuMachines = (event) => { "gtceu:block/casings/solid/machine_casing_stable_titanium", "gtceu:block/machines/gas_collector", false ) -} \ No newline at end of file +}