diff --git a/kubejs/client_scripts/constants.js b/kubejs/client_scripts/constants.js index 0799e6552..6bb79dbb7 100644 --- a/kubejs/client_scripts/constants.js +++ b/kubejs/client_scripts/constants.js @@ -1,3 +1,111 @@ // priority: 200 +<<<<<<< HEAD -// some constants \ No newline at end of file +// some constants +======= +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", + "minecraft:netherite_helmet", + "minecraft:netherite_chestplate", + "minecraft:netherite_leggings", + "minecraft:netherite_boots", +] + +const createItemsToHide = [ + "create: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", +] + +const stoneTypesToHide = [ + "sand", + "red_sand", + "gravel", + "ore", + "deepslate", + "basalt", + "endstone", + "netherrack", + "andesite", + "diorite", + "granite", + "tuff" +] + +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" +] +>>>>>>> 92570c6f6c571dff991711daf527a130633ca759 diff --git a/kubejs/client_scripts/tfc/constants.js b/kubejs/client_scripts/tfc/constants.js index ec8b2a6aa..49efed451 100644 --- a/kubejs/client_scripts/tfc/constants.js +++ b/kubejs/client_scripts/tfc/constants.js @@ -304,7 +304,27 @@ const tfcItemsToHide = [ 'tfc:ore/poor_cassiterite', 'tfc:ore/rich_native_silver', 'tfc:ore/normal_native_silver', - 'tfc:ore/poor_native_silver' + 'tfc:ore/poor_native_silver', + + // Gems + 'tfc:gem/amethyst', + 'tfc:gem/diamond', + 'tfc:gem/lapis_lazuli', + 'tfc:gem/emerald', + 'tfc:gem/pyrite', + 'tfc:gem/opal', + 'tfc:gem/ruby', + 'tfc:gem/sapphire', + 'tfc:gem/topaz', + 'tfc:ore/amethyst', + 'tfc:ore/diamond', + 'tfc:ore/lapis_lazuli', + 'tfc:ore/emerald', + 'tfc:ore/pyrite', + 'tfc:ore/opal', + 'tfc:ore/ruby', + 'tfc:ore/sapphire', + 'tfc:ore/topaz' ] const tfcSimpleMaterials = [ diff --git a/kubejs/server_scripts/mainServerScript.js b/kubejs/server_scripts/mainServerScript.js index 1e08315b3..9e8390140 100644 --- a/kubejs/server_scripts/mainServerScript.js +++ b/kubejs/server_scripts/mainServerScript.js @@ -5,11 +5,10 @@ ServerEvents.highPriorityData(event => { }) ServerEvents.tags('block', event => { - // register blocktags here + }) ServerEvents.tags('item', event => { - // register itemtags here registerCreateTags(event) registerTFCTags(event) }) @@ -18,6 +17,7 @@ ServerEvents.recipes(event => { registerCreateRecipes(event) registerExtendedCraftingRecipes(event) registerMinecraftRecipes(event) + registerTFCRecipes(event) }) LootJS.modifiers((event) => { diff --git a/kubejs/server_scripts/tfc/constants.js b/kubejs/server_scripts/tfc/constants.js new file mode 100644 index 000000000..b4067e7c8 --- /dev/null +++ b/kubejs/server_scripts/tfc/constants.js @@ -0,0 +1,23 @@ +// priority: 0 + +const removeAllTagsItems = [ + 'tfc:ore/amethyst', + 'tfc:ore/diamond', + 'tfc:ore/lapis_lazuli', + 'tfc:ore/emerald', + 'tfc:ore/pyrite', + 'tfc:ore/opal', + 'tfc:ore/ruby', + 'tfc:ore/sapphire', + 'tfc:ore/topaz', + + 'tfc:gem/amethyst', + 'tfc:gem/diamond', + 'tfc:gem/lapis_lazuli', + 'tfc:gem/emerald', + 'tfc:gem/pyrite', + 'tfc:gem/opal', + 'tfc:gem/ruby', + 'tfc:gem/sapphire', + 'tfc:gem/topaz' +] diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 3e9a6b26f..f32de2496 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -1,16 +1,17 @@ // 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 } - ] - })*/ - + + // Remove recipe (gem -> cut gem) + event.remove({ id: 'tfc:crafting/vanilla/lapis_block' }) + + event.remove({ id: 'tfc:quern/amethyst' }) + event.remove({ id: 'tfc:quern/diamond' }) + event.remove({ id: 'tfc:quern/lapis_lazuli' }) + event.remove({ id: 'tfc:quern/emerald' }) + event.remove({ id: 'tfc:quern/pyrite' }) + event.remove({ id: 'tfc:quern/opal' }) + event.remove({ id: 'tfc:quern/ruby' }) + event.remove({ id: 'tfc:quern/sapphire' }) + event.remove({ id: 'tfc:quern/topaz' }) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js new file mode 100644 index 000000000..cebc2510c --- /dev/null +++ b/kubejs/server_scripts/tfc/tags.js @@ -0,0 +1,7 @@ +// priority: 0 + +const registerTFCTags = (event) => { + removeAllTagsItems.forEach(item => { + event.removeAllTagsFrom(item) + }) +} \ No newline at end of file diff --git a/kubejs/startup_scripts/create/newCreateItems.js b/kubejs/startup_scripts/create/newCreateItems.js deleted file mode 100644 index edbc73131..000000000 --- a/kubejs/startup_scripts/create/newCreateItems.js +++ /dev/null @@ -1,3 +0,0 @@ -const newCreateItems = (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 151a354b1..e7ce4968c 100644 --- a/kubejs/startup_scripts/mainStartupScript.js +++ b/kubejs/startup_scripts/mainStartupScript.js @@ -1,5 +1,5 @@ // priority: 999 StartupEvents.registry('item', event => { - newCreateItems(event); + registerCreateItems(event); }) \ No newline at end of file