Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added fixes to tinkers construct recipes #478

Open
wants to merge 2 commits into
base: Astral-Experimental
Choose a base branch
from
Open

Added fixes to tinkers construct recipes #478

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e153eff
Added fixes to tinkers construct recipes
mnorfolk03 Dec 19, 2024
407f10c
requires heating for blazing blood
mnorfolk03 Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,706 changes: 2,361 additions & 2,345 deletions index.toml
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 19 additions & 11 deletions kubejs/server_scripts/Bloodyfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ onEvent("recipes", (event) => {
["minecraft:porkchop"],
["createastral:seitan"],
[event.recipes.createDeploying("createastral:protopork", ["createastral:protopork","minecraft:rotten_flesh"]),

event.recipes.createFilling("createastral:protopork",
["createastral:protopork",{ fluid: "tconstruct:blood", amount: 100 * mB }]),

event.recipes.createPressing("createastral:protopork",
"createastral:protopork"),
event.recipes.createCutting("createastral:protopork",
Expand Down Expand Up @@ -48,7 +48,7 @@ onEvent("recipes", (event) => {
)
.transitionalItem("createastral:protomutton")
.loops(1);

event.recipes
.createSequencedAssembly(
["minecraft:beef"],
Expand All @@ -68,7 +68,7 @@ onEvent("recipes", (event) => {
)
.transitionalItem("createastral:protobeef")
.loops(1);

event.recipes
.createSequencedAssembly(
["minecraft:chicken"],
Expand Down Expand Up @@ -119,7 +119,7 @@ onEvent("recipes", (event) => {
"techreborn:calcite_dust",
]),
event.recipes.createFilling("createastral:seitan",
["createastral:seitan",{ fluid: "tconstruct:earth_slime", amount: 10 * mB }
["createastral:seitan",{ fluid: "tconstruct:earth_slime", amount: 10 * mB }
]),
event.recipes.createPressing("createastral:seitan",
"createastral:seitan"),
Expand All @@ -146,10 +146,10 @@ onEvent("recipes", (event) => {
"minecraft:porkchop",
"createastral:seitan",
]),

event.recipes.createFilling("minecraft:porkchop",
["minecraft:porkchop",{ fluid: "tconstruct:blood", amount: 100 * mB }]),

event.recipes.createPressing("minecraft:porkchop",
"minecraft:porkchop"),
]
Expand All @@ -174,10 +174,10 @@ onEvent("recipes", (event) => {
"createastral:seitan",
"minecraft:black_dye",
]),

event.recipes.createFilling("createastral:seitan",
["createastral:seitan",{ fluid: "minecraft:water", amount: 500 * mB }]),

event.recipes.createPressing("createastral:seitan",
"createastral:seitan"),
]
Expand All @@ -197,10 +197,10 @@ onEvent("recipes", (event) => {

event.recipes.createFilling("createastral:incomplete_blaze_head",
["createastral:incomplete_blaze_head",{ fluid: "tconstruct:blazing_blood", amount: 100 * mB }]),

event.recipes.createFilling("createastral:incomplete_blaze_head",
["createastral:incomplete_blaze_head",{ fluid: "kubejs:shimmer", amount: 50 * mB }]),

event.recipes.createPressing("createastral:incomplete_blaze_head",
"createastral:incomplete_blaze_head"),
]
Expand Down Expand Up @@ -249,6 +249,14 @@ const mixings = [
],
heat: "superheated",
time: null, //Vegan BLOOD
},{
output: {fluid: "tconstruct:blazing_blood", amount: BUCKET / 4 },
input: [
"minecraft:blaze_powder",
{ fluid: "tconstruct:blood", amount: BUCKET },
],
heat: "",
time: 120,
}];
for (const mixing of mixings) {
event.recipes
Expand Down
18 changes: 18 additions & 0 deletions kubejs/server_scripts/create.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2345,6 +2345,24 @@ function mixingRecipes(event) {
heat: "superheated",
time: 100,
},
{
output: Fluid.of("tconstruct:molten_netherite", INGOT * 3 / 10),
input: [
{ fluid: "tconstruct:molten_debris", amount: INGOT * 10 / 10 },
{ fluid: "tconstruct:molten_gold", amount: INGOT * 10 / 10},
],
heat: "heated",
time: 100,
},
{
output: Fluid.of("tconstruct:molten_netherite", INGOT * 2),
input: [
{ fluid: "tconstruct:molten_debris", amount: INGOT * 4 },
{ fluid: "tconstruct:molten_gold", amount: INGOT * 4 },
],
heat: "superheated",
time: 100,
},
{
output: Fluid.of("tconstruct:molten_steel", INGOT),
input: ["techreborn:steel_dust"],
Expand Down
3 changes: 2 additions & 1 deletion kubejs/server_scripts/removals.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,8 @@ onEvent("recipes", (event) => {
{ output: "ae2:controller", type: "crafting_shaped" },

// Tconstruct

{output: "tconstruct:gold_bars"},
{input: "tconstruct:gold_bars", output: "tconstruct:molten_gold"},
{ mod: "tconstruct", output: "minecraft:granite" },
{
type: "tconstruct:casting_basin",
Expand Down
127 changes: 66 additions & 61 deletions kubejs/server_scripts/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,94 +34,94 @@ function farmersDelightCuttingChanges(event) {
// Tech Reborn Rubber Log
event.custom({
type: "farmersdelight:cutting",
ingredients: [{ item: "techreborn:rubber_log" }],
ingredients: [{item: "techreborn:rubber_log"}],
tool: {
type: "farmersdelight:tool",
tag: "c:tools/axes",
},
result: [{ item: "techreborn:rubber_log_stripped" }, { item: "farmersdelight:tree_bark" }],
result: [{item: "techreborn:rubber_log_stripped"}, {item: "farmersdelight:tree_bark"}],
sound: "minecraft:item.axe.strip",
});

// Ad Astra Glacian Log
event.custom({
type: "farmersdelight:cutting",
ingredients: [{ item: "ad_astra:glacian_log" }],
ingredients: [{item: "ad_astra:glacian_log"}],
tool: {
type: "farmersdelight:tool",
tag: "c:tools/axes",
},
result: [{ item: "ad_astra:stripped_glacian_log" }, { item: "farmersdelight:tree_bark" }],
result: [{item: "ad_astra:stripped_glacian_log"}, {item: "farmersdelight:tree_bark"}],
sound: "minecraft:item.axe.strip",
});

// Tinkers' Construct Bloodshroom Log
event.custom({
type: "farmersdelight:cutting",
ingredients: [{ item: "tconstruct:bloodshroom_log" }],
ingredients: [{item: "tconstruct:bloodshroom_log"}],
tool: {
type: "farmersdelight:tool",
tag: "c:tools/axes",
},
result: [{ item: "tconstruct:stripped_bloodshroom_log" }, { item: "farmersdelight:tree_bark" }],
result: [{item: "tconstruct:stripped_bloodshroom_log"}, {item: "farmersdelight:tree_bark"}],
sound: "minecraft:item.axe.strip",
});

// Tinkers' Construct Greenheart Log
event.custom({
type: "farmersdelight:cutting",
ingredients: [{ item: "tconstruct:greenheart_log" }],
ingredients: [{item: "tconstruct:greenheart_log"}],
tool: {
type: "farmersdelight:tool",
tag: "c:tools/axes",
},
result: [{ item: "tconstruct:stripped_greenheart_log" }, { item: "farmersdelight:tree_bark" }],
result: [{item: "tconstruct:stripped_greenheart_log"}, {item: "farmersdelight:tree_bark"}],
sound: "minecraft:item.axe.strip",
});

// Tinkers' Construct Skyroot Log
event.custom({
type: "farmersdelight:cutting",
ingredients: [{ item: "tconstruct:skyroot_log" }],
ingredients: [{item: "tconstruct:skyroot_log"}],
tool: {
type: "farmersdelight:tool",
tag: "c:tools/axes",
},
result: [{ item: "tconstruct:stripped_skyroot_log" }, { item: "farmersdelight:tree_bark" }],
result: [{item: "tconstruct:stripped_skyroot_log"}, {item: "farmersdelight:tree_bark"}],
sound: "minecraft:item.axe.strip",
});

// Astral Foods section

event.custom({
type: "farmersdelight:cutting",
ingredients: [{ item: "ae2:singularity" }],
ingredients: [{item: "ae2:singularity"}],
tool: {
type: "farmersdelight:tool",
tag: "c:tools/knives",
},
result: [{ item: "astralfoods:quantum_bites", count: 3 }],
result: [{item: "astralfoods:quantum_bites", count: 3}],
});
}

function farmersdelight(event) {
event.custom({
type: "farmersdelight:cooking",
ingredients: [{ item: "createastral:astral_singularity" }],
result: { item: "astralfoods:astral_sauce" },
container: { item: "minecraft:bowl" },
ingredients: [{item: "createastral:astral_singularity"}],
result: {item: "astralfoods:astral_sauce"},
container: {item: "minecraft:bowl"},
experience: 10.0,
cookingtime: 360,
});

event.custom({
type: "farmersdelight:cooking",
ingredients: [
{ item: "astralfoods:astral_sauce" },
{ item: "astralfoods:quantum_bites" },
{ item: "farmersdelight:raw_pasta" },
{item: "astralfoods:astral_sauce"},
{item: "astralfoods:quantum_bites"},
{item: "farmersdelight:raw_pasta"},
],
result: { item: "astralfoods:quantum_pasta" },
result: {item: "astralfoods:quantum_pasta"},
experience: 8.0,
cookingtime: 300,
});
Expand All @@ -143,13 +143,14 @@ function sequencedAssemblyCooking(event) {

event.recipes.createFilling("minecraft:bowl", [
"minecraft:bowl",
{ fluid: "kubejs:shimmer", amount: BUCKET },
{fluid: "kubejs:shimmer", amount: BUCKET},
]),
]
)
.transitionalItem("minecraft:bowl")
.loops(1);
}

function astralAdditionsFood(event) {
event.custom({
type: "custommachinery:custom_machine",
Expand Down Expand Up @@ -217,35 +218,35 @@ function astralAdditionsFood(event) {
event.custom({
type: "astraladditions:desizer",
ingredients: [
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },

{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },

{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{ item: "farmersdelight:onion_crate" },
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},

{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},

{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
{item: "farmersdelight:onion_crate"},
],
output: {
item: "astralfoods:compressed_onion",
Expand Down Expand Up @@ -298,7 +299,7 @@ function lizardMiscChanges(event) {
});

// Change the resin basin recipe to use an Item Drain so that it can be crafted during chapter 2
event.replaceInput({id:"techreborn:crafting_table/machine/resin_basin"}, "techreborn:drain", "create:item_drain")
event.replaceInput({id: "techreborn:crafting_table/machine/resin_basin"}, "techreborn:drain", "create:item_drain")

// Buffed catwalk output. Seriously! Its so resource heavy!
const CATWALK_MATERIALS = [
Expand Down Expand Up @@ -444,6 +445,10 @@ function lizardCH3Changes(event) {
// De-gating chunk-loader, but then give it more difficult materials to balance it out
// Todo V2.X: make it require plates that require special dust crafting. (emerald and diamond plates suffice for now)

event.shaped("6x tconstruct:gold_bars", ["AAA", "AAA"], {
A: "minecraft:gold_ingot"
})

// Scorched tanks NEED a recipe! These both take the same amount of bricks.
// Seared version did require brass but I don't think that makes sense.
event.shaped("tconstruct:scorched_fuel_tank", ["AAA", "ABA"], {
Expand Down Expand Up @@ -549,7 +554,7 @@ function portalBlocks(event) {
]),
event.recipes.createFilling("createastral:martian_clump", [
"createastral:martian_clump",
{ fluid: "kubejs:shimmer", amount: BUCKET / 2 },
{fluid: "kubejs:shimmer", amount: BUCKET / 2},
]),
]
)
Expand Down Expand Up @@ -716,7 +721,7 @@ onEvent("recipes", (event) => {
S: "#c:raw_materials",
A: "minecraft:cobblestone",
});
event.shaped("minecraft:furnace", ["AAA", "A A", "SSS"], {
event.shaped("minecraft:furnace", ["AAA", "A A", "SSS"], {
S: "#c:ingots",
A: "minecraft:cobblestone",
});
Expand Down Expand Up @@ -1493,10 +1498,10 @@ onEvent("recipes", (event) => {

/// Stuff Laky CBA updating to new format from experimental yet

event.remove({ output: "techreborn:sulfur_dust" });
event.remove({ output: "techreborn:sulfur_small_dust" });
event.remove({ output: "techreborn:sulfur" });
event.remove({ output: "techreborn:saltpeter_dust" });
event.remove({output: "techreborn:sulfur_dust"});
event.remove({output: "techreborn:sulfur_small_dust"});
event.remove({output: "techreborn:sulfur"});
event.remove({output: "techreborn:saltpeter_dust"});
event.remove({
input: "minecraft:soul_soil",
output: "techreborn:coal_dust",
Expand Down Expand Up @@ -1622,11 +1627,11 @@ onEvent("recipes", (event) => {
//adding composting recipes for coral variants
onEvent("recipes.compostables", (event) => {
const coral = [
{ type: "tube" },
{ type: "brain" },
{ type: "bubble" },
{ type: "fire" },
{ type: "horn" },
{type: "tube"},
{type: "brain"},
{type: "bubble"},
{type: "fire"},
{type: "horn"},
].forEach((coral) => {
//normal coral
event.add("minecraft:" + coral.type + "_coral", 0.3);
Expand Down
Loading
Loading