diff --git a/kubejs/client_scripts/gregtech/constants.js b/kubejs/client_scripts/gregtech/constants.js index 2872216ed..253bd98bf 100644 --- a/kubejs/client_scripts/gregtech/constants.js +++ b/kubejs/client_scripts/gregtech/constants.js @@ -1,5 +1,10 @@ // priority: 199 +const gtItemsToHide = [ + 'gtceu:flint_mortar', + 'gtceu:flint_knife' +] + const stoneTypesToHide = [ "sand", "red_sand", diff --git a/kubejs/client_scripts/gregtech/rei.js b/kubejs/client_scripts/gregtech/rei.js index f5d44f8e7..ccb322a45 100644 --- a/kubejs/client_scripts/gregtech/rei.js +++ b/kubejs/client_scripts/gregtech/rei.js @@ -7,6 +7,10 @@ const hideGTStuff = (event) => { event.hide(`#forge:ores/${stoneTypeName}/${material}`) }) }) + + gtItemsToHide.forEach(item => { + event.hide(item) + }) } const groupGTStuff = (event) => { diff --git a/kubejs/client_scripts/tfc/constants.js b/kubejs/client_scripts/tfc/constants.js index 49efed451..d121c3e75 100644 --- a/kubejs/client_scripts/tfc/constants.js +++ b/kubejs/client_scripts/tfc/constants.js @@ -324,7 +324,18 @@ const tfcItemsToHide = [ 'tfc:ore/opal', 'tfc:ore/ruby', 'tfc:ore/sapphire', - 'tfc:ore/topaz' + 'tfc:ore/topaz', + + 'tfc:ore/graphite', + 'tfc:ore/sulfur', + 'tfc:ore/cinnabar', + 'tfc:ore/cryolite', + 'tfc:ore/saltpeter', + 'tfc:ore/borax', + 'tfc:ore/sylvite', + 'tfc:ore/bituminous_coal', + 'tfc:ore/lignite', + 'tfc:ore/halite' ] const tfcSimpleMaterials = [ diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 860c38e06..2d6705d63 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -22,4 +22,6 @@ const registerMinecraftRecipes = (event) => { event.smelting('2x #forge:ingots/gold', '1x #forge:raw_materials/gold').id('minecraft:gold_ingot_from_smelting_raw_gold').xp(0.7) event.blasting('2x #forge:ingots/gold', '1x #forge:raw_materials/gold').id('minecraft:gold_ingot_from_blasting_raw_gold').xp(0.7) + + event.remove({id: 'minecraft:fire_charge'}) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/constants.js b/kubejs/server_scripts/tfc/constants.js index b4067e7c8..50d9b95f6 100644 --- a/kubejs/server_scripts/tfc/constants.js +++ b/kubejs/server_scripts/tfc/constants.js @@ -19,5 +19,8 @@ const removeAllTagsItems = [ 'tfc:gem/opal', 'tfc:gem/ruby', 'tfc:gem/sapphire', - 'tfc:gem/topaz' + 'tfc:gem/topaz', + + 'tfc:ore/bituminous_coal', + 'tfc:ore/lignite' ] diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index f32de2496..04441850a 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -1,8 +1,6 @@ // priority: 0 const registerTFCRecipes = (event) => { - - // Remove recipe (gem -> cut gem) event.remove({ id: 'tfc:crafting/vanilla/lapis_block' }) event.remove({ id: 'tfc:quern/amethyst' }) @@ -14,4 +12,322 @@ const registerTFCRecipes = (event) => { event.remove({ id: 'tfc:quern/ruby' }) event.remove({ id: 'tfc:quern/sapphire' }) event.remove({ id: 'tfc:quern/topaz' }) + + event.remove({ id: 'tfc:quern/graphite' }) + event.remove({ id: 'tfc:quern/sulfur' }) + event.remove({ id: 'tfc:quern/cinnabar' }) + event.remove({ id: 'tfc:quern/cryolite' }) + event.remove({ id: 'tfc:quern/saltpeter' }) + event.remove({ id: 'tfc:quern/borax' }) + event.remove({ id: 'tfc:quern/sylvite' }) + event.remove({ id: 'tfc:quern/salt' }) + + event.remove({ id: 'tfc:quern/small_native_gold' }) + event.remove({ id: 'tfc:quern/small_native_silver' }) + event.remove({ id: 'tfc:quern/small_cassiterite' }) + event.remove({ id: 'tfc:quern/small_bismuthinite' }) + event.remove({ id: 'tfc:quern/small_garnierite' }) + event.remove({ id: 'tfc:quern/small_sphalerite' }) + + // Fire Charge + event.remove({ id: 'tfc:crafting/vanilla/fire_charge' }) + event.shapeless('3x minecraft:fire_charge', [ + '#forge:dusts/gunpowder', + '#minecraft:coals', + 'tfc:firestarter' + ]) + + // 2x Coke Powder + addQuernRecipe(event, + { tag: "forge:gems/coke" }, + { item: "tfc:powder/coke", count: 2 } + ) + + // 4x Amethyst Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/amethyst" }, + { item: "tfc:powder/amethyst", count: 4 } + ) + + // 4x Diamond Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/diamond" }, + { item: "tfc:powder/diamond", count: 4 } + ) + + // 4x Emerald Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/emerald" }, + { item: "tfc:powder/emerald", count: 4 } + ) + + // 4x LapisLazuli Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/lapis_lazuli" }, + { item: "tfc:powder/lapis_lazuli", count: 4 } + ) + + // 4x Opal Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/opal" }, + { item: "tfc:powder/opal", count: 4 } + ) + + // 4x Pyrite Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/pyrite" }, + { item: "tfc:powder/pyrite", count: 4 } + ) + + // 4x Ruby Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/ruby" }, + { item: "tfc:powder/ruby", count: 4 } + ) + + // 4x Sapphire Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/sapphire" }, + { item: "tfc:powder/sapphire", count: 4 } + ) + + // 4x Topaz Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/topaz" }, + { item: "tfc:powder/topaz", count: 4 } + ) + + // 2x Gold Powder + addQuernRecipe(event, + { tag: "forge:poor_raw_materials/gold" }, + { item: "tfc:powder/native_gold", count: 2 } + ) + + // 4x Gold Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/gold" }, + { item: "tfc:powder/native_gold", count: 4 } + ) + + // 6x Gold Powder + addQuernRecipe(event, + { tag: "forge:rich_raw_materials/gold" }, + { item: "tfc:powder/native_gold", count: 6 } + ) + + // 2x Silver Powder + addQuernRecipe(event, + { tag: "forge:poor_raw_materials/silver" }, + { item: "tfc:powder/native_silver", count: 2 } + ) + + // 4x Silver Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/silver" }, + { item: "tfc:powder/native_silver", count: 4 } + ) + + // 6x Silver Powder + addQuernRecipe(event, + { tag: "forge:rich_raw_materials/silver" }, + { item: "tfc:powder/native_silver", count: 6 } + ) + + // 2x Cassiterite Powder + addQuernRecipe(event, + { tag: "forge:poor_raw_materials/cassiterite" }, + { item: "tfc:powder/cassiterite", count: 2 } + ) + + // 4x Cassiterite Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/cassiterite" }, + { item: "tfc:powder/cassiterite", count: 4 } + ) + + // 6x Cassiterite Powder + addQuernRecipe(event, + { tag: "forge:rich_raw_materials/cassiterite" }, + { item: "tfc:powder/cassiterite", count: 6 } + ) + + // 2x Bismuth Powder + addQuernRecipe(event, + { tag: "forge:poor_raw_materials/bismuth" }, + { item: "tfc:powder/bismuthinite", count: 2 } + ) + + // 4x Bismuth Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/bismuth" }, + { item: "tfc:powder/bismuthinite", count: 4 } + ) + + // 6x Bismuth Powder + addQuernRecipe(event, + { tag: "forge:rich_raw_materials/bismuth" }, + { item: "tfc:powder/bismuthinite", count: 6 } + ) + + // 2x Garnierite Powder + addQuernRecipe(event, + { tag: "forge:poor_raw_materials/garnierite" }, + { item: "tfc:powder/garnierite", count: 1 } + ) + + // 4x Garnierite Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/garnierite" }, + { item: "tfc:powder/garnierite", count: 3 } + ) + + // 6x Garnierite Powder + addQuernRecipe(event, + { tag: "forge:rich_raw_materials/garnierite" }, + { item: "tfc:powder/garnierite", count: 5 } + ) + + // 2x Nickel Powder + addQuernRecipe(event, + { tag: "forge:poor_raw_materials/nickel" }, + { item: "tfc:powder/garnierite", count: 2 } + ) + + // 4x Nickel Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/nickel" }, + { item: "tfc:powder/garnierite", count: 4 } + ) + + // 6x Nickel Powder + addQuernRecipe(event, + { tag: "forge:rich_raw_materials/nickel" }, + { item: "tfc:powder/garnierite", count: 6 } + ) + + // 2x Sphalerite Powder + addQuernRecipe(event, + { tag: "forge:poor_raw_materials/sphalerite" }, + { item: "tfc:powder/sphalerite", count: 2 } + ) + + // 4x Sphalerite Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/sphalerite" }, + { item: "tfc:powder/sphalerite", count: 4 } + ) + + // 6x Sphalerite Powder + addQuernRecipe(event, + { tag: "forge:rich_raw_materials/sphalerite" }, + { item: "tfc:powder/sphalerite", count: 6 } + ) + + // 2x Sulfur Powder + addQuernRecipe(event, + { tag: "forge:poor_raw_materials/sulfur" }, + { item: "tfc:powder/sulfur", count: 2 } + ) + + // 4x Sulfur Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/sulfur" }, + { item: "tfc:powder/sulfur", count: 4 } + ) + + // 6x Sulfur Powder + addQuernRecipe(event, + { tag: "forge:rich_raw_materials/sulfur" }, + { item: "tfc:powder/sulfur", count: 6 } + ) + + // 2x Saltpeter Powder + addQuernRecipe(event, + { tag: "forge:poor_raw_materials/saltpeter" }, + { item: "tfc:powder/saltpeter", count: 2 } + ) + + // 4x Saltpeter Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/saltpeter" }, + { item: "tfc:powder/saltpeter", count: 4 } + ) + + // 6x Saltpeter Powder + addQuernRecipe(event, + { tag: "forge:rich_raw_materials/saltpeter" }, + { item: "tfc:powder/saltpeter", count: 6 } + ) + + // 2x Salt Powder + addQuernRecipe(event, + { tag: "forge:poor_raw_materials/salt" }, + { item: "tfc:powder/salt", count: 2 } + ) + + // 4x Salt Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/salt" }, + { item: "tfc:powder/salt", count: 4 } + ) + + // 6x Salt Powder + addQuernRecipe(event, + { tag: "forge:rich_raw_materials/salt" }, + { item: "tfc:powder/salt", count: 6 } + ) + + // 2x Graphite Powder + addQuernRecipe(event, + { tag: "forge:poor_raw_materials/graphite" }, + { item: "tfc:powder/graphite", count: 2 } + ) + + // 4x Graphite Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/graphite" }, + { item: "tfc:powder/graphite", count: 4 } + ) + + // 6x Graphite Powder + addQuernRecipe(event, + { tag: "forge:rich_raw_materials/graphite" }, + { item: "tfc:powder/graphite", count: 6 } + ) + + // 2x Sylvite Powder + addQuernRecipe(event, + { tag: "forge:poor_raw_materials/sylvite" }, + { item: "tfc:powder/sylvite", count: 2 } + ) + + // 4x Sylvite Powder + addQuernRecipe(event, + { tag: "forge:raw_materials/sylvite" }, + { item: "tfc:powder/sylvite", count: 4 } + ) + + // 6x Sylvite Powder + addQuernRecipe(event, + { tag: "forge:rich_raw_materials/sylvite" }, + { item: "tfc:powder/sylvite", count: 6 } + ) + + // 2x Flux + addQuernRecipe(event, + { tag: "forge:poor_raw_materials/borax" }, + { item: "tfc:powder/flux", count: 2 } + ) + + // 4x Flux + addQuernRecipe(event, + { tag: "forge:raw_materials/borax" }, + { item: "tfc:powder/flux", count: 4 } + ) + + // 6x Flux + addQuernRecipe(event, + { tag: "forge:rich_raw_materials/borax" }, + { item: "tfc:powder/flux", count: 6 } + ) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/utility.js b/kubejs/server_scripts/tfc/utility.js index 93768ea70..15c853c65 100644 --- a/kubejs/server_scripts/tfc/utility.js +++ b/kubejs/server_scripts/tfc/utility.js @@ -60,4 +60,12 @@ const customHeatLevel = (event, input1, heat_capacity, forging_temperature, weld forging_temperature: forging_temperature, welding_temperature: welding_temperature }) +} + +const addQuernRecipe = (event, input, output) => { + event.custom({ + type: "tfc:quern", + ingredient: input, + result: output + }) } \ No newline at end of file diff --git a/mods/terrafirmagreg-0.0.1.jar b/mods/terrafirmagreg-0.0.1.jar index 88793f3e5..d2a7e333a 100644 Binary files a/mods/terrafirmagreg-0.0.1.jar and b/mods/terrafirmagreg-0.0.1.jar differ