diff --git a/kubejs/assets/kubejs/textures/item/galvanized_iron.png b/kubejs/assets/kubejs/textures/item/galvanized_iron.png new file mode 100644 index 000000000..81e5c0fe9 Binary files /dev/null and b/kubejs/assets/kubejs/textures/item/galvanized_iron.png differ diff --git a/kubejs/client_scripts/constants.js b/kubejs/client_scripts/constants.js index 0799e6552..4f968186f 100644 --- a/kubejs/client_scripts/constants.js +++ b/kubejs/client_scripts/constants.js @@ -1,3 +1 @@ // priority: 200 - -// some constants \ No newline at end of file diff --git a/kubejs/client_scripts/create/constants.js b/kubejs/client_scripts/create/constants.js index cebb0769d..c7f4eda76 100644 --- a/kubejs/client_scripts/create/constants.js +++ b/kubejs/client_scripts/create/constants.js @@ -2,5 +2,14 @@ const createItemsToHide = [ "create:zinc_ore", - "create:deepslate_zinc_ore" + "create:deepslate_zinc_ore", + "create:crushed_raw_silver", + "create:crushed_raw_tin", + "create:crushed_raw_nickel", + "create:copper_sheet", + "create:brass_sheet", + "create:iron_sheet", + "create:golden_sheet", + "create:zinc_ingot", + "create:brass_ingot", ] diff --git a/kubejs/client_scripts/extendedCrafting/constants.js b/kubejs/client_scripts/extendedCrafting/constants.js new file mode 100644 index 000000000..aaefe771f --- /dev/null +++ b/kubejs/client_scripts/extendedCrafting/constants.js @@ -0,0 +1,5 @@ +// priority: 199 + +const extendedCraftingItemsToHide = [ + "extendedcrafting:singularity", +] diff --git a/kubejs/client_scripts/extendedCrafting/rei.js b/kubejs/client_scripts/extendedCrafting/rei.js new file mode 100644 index 000000000..83f9cce7a --- /dev/null +++ b/kubejs/client_scripts/extendedCrafting/rei.js @@ -0,0 +1,7 @@ +// priority: 0 + +const hideExtendedCraftingStuff = (event) => { + extendedCraftingItemsToHide.forEach(itemToHide => { + event.hide(itemToHide) + }) +} \ No newline at end of file diff --git a/kubejs/client_scripts/mainClientScript.js b/kubejs/client_scripts/mainClientScript.js index ca8050d5c..b9619605d 100644 --- a/kubejs/client_scripts/mainClientScript.js +++ b/kubejs/client_scripts/mainClientScript.js @@ -5,6 +5,7 @@ REIEvents.hide('item', event => { hideTFCStuff(event) hideCreateStuff(event) hideMinecraftStuff(event) + hideExtendedCraftingStuff(event) }) diff --git a/kubejs/client_scripts/minecraft/constants.js b/kubejs/client_scripts/minecraft/constants.js index 9a92e40c6..1a695d234 100644 --- a/kubejs/client_scripts/minecraft/constants.js +++ b/kubejs/client_scripts/minecraft/constants.js @@ -19,5 +19,9 @@ const minecraftItemsToHide = [ "minecraft:deepslate_diamond_ore", "minecraft:nether_gold_ore", "minecraft:nether_quartz_ore", - "minecraft:ancient_debris" + "minecraft:ancient_debris", + "minecraft:netherite_helmet", + "minecraft:netherite_chestplate", + "minecraft:netherite_leggings", + "minecraft:netherite_boots", ] \ No newline at end of file diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js new file mode 100644 index 000000000..12e3a3063 --- /dev/null +++ b/kubejs/server_scripts/create/recipes.js @@ -0,0 +1,45 @@ +// priority: 0 + +const registerCreateRecipes = (event) => { + // Удаление рецептов мода create + event.remove({ mod: 'create' }); + + // Деревянная пластина для шестеренки + 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', + }); + + // 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, "forge:ingots/galvanized_iron", ["tfc:metal/wrought_iron", 144], 1400); + //customHeatLevel(event,"forge:ingots/galvanized_iron", 5.714, 921, 1228); + + //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/tags.js b/kubejs/server_scripts/create/tags.js new file mode 100644 index 000000000..7e3eb6fea --- /dev/null +++ b/kubejs/server_scripts/create/tags.js @@ -0,0 +1,6 @@ +// priority: 0 + +const registerCreateTags = (event) => { + + event.add('forge:ingots/galvanized_iron', 'kubejs:galvanized_iron'); +} diff --git a/kubejs/server_scripts/extendedCrafting/recipes.js b/kubejs/server_scripts/extendedCrafting/recipes.js new file mode 100644 index 000000000..82c9d2610 --- /dev/null +++ b/kubejs/server_scripts/extendedCrafting/recipes.js @@ -0,0 +1,6 @@ +// priority: 0 + +const registerExtendedCraftingRecipes = (event) => { + + event.remove({ mod: 'extendedcrafting' }); +} \ No newline at end of file diff --git a/kubejs/server_scripts/mainServerScript.js b/kubejs/server_scripts/mainServerScript.js index af0b63570..9e8390140 100644 --- a/kubejs/server_scripts/mainServerScript.js +++ b/kubejs/server_scripts/mainServerScript.js @@ -5,14 +5,17 @@ ServerEvents.highPriorityData(event => { }) ServerEvents.tags('block', event => { - // register blocktags here + }) ServerEvents.tags('item', event => { + registerCreateTags(event) registerTFCTags(event) }) ServerEvents.recipes(event => { + registerCreateRecipes(event) + registerExtendedCraftingRecipes(event) registerMinecraftRecipes(event) registerTFCRecipes(event) }) diff --git a/kubejs/server_scripts/tfc/customRecipes.js b/kubejs/server_scripts/tfc/customRecipes.js new file mode 100644 index 000000000..93768ea70 --- /dev/null +++ b/kubejs/server_scripts/tfc/customRecipes.js @@ -0,0 +1,63 @@ +// priority: 0 + +const customWelding = (event, [input1, input2], result, tier) => { + event.custom({ + type: "tfc:welding", + first_input: { + tag: input1 + }, + second_input: { + tag: input2 + }, + result: { + item: result + }, + tier: tier, + }) +} + +const customHeating = (event, input1, [result, amount], temperature) => { + event.custom({ + type: "tfc:heating", + ingredient: { + tag: input1 + }, + result_fluid: { + fluid: result, + amount: amount + }, + temperature: temperature + }) +} + +const customAnvil = (event, input1, [result, count], tier, [firstRule, secondRule, thirdRule]) => { + event.custom({ + type: "tfc:anvil", + input: { + tag: input1 + }, + result: { + item: result, + count: count + }, + tier: tier, + rules: [ + firstRule, + secondRule, + thirdRule + ] + }) +} + +// Кастомная температура плавления + +const customHeatLevel = (event, input1, heat_capacity, forging_temperature, welding_temperature) => { + event.custom({ + ingredient: { + item: input1 + }, + heat_capacity: heat_capacity, + forging_temperature: forging_temperature, + welding_temperature: welding_temperature + }) +} \ No newline at end of file diff --git a/kubejs/startup_scripts/create/items.js b/kubejs/startup_scripts/create/items.js new file mode 100644 index 000000000..d2acf56a1 --- /dev/null +++ b/kubejs/startup_scripts/create/items.js @@ -0,0 +1,3 @@ +const registerCreateItems = (event) => { + event.create('galvanized_iron').displayName('Galvanized Iron').maxStackSize(16).texture("kubejs:item/galvanized_iron") +} \ No newline at end of file diff --git a/kubejs/startup_scripts/mainStartupScript.js b/kubejs/startup_scripts/mainStartupScript.js index 5b4e86b6f..e7ce4968c 100644 --- a/kubejs/startup_scripts/mainStartupScript.js +++ b/kubejs/startup_scripts/mainStartupScript.js @@ -1 +1,5 @@ // priority: 999 +StartupEvents.registry('item', event => +{ + registerCreateItems(event); +}) \ No newline at end of file