diff --git a/kubejs/server_scripts/create/newCreateRecipes.js b/kubejs/server_scripts/create/newCreateRecipes.js new file mode 100644 index 000000000..ad2856332 --- /dev/null +++ b/kubejs/server_scripts/create/newCreateRecipes.js @@ -0,0 +1,31 @@ +const newCreateRecipes = (event) => { + // Деревянная пластина для шестеренки + event.shaped('gtceu:wood_plate', [ + ' A', + ' B ', + ' ' + ], { + A: '#tfc:chisels', + B: '#tfc:lumber', + }); + + // Деревянная шестеренка ( маленькая ) + event.shaped('create:cogwheel', [ + ' A ', + ' B ', + ' ' + ], { + A: '#tfc:saws', + B: 'create:large_cogwheel', + }); + + // Деревянная шестеренка ( большая ) + event.shaped('create:large_cogwheel', [ + ' A ', + ' B ', + ' ' + ], { + A: 'create:shaft', + B: 'gtceu:wood_gear', + }); +} \ No newline at end of file diff --git a/kubejs/server_scripts/create/newFluids.js b/kubejs/server_scripts/create/newFluids.js deleted file mode 100644 index ca7b1154e..000000000 --- a/kubejs/server_scripts/create/newFluids.js +++ /dev/null @@ -1,115 +0,0 @@ - -const newCreateFluids = (event) => { - event.create('solder') - .stillTexture('tfc:block/molten_still') - .flowingTexture('tfc:block/molten_flow') - //.color(0x8393A6) - .color(0x8388A6) - .displayName(`Solder`) - .noBlock() - - event.create('incandescent_oil') - .stillTexture('kubejs:block/incandescent_oil_still') - .flowingTexture('kubejs:block/incandescent_oil_flow') - .color(0x6A7536) - .displayName('Incandescent Oil') - .noBlock() - - event.create('potion_beer') - .stillTexture('minecraft:block/water_still') - .flowingTexture('minecraft:block/water_flow') - .color(0xC39E36) - .displayName('Formulated Beer') - .noBlock() - event.create('potion_cider') - .stillTexture('minecraft:block/water_still') - .flowingTexture('minecraft:block/water_flow') - .color(0xB0AE31) - .displayName('Formulated Cider') - .noBlock() - event.create('potion_rum') - .stillTexture('minecraft:block/water_still') - .flowingTexture('minecraft:block/water_flow') - .color(0x6E0122) - .displayName('Formulated Rum') - .noBlock() - event.create('potion_sake') - .stillTexture('minecraft:block/water_still') - .flowingTexture('minecraft:block/water_flow') - .color(0xB7D9BB) - .displayName('Formulated Sake') - .noBlock() - event.create('potion_vodka') - .stillTexture('minecraft:block/water_still') - .flowingTexture('minecraft:block/water_flow') - .color(0xDCDCDB) - .displayName('Formulated Vodka') - .noBlock() - event.create('potion_whiskey') - .stillTexture('minecraft:block/water_still') - .flowingTexture('minecraft:block/water_flow') - .color(0x583718) - .displayName('Formulated Whiskey') - .noBlock() - event.create('potion_corn_whiskey') - .stillTexture('minecraft:block/water_still') - .flowingTexture('minecraft:block/water_flow') - .color(0xD9C7B6) - .displayName('Formulated Corn Whiskey') - .noBlock() - event.create('potion_rye_whiskey') - .stillTexture('minecraft:block/water_still') - .flowingTexture('minecraft:block/water_flow') - .color(0xC77D50) - .displayName('Formulated Rye Whiskey') - .noBlock() - - event.create('potion_strong_beer') - .stillTexture('minecraft:block/water_still') - .flowingTexture('minecraft:block/water_flow') - .color(0xC39E36) - .displayName('Alchemical Beer') - .noBlock() - event.create('potion_strong_cider') - .stillTexture('minecraft:block/water_still') - .flowingTexture('minecraft:block/water_flow') - .color(0xB0AE31) - .displayName('Alchemical Cider') - .noBlock() - event.create('potion_strong_rum') - .stillTexture('minecraft:block/water_still') - .flowingTexture('minecraft:block/water_flow') - .color(0x6E0122) - .displayName('Alchemical Rum') - .noBlock() - event.create('potion_strong_sake') - .stillTexture('minecraft:block/water_still') - .flowingTexture('minecraft:block/water_flow') - .color(0xB7D9BB) - .displayName('Alchemical Sake') - .noBlock() - event.create('potion_strong_vodka') - .stillTexture('minecraft:block/water_still') - .flowingTexture('minecraft:block/water_flow') - .color(0xDCDCDB) - .displayName('Alchemical Vodka') - .noBlock() - event.create('potion_strong_whiskey') - .stillTexture('minecraft:block/water_still') - .flowingTexture('minecraft:block/water_flow') - .color(0x583718) - .displayName('Alchemical Whiskey') - .noBlock() - event.create('potion_strong_corn_whiskey') - .stillTexture('minecraft:block/water_still') - .flowingTexture('minecraft:block/water_flow') - .color(0xD9C7B6) - .displayName('Alchemical Corn Whiskey') - .noBlock() - event.create('potion_strong_rye_whiskey') - .stillTexture('minecraft:block/water_still') - .flowingTexture('minecraft:block/water_flow') - .color(0xC77D50) - .displayName('Alchemical Rye Whiskey') - .noBlock() -} \ No newline at end of file diff --git a/kubejs/server_scripts/create/newItems.js b/kubejs/server_scripts/create/newItems.js index b59565fe4..5bf2ac212 100644 --- a/kubejs/server_scripts/create/newItems.js +++ b/kubejs/server_scripts/create/newItems.js @@ -1,5 +1,11 @@ const newItemsCreate = (event) => { + // galvanized_iron customWelding(event,["forge:ingots/iron","forge:plates/zinc"],"kubejs:galvanized_iron",3); customWelding(event,["forge:ingots/wrought_iron","forge:plates/zinc"],"kubejs:galvanized_iron",3); - customHeating(event,"kubejs:galvanized_iron",["tfc:metal/wrought_iron",144],1400 ); + customHeating(event,"forge:ingots/galvanized_iron",["tfc:metal/wrought_iron",144],1400); + + //shaft craft + customAnvil(event,"forge:ingots/galvanized_iron",["create:shaft",4],3,["hit_last","hit_second_last","hit_third_last"]); + + } \ No newline at end of file diff --git a/kubejs/server_scripts/create/removeReworkedRecipes.js b/kubejs/server_scripts/create/removeReworkedRecipes.js new file mode 100644 index 000000000..e3db10d4a --- /dev/null +++ b/kubejs/server_scripts/create/removeReworkedRecipes.js @@ -0,0 +1,3 @@ +const removeReworkedRecipes = (event) => { + event.remove({ mod: 'create' }); +} \ No newline at end of file diff --git a/kubejs/server_scripts/mainServerScript.js b/kubejs/server_scripts/mainServerScript.js index b8794c61c..265301e14 100644 --- a/kubejs/server_scripts/mainServerScript.js +++ b/kubejs/server_scripts/mainServerScript.js @@ -10,9 +10,12 @@ ServerEvents.tags('block', event => { ServerEvents.tags('item', event => { // register itemtags here + event.add('forge:ingots/galvanized_iron', 'kubejs:galvanized_iron'); }) ServerEvents.recipes(event => { + newCreateRecipes(event) + removeReworkedRecipes(event) registerMinecraftRecipes(event) newItemsCreate(event) }) diff --git a/kubejs/server_scripts/tfc/customRecipes.js b/kubejs/server_scripts/tfc/customRecipes.js index 973678579..948b3f69c 100644 --- a/kubejs/server_scripts/tfc/customRecipes.js +++ b/kubejs/server_scripts/tfc/customRecipes.js @@ -18,7 +18,7 @@ const customHeating = (event,input1,[result,amount],temperature) => { event.custom({ type: "tfc:heating", ingredient: { - item: input1 + tag: input1 }, result_fluid: { fluid: result, @@ -28,14 +28,15 @@ const customHeating = (event,input1,[result,amount],temperature) => { }) } -const customAnvil = (event,input1,result,tier,[firstRule,secondRule,thirdRule]) => { +const customAnvil = (event,input1,[result,count],tier,[firstRule,secondRule,thirdRule]) => { event.custom({ type: "tfc:anvil", input: { tag: input1 }, result: { - item: result + item: result, + count: count }, tier: tier, rules: [ diff --git a/kubejs/startup_scripts/mainStartupScript.js b/kubejs/startup_scripts/mainStartupScript.js index 515ba5edf..151a354b1 100644 --- a/kubejs/startup_scripts/mainStartupScript.js +++ b/kubejs/startup_scripts/mainStartupScript.js @@ -2,5 +2,4 @@ StartupEvents.registry('item', event => { newCreateItems(event); - newCreateFluids(event); }) \ No newline at end of file