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.

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

Some random fixes #144

Open
wants to merge 8 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 23 additions & 23 deletions kubejs/server_scripts/datapack/greg_ingots.js
Original file line number Diff line number Diff line change
Expand Up @@ -202,117 +202,117 @@ let addGregTechIngotsToTFC = (/** @type {Internal.DataPackEventJS} */ event) =>
{
ore: "gtceu:raw_lead",
liquid: "gtceu:lead",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_silver",
liquid: "tfc:metal/silver",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_tin",
liquid: "tfc:metal/tin",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_hematite",
liquid: "tfc:metal/cast_iron",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_goethite",
liquid: "tfc:metal/cast_iron",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_cassiterite",
liquid: "tfc:metal/tin",
amount: 144
amount: 36
},
{
ore: "gtceu:raw_cassiterite_sand",
liquid: "tfc:metal/tin",
amount: 144
amount: 36
},
{
ore: "gtceu:raw_galena",
liquid: "gtceu:lead",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_garnierite",
liquid: "tfc:metal/nickel",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_magnetite",
liquid: "tfc:metal/cast_iron",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_pyrite",
liquid: "tfc:metal/cast_iron",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_sphalerite",
liquid: "tfc:metal/zinc",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_tetrahedrite",
liquid: "tfc:metal/copper",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_chalcopyrite",
liquid: "tfc:metal/copper",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_yellow_limonite",
liquid: "tfc:metal/cast_iron",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_bornite",
liquid: "tfc:metal/copper",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_chalcocite",
liquid: "tfc:metal/copper",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_pentlandite",
liquid: "tfc:metal/nickel",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_malachite",
liquid: "tfc:metal/copper",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_basaltic_mineral_sand",
liquid: "tfc:metal/cast_iron",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_granitic_mineral_sand",
liquid: "tfc:metal/cast_iron",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_thorium",
liquid: "gtceu:thorium",
amount: 72
amount: 36
},
{
ore: "gtceu:raw_chromite",
liquid: "gtceu:chromium",
amount: 72
amount: 36
}


Expand Down
1 change: 1 addition & 0 deletions kubejs/server_scripts/mods/gtceu/gtceuAdd.js
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ let gtceuAdd = (/** @type {Internal.RecipesEventJS} */ event) => {
.EUt(LV)
})


event.recipes.kubejs.shaped('gtceu:wood_drum', [ 'mRs', 'PWP', 'PWP' ], { m: '#forge:tools/mallets', R: 'gtceu:sticky_resin', s: '#forge:tools/saws', P: '#minecraft:planks', W: 'gtceu:long_wrought_iron_rod'}).damageIngredient(['#forge:tools'])

event.recipes.kubejs.shaped('gtceu:lv_electric_motor', ['cwr', 'wmw', 'rwc'], { c: 'gtceu:tin_single_cable', w: 'gtceu:copper_single_wire', r: 'gtceu:wrought_iron_rod', m: 'gtceu:magnetic_wrought_iron_rod' })
Expand Down
4 changes: 4 additions & 0 deletions kubejs/server_scripts/recipes/add.js
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,9 @@ let recipeAdd = (/** @type {Internal.RecipesEventJS} */ event) => {
smoking(`tfc:food\/${grain}_bread`,`firmalife:food\/${grain}_dough`)
})


event.recipes.tfc.anvil('gtceu:wrought_iron_plate', 'tfc:metal/double_ingot/wrought_iron', ['hit_last', 'hit_second_last', 'hit_third_last'])

shaped("gtceu:bronze_rotor" , ["PHP", "SRF","PDP"], {
H: "#forge:tools/hammers",
D: "#forge:tools/screwdrivers",
Expand Down Expand Up @@ -812,4 +815,5 @@ let recipeAdd = (/** @type {Internal.RecipesEventJS} */ event) => {
sound: "minecraft:block.fire.extinguish"
})
})

}
30 changes: 30 additions & 0 deletions kubejs/server_scripts/recipes/removal.js
Original file line number Diff line number Diff line change
Expand Up @@ -324,4 +324,34 @@ let recipeRemoval = (/** @type {Internal.RecipesEventJS} */ event) => {
event.remove({ id: `/^iceandfire:.*copper.*/`})
event.remove({ id: `/^iceandfire:.*_pile/`})

event.remove({ id: 'tfc:anvil/wrought_iron_sheet'})

let only_hotworked = (mineral) => {
event.remove({ id: "gtceu:shaped/plate_" + mineral })
event.remove({ id: "gtceu:shaped/plate_double_" + mineral })
}


only_hotworked("bismuth")
only_hotworked("copper")
only_hotworked("gold")
only_hotworked("nickel")
only_hotworked("silver")
only_hotworked("tin")
only_hotworked("zinc")
only_hotworked("brass")
only_hotworked("bronze")
only_hotworked("invar")
only_hotworked("sterling_silver")
only_hotworked("rose_gold")
only_hotworked("black_bronze")
only_hotworked("bismuth_bronze")
only_hotworked("steel")
only_hotworked("rose_gold")
only_hotworked("wrought_iron")
only_hotworked("black_steel")
only_hotworked("red_steel")
only_hotworked("blue_steel")
only_hotworked("wrought_iron")

}