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/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/newCreateRecipes.js b/kubejs/server_scripts/create/newCreateRecipes.js deleted file mode 100644 index ad2856332..000000000 --- a/kubejs/server_scripts/create/newCreateRecipes.js +++ /dev/null @@ -1,31 +0,0 @@ -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/newItems.js b/kubejs/server_scripts/create/newItems.js deleted file mode 100644 index 1493ad963..000000000 --- a/kubejs/server_scripts/create/newItems.js +++ /dev/null @@ -1,12 +0,0 @@ -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,"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/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/removeReworkedRecipes.js b/kubejs/server_scripts/create/removeReworkedRecipes.js deleted file mode 100644 index 5cf05e97d..000000000 --- a/kubejs/server_scripts/create/removeReworkedRecipes.js +++ /dev/null @@ -1,4 +0,0 @@ -const removeReworkedRecipes = (event) => { - event.remove({ mod: 'create' }); - event.remove({ mod: 'extendedcrafting' }); -} \ 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 265301e14..1e08315b3 100644 --- a/kubejs/server_scripts/mainServerScript.js +++ b/kubejs/server_scripts/mainServerScript.js @@ -10,14 +10,14 @@ ServerEvents.tags('block', event => { ServerEvents.tags('item', event => { // register itemtags here - event.add('forge:ingots/galvanized_iron', 'kubejs:galvanized_iron'); + registerCreateTags(event) + registerTFCTags(event) }) ServerEvents.recipes(event => { - newCreateRecipes(event) - removeReworkedRecipes(event) + registerCreateRecipes(event) + registerExtendedCraftingRecipes(event) registerMinecraftRecipes(event) - newItemsCreate(event) }) LootJS.modifiers((event) => { diff --git a/kubejs/server_scripts/tfc/customRecipes.js b/kubejs/server_scripts/tfc/customRecipes.js index e4e92926c..93768ea70 100644 --- a/kubejs/server_scripts/tfc/customRecipes.js +++ b/kubejs/server_scripts/tfc/customRecipes.js @@ -1,3 +1,5 @@ +// priority: 0 + const customWelding = (event, [input1, input2], result, tier) => { event.custom({ type: "tfc:welding", diff --git a/mods/treetap-1.20.1-0.0.4.jar b/mods/treetap-1.20.1-0.0.4.jar new file mode 100644 index 000000000..bc37ced23 Binary files /dev/null and b/mods/treetap-1.20.1-0.0.4.jar differ