diff --git a/kubejs/data/design_decor/recipes/stonecutting/chain/cobalt_large_chain.json b/kubejs/data/design_decor/recipes/stonecutting/chain/cobalt_large_chain.json deleted file mode 100644 index fcb4b195..00000000 --- a/kubejs/data/design_decor/recipes/stonecutting/chain/cobalt_large_chain.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "tconstruct:cobalt_ingot" - }, - "result": "design_decor:cobalt_large_chain", - "count": 4 -} diff --git a/kubejs/data/design_decor/recipes/stonecutting/chain/electrum_large_chain.json b/kubejs/data/design_decor/recipes/stonecutting/chain/electrum_large_chain.json deleted file mode 100644 index 9d5af505..00000000 --- a/kubejs/data/design_decor/recipes/stonecutting/chain/electrum_large_chain.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "createaddition:electrum_ingot" - }, - "result": "design_decor:electrum_large_chain", - "count": 4 -} diff --git a/kubejs/data/design_decor/recipes/stonecutting/chain/hepatizon_large_chain.json b/kubejs/data/design_decor/recipes/stonecutting/chain/hepatizon_large_chain.json deleted file mode 100644 index 268218df..00000000 --- a/kubejs/data/design_decor/recipes/stonecutting/chain/hepatizon_large_chain.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "tconstruct:hepatizon_ingot" - }, - "result": "design_decor:hepatizon_large_chain", - "count": 4 -} diff --git a/kubejs/data/design_decor/recipes/stonecutting/chain/iron_large_chain.json b/kubejs/data/design_decor/recipes/stonecutting/chain/iron_large_chain.json deleted file mode 100644 index 268218df..00000000 --- a/kubejs/data/design_decor/recipes/stonecutting/chain/iron_large_chain.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "tconstruct:hepatizon_ingot" - }, - "result": "design_decor:hepatizon_large_chain", - "count": 4 -} diff --git a/kubejs/data/design_decor/recipes/stonecutting/chain/manyullyn_large_chain.json b/kubejs/data/design_decor/recipes/stonecutting/chain/manyullyn_large_chain.json deleted file mode 100644 index ac2df609..00000000 --- a/kubejs/data/design_decor/recipes/stonecutting/chain/manyullyn_large_chain.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "tconstruct:manyullyn_ingot" - }, - "result": "design_decor:manyullyn_large_chain", - "count": 4 -} diff --git a/kubejs/data/design_decor/recipes/stonecutting/chain/netherite_large_chain.json b/kubejs/data/design_decor/recipes/stonecutting/chain/netherite_large_chain.json deleted file mode 100644 index ac2df609..00000000 --- a/kubejs/data/design_decor/recipes/stonecutting/chain/netherite_large_chain.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "tconstruct:manyullyn_ingot" - }, - "result": "design_decor:manyullyn_large_chain", - "count": 4 -} diff --git a/kubejs/data/design_decor/recipes/stonecutting/chain/pig_iron_large_chain.json b/kubejs/data/design_decor/recipes/stonecutting/chain/pig_iron_large_chain.json deleted file mode 100644 index 7dc2b810..00000000 --- a/kubejs/data/design_decor/recipes/stonecutting/chain/pig_iron_large_chain.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "tconstruct:pig_iron_ingot" - }, - "result": "design_decor:pig_iron_large_chain", - "count": 4 -} diff --git a/kubejs/data/design_decor/recipes/stonecutting/chain/queen_slime_large_chain.json b/kubejs/data/design_decor/recipes/stonecutting/chain/queen_slime_large_chain.json deleted file mode 100644 index daa7f749..00000000 --- a/kubejs/data/design_decor/recipes/stonecutting/chain/queen_slime_large_chain.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "tconstruct:queens_slime_ingot" - }, - "result": "design_decor:queen_slime_large_chain", - "count": 4 -} diff --git a/kubejs/data/tconstruct/recipes/smeltery/casting/metal/amethyst_bronze/block.json b/kubejs/data/tconstruct/recipes/smeltery/casting/metal/amethyst_bronze/block.json deleted file mode 100644 index 79d7810c..00000000 --- a/kubejs/data/tconstruct/recipes/smeltery/casting/metal/amethyst_bronze/block.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "tconstruct:casting_basin", - "cooling_time": 182, - "fluid": { - "amount": 81000, - "name": "tconstruct:molten_amethyst_bronze" - }, - "result": "tconstruct:amethyst_bronze_block" -} diff --git a/kubejs/data/tconstruct/recipes/smeltery/casting/metal/cobalt/block.json b/kubejs/data/tconstruct/recipes/smeltery/casting/metal/cobalt/block.json deleted file mode 100644 index e714043d..00000000 --- a/kubejs/data/tconstruct/recipes/smeltery/casting/metal/cobalt/block.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "tconstruct:casting_basin", - "cooling_time": 194, - "fluid": { - "amount": 81000, - "name": "tconstruct:molten_cobalt" - }, - "result": "tconstruct:cobalt_block" -} diff --git a/kubejs/data/tconstruct/recipes/smeltery/casting/metal/hepatizon/block.json b/kubejs/data/tconstruct/recipes/smeltery/casting/metal/hepatizon/block.json deleted file mode 100644 index 9722c006..00000000 --- a/kubejs/data/tconstruct/recipes/smeltery/casting/metal/hepatizon/block.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "tconstruct:casting_basin", - "cooling_time": 233, - "fluid": { - "amount": 81000, - "name": "tconstruct:molten_hepatizon" - }, - "result": "tconstruct:hepatizon_block" -} diff --git a/kubejs/data/tconstruct/recipes/smeltery/casting/metal/manyullyn/block.json b/kubejs/data/tconstruct/recipes/smeltery/casting/metal/manyullyn/block.json deleted file mode 100644 index be4e9e81..00000000 --- a/kubejs/data/tconstruct/recipes/smeltery/casting/metal/manyullyn/block.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "tconstruct:casting_basin", - "cooling_time": 182, - "fluid": { - "amount": 81000, - "name": "tconstruct:molten_manyullyn" - }, - "result": "tconstruct:manyullyn_block" -} diff --git a/kubejs/data/tconstruct/recipes/smeltery/casting/metal/rose_gold/block.json b/kubejs/data/tconstruct/recipes/smeltery/casting/metal/rose_gold/block.json deleted file mode 100644 index dc028de7..00000000 --- a/kubejs/data/tconstruct/recipes/smeltery/casting/metal/rose_gold/block.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "tconstruct:casting_basin", - "cooling_time": 155, - "fluid": { - "amount": 81000, - "name": "tconstruct:molten_rose_gold" - }, - "result": "tconstruct:rose_gold_block" -} diff --git a/kubejs/data/tconstruct/recipes/smeltery/casting/metal/silver/block.json b/kubejs/data/tconstruct/recipes/smeltery/casting/metal/silver/block.json deleted file mode 100644 index f88039ef..00000000 --- a/kubejs/data/tconstruct/recipes/smeltery/casting/metal/silver/block.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "tconstruct:casting_basin", - "cooling_time": 180, - "fluid": { - "amount": 81000, - "tag": "tconstruct:molten_silver" - }, - "result": "yjas:silver_block" -} \ No newline at end of file diff --git a/kubejs/server_scripts/recipes/design_decor.js b/kubejs/server_scripts/recipes/design_decor.js new file mode 100644 index 00000000..9e818417 --- /dev/null +++ b/kubejs/server_scripts/recipes/design_decor.js @@ -0,0 +1,10 @@ +const chains = [ + "tconstruct:manyullyn", "tconstruct:cobalt", "createaddition:electrum", "tconstruct:hepatizon", "minecraft:iron", "minecraft:netherite", "tconstruct:pig_iron", { dd: 'queen_slime', real: 'tconstruct:queens_slime'}, "tconstruct:rose_gold" +] + +ServerEvents.recipes((event) => { + chains.forEach(c => { + event.remove({ id: `design_decor:stonecutting/chain/${c.dd ? c.dd : c.split(':')[1]}_large_chain` }); + event.stonecutting(`4x design_decor:${c.dd ? c.dd : c.split(':')[1]}_large_chain`, `${c.real ? c.real : c}_ingot`) + }) +}) diff --git a/kubejs/server_scripts/recipes/tinkers.js b/kubejs/server_scripts/recipes/tinkers.js index 88f3c715..9e27f89a 100644 --- a/kubejs/server_scripts/recipes/tinkers.js +++ b/kubejs/server_scripts/recipes/tinkers.js @@ -9,6 +9,26 @@ const threeIngredientAlloying = [ ["minecraft:gold_ingot", "minecraft:magma_cream", "tconstruct:cobalt_ingot", "tconstruct:queens_slime_ingot", 1], ] +const blockRecipes = { + "amethyst_bronze": 182, "cobalt": 194, "hepatizon": 233, "manyullyn": 182, "rose_gold": 155, "silver": 180 +} +const nuggetRecipes = { + "amethyst_bronze": { time: 20 }, "cobalt": { time: 22 }, "silver": { time: 20, mod: "yjas" }, "electrum": { time: 20, mod: "createaddition" }, "hepatizon": { time: 26 }, "manyullyn": { time: 24 }, "rose_gold": { time: 17 }, "netherite": { time: 25 } +} +const ingotRecipes = { + "amethyst_bronze": { time: 61 }, "cobalt": { time: 65 }, "electrum": { time: 59, mod: "createaddition" }, "hepatizon": { time: 78 }, "manyullyn": { time: 72 }, "queens_slime": { time: 71 }, "rose_gold": { time: 52 }, "silver": { time: 60, mod: "yjas" } +} +const rodRecipes = { + "brass": { time: 38 }, "copper": { time: 35 }, "electrum": { time: 42 }, "gold": { time: 40 }, "iron": { time: 43 } +} +const plateRecipes = { + "zinc": { time: 47 }, "electrum": { time: 59 } +} +const wireRecipes = { + "copper": { time: 35 }, "electrum": { time: 42 }, "gold": { time: 40 }, "iron": { time: 43 } +} + + ServerEvents.recipes((event) => { // Alloying twoIngredientAlloying.forEach((recipe) => { @@ -418,4 +438,184 @@ ServerEvents.recipes((event) => { "time": 55 } ) -}); \ No newline at end of file + + // grosik's tinkers fixes + for(let key in blockRecipes) { + event.remove({ id: `tconstruct:smeltery/casting/metal/${key}/block` }); + event.custom({ + type: 'tconstruct:casting_basin', + cooling_time: blockRecipes[key], + fluid: { + amount: 81000, + name: `tconstruct:molten_${key}` + }, + result: `${key == 'silver' ? 'yjas' : 'tconstruct'}:${key}_block` + }) + } + + let nugV + for(let key in nuggetRecipes) { + nugV = nuggetRecipes[key] + event.remove({ id: `tconstruct:smeltery/casting/metal/${key}/nugget_sand_cast` }); + event.custom({ + type: 'tconstruct:casting_table', + cast: { + tag: "tconstruct:casts/single_use/nugget" + }, + cast_consumed: true, + cooling_time: nugV.time, + fluid: { + amount: 1000, + name: `tconstruct:molten_${key}` + }, + result: `${nugV.mod ? nugV.mod : 'tconstruct'}:${key}_nugget` + }) + event.remove({ id: `tconstruct:smeltery/casting/metal/${key}/nugget_gold_cast` }); + event.custom({ + type: 'tconstruct:casting_table', + cast: { + tag: "tconstruct:casts/multi_use/nugget" + }, + cooling_time: nugV.time, + fluid: { + amount: 1000, + name: `tconstruct:molten_${key}` + }, + result: `${nugV.mod ? nugV.mod : 'tconstruct'}:${key}_nugget` + }) + } + + let ingV + for(let key in ingotRecipes) { + ingV = ingotRecipes[key] + event.remove({ id: `tconstruct:smeltery/casting/metal/${key}/ingot_sand_cast` }); + event.custom({ + type: 'tconstruct:casting_table', + cast: { + tag: "tconstruct:casts/single_use/ingot" + }, + cast_consumed: true, + cooling_time: ingV.time, + fluid: { + amount: 9000, + name: `tconstruct:molten_${key}` + }, + result: `${ingV.mod ? ingV.mod : 'tconstruct'}:${key}_ingot` + }) + event.remove({ id: `tconstruct:smeltery/casting/metal/${key}/ingot_gold_cast` }); + event.custom({ + type: 'tconstruct:casting_table', + cast: { + tag: "tconstruct:casts/multi_use/ingot" + }, + cooling_time: ingV.time, + fluid: { + amount: 9000, + name: `tconstruct:molten_${key}` + }, + result: `${ingV.mod ? ingV.mod : 'tconstruct'}:${key}_ingot` + }) + } + + let rodV + for(let key in rodRecipes) { + rodV = rodRecipes[key] + event.remove({ id: `tconstruct:smeltery/casting/metal/${key}/rod_sand_cast` }); + event.custom({ + type: 'tconstruct:casting_table', + cast: { + tag: "tconstruct:casts/single_use/rod" + }, + cast_consumed: true, + cooling_time: rodV.time, + fluid: { + amount: 4500, + name: `tconstruct:molten_${key}` + }, + result: `${rodV.mod ? rodV.mod : 'createaddition'}:${key}_rod` + }) + event.remove({ id: `tconstruct:smeltery/casting/metal/${key}/rod_gold_cast` }); + event.custom({ + type: 'tconstruct:casting_table', + cast: { + tag: "tconstruct:casts/multi_use/rod" + }, + cooling_time: rodV.time, + fluid: { + amount: 4500, + name: `tconstruct:molten_${key}` + }, + result: `${rodV.mod ? rodV.mod : 'createaddition'}:${key}_rod` + }) + } + + let plaV + for(let key in plateRecipes) { + plaV = plateRecipes[key] + event.remove({ id: `tconstruct:smeltery/casting/metal/${key}/plate_sand_cast` }); + event.custom({ + type: 'tconstruct:casting_table', + cast: { + tag: "tconstruct:casts/single_use/plate" + }, + cast_consumed: true, + cooling_time: plaV.time, + fluid: { + amount: 9000, + name: `tconstruct:molten_${key}` + }, + result: `${plaV.mod ? plaV.mod : 'createaddition'}:${key}_sheet` + }) + event.remove({ id: `tconstruct:smeltery/casting/metal/${key}/plate_gold_cast` }); + event.custom({ + type: 'tconstruct:casting_table', + cast: { + tag: "tconstruct:casts/multi_use/plate" + }, + cooling_time: plaV.time, + fluid: { + amount: 9000, + name: `tconstruct:molten_${key}` + }, + result: `${plaV.mod ? plaV.mod : 'createaddition'}:${key}_sheet`, + cooling_time: plaV.time, + fluid: { + amount: 9000, + name: `tconstruct:molten_${key}` + }, + result: `${plaV.mod ? plaV.mod : 'createaddition'}:${key}_sheet` + }) + } + + let wireV + for(let key in wireRecipes) { + wireV = wireRecipes[key] + event.remove({ id: `tconstruct:smeltery/casting/metal/${key}/wire_sand_cast` }); + event.custom({ + type: 'tconstruct:casting_table', + cast: { + tag: "tconstruct:casts/single_use/wire" + }, + cast_consumed: true, + cooling_time: wireV.time, + fluid: { + amount: 4500, + name: `tconstruct:molten_${key}` + }, + result: `${wireV.mod ? wireV.mod : 'createaddition'}:${key}_wire` + }) + event.remove({ id: `tconstruct:smeltery/casting/metal/${key}/wire_gold_cast` }); + event.custom({ + type: 'tconstruct:casting_table', + cast: { + tag: "tconstruct:casts/multi_use/wire" + }, + cooling_time: wireV.time, + fluid: { + amount: 4500, + name: `tconstruct:molten_${key}` + }, + result: `${wireV.mod ? wireV.mod : 'createaddition'}:${key}_wire` + }) + } +});