diff --git a/kubejs/assets/create/lang/en_us.json b/kubejs/assets/create/lang/en_us.json index 62ca01799..68b84fa1f 100644 --- a/kubejs/assets/create/lang/en_us.json +++ b/kubejs/assets/create/lang/en_us.json @@ -1,8 +1,16 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.create.netherite_backtank": "Blue Steel Backtank", + "block.create.industrial_iron_block": "Industrial Steel Block", + "block.create.weathered_iron_block": "Weathered Steel Block", + "block.create.industrial_iron_window": "Industrial Steel Window", + "block.create.weathered_iron_window": "Weathered Steel Window", + "block.create.industrial_iron_window_pane": "Industrial Steel Window Pane", + "block.create.weathered_iron_window_pane": "Weathered Steel Window Pane", "block.create.dark_oak_window": "Hickory Window", "block.create.dark_oak_window_pane": "Hickory Window Pane", + "block.create.cherry_window": "Fig Window", + "block.create.cherry_window_pane": "Fig Window Pane", "block.create.andesite_bars": "Metal Bars", "block.create.andesite_belt_funnel": "Metal Belt Funnel", "block.create.andesite_casing": "Metal Casing", diff --git a/kubejs/assets/createconnected/lang/en_us.json b/kubejs/assets/createconnected/lang/en_us.json index 2c1a83ebf..7c65a3b40 100644 --- a/kubejs/assets/createconnected/lang/en_us.json +++ b/kubejs/assets/createconnected/lang/en_us.json @@ -1,5 +1,3 @@ { - "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", - "create_connected:cherry_window": "Fig Window", - "create_connected:cherry_window_pane": "Fig Window Pane" + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information." } \ No newline at end of file diff --git a/kubejs/assets/createdeco/lang/en_us.json b/kubejs/assets/createdeco/lang/en_us.json index f1271a2a9..695536432 100644 --- a/kubejs/assets/createdeco/lang/en_us.json +++ b/kubejs/assets/createdeco/lang/en_us.json @@ -19,6 +19,7 @@ "block.createdeco.andesite_door": "Tin Alloy Door", "block.createdeco.locked_andesite_door": "Locked Tin Alloy Door", "block.createdeco.andesite_trapdoor": "Tin Alloy Trapdoor", + "block.createdeco.andesite_facade": "Tin Alloy Facade", "block.createdeco.iron_bars": "Wrought Iron Bars", "block.createdeco.iron_bars_overlay": "Wrought Iron Bars Overlay", "block.createdeco.iron_window": "Wrought Iron Window", @@ -38,6 +39,7 @@ "block.createdeco.iron_door": "Wrought Iron Door", "block.createdeco.locked_iron_door": "Locked Wrought Iron Door", "block.createdeco.iron_trapdoor": "Wrought Iron Trapdoor", + "block.createdeco.iron_facade": "Wrought Iron Facade", "block.createdeco.iron_coinstack": "Wrought Iron Coinstack", "block.createdeco.netherite_coinstack": "Blue Steel Coinstack", "block.createdeco.industrial_iron_coinstack": "Steel Coinstack", diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 837b4b786..5caba0ebf 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -63,6 +63,8 @@ const registerCreateRecipes = (event) => { event.remove({ type: 'minecraft:stonecutting', input: 'create:andesite_alloy' }) event.remove({ type: 'minecraft:stonecutting', input: 'create:rose_quartz' }) + event.remove({ type: 'minecraft:stonecutting', input: 'create:polished_rose_quartz' }) + event.remove({ type: 'minecraft:stonecutting', input: 'minecraft:iron_ingot' }) // Train Station event.shapeless('2x create:track_station', [ @@ -359,7 +361,7 @@ const registerCreateRecipes = (event) => { .EUt(20) // Редстоуновый вал - event.shaped('create:gantry_shaft', [ + event.shaped('8x create:gantry_shaft', [ 'A ', 'BC', 'A ' @@ -372,7 +374,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('tfg:create/gantry_shaft') .itemInputs('gtceu:red_alloy_single_wire', '2x #forge:plates/wrought_iron') .circuit(3) - .itemOutputs('create:gantry_shaft') + .itemOutputs('8x create:gantry_shaft') .duration(200) .EUt(20) @@ -390,7 +392,7 @@ const registerCreateRecipes = (event) => { }).id('tfg:create/shaped/rope_pulley') event.recipes.gtceu.assembler('create:rope_pulley') - .itemInputs('create:andesite_casing', 'firmalife:rope_coil', '#forge:plates/wrought_iron', '2x #tfg:small_cogwheels') + .itemInputs('create:andesite_casing', 'firmaciv:rope_coil', '#forge:plates/wrought_iron', '2x #tfg:small_cogwheels') .itemOutputs('create:rope_pulley') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) @@ -436,7 +438,7 @@ const registerCreateRecipes = (event) => { .circuit(21) // Контроллер рельсы - event.shaped('create:controller_rail', [ + event.shaped('4x create:controller_rail', [ 'ABA', 'ACA', 'ABA' @@ -447,24 +449,25 @@ const registerCreateRecipes = (event) => { }).id('tfg:create/shaped/controller_rail') // Линейный переход - event.shaped('3x create:linear_chassis', [ - 'ABA', + event.shaped('4x create:linear_chassis', [ + 'A A', 'CCC', - 'ABA' + 'A A' ], { A: '#forge:screws/wrought_iron', - B: '#forge:plates/wrought_iron', C: '#minecraft:logs' }).id('tfg:create/shaped/linear_chassis') + event.shapeless('create:linear_chassis', ['create:secondary_linear_chassis']) + event.shapeless('create:secondary_linear_chassis', ['create:linear_chassis']) + // Радиальный переход event.shaped('3x create:radial_chassis', [ 'ACA', - 'BCB', + ' C ', 'ACA' ], { A: '#forge:screws/wrought_iron', - B: '#forge:plates/wrought_iron', C: '#minecraft:logs' }).id('tfg:create/shaped/radial_chassis') @@ -1200,6 +1203,9 @@ const registerCreateRecipes = (event) => { B: '#forge:cloth' }).id('tfg:create/shaped/package_filter') + event.shapeless('create:package_filter', ['create:package_filter']) + .id('tfg:shapeless/package_filter') + // Расписание поездов event.shapeless('4x create:schedule', [ 'minecraft:paper', @@ -1625,7 +1631,10 @@ const registerCreateRecipes = (event) => { [ ['dark_oak', 'tfc:wood/planks/hickory'], ['mangrove', 'tfc:wood/planks/mangrove'], - ['ornate_iron', 'tfc:metal/bars/wrought_iron'] + ['cherry', 'afc:wood/planks/fig'], + ['bamboo', 'minecraft:bamboo_planks'], + ['ornate_iron', 'tfc:metal/bars/wrought_iron'], + ['industrial_iron', 'tfc:metal/bars/steel'] ] CREATE_OTHER_GLASS_WINDOWS.forEach(x => { @@ -1717,15 +1726,32 @@ const registerCreateRecipes = (event) => { A: '#forge:tools/hammers', B: '#tfc:trapdoors', C: 'create:chute', - }).id('tfg:create/shaped/item_hatch') + }).id('tfg:create/shaped/item_hatch_tfc') - event.recipes.gtceu.assembler('tfg:create/item_hatch') + event.shaped('create:item_hatch', [ + 'A', + 'B', + 'C' + ], { + A: '#forge:tools/hammers', + B: '#createdeco:metal_trapdoors', + C: 'create:chute', + }).id('tfg:create/shaped/item_hatch_deco') + + event.recipes.gtceu.assembler('tfg:create/item_hatch_tfc') .itemInputs('3x #forge:plates/wrought_iron', '#tfc:trapdoors') .circuit(19) .itemOutputs('create:item_hatch') .duration(200) .EUt(20) + event.recipes.gtceu.assembler('tfg:create/item_hatch_deco') + .itemInputs('3x #forge:plates/wrought_iron', '#createdeco:metal_trapdoors') + .circuit(19) + .itemOutputs('create:item_hatch') + .duration(200) + .EUt(20) + event.shaped('create:package_frogport', [ 'GAG', 'HCB', @@ -2003,7 +2029,7 @@ const registerCreateRecipes = (event) => { }).id('tfg:create/shaped/redstone_link') event.recipes.gtceu.assembler('create:redstone_link') - .itemInputs('create:brass_casing', '#gtceu:circuits/ulv', '#forge:small_springs', '2x #forge:plates/wrought_iron') + .itemInputs('create:andesite_casing', '#gtceu:circuits/ulv', '#forge:small_springs', '2x #forge:plates/wrought_iron') .itemOutputs('create:redstone_link') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) @@ -2048,6 +2074,28 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + event.shaped('create:pulse_timer', [ + 'E E', + 'ABC', + 'DDD' + ], { + A: 'minecraft:redstone', + B: '#forge:plates/brass', + C: 'minecraft:redstone_torch', + D: '#forge:stone', + E: '#forge:rods/amethyst' + }).id('tfg:shaped/pulse_timer') + + event.shaped('create:desk_bell', [ + 'A', + 'B', + 'C' + ], { + A: '#minecraft:buttons', + B: '#tfc:bells', + C: 'minecraft:redstone' + }).id('tfg:shaped/desk_bell') + event.shaped('create:sequenced_gearshift', [ 'DBE', 'CAC', @@ -2184,6 +2232,86 @@ const registerCreateRecipes = (event) => { event.stonecutting('2x create:andesite_ladder', '#forge:ingots/tin_alloy') event.stonecutting('2x create:andesite_bars', '#forge:ingots/tin_alloy') + // Industrial Iron stuff + + event.stonecutting('2x create:industrial_iron_block', '#forge:ingots/steel') + + event.custom({ + type: "ae2:transform", + circumstance: { + type: "fluid", + tag: "tfc:water" + }, + ingredients: [{ item: 'create:industrial_iron_block' }], + result: { item: 'create:weathered_iron_block' } + }).id(`tfg:ae_transform/weathered_iron_block`) + + event.recipes.gtceu.chemical_bath('tfg:industrial_iron_block') + .itemInputs('create:industrial_iron_block') + .inputFluids(Fluid.of('minecraft:water', 250)) + .itemOutputs('create:weathered_iron_block') + .duration(100) + .EUt(GTValues.VA[GTValues.ULV]) + + event.custom({ + type: "ae2:transform", + circumstance: { + type: "fluid", + tag: "tfc:water" + }, + ingredients: [{ item: 'create:industrial_iron_window' }], + result: { item: 'create:weathered_iron_window' } + }).id(`tfg:ae_transform/weathered_iron_window`) + + event.recipes.gtceu.chemical_bath('tfg:industrial_iron_window') + .itemInputs('create:industrial_iron_window') + .inputFluids(Fluid.of('minecraft:water', 250)) + .itemOutputs('create:weathered_iron_window') + .duration(100) + .EUt(GTValues.VA[GTValues.ULV]) + + event.custom({ + type: "ae2:transform", + circumstance: { + type: "fluid", + tag: "tfc:water" + }, + ingredients: [{ item: 'create:industrial_iron_window_pane' }], + result: { item: 'create:weathered_iron_window_pane' } + }).id(`tfg:ae_transform/weathered_iron_window_pane`) + + event.recipes.gtceu.chemical_bath('tfg:industrial_iron_window_pane') + .itemInputs('create:industrial_iron_window_pane') + .inputFluids(Fluid.of('minecraft:water', 250)) + .itemOutputs('create:weathered_iron_window_pane') + .duration(100) + .EUt(GTValues.VA[GTValues.ULV]) + + // Rose quartz + + event.shaped('create:rose_quartz_lamp', [ + 'ABA' + ], { + A: '#forge:plates/rose_quartz', + B: 'minecraft:redstone_lamp' + }).id('tfg:shaped/rose_quartz_lamp') + + event.recipes.gtceu.laser_engraver('tfg:rose_quartz_tiles') + .itemInputs('#forge:storage_blocks/rose_quartz') + .itemOutputs('4x create:rose_quartz_tiles') + .notConsumable('tfc:lens') + .circuit(1) + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.laser_engraver('tfg:small_rose_quartz_tiles') + .itemInputs('#forge:storage_blocks/rose_quartz') + .itemOutputs('4x create:small_rose_quartz_tiles') + .notConsumable('tfc:lens') + .circuit(2) + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + // Bars event.recipes.gtceu.cutter('tfg:create_andesite_bars') diff --git a/kubejs/server_scripts/create/tags.js b/kubejs/server_scripts/create/tags.js index 9253c1cbb..946b6efe8 100644 --- a/kubejs/server_scripts/create/tags.js +++ b/kubejs/server_scripts/create/tags.js @@ -116,6 +116,8 @@ const registerCreateFluidTags = (event) => { // Добавляем тег для скрытия в EMI event.add('c:hidden_from_recipe_viewers', 'create:chocolate') event.add('c:hidden_from_recipe_viewers', 'create:honey') + event.add('c:hidden_from_recipe_viewers', 'create:builders_tea') + event.add('c:hidden_from_recipe_viewers', 'create:uncraftable_potion') // Disable bulk blasting event.removeAll('create:fan_processing_catalysts/blasting') diff --git a/kubejs/server_scripts/create_connected/recipes.js b/kubejs/server_scripts/create_connected/recipes.js index 4e07b8bce..07df31810 100644 --- a/kubejs/server_scripts/create_connected/recipes.js +++ b/kubejs/server_scripts/create_connected/recipes.js @@ -64,4 +64,6 @@ const registerCreateConnectedRecipes = (event) => { D: 'minecraft:redstone_torch', E: '#forge:stone' }).id('create_connected:crafting/kinetics/sequenced_pulse_generator') + + event.replaceInput({ id: 'create_connected:crafting/kinetics/redstone_link_wildcard' }, 'create:transmitter', 'minecraft:redstone_torch') } \ No newline at end of file diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index 24f81455b..f44b1ebd1 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -47,6 +47,7 @@ const registerCreatedecoRecipes = (event) => { event.remove({ id: 'createdeco:industrial_iron_bars' }) event.remove({ id: 'createdeco:zinc_bars_overlay' }) event.remove({ id: 'createdeco:zinc_bars' }) + event.remove({ id: 'createdeco:industrial_iron_block' }) event.remove({ id: 'gtceu:assembler/bricks' }) event.remove({ type: 'minecraft:stonecutting', input: '#forge:storage_blocks/tin_alloy' }) event.remove({ type: 'minecraft:stonecutting', input: '#forge:storage_blocks/brass' }) @@ -174,6 +175,9 @@ const registerCreatedecoRecipes = (event) => { }); //#endregion + event.stonecutting('4x createdeco:andesite_mesh_fence', '#forge:ingots/tin_alloy') + event.stonecutting('4x createdeco:iron_mesh_fence', '#forge:ingots/wrought_iron') + // #region Bars + Doors const metalThings = [ @@ -223,6 +227,15 @@ const registerCreatedecoRecipes = (event) => { .duration(100) .EUt(GTValues.VA[GTValues.LV]) .circuit(13) + + event.shaped(`4x createdeco:${bar.metal}_facade`, [ + ' A ', + 'ABA', + ' A ' + ], { + A: `#forge:rods/${bar.material}`, + B: `createdeco:${bar.metal}_mesh_fence` + }).id(`tfg:shaped/createdeco_${bar.metal}_facade`) }) // #endregion @@ -273,7 +286,7 @@ const registerCreatedecoRecipes = (event) => { .duration(GTMaterials.Zinc.getMass()) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.tfc.anvil(`createdeco:andesite_trapdoor`, `#forge:ingots/iron_alloy`, ['shrink_last', 'draw_second_last', 'draw_third_last']) + event.recipes.tfc.anvil(`createdeco:andesite_trapdoor`, `#forge:ingots/tin_alloy`, ['shrink_last', 'draw_second_last', 'draw_third_last']) .tier(3).id(`createdeco:anvil/andesite_trapdoor`) event.recipes.gtceu.alloy_smelter(`tfg:cast_tin_alloy_trapdoor`) diff --git a/kubejs/server_scripts/createdeco/tags.js b/kubejs/server_scripts/createdeco/tags.js index bd5a7cb04..ff60ac43a 100644 --- a/kubejs/server_scripts/createdeco/tags.js +++ b/kubejs/server_scripts/createdeco/tags.js @@ -17,6 +17,12 @@ const registerCreateDecoItemTags = (event) => { event.add('tfg:metal_bars', `createdeco:${metalBars}_bars_overlay`) }); + event.add('createdeco:metal_trapdoors', 'createdeco:andesite_trapdoor') + event.add('createdeco:metal_trapdoors', 'createdeco:brass_trapdoor') + event.add('createdeco:metal_trapdoors', 'createdeco:copper_trapdoor') + event.add('createdeco:metal_trapdoors', 'createdeco:industrial_iron_trapdoor') + event.add('createdeco:metal_trapdoors', 'createdeco:zinc_trapdoor') + event.add("createdeco:internal/plates/iron_plates", "#forge:plates/wrought_iron") event.add("createdeco:internal/plates/copper_plates", "#forge:plates/copper") event.add("createdeco:internal/plates/brass_plates", "#forge:plates/brass") diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index 22b279f2b..65eb78610 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -28,6 +28,7 @@ function removeGreateRecipes(event) { event.remove({ id: 'greate:splashing/dough' }) event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_chromatic_compound' }) + event.remove({ id: 'greate:mixing/integration/create/mixing/tea' }) event.remove({ mod: 'greate', type: 'create:deploying' }); event.remove({ mod: 'greate', type: 'create:sequenced_assembly' }); diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index c3d5ca7ce..fbf312309 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1183,26 +1183,22 @@ const registerGTCEURecipes = (event) => { event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_chromatic_compound' }); event.remove({ id: 'gtceu:autoclave/autoclave_dust_rose_quartz_water'}) event.remove({ id: 'gtceu:autoclave/autoclave_dust_rose_quartz_distilled'}) - generateMixerRecipe(event, ['gtceu:nether_quartz_dust', '8x minecraft:redstone'], [], '9x gtceu:rose_quartz_dust', 2, [], 180, 6, 64, 'rose_quartz_dust_mixing') - generateMixerRecipe(event, ['gtceu:tiny_nether_quartz_dust', '8x gtceu:tiny_redstone_dust'], [], 'gtceu:rose_quartz_dust', 2, [], 20, 6, 64, 'tiny_rose_quartz_dust_mixing') - event.recipes.gtceu.autoclave("autoclave_dust_rose_quartz_ice") + + generateMixerRecipe(event, ['gtceu:nether_quartz_dust', '8x minecraft:redstone'], [], '9x gtceu:rose_quartz_dust', 2, [], 180, 60, 64, 'rose_quartz_dust_mixing') + generateMixerRecipe(event, ['gtceu:tiny_nether_quartz_dust', '8x gtceu:tiny_redstone_dust'], [], 'gtceu:rose_quartz_dust', 2, [], 20, 60, 64, 'tiny_rose_quartz_dust_mixing') + + event.recipes.gtceu.autoclave("autoclave_dust_rose_quartz_ice") .itemInputs("gtceu:rose_quartz_dust") .inputFluids(Fluid.of("gtceu:ice", 144)) .itemOutputs("gtceu:rose_quartz_gem") .duration(2000) .EUt(120) + event.recipes.gtceu.electrolyzer('electrolyze_rose_quartz_dust') .itemInputs('9x gtceu:rose_quartz_dust') .itemOutputs('1x gtceu:nether_quartz_dust', '8x minecraft:redstone') - .duration(540) - .EUt(24) - .circuit(1) - event.recipes.gtceu.electrolyzer('electrolyze_rose_quartz_dust_to_tiny') - .itemInputs('gtceu:rose_quartz_dust') - .itemOutputs('1x gtceu:tiny_nether_quartz_dust', '8x gtceu:tiny_redstone_dust') - .duration(60) - .EUt(24) - .circuit(2) + .duration(7 * 20) + .EUt(60) //#endregion // TODO: Greate again... diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 21caca12f..bb3f20f28 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -198,7 +198,7 @@ ServerEvents.recipes(event => { registerChiselAndBitsRecipes(event) registerComfortsRecipes(event); registerComputerCraftRecipes(event) - registerCccBridgeRecipes(event) + //registerCccBridgeRecipes(event) registerConstructionwandRecipes(event) registerCreateRecipes(event) registerCreateAdditionsRecipes(event) diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index 9766d8898..7799cb4b7 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -70,6 +70,8 @@ const registerMinecraftItemTags = (event) => { event.add('tfc:compost_greens_high', 'minecraft:ochre_froglight') event.add('tfc:colored_terracotta', 'minecraft:white_terracotta') + + event.add('tfc:bells', 'minecraft:bell') } const registerMinecraftBlockTags = (event) => { diff --git a/kubejs/server_scripts/railways/recipes.js b/kubejs/server_scripts/railways/recipes.js index c31104657..79f782d37 100644 --- a/kubejs/server_scripts/railways/recipes.js +++ b/kubejs/server_scripts/railways/recipes.js @@ -161,7 +161,7 @@ const registerRailWaysRecipes = (event) => { }).id('tfg:railways/shaped/track_switch_brass') event.recipes.gtceu.assembler('tfg:railways/track_switch_brass') - .itemInputs('minecraft:lever', '2x #forge:bolts/wrought_iron', '2x #tfg:small_cogwheels', 'create:brass_casing') + .itemInputs('minecraft:lever', '2x #forge:bolts/brass', '2x #tfg:small_cogwheels', 'create:brass_casing') .circuit(3) .itemOutputs('railways:track_switch_brass') .duration(200) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 0d0ea3b55..b3c90ed53 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -295,6 +295,10 @@ const registerTFCItemTags = (event) => { event.add('minecraft:piglin_loved', 'tfc:ore/poor_native_gold') event.add('minecraft:piglin_loved', 'tfc:ore/normal_native_gold') event.add('minecraft:piglin_loved', 'tfc:ore/rich_native_gold') + + // Bells + event.add('tfc:bells', 'tfc:bronze_bell') + event.add('tfc:bells', 'tfc:brass_bell') } const registerTFCBlockTags = (event) => { diff --git a/kubejs/server_scripts/tfg/tags.facades.js b/kubejs/server_scripts/tfg/tags.facades.js index abbdb17f9..81356c98a 100644 --- a/kubejs/server_scripts/tfg/tags.facades.js +++ b/kubejs/server_scripts/tfg/tags.facades.js @@ -113,8 +113,10 @@ function registerFacadeWhitelistTags(event) { 'create:dark_oak_window', 'create:mangrove_window', 'create:ornate_iron_window', - 'create_connected:cherry_window', - 'create_connected:bamboo_window', + 'create:industrial_iron_window', + 'create:weathered_iron_window', + 'create:cherry_window', + 'create:bamboo_window', 'createdeco:andesite_window', 'createdeco:copper_window', 'createdeco:iron_window', @@ -134,108 +136,50 @@ function registerFacadeWhitelistTags(event) { 'createdeco:zinc_sheet_metal' ]; - const mc_colors = - [ - 'white', - 'orange', - 'magenta', - 'light_blue', - 'yellow', - 'lime', - 'pink', - 'gray', - 'light_gray', - 'cyan', - 'purple', - 'blue', - 'brown', - 'green', - 'red', - 'black' - ] - - const wood_types_tfc = - [ - 'acacia', - 'ash', - 'aspen', - 'birch', - 'blackwood', - 'chestnut', - 'douglas_fir', - 'hickory', - 'kapok', - 'mangrove', - 'maple', - 'oak', - 'palm', - 'pine', - 'rosewood', - 'sequoia', - 'spruce', - 'sycamore', - 'white_cedar', - 'willow' - ] - - const wood_types_afc = - [ - 'baobao', - 'eucalyptus', - 'mahogany', - 'heavea', - 'tualang', - 'teak', - 'cypress', - 'fig', - 'ironwood', - 'ipe' - ] - const createdeco_bricks_fm = [ - 'pearl_bricks', - 'verdant_bricks', - 'red_bricks', - 'dean_bricks', - 'umber_bricks', - 'dusk_bricks', - 'blue_bricks', - 'scarlet_bricks' + 'pearl_bricks', + 'verdant_bricks', + 'red_bricks', + 'dean_bricks', + 'umber_bricks', + 'dusk_bricks', + 'blue_bricks', + 'scarlet_bricks' ] const gtceu_stonelike_fm = [ - 'light_concrete', - 'dark_concrete', - 'red_granite', - 'marble' + 'light_concrete', + 'dark_concrete', + 'red_granite', + 'marble' ] const create_copper_fm = [ - 'copper', - 'exposed_copper', - 'weathered_copper', - 'oxidized_copper' + 'copper', + 'exposed_copper', + 'weathered_copper', + 'oxidized_copper' ] const create_rock_types_fm = [ - 'granite', - 'diorite', - 'andesite', - 'calcite', - 'dripstone', - 'deepslate', - 'limestone' - //'ochrum', - //'scoria', - //'scorchia', - //'veridium' - //'tuff', - //'asurine', - //'crimsite', + 'granite', + 'diorite', + 'andesite', + 'calcite', + 'dripstone', + 'deepslate', + 'limestone' + //'ochrum', + //'scoria', + //'scorchia', + //'veridium' + //'tuff', + //'asurine', + //'crimsite', ] //misc blocks @@ -267,7 +211,7 @@ function registerFacadeWhitelistTags(event) { }); //gtceu misc colored blocks - mc_colors.forEach(facade_material => { + global.MINECRAFT_DYE_NAMES.forEach(facade_material => { event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_metal_sheet') event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_large_metal_sheet') event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_studs') @@ -296,7 +240,7 @@ function registerFacadeWhitelistTags(event) { }); //rnr shingles - wood_types_tfc.concat(wood_types_afc).forEach(facade_material => { + global.TFC_WOOD_TYPES.concat(global.AFC_WOOD_TYPES).forEach(facade_material => { event.add('tfg:whitelisted/facades', 'rnr:wood/shingles/' + facade_material) }); @@ -315,10 +259,10 @@ function registerFacadeWhitelistTags(event) { }); //everycomp windows - wood_types_tfc.forEach(facade_material => { + global.TFC_WOOD_TYPES.forEach(facade_material => { event.add('tfg:whitelisted/facades', 'everycomp:c/tfc/' + facade_material + '_window') }); - wood_types_afc.forEach(facade_material => { + global.AFC_WOOD_TYPES.forEach(facade_material => { event.add('tfg:whitelisted/facades', 'everycomp:c/afc/' + facade_material + '_window') }); } diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 6e7166b86..1906d8f6c 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -294,7 +294,14 @@ function registerVintageImprovementsRecipes(event) { forEachMaterial(material => { const ingotItem = ChemicalHelper.get(TagPrefix.ingot, material, 1); - if (ingotItem == null || ingotItem.hasTag('c:hidden_from_recipe_viewers')) + if (ingotItem != null && ingotItem.hasTag('c:hidden_from_recipe_viewers')) + return; + + const gemItem = ChemicalHelper.get(TagPrefix.gem, material, 1); + if (gemItem != null && gemItem.hasTag('c:hidden_from_recipe_viewers')) + return; + + if (ingotItem == null || gemItem == null) return; // #region Coiling diff --git a/kubejs/startup_scripts/create_additions/constants.js b/kubejs/startup_scripts/create_additions/constants.js index 60fe55b78..ecc95811d 100644 --- a/kubejs/startup_scripts/create_additions/constants.js +++ b/kubejs/startup_scripts/create_additions/constants.js @@ -39,4 +39,5 @@ global.CREATE_ADDITIONS_DISABLED_ITEMS = [ 'createaddition:copper_spool', 'createaddition:festive_spool', 'createaddition:small_light_connector', + 'createaddition:electrum_block' ]; diff --git a/kubejs/startup_scripts/create_connected/constants.js b/kubejs/startup_scripts/create_connected/constants.js index b1f25efd2..61914ebfa 100644 --- a/kubejs/startup_scripts/create_connected/constants.js +++ b/kubejs/startup_scripts/create_connected/constants.js @@ -12,5 +12,11 @@ global.CREATE_CONNECTED_DISABLED_ITEMS = [ 'create_connected:control_chip', 'create_connected:incomplete_control_chip', 'create_connected:crank_wheel', - 'create_connected:large_crank_wheel' + 'create_connected:large_crank_wheel', + 'create_connected:cross_connector', + 'create_connected:andesite_encased_cross_connector', + 'create_connected:brass_encased_cross_connector', + 'create_connected:kinetic_bridge', + 'create_connected:kinetic_battery', + 'create_connected:charged_kinetic_battery', ] \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 75b26f052..6b3ebefb0 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -268,7 +268,7 @@ const registerGTCEuMaterialModification = (event) => { // Change byproducts so you can't get certus from normal quartzite GTMaterials.Quartzite.getProperty(PropertyKey.ORE).setOreByProducts(GTMaterials.NetherQuartz, GTMaterials.Barite, GTMaterials.NetherQuartz); GTMaterials.CertusQuartz.getProperty(PropertyKey.ORE).setOreByProducts(GTMaterials.CertusQuartz, GTMaterials.Quartzite, GTMaterials.CertusQuartz); - + // Color Adjustments GTMaterials.BismuthBronze.setMaterialARGB(0x5A966E) GTMaterials.BismuthBronze.setMaterialSecondaryARGB(0x203E2A) @@ -324,5 +324,6 @@ const registerGTCEuMaterialModification = (event) => { let rose_quartz = GTCEuAPI.materialManager.getMaterial('greate:rose_quartz'); rose_quartz.setProperty(PropertyKey.ORE, new $ORE_PROPERTY()); + rose_quartz.getProperty(PropertyKey.ORE).setOreByProducts(rose_quartz, GTMaterials.Redstone, rose_quartz); rose_quartz.setMaterialIconSet(GTMaterialIconSet.getByName('nether_quartz')) } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index fdc89b64c..be4a1c23b 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -82,6 +82,8 @@ const registerTFGMaterials = (event) => { .components('5x nitrogen', '3x oxygen', '2x helium_3') .color(0xa3ed95) + // Refrigerants + event.create('tfg:chlorodifluoromethane') .gas() .components('1x carbon', '1x hydrogen', '1x chlorine', '2x fluorine') diff --git a/kubejs/startup_scripts/vintage_improvements/constants.js b/kubejs/startup_scripts/vintage_improvements/constants.js index 3d642f7ba..1a6a77135 100644 --- a/kubejs/startup_scripts/vintage_improvements/constants.js +++ b/kubejs/startup_scripts/vintage_improvements/constants.js @@ -98,6 +98,7 @@ global.VINTAGE_IMPROVEMENTS_DISABLED_BLOCKS = [ global.VINTAGE_IMPROVEMENTS_DISABLED_FLUIDS = [ - 'vintageimprovements:sulfuric_acid' - + 'vintageimprovements:sulfuric_acid', + 'vintageimprovements:sulfur_dioxide', + 'vintageimprovements:sulfur_trioxide' ] \ No newline at end of file