diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index 874417279..94d91622f 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -14,7 +14,7 @@ const registerCreatedecoRecipes = (event) => { 'createdeco:industrial_iron_ingot': '#forge:ingots/steel', 'createdeco:industrial_iron_sheet': '#forge:plates/steel', 'createdeco:industrial_iron_nugget': '#forge:nuggets/steel', - 'minecraft:torch': 'minecraft:glowstone_dust', + 'minecraft:torch': 'minecraft:glowstone', 'minecraft:vine': '#tfc:moss', 'create:andesite_alloy': '#forge:ingots/tin_alloy', 'createdeco:andesite_sheet': '#forge:plates/tin_alloy', @@ -76,7 +76,7 @@ const registerCreatedecoRecipes = (event) => { } let ingredients = { - T: `minecraft:glowstone_dust`, + T: `minecraft:glowstone`, N: `#forge:nuggets/${replacementLampType}`, P: `#forge:plates/${replacementLampType}`, D: null, diff --git a/kubejs/server_scripts/diggerhelmet/recipes.js b/kubejs/server_scripts/diggerhelmet/recipes.js index 8abb548d0..ae65bff3f 100644 --- a/kubejs/server_scripts/diggerhelmet/recipes.js +++ b/kubejs/server_scripts/diggerhelmet/recipes.js @@ -3,19 +3,17 @@ function registerDiggerHelmetRecipes(event) { event.remove({ mod: 'diggerhelmet' }) - event.shapeless('diggerhelmet:eternal_candle', ['#minecraft:candles', 'minecraft:glowstone_dust']) - .id('tfg:shapeless/eternal_candle') - event.shaped('diggerhelmet:digger_helmet', [ - ' A ', - 'EB ', + ' F ', + 'EAB', 'DCD' ], { - A: 'diggerhelmet:eternal_candle', + A: '#minecraft:candles', B: '#forge:rings', C: 'minecraft:leather_helmet', D: '#forge:rods/tin', - E: '#forge:tools/hammers' + E: '#forge:tools/hammers', + F: 'minecraft:glowstone_dust' }) .id('tfg:shaped/digger_helmet') diff --git a/kubejs/server_scripts/diggerhelmet/tags.js b/kubejs/server_scripts/diggerhelmet/tags.js index 483727141..7e7176c35 100644 --- a/kubejs/server_scripts/diggerhelmet/tags.js +++ b/kubejs/server_scripts/diggerhelmet/tags.js @@ -3,6 +3,7 @@ function registerDiggerHelmetItemTags(event) { const DISABLED_ITEMS = [ + 'diggerhelmet:eternal_candle', 'diggerhelmet:wool_lining' ] diff --git a/kubejs/server_scripts/framed_blocks/recipes.js b/kubejs/server_scripts/framed_blocks/recipes.js index 237152eee..6667bce79 100644 --- a/kubejs/server_scripts/framed_blocks/recipes.js +++ b/kubejs/server_scripts/framed_blocks/recipes.js @@ -539,4 +539,29 @@ const registerFramedBlocksRecipes = (event) => { count: 4 } }).id('framedblocks:framing_saw/framed_lever') + + // Glowing cube + + event.shapeless( + Item.of('framedblocks:framed_glowing_cube', 1), + [ + 'framedblocks:framed_cube', + 'minecraft:glowstone', + ] + ).id('framedblocks:framed_glowing_cube') + + event.custom({ + type: "framedblocks:frame", + additives: [ + { + "count": 1, + "ingredient": { item: "minecraft:glowstone" } + } + ], + material: 6144, + result: { + item: "framedblocks:framed_glowing_cube", + count: 1 + } + }).id('framedblocks:framing_saw/framed_glowing_cube') } diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 010ebf123..bc6049948 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -348,6 +348,13 @@ const registerMinecraftRecipes = (event) => { C: '#tfc:rock/smooth' }).id('tfg:shaped/comparator_nether_quartz'); + event.replaceInput({id: 'gtceu:shaped/redstone_lamp' }, 'minecraft:glass_pane', '#forge:glass_panes') + event.recipes.gtceu.assembler('redstone_lamp') + .itemInputs('1x #forge:glass', '1x minecraft:glowstone', '1x #forge:rods/red_alloy') + .itemOutputs('minecraft:redstone_lamp') + .duration(50) + .EUt(7) + //#endregion //#region Выход: Рамка diff --git a/kubejs/server_scripts/simplylight/recipes.js b/kubejs/server_scripts/simplylight/recipes.js index b650a278d..a6f763729 100644 --- a/kubejs/server_scripts/simplylight/recipes.js +++ b/kubejs/server_scripts/simplylight/recipes.js @@ -86,7 +86,7 @@ const registerSimplylightRecipes = (event) => { 'BBB', ' ' ], { - A: '#forge:dusts/glowstone', + A: 'minecraft:glowstone', B: '#forge:plates/tin_alloy' }).id('tfg:simplylight/illuminant_slab') @@ -95,7 +95,7 @@ const registerSimplylightRecipes = (event) => { 'BA ', 'BA ' ], { - A: '#forge:dusts/glowstone', + A: 'minecraft:glowstone', B: '#forge:plates/tin_alloy' }).id('tfg:simplylight/wall_lamp') @@ -104,7 +104,7 @@ const registerSimplylightRecipes = (event) => { 'ABA', 'ACA' ], { - A: '#forge:dusts/glowstone', + A: 'minecraft:glowstone', B: '#forge:rods/tin_alloy', C: '#forge:bolts/tin_alloy' }).id('tfg:simplylight/rod_lamp') @@ -114,7 +114,7 @@ const registerSimplylightRecipes = (event) => { 'BBB', ' ' ], { - A: '#forge:dusts/glowstone', + A: 'minecraft:glowstone', B: '#forge:plates/tin_alloy' }).id('tfg:simplylight/light_bulb') @@ -123,20 +123,19 @@ const registerSimplylightRecipes = (event) => { 'CBC', ' ' ], { - A: '#forge:dusts/glowstone', + A: 'minecraft:glowstone', B: '#forge:rods/tin_alloy', C: '#forge:bolts/tin_alloy' }).id('tfg:simplylight/edge_light') - event.shaped('8x simplylight:lamp_post', [ + event.shaped('4x simplylight:lamp_post', [ ' A ', ' B ', - 'CDC' + ' C ' ], { A: '#simplylight:any_lamp_on', - B: '#forge:rods/long/bronze', - C: '#forge:plates/bronze', - D: '#forge:screws/bronze' + B: '#forge:rods/long/tin_alloy', + C: '#forge:plates/tin_alloy', }).id('tfg:simplylight/lamp_post') event.shaped('8x simplylight:illuminant_block_on', [ @@ -144,7 +143,7 @@ const registerSimplylightRecipes = (event) => { 'ACA', 'BAB' ], { - A: '#forge:dusts/glowstone', + A: 'minecraft:glowstone', B: '#forge:plates/tin_alloy', C: '#forge:fine_wires/red_alloy', }).id('tfg:simplylight/illuminant_block_on') @@ -154,7 +153,7 @@ const registerSimplylightRecipes = (event) => { 'BCB', 'ABA' ], { - A: '#forge:dusts/glowstone', + A: 'minecraft:glowstone', B: '#forge:plates/tin_alloy', C: '#forge:fine_wires/red_alloy', }).id('tfg:simplylight/illuminant_block')