diff --git a/kubejs/assets/mainmenu/button.png b/kubejs/assets/mainmenu/button.png new file mode 100644 index 000000000..363609aed Binary files /dev/null and b/kubejs/assets/mainmenu/button.png differ diff --git a/kubejs/assets/mainmenu/button98x20.png b/kubejs/assets/mainmenu/button98x20.png new file mode 100644 index 000000000..77eae7dd7 Binary files /dev/null and b/kubejs/assets/mainmenu/button98x20.png differ diff --git a/kubejs/assets/mainmenu/button98x20_hovered.png b/kubejs/assets/mainmenu/button98x20_hovered.png new file mode 100644 index 000000000..c2bcc801b Binary files /dev/null and b/kubejs/assets/mainmenu/button98x20_hovered.png differ diff --git a/kubejs/assets/mainmenu/button_hovered.png b/kubejs/assets/mainmenu/button_hovered.png new file mode 100644 index 000000000..cd4452f03 Binary files /dev/null and b/kubejs/assets/mainmenu/button_hovered.png differ diff --git a/kubejs/assets/mainmenu/curse_logo.png b/kubejs/assets/mainmenu/curse_logo.png new file mode 100644 index 000000000..fca41d271 Binary files /dev/null and b/kubejs/assets/mainmenu/curse_logo.png differ diff --git a/kubejs/assets/mainmenu/curse_logo_hovered.png b/kubejs/assets/mainmenu/curse_logo_hovered.png new file mode 100644 index 000000000..8c8751937 Binary files /dev/null and b/kubejs/assets/mainmenu/curse_logo_hovered.png differ diff --git a/kubejs/assets/mainmenu/ds_logo.png b/kubejs/assets/mainmenu/ds_logo.png new file mode 100644 index 000000000..c6d970fea Binary files /dev/null and b/kubejs/assets/mainmenu/ds_logo.png differ diff --git a/kubejs/assets/mainmenu/ds_logo_hovered.png b/kubejs/assets/mainmenu/ds_logo_hovered.png new file mode 100644 index 000000000..438db91ed Binary files /dev/null and b/kubejs/assets/mainmenu/ds_logo_hovered.png differ diff --git a/kubejs/assets/mainmenu/git_logo.png b/kubejs/assets/mainmenu/git_logo.png new file mode 100644 index 000000000..66547402f Binary files /dev/null and b/kubejs/assets/mainmenu/git_logo.png differ diff --git a/kubejs/assets/mainmenu/git_logo_hovered.png b/kubejs/assets/mainmenu/git_logo_hovered.png new file mode 100644 index 000000000..00e56d352 Binary files /dev/null and b/kubejs/assets/mainmenu/git_logo_hovered.png differ diff --git a/kubejs/assets/mainmenu/mdr_logo.png b/kubejs/assets/mainmenu/mdr_logo.png new file mode 100644 index 000000000..a90b085d7 Binary files /dev/null and b/kubejs/assets/mainmenu/mdr_logo.png differ diff --git a/kubejs/assets/mainmenu/mdr_logo_hovered.png b/kubejs/assets/mainmenu/mdr_logo_hovered.png new file mode 100644 index 000000000..ebe2dce68 Binary files /dev/null and b/kubejs/assets/mainmenu/mdr_logo_hovered.png differ diff --git a/kubejs/client_scripts/constants.js b/kubejs/client_scripts/constants.js index 531243163..95d20ec89 100644 --- a/kubejs/client_scripts/constants.js +++ b/kubejs/client_scripts/constants.js @@ -1,5 +1,6 @@ // priority: 200 +<<<<<<< HEAD const minecraftItemsToHide = [ "minecraft:coal_ore", "minecraft:deepslate_coal_ore", @@ -104,4 +105,7 @@ const tfcDepositeMaterials = [ "native_copper", "native_gold", "native_silver" -] \ No newline at end of file +] +======= +// some constants +>>>>>>> origin/main diff --git a/kubejs/client_scripts/create/constants.js b/kubejs/client_scripts/create/constants.js new file mode 100644 index 000000000..cebb0769d --- /dev/null +++ b/kubejs/client_scripts/create/constants.js @@ -0,0 +1,6 @@ +// priority: 199 + +const createItemsToHide = [ + "create:zinc_ore", + "create:deepslate_zinc_ore" +] 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/gregtech/constants.js b/kubejs/client_scripts/gregtech/constants.js new file mode 100644 index 000000000..2872216ed --- /dev/null +++ b/kubejs/client_scripts/gregtech/constants.js @@ -0,0 +1,16 @@ +// priority: 199 + +const stoneTypesToHide = [ + "sand", + "red_sand", + "gravel", + "ore", + "deepslate", + "basalt", + "endstone", + "netherrack", + "andesite", + "diorite", + "granite", + "tuff" +] diff --git a/kubejs/client_scripts/gregtech/rei.js b/kubejs/client_scripts/gregtech/rei.js index aefeabc97..f5d44f8e7 100644 --- a/kubejs/client_scripts/gregtech/rei.js +++ b/kubejs/client_scripts/gregtech/rei.js @@ -10,21 +10,107 @@ const hideGTStuff = (event) => { } const groupGTStuff = (event) => { - event.groupItemsByTag('tfg:rei_groups/nuggets', 'Nuggets', 'forge:nuggets') - event.groupItemsByTag('tfg:rei_groups/dusts_tiny', 'Tiny Dusts', 'forge:dusts/tiny') - event.groupItemsByTag('tfg:rei_groups/dusts_small', 'Small Dusts', 'forge:dusts/small') + event.groupItemsByTag('tfg:rei_groups/dusts/tiny', 'Tiny Dusts', 'forge:dusts/tiny') + event.groupItemsByTag('tfg:rei_groups/dusts/small', 'Small Dusts', 'forge:dusts/small') event.groupItemsByTag('tfg:rei_groups/dusts', 'Dusts', 'forge:dusts') - event.groupItemsByTag('tfg:rei_groups/dusts_pure', 'Pure Dusts', 'forge:dusts/pure') - event.groupItemsByTag('tfg:rei_groups/dusts_impure', 'Impure Dusts', 'forge:dusts/impure') + event.groupItemsByTag('tfg:rei_groups/dusts/pure', 'Pure Dusts', 'forge:dusts/pure') + event.groupItemsByTag('tfg:rei_groups/dusts/impure', 'Impure Dusts', 'forge:dusts/impure') + + event.groupItemsByTag('tfg:rei_groups/nuggets', 'Nuggets', 'forge:nuggets') + event.groupItemsByTag('tfg:rei_groups/ores', 'Ores', 'forge:ores') event.groupItemsByTag('tfg:rei_groups/crushed_ores', 'Crushed Ores', 'forge:crushed_ores') event.groupItemsByTag('tfg:rei_groups/purified_ores', 'Purified Ores', 'forge:purified_ores') event.groupItemsByTag('tfg:rei_groups/refined_ores', 'Refined Ores', 'forge:refined_ores') - // event.groupItems('tfg:rei_groups/poor_raw_ores', 'Poor Raw Ores', [/gtceu:poor_raw/]) - // event.groupItems('tfg:rei_groups/normal_raw_ores', 'Normal Raw Ores', [/gtceu:raw/]) - // event.groupItems('tfg:rei_groups/rich_raw_ores', 'Rich Raw Ores', [/gtceu:rich_raw/]) - // todo: add poor raw ore - // todo: add normal raw ore - // todo: add rich raw ore + event.groupItemsByTag('tfg:rei_groups/ingots', 'Ingots', 'forge:ingots') + event.groupItemsByTag('tfg:rei_groups/ingots/hot', 'Hot Ingots', 'forge:ingots/hot') + + event.groupItemsByTag('tfg:rei_groups/gears/small', 'Small Gears', 'forge:gears/small') + event.groupItemsByTag('tfg:rei_groups/gears', 'Gears', 'forge:gears') + + event.groupItemsByTag('tfg:rei_groups/rods', 'Rods', 'forge:rods') + event.groupItemsByTag('tfg:rei_groups/rods/long', 'Long Rods', 'forge:rods/long') + + event.groupItemsByTag('tfg:rei_groups/plates', 'Plates', 'forge:plates') + event.groupItemsByTag('tfg:rei_groups/plates/double', 'Double Plates', 'forge:plates/double') + event.groupItemsByTag('tfg:rei_groups/plates/dense', 'Dense Plates', 'forge:plates/dense') + + event.groupItemsByTag('tfg:rei_groups/springs', 'Springs', 'forge:springs') + event.groupItemsByTag('tfg:rei_groups/springs/small', 'Small Springs', 'forge:springs/small') + + event.groupItemsByTag('tfg:rei_groups/gems/exquisite', 'Exquisite Gems', 'forge:gems/exquisite') + event.groupItemsByTag('tfg:rei_groups/gems', 'Gems', 'forge:gems') + event.groupItemsByTag('tfg:rei_groups/gems/flawless', 'Flawless Gems', 'forge:gems/flawless') + event.groupItemsByTag('tfg:rei_groups/gems/flawed', 'Flawed Gems', 'forge:gems/flawed') + event.groupItemsByTag('tfg:rei_groups/gems/chipped', 'Chipped Gems', 'forge:gems/chipped') + + event.groupItemsByTag('tfg:rei_groups/material_blocks', 'Material Blocks', 'forge:material_blocks') + event.groupItemsByTag('tfg:rei_groups/raw_material_blocks', 'Raw Material Blocks', 'forge:raw_material_blocks') + + event.groupItemsByTag('tfg:rei_groups/sword_heads', 'Sword Heads', 'forge:sword_heads') + event.groupItemsByTag('tfg:rei_groups/butchery_knife_heads', 'Butchery Knife Heads', 'forge:butchery_knife_heads') + event.groupItemsByTag('tfg:rei_groups/mining_hammer_heads', 'Mining Hammer Heads', 'forge:mining_hammer_heads') + event.groupItemsByTag('tfg:rei_groups/hoe_heads', 'Hoe Heads', 'forge:hoe_heads') + event.groupItemsByTag('tfg:rei_groups/hammer_heads', 'Hammer Heads', 'forge:hammer_heads') + event.groupItemsByTag('tfg:rei_groups/knife_heads', 'Knife Heads', 'forge:knife_heads') + event.groupItemsByTag('tfg:rei_groups/pickaxe_heads', 'Pickaxe Heads', 'forge:pickaxe_heads') + event.groupItemsByTag('tfg:rei_groups/axe_heads', 'Axe Heads', 'forge:axe_heads') + event.groupItemsByTag('tfg:rei_groups/saw_heads', 'Saw Heads', 'forge:saw_heads') + event.groupItemsByTag('tfg:rei_groups/shovel_heads', 'Shovel Heads', 'forge:shovel_heads') + event.groupItemsByTag('tfg:rei_groups/scythe_heads', 'Scythe Heads', 'forge:scythe_heads') + event.groupItemsByTag('tfg:rei_groups/file_heads', 'File Heads', 'forge:file_heads') + + event.groupItemsByTag('tfg:rei_groups/poor_raw_ores', 'Poor Raw Ores', 'forge:poor_raw_materials') + event.groupItemsByTag('tfg:rei_groups/normal_raw_ores', 'Normal Raw Ores', 'forge:raw_materials') + event.groupItemsByTag('tfg:rei_groups/rich_raw_ores', 'Rich Raw Ores', 'forge:rich_raw_materials') + + event.groupItemsByTag('tfg:rei_groups/rings', 'Rings', 'forge:rings') + event.groupItemsByTag('tfg:rei_groups/bolts', 'Bolts', 'forge:bolts') + event.groupItemsByTag('tfg:rei_groups/screws', 'Screws', 'forge:screws') + event.groupItemsByTag('tfg:rei_groups/foils', 'Foils', 'forge:foils') + event.groupItemsByTag('tfg:rei_groups/rotors', 'Rotors', 'forge:rotors') + event.groupItemsByTag('tfg:rei_groups/wires/fine', 'Fine Wires', 'forge:wires/fine') + + event.groupItems('tfg:rei_groups/drill_heads', 'Drill Heads', [/gtceu:.*_drill_head/]) + event.groupItems('tfg:rei_groups/chainsaw_heads', 'Chainsaw Heads', [/gtceu:.*_chainsaw_head/]) + event.groupItems('tfg:rei_groups/buzzsaw_blades', 'Buzz Saw Blades', [/gtceu:.*_buzz_saw_blade/]) + + event.groupItems('tfg:rei_groups/turbine_blades', 'Turbine Blades', [/gtceu:.*_turbine_blade/]) + event.groupItems('tfg:rei_groups/wrench_tips', 'Wrench Tips', [/gtceu:.*_wrench_tip/]) + event.groupItems('tfg:rei_groups/screwdriver_tips', 'Screwdriver Tips', [/gtceu:.*_screwdriver_tip/]) + + event.groupItems('tfg:rei_groups/buckets', 'Buckets', [/gtceu:.*_bucket/]) + event.groupItems('tfg:rei_groups/frame', 'Frames', [/gtceu:.*_frame/]) + + event.groupItems('tfg:rei_groups/single_wires', 'Single Wires', [/gtceu:.*_single_wire/]) + event.groupItems('tfg:rei_groups/double_wires', 'Double Wires', [/gtceu:.*_double_wire/]) + event.groupItems('tfg:rei_groups/quadruple_wires', 'Quadruple Wires', [/gtceu:.*_quadruple_wire/]) + event.groupItems('tfg:rei_groups/octal_wires', 'Octal Wires', [/gtceu:.*_octal_wire/]) + event.groupItems('tfg:rei_groups/hex_wires', 'Hex Wires', [/gtceu:.*_hex_wire/]) + + event.groupItems('tfg:rei_groups/single_cables', 'Single Cables', [/gtceu:.*_single_cable/]) + event.groupItems('tfg:rei_groups/double_cables', 'Double Cables', [/gtceu:.*_double_cable/]) + event.groupItems('tfg:rei_groups/quadruple_cables', 'Quadruple Cables', [/gtceu:.*_quadruple_cable/]) + event.groupItems('tfg:rei_groups/octal_cables', 'Octal Cables', [/gtceu:.*_octal_cable/]) + event.groupItems('tfg:rei_groups/hex_cables', 'Hex Cables', [/gtceu:.*_hex_cable/]) + + event.groupItems('tfg:rei_groups/tiny_fluid_pipes', 'Tiny Fluid Pipes', [/gtceu:.*_tiny_fluid_pipe/]) + event.groupItems('tfg:rei_groups/small_fluid_pipes', 'Small Fluid Pipes', [/gtceu:.*_small_fluid_pipe/]) + event.groupItems('tfg:rei_groups/normal_fluid_pipes', 'Normal Fluid Pipes', [/gtceu:.*_normal_fluid_pipe/]) + event.groupItems('tfg:rei_groups/large_fluid_pipes', 'Large Fluid Pipes', [/gtceu:.*_large_fluid_pipe/]) + event.groupItems('tfg:rei_groups/huge_fluid_pipes', 'Huge Fluid Pipes', [/gtceu:.*_huge_fluid_pipe/]) + event.groupItems('tfg:rei_groups/quadruple_fluid_pipes', 'Quadruple Fluid Pipes', [/gtceu:.*_quadruple_fluid_pipe/]) + event.groupItems('tfg:rei_groups/nonuple_fluid_pipes', 'Nonuple Fluid Pipes', [/gtceu:.*_nonuple_fluid_pipe/]) + + event.groupItems('tfg:rei_groups/tiny_item_pipes', 'Tiny Item Pipes', [/gtceu:.*_tiny_item_pipe/]) + event.groupItems('tfg:rei_groups/small_item_pipes', 'Small Item Pipes', [/gtceu:.*_small_item_pipe/]) + event.groupItems('tfg:rei_groups/normal_item_pipes', 'Normal Item Pipes', [/gtceu:.*_normal_item_pipe/]) + event.groupItems('tfg:rei_groups/large_item_pipes', 'Large Item Pipes', [/gtceu:.*_large_item_pipe/]) + event.groupItems('tfg:rei_groups/huge_item_pipes', 'Huge Item Pipes', [/gtceu:.*_huge_item_pipe/]) + + event.groupItems('tfg:rei_groups/small_restrictive_item_pipes', 'Small Resctrictive Item Pipes', [/gtceu:.*_small_restrictive_item_pipe/]) + event.groupItems('tfg:rei_groups/normal_restrictive_item_pipes', 'Normal Resctrictive Item Pipes', [/gtceu:.*_normal_restrictive_item_pipe/]) + event.groupItems('tfg:rei_groups/large_restrictive_item_pipes', 'Large Resctrictive Item Pipes', [/gtceu:.*_large_restrictive_item_pipe/]) + event.groupItems('tfg:rei_groups/huge_restrictive_item_pipes', 'Huge Resctrictive Item Pipes', [/gtceu:.*_huge_restrictive_item_pipe/]) } \ 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 new file mode 100644 index 000000000..9a92e40c6 --- /dev/null +++ b/kubejs/client_scripts/minecraft/constants.js @@ -0,0 +1,23 @@ +// priority: 199 + +const minecraftItemsToHide = [ + "minecraft:coal_ore", + "minecraft:deepslate_coal_ore", + "minecraft:iron_ore", + "minecraft:deepslate_iron_ore", + "minecraft:copper_ore", + "minecraft:deepslate_copper_ore", + "minecraft:gold_ore", + "minecraft:deepslate_gold_ore", + "minecraft:redstone_ore", + "minecraft:deepslate_redstone_ore", + "minecraft:emerald_ore", + "minecraft:deepslate_emerald_ore", + "minecraft:lapis_ore", + "minecraft:deepslate_lapis_ore", + "minecraft:diamond_ore", + "minecraft:deepslate_diamond_ore", + "minecraft:nether_gold_ore", + "minecraft:nether_quartz_ore", + "minecraft:ancient_debris" +] \ No newline at end of file diff --git a/kubejs/client_scripts/tfc/constants.js b/kubejs/client_scripts/tfc/constants.js new file mode 100644 index 000000000..ec8b2a6aa --- /dev/null +++ b/kubejs/client_scripts/tfc/constants.js @@ -0,0 +1,359 @@ +// priority: 199 + +const tfcItemsToHide = [ + // Simple metals + // Bismuth + 'tfc:metal/ingot/bismuth', + 'tfc:metal/sheet/bismuth', + 'tfc:metal/double_sheet/bismuth', + 'tfc:metal/rod/bismuth', + + // Gold + 'tfc:metal/ingot/gold', + 'tfc:metal/sheet/gold', + 'tfc:metal/double_sheet/gold', + + // Nickel + 'tfc:metal/sheet/nickel', + 'tfc:metal/double_sheet/nickel', + + // Rose Gold + 'tfc:metal/ingot/rose_gold', + 'tfc:metal/sheet/rose_gold', + 'tfc:metal/double_sheet/rose_gold', + 'tfc:metal/rod/rose_gold', + + // Silver + 'tfc:metal/sheet/silver', + 'tfc:metal/double_sheet/silver', + + // Tin + 'tfc:metal/sheet/tin', + 'tfc:metal/double_sheet/tin', + + // Brass + 'tfc:metal/sheet/brass', + 'tfc:metal/double_sheet/brass', + + // Zinc + 'tfc:metal/sheet/zinc', + 'tfc:metal/double_sheet/zinc', + + // Sterling Silver + 'tfc:metal/ingot/sterling_silver', + 'tfc:metal/sheet/sterling_silver', + 'tfc:metal/double_sheet/sterling_silver', + 'tfc:metal/rod/sterling_silver', + + // Cast + 'tfc:metal/ingot/cast_iron', + 'tfc:metal/sheet/cast_iron', + 'tfc:metal/double_sheet/cast_iron', + 'tfc:metal/rod/cast_iron', + + // Metals with tools + // Copper + 'tfc:metal/ingot/copper', + 'tfc:metal/sheet/copper', + 'tfc:metal/double_sheet/copper', + 'tfc:metal/rod/copper', + 'tfc:metal/pickaxe/copper', + 'tfc:metal/pickaxe_head/copper', + 'tfc:metal/axe/copper', + 'tfc:metal/axe_head/copper', + 'tfc:metal/shovel/copper', + 'tfc:metal/shovel_head/copper', + 'tfc:metal/hoe/copper', + 'tfc:metal/hoe_head/copper', + 'tfc:metal/hammer/copper', + 'tfc:metal/hammer_head/copper', + 'tfc:metal/saw/copper', + 'tfc:metal/saw_blade/copper', + 'tfc:metal/sword/copper', + 'tfc:metal/sword_blade/copper', + 'tfc:metal/knife/copper', + 'tfc:metal/knife_blade/copper', + 'tfc:metal/scythe/copper', + 'tfc:metal/scythe_blade/copper', + + // Bismuth Bronze + 'tfc:metal/ingot/bismuth_bronze', + 'tfc:metal/sheet/bismuth_bronze', + 'tfc:metal/double_sheet/bismuth_bronze', + 'tfc:metal/rod/bismuth_bronze', + 'tfc:metal/pickaxe/bismuth_bronze', + 'tfc:metal/pickaxe_head/bismuth_bronze', + 'tfc:metal/axe/bismuth_bronze', + 'tfc:metal/axe_head/bismuth_bronze', + 'tfc:metal/shovel/bismuth_bronze', + 'tfc:metal/shovel_head/bismuth_bronze', + 'tfc:metal/hoe/bismuth_bronze', + 'tfc:metal/hoe_head/bismuth_bronze', + 'tfc:metal/hammer/bismuth_bronze', + 'tfc:metal/hammer_head/bismuth_bronze', + 'tfc:metal/saw/bismuth_bronze', + 'tfc:metal/saw_blade/bismuth_bronze', + 'tfc:metal/sword/bismuth_bronze', + 'tfc:metal/sword_blade/bismuth_bronze', + 'tfc:metal/knife/bismuth_bronze', + 'tfc:metal/knife_blade/bismuth_bronze', + 'tfc:metal/scythe/bismuth_bronze', + 'tfc:metal/scythe_blade/bismuth_bronze', + + // Bronze + 'tfc:metal/ingot/bronze', + 'tfc:metal/sheet/bronze', + 'tfc:metal/double_sheet/bronze', + 'tfc:metal/rod/bronze', + 'tfc:metal/pickaxe/bronze', + 'tfc:metal/pickaxe_head/bronze', + 'tfc:metal/axe/bronze', + 'tfc:metal/axe_head/bronze', + 'tfc:metal/shovel/bronze', + 'tfc:metal/shovel_head/bronze', + 'tfc:metal/hoe/bronze', + 'tfc:metal/hoe_head/bronze', + 'tfc:metal/hammer/bronze', + 'tfc:metal/hammer_head/bronze', + 'tfc:metal/saw/bronze', + 'tfc:metal/saw_blade/bronze', + 'tfc:metal/sword/bronze', + 'tfc:metal/sword_blade/bronze', + 'tfc:metal/knife/bronze', + 'tfc:metal/knife_blade/bronze', + 'tfc:metal/scythe/bronze', + 'tfc:metal/scythe_blade/bronze', + + // Black Bronze + 'tfc:metal/ingot/black_bronze', + 'tfc:metal/sheet/black_bronze', + 'tfc:metal/double_sheet/black_bronze', + 'tfc:metal/rod/black_bronze', + 'tfc:metal/pickaxe/black_bronze', + 'tfc:metal/pickaxe_head/black_bronze', + 'tfc:metal/axe/black_bronze', + 'tfc:metal/axe_head/black_bronze', + 'tfc:metal/shovel/black_bronze', + 'tfc:metal/shovel_head/black_bronze', + 'tfc:metal/hoe/black_bronze', + 'tfc:metal/hoe_head/black_bronze', + 'tfc:metal/hammer/black_bronze', + 'tfc:metal/hammer_head/black_bronze', + 'tfc:metal/saw/black_bronze', + 'tfc:metal/saw_blade/black_bronze', + 'tfc:metal/sword/black_bronze', + 'tfc:metal/sword_blade/black_bronze', + 'tfc:metal/knife/black_bronze', + 'tfc:metal/knife_blade/black_bronze', + 'tfc:metal/scythe/black_bronze', + 'tfc:metal/scythe_blade/black_bronze', + + // Wrought Iron + 'tfc:metal/ingot/wrought_iron', + 'tfc:metal/sheet/wrought_iron', + 'tfc:metal/double_sheet/wrought_iron', + 'tfc:metal/rod/wrought_iron', + 'tfc:metal/pickaxe/wrought_iron', + 'tfc:metal/pickaxe_head/wrought_iron', + 'tfc:metal/axe/wrought_iron', + 'tfc:metal/axe_head/wrought_iron', + 'tfc:metal/shovel/wrought_iron', + 'tfc:metal/shovel_head/wrought_iron', + 'tfc:metal/hoe/wrought_iron', + 'tfc:metal/hoe_head/wrought_iron', + 'tfc:metal/hammer/wrought_iron', + 'tfc:metal/hammer_head/wrought_iron', + 'tfc:metal/saw/wrought_iron', + 'tfc:metal/saw_blade/wrought_iron', + 'tfc:metal/sword/wrought_iron', + 'tfc:metal/sword_blade/wrought_iron', + 'tfc:metal/knife/wrought_iron', + 'tfc:metal/knife_blade/wrought_iron', + 'tfc:metal/scythe/wrought_iron', + 'tfc:metal/scythe_blade/wrought_iron', + + // Steel + 'tfc:metal/ingot/steel', + 'tfc:metal/sheet/steel', + 'tfc:metal/double_sheet/steel', + 'tfc:metal/rod/steel', + 'tfc:metal/pickaxe/steel', + 'tfc:metal/pickaxe_head/steel', + 'tfc:metal/axe/steel', + 'tfc:metal/axe_head/steel', + 'tfc:metal/shovel/steel', + 'tfc:metal/shovel_head/steel', + 'tfc:metal/hoe/steel', + 'tfc:metal/hoe_head/steel', + 'tfc:metal/hammer/steel', + 'tfc:metal/hammer_head/steel', + 'tfc:metal/saw/steel', + 'tfc:metal/saw_blade/steel', + 'tfc:metal/sword/steel', + 'tfc:metal/sword_blade/steel', + 'tfc:metal/knife/steel', + 'tfc:metal/knife_blade/steel', + 'tfc:metal/scythe/steel', + 'tfc:metal/scythe_blade/steel', + + // Black Steel + 'tfc:metal/ingot/black_steel', + 'tfc:metal/sheet/black_steel', + 'tfc:metal/double_sheet/black_steel', + 'tfc:metal/rod/black_steel', + 'tfc:metal/pickaxe/black_steel', + 'tfc:metal/pickaxe_head/black_steel', + 'tfc:metal/axe/black_steel', + 'tfc:metal/axe_head/black_steel', + 'tfc:metal/shovel/black_steel', + 'tfc:metal/shovel_head/black_steel', + 'tfc:metal/hoe/black_steel', + 'tfc:metal/hoe_head/black_steel', + 'tfc:metal/hammer/black_steel', + 'tfc:metal/hammer_head/black_steel', + 'tfc:metal/saw/black_steel', + 'tfc:metal/saw_blade/black_steel', + 'tfc:metal/sword/black_steel', + 'tfc:metal/sword_blade/black_steel', + 'tfc:metal/knife/black_steel', + 'tfc:metal/knife_blade/black_steel', + 'tfc:metal/scythe/black_steel', + 'tfc:metal/scythe_blade/black_steel', + + // Red Steel + 'tfc:metal/ingot/red_steel', + 'tfc:metal/sheet/red_steel', + 'tfc:metal/double_sheet/red_steel', + 'tfc:metal/rod/red_steel', + 'tfc:metal/pickaxe/red_steel', + 'tfc:metal/pickaxe_head/red_steel', + 'tfc:metal/axe/red_steel', + 'tfc:metal/axe_head/red_steel', + 'tfc:metal/shovel/red_steel', + 'tfc:metal/shovel_head/red_steel', + 'tfc:metal/hoe/red_steel', + 'tfc:metal/hoe_head/red_steel', + 'tfc:metal/hammer/red_steel', + 'tfc:metal/hammer_head/red_steel', + 'tfc:metal/saw/red_steel', + 'tfc:metal/saw_blade/red_steel', + 'tfc:metal/sword/red_steel', + 'tfc:metal/sword_blade/red_steel', + 'tfc:metal/knife/red_steel', + 'tfc:metal/knife_blade/red_steel', + 'tfc:metal/scythe/red_steel', + 'tfc:metal/scythe_blade/red_steel', + + // Blue Steel + 'tfc:metal/ingot/blue_steel', + 'tfc:metal/sheet/blue_steel', + 'tfc:metal/double_sheet/blue_steel', + 'tfc:metal/rod/blue_steel', + 'tfc:metal/pickaxe/blue_steel', + 'tfc:metal/pickaxe_head/blue_steel', + 'tfc:metal/axe/blue_steel', + 'tfc:metal/axe_head/blue_steel', + 'tfc:metal/shovel/blue_steel', + 'tfc:metal/shovel_head/blue_steel', + 'tfc:metal/hoe/blue_steel', + 'tfc:metal/hoe_head/blue_steel', + 'tfc:metal/hammer/blue_steel', + 'tfc:metal/hammer_head/blue_steel', + 'tfc:metal/saw/blue_steel', + 'tfc:metal/saw_blade/blue_steel', + 'tfc:metal/sword/blue_steel', + 'tfc:metal/sword_blade/blue_steel', + 'tfc:metal/knife/blue_steel', + 'tfc:metal/knife_blade/blue_steel', + 'tfc:metal/scythe/blue_steel', + 'tfc:metal/scythe_blade/blue_steel', + + // Ores + 'tfc:ore/poor_native_copper', + 'tfc:ore/normal_native_copper', + 'tfc:ore/rich_native_copper', + 'tfc:ore/poor_native_gold', + 'tfc:ore/normal_native_gold', + 'tfc:ore/rich_native_gold', + 'tfc:ore/poor_hematite', + 'tfc:ore/normal_hematite', + 'tfc:ore/rich_hematite', + 'tfc:ore/rich_tetrahedrite', + 'tfc:ore/normal_tetrahedrite', + 'tfc:ore/poor_tetrahedrite', + 'tfc:ore/rich_sphalerite', + 'tfc:ore/normal_sphalerite', + 'tfc:ore/poor_sphalerite', + 'tfc:ore/rich_limonite', + 'tfc:ore/normal_limonite', + 'tfc:ore/poor_limonite', + 'tfc:ore/rich_magnetite', + 'tfc:ore/normal_magnetite', + 'tfc:ore/poor_magnetite', + 'tfc:ore/rich_malachite', + 'tfc:ore/normal_malachite', + 'tfc:ore/poor_malachite', + 'tfc:ore/rich_garnierite', + 'tfc:ore/normal_garnierite', + 'tfc:ore/poor_garnierite', + 'tfc:ore/rich_bismuthinite', + 'tfc:ore/normal_bismuthinite', + 'tfc:ore/poor_bismuthinite', + 'tfc:ore/rich_cassiterite', + 'tfc:ore/normal_cassiterite', + 'tfc:ore/poor_cassiterite', + 'tfc:ore/rich_native_silver', + 'tfc:ore/normal_native_silver', + 'tfc:ore/poor_native_silver' +] + +const tfcSimpleMaterials = [ + "gypsum", + "cinnabar", + "cryolite", + "saltpeter", + "sylvite", + "borax", + "halite", + "amethyst", + "opal", + "pyrite", + "topaz", + "bituminous_coal", + "lignite", + "graphite", + "sulfur", + "diamond", + "emerald", + "lapis_lazuli", + "ruby", + "sapphire" +] + +const tfcOreTypes = [ + "poor", + "normal", + "rich" +] + +const tfcOreMaterials = [ + "bismuthinite", + "cassiterite", + "garnierite", + "hematite", + "limonite", + "magnetite", + "malachite", + "native_copper", + "native_gold", + "native_silver", + "sphalerite", + "tetrahedrite" +] + +const tfcDepositeMaterials = [ + "cassiterite", + "native_copper", + "native_gold", + "native_silver" +] diff --git a/kubejs/client_scripts/tfc/rei.js b/kubejs/client_scripts/tfc/rei.js index a14869c49..8338100f1 100644 --- a/kubejs/client_scripts/tfc/rei.js +++ b/kubejs/client_scripts/tfc/rei.js @@ -13,4 +13,8 @@ const hideTFCStuff = (event) => { }) }) }) + + tfcItemsToHide.forEach(item => { + event.hide(item) + }) } \ No newline at end of file diff --git a/kubejs/server_scripts/create/newItems.js b/kubejs/server_scripts/create/newItems.js index 5bf2ac212..1493ad963 100644 --- a/kubejs/server_scripts/create/newItems.js +++ b/kubejs/server_scripts/create/newItems.js @@ -3,6 +3,7 @@ const newItemsCreate = (event) => { 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"]); diff --git a/kubejs/server_scripts/create/removeReworkedRecipes.js b/kubejs/server_scripts/create/removeReworkedRecipes.js index e3db10d4a..5cf05e97d 100644 --- a/kubejs/server_scripts/create/removeReworkedRecipes.js +++ b/kubejs/server_scripts/create/removeReworkedRecipes.js @@ -1,3 +1,4 @@ const removeReworkedRecipes = (event) => { event.remove({ mod: 'create' }); + event.remove({ mod: 'extendedcrafting' }); } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/customRecipes.js b/kubejs/server_scripts/tfc/customRecipes.js index 948b3f69c..e4e92926c 100644 --- a/kubejs/server_scripts/tfc/customRecipes.js +++ b/kubejs/server_scripts/tfc/customRecipes.js @@ -1,4 +1,4 @@ -const customWelding = (event,[input1,input2],result,tier) => { +const customWelding = (event, [input1, input2], result, tier) => { event.custom({ type: "tfc:welding", first_input: { @@ -14,35 +14,48 @@ const customWelding = (event,[input1,input2],result,tier) => { }) } -const customHeating = (event,input1,[result,amount],temperature) => { +const customHeating = (event, input1, [result, amount], temperature) => { event.custom({ type: "tfc:heating", ingredient: { - tag: input1 + tag: input1 }, result_fluid: { - fluid: result, - amount: amount + fluid: result, + amount: amount }, temperature: temperature - }) + }) } -const customAnvil = (event,input1,[result,count],tier,[firstRule,secondRule,thirdRule]) => { +const customAnvil = (event, input1, [result, count], tier, [firstRule, secondRule, thirdRule]) => { event.custom({ type: "tfc:anvil", input: { - tag: input1 + tag: input1 }, result: { - item: result, - count: count + item: result, + count: count }, tier: tier, rules: [ - firstRule, - secondRule, - thirdRule + 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/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js new file mode 100644 index 000000000..3e9a6b26f --- /dev/null +++ b/kubejs/server_scripts/tfc/recipes.js @@ -0,0 +1,16 @@ +// priority: 0 + +const registerTFCRecipes = (event) => { + /* + event.custom({ + type: 'farmersdelight:cutting', + ingredients: [ + { item: 'minecraft:cake' } + ], + tool: { tag: 'forge:tools/knives' }, + result: [ + { item: 'farmersdelight:cake_slice', count: 7 } + ] + })*/ + +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/utility.js b/kubejs/server_scripts/tfc/utility.js new file mode 100644 index 000000000..2decd92c5 --- /dev/null +++ b/kubejs/server_scripts/tfc/utility.js @@ -0,0 +1 @@ +// priority: 0 diff --git a/mods/BetterThirdPerson-Forge-1.20-1.9.0.jar b/mods/BetterThirdPerson-Forge-1.20-1.9.0.jar new file mode 100644 index 000000000..44a88da44 Binary files /dev/null and b/mods/BetterThirdPerson-Forge-1.20-1.9.0.jar differ diff --git a/mods/Cucumber-1.20.1-7.0.4.jar b/mods/Cucumber-1.20.1-7.0.4.jar new file mode 100644 index 000000000..ba783af8d Binary files /dev/null and b/mods/Cucumber-1.20.1-7.0.4.jar differ diff --git a/mods/ExtendedCrafting-1.20.1-6.0.4.jar b/mods/ExtendedCrafting-1.20.1-6.0.4.jar new file mode 100644 index 000000000..4b964919c Binary files /dev/null and b/mods/ExtendedCrafting-1.20.1-6.0.4.jar differ diff --git a/mods/terrafirmagreg-0.0.1.jar b/mods/terrafirmagreg-0.0.1.jar index db503f045..88793f3e5 100644 Binary files a/mods/terrafirmagreg-0.0.1.jar and b/mods/terrafirmagreg-0.0.1.jar differ