123
This commit is contained in:
SpeeeDCraft
parent
1387978d9c
commit
ca286391da
4 changed files with 113 additions and 104 deletions
|
|
@ -20,8 +20,11 @@ const oreProperty = [
|
|||
"rich_raw"
|
||||
]
|
||||
|
||||
const doubleIngotProperty = [
|
||||
"double_ingot"
|
||||
]
|
||||
|
||||
const partProperty = [
|
||||
"double_ingot",
|
||||
"sheet",
|
||||
"double_sheet",
|
||||
"rod",
|
||||
|
|
@ -380,7 +383,7 @@ const ItemHeats = {
|
|||
input: (name) => { return { tag: `forge:ingots/${name}` } },
|
||||
output: (name) => { return { item: Item.getId(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.get(name), 1)) } } },
|
||||
"double_ingot": { heat_capacity: 5.714, metal_amount: 288,
|
||||
input: (name) => { return { tag: `forge:double_ingots/${name}` } },
|
||||
input: (name) => { return { item: `tfc:metal/double_ingot/${name}` } },
|
||||
output: (name) => { return { item: `tfc:metal/double_ingot/${name}` } } },
|
||||
"sheet": { heat_capacity: 5.714, metal_amount: 288,
|
||||
input: (name) => { return { tag: `forge:plates/${name}` } },
|
||||
|
|
@ -394,42 +397,43 @@ const ItemHeats = {
|
|||
}
|
||||
|
||||
const Metals = {
|
||||
"bismuth": { forging_temp: 162, welding_temp: 216, melt_temp: 270, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty, nuggetProperty) },
|
||||
"brass": { forging_temp: 558, welding_temp: 744, melt_temp: 930, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty, nuggetProperty) },
|
||||
"gold": { forging_temp: 636, welding_temp: 848, melt_temp: 1060, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty, nuggetProperty) },
|
||||
"nickel": { forging_temp: 872, welding_temp: 1162, melt_temp: 1453, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty, nuggetProperty) },
|
||||
"rose_gold": { forging_temp: 576, welding_temp: 768, melt_temp: 960, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty, nuggetProperty) },
|
||||
"silver": { forging_temp: 577, welding_temp: 769, melt_temp: 961, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty, nuggetProperty) },
|
||||
"tin": { forging_temp: 138, welding_temp: 184, melt_temp: 230, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty, nuggetProperty) },
|
||||
"zinc": { forging_temp: 252, welding_temp: 336, melt_temp: 420, props: [].concat(defaultProperty, partProperty, dustProperty, nuggetProperty) },
|
||||
"sterling_silver": { forging_temp: 570, welding_temp: 760, melt_temp: 950, props: [].concat(defaultProperty, partProperty, dustProperty, nuggetProperty) },
|
||||
"copper": { forging_temp: 648, welding_temp: 864, melt_temp: 1080, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, oreProperty, dustProperty, nuggetProperty) },
|
||||
"bismuth_bronze": { forging_temp: 591, welding_temp: 788, melt_temp: 985, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) },
|
||||
"bronze": { forging_temp: 570, welding_temp: 760, melt_temp: 950, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) },
|
||||
"black_bronze": { forging_temp: 642, welding_temp: 856, melt_temp: 1070, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) },
|
||||
"wrought_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, oreProperty, dustProperty, nuggetProperty) },
|
||||
"cast_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, customName: "iron", props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty) },
|
||||
"pig_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, props: defaultProperty},
|
||||
"steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) },
|
||||
"high_carbon_black_steel": { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, props: defaultProperty },
|
||||
"high_carbon_red_steel": { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, props: defaultProperty },
|
||||
"high_carbon_blue_steel": { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, props: defaultProperty },
|
||||
"weak_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, props: defaultProperty },
|
||||
"weak_red_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, props: defaultProperty },
|
||||
"weak_blue_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, props: defaultProperty },
|
||||
"black_steel": { forging_temp: 891, welding_temp: 1188, melt_temp: 1485, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) },
|
||||
"red_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) },
|
||||
"blue_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) },
|
||||
"unknown": { forging_temp: 240, welding_temp: 320, melt_temp: 400, props: defaultProperty },
|
||||
"cassiterite": { forging_temp: 138, welding_temp: 184, melt_temp: 230, props: [].concat(oreProperty, dustProperty) },
|
||||
"garnierite": { forging_temp: 138, welding_temp: 184, melt_temp: 1453, props: [].concat(oreProperty, dustProperty) },
|
||||
"hematite": { forging_temp: 138, welding_temp: 184, melt_temp: 1535, props: [].concat(oreProperty, dustProperty) },
|
||||
"limonite": { forging_temp: 138, welding_temp: 184, melt_temp: 1535, customName: "yellow_limonite", props: [].concat(oreProperty, dustProperty) },
|
||||
"magnetite": { forging_temp: 138, welding_temp: 184, melt_temp: 1535, props: [].concat(oreProperty, dustProperty) },
|
||||
"malachite": { forging_temp: 138, welding_temp: 184, melt_temp: 1080, props: [].concat(oreProperty, dustProperty) },
|
||||
"pyrite": { forging_temp: 138, welding_temp: 184, melt_temp: 1535, props: [].concat(oreProperty, dustProperty) },
|
||||
"sphalerite": { forging_temp: 138, welding_temp: 184, melt_temp: 420, props: [].concat(oreProperty, dustProperty) },
|
||||
"tetrahedrite": { forging_temp: 138, welding_temp: 184, melt_temp: 1080, props: [].concat(oreProperty, dustProperty) }
|
||||
"bismuth": { forging_temp: 162, welding_temp: 216, melt_temp: 270, fluidName: "gtceu:bismuth", props: [].concat(defaultProperty, partProperty, doubleIngotProperty, oreProperty, dustProperty, nuggetProperty) },
|
||||
"brass": { forging_temp: 558, welding_temp: 744, melt_temp: 930, fluidName: "gtceu:brass", props: [].concat(defaultProperty, partProperty, doubleIngotProperty, dustProperty, nuggetProperty) },
|
||||
"gold": { forging_temp: 636, welding_temp: 848, melt_temp: 1060, fluidName: "gtceu:gold", props: [].concat(defaultProperty, partProperty, doubleIngotProperty, oreProperty, dustProperty, nuggetProperty) },
|
||||
"nickel": { forging_temp: 872, welding_temp: 1162, melt_temp: 1453, fluidName: "gtceu:nickel", props: [].concat(defaultProperty, partProperty, doubleIngotProperty, oreProperty, dustProperty, nuggetProperty) },
|
||||
"rose_gold": { forging_temp: 576, welding_temp: 768, melt_temp: 960, fluidName: "gtceu:rose_gold", props: [].concat(defaultProperty, partProperty, doubleIngotProperty, dustProperty, nuggetProperty) },
|
||||
"silver": { forging_temp: 577, welding_temp: 769, melt_temp: 961, fluidName: "gtceu:silver", props: [].concat(defaultProperty, partProperty, doubleIngotProperty, oreProperty, dustProperty, nuggetProperty) },
|
||||
"tin": { forging_temp: 138, welding_temp: 184, melt_temp: 230, fluidName: "gtceu:tin", props: [].concat(defaultProperty, partProperty, doubleIngotProperty, oreProperty, dustProperty, nuggetProperty) },
|
||||
"zinc": { forging_temp: 252, welding_temp: 336, melt_temp: 420, fluidName: "gtceu:zinc", props: [].concat(defaultProperty, partProperty, doubleIngotProperty, dustProperty, nuggetProperty) },
|
||||
"sterling_silver": { forging_temp: 570, welding_temp: 760, melt_temp: 950, fluidName: "gtceu:sterling_silver", props: [].concat(defaultProperty, partProperty, doubleIngotProperty, dustProperty, nuggetProperty) },
|
||||
"copper": { forging_temp: 648, welding_temp: 864, melt_temp: 1080, fluidName: "gtceu:copper", props: [].concat(defaultProperty, partProperty, doubleIngotProperty, armorProperty, toolProperty, utilityProperty, oreProperty, dustProperty, nuggetProperty) },
|
||||
"bismuth_bronze": { forging_temp: 591, welding_temp: 788, melt_temp: 985, fluidName: "gtceu:bismuth_bronze", props: [].concat(defaultProperty, partProperty, doubleIngotProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) },
|
||||
"bronze": { forging_temp: 570, welding_temp: 760, melt_temp: 950, fluidName: "gtceu:bronze", props: [].concat(defaultProperty, partProperty, doubleIngotProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) },
|
||||
"black_bronze": { forging_temp: 642, welding_temp: 856, melt_temp: 1070, fluidName: "gtceu:black_bronze", props: [].concat(defaultProperty, partProperty, doubleIngotProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) },
|
||||
"wrought_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "gtceu:wrought_iron", props: [].concat(defaultProperty, partProperty, doubleIngotProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) },
|
||||
"iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "gtceu:iron", props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty) },
|
||||
"cast_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "gtceu:iron", props: [].concat(doubleIngotProperty) },
|
||||
"pig_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "tfc:metal/pig_iron", props: defaultProperty},
|
||||
"steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "gtceu:steel", props: [].concat(defaultProperty, partProperty, doubleIngotProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) },
|
||||
"high_carbon_black_steel": { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, fluidName: "tfc:metal/high_carbon_black_steel", props: defaultProperty },
|
||||
"high_carbon_red_steel": { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, fluidName: "tfc:metal/high_carbon_red_steel", props: defaultProperty },
|
||||
"high_carbon_blue_steel": { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, fluidName: "tfc:metal/high_carbon_blue_steel", props: defaultProperty },
|
||||
"weak_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "tfc:metal/weak_steel", props: defaultProperty },
|
||||
"weak_red_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "tfc:metal/weak_red_steel", props: defaultProperty },
|
||||
"weak_blue_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "tfc:metal/weak_blue_steel", props: defaultProperty },
|
||||
"black_steel": { forging_temp: 891, welding_temp: 1188, melt_temp: 1485, fluidName: "gtceu:black_steel", props: [].concat(defaultProperty, partProperty, doubleIngotProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) },
|
||||
"red_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "gtceu:red_steel", props: [].concat(defaultProperty, partProperty, doubleIngotProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) },
|
||||
"blue_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "gtceu:blue_steel", props: [].concat(defaultProperty, partProperty, doubleIngotProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) },
|
||||
"unknown": { forging_temp: 240, welding_temp: 320, melt_temp: 400, fluidName: "tfc:metal/unknown", props: defaultProperty },
|
||||
"cassiterite": { forging_temp: 138, welding_temp: 184, melt_temp: 230, fluidName: "gtceu:zinc", props: [].concat(oreProperty, dustProperty) },
|
||||
"garnierite": { forging_temp: 138, welding_temp: 184, melt_temp: 1453, fluidName: "gtceu:nickel", props: [].concat(oreProperty, dustProperty) },
|
||||
"hematite": { forging_temp: 138, welding_temp: 184, melt_temp: 1535, fluidName: "gtceu:iron", props: [].concat(oreProperty, dustProperty) },
|
||||
"limonite": { forging_temp: 138, welding_temp: 184, melt_temp: 1535, fluidName: "gtceu:iron", customName: "yellow_limonite", props: [].concat(oreProperty, dustProperty) },
|
||||
"magnetite": { forging_temp: 138, welding_temp: 184, melt_temp: 1535, fluidName: "gtceu:iron", props: [].concat(oreProperty, dustProperty) },
|
||||
"malachite": { forging_temp: 138, welding_temp: 184, melt_temp: 1080, fluidName: "gtceu:copper", props: [].concat(oreProperty, dustProperty) },
|
||||
"pyrite": { forging_temp: 138, welding_temp: 184, melt_temp: 1535, fluidName: "gtceu:iron", props: [].concat(oreProperty, dustProperty) },
|
||||
"sphalerite": { forging_temp: 138, welding_temp: 184, melt_temp: 420, fluidName: "gtceu:zinc", props: [].concat(oreProperty, dustProperty) },
|
||||
"tetrahedrite": { forging_temp: 138, welding_temp: 184, melt_temp: 1080, fluidName: "gtceu:copper", props: [].concat(oreProperty, dustProperty) }
|
||||
}
|
||||
|
||||
const removeAllTagsItems = [
|
||||
|
|
|
|||
|
|
@ -1,11 +1,5 @@
|
|||
// priority: 0
|
||||
|
||||
const emptyJson = {
|
||||
conditions: [
|
||||
{ type: "forge:false" }
|
||||
]
|
||||
}
|
||||
|
||||
const registerTFCItemHeats = (event) => {
|
||||
for (const [tfcMetalName, metalSpecifications] of Object.entries(Metals)) {
|
||||
metalSpecifications.props.forEach(propertyName => {
|
||||
|
|
@ -25,61 +19,6 @@ const registerTFCItemHeats = (event) => {
|
|||
forging_temperature: metalSpecifications.forging_temp,
|
||||
welding_temperature: metalSpecifications.welding_temp
|
||||
}
|
||||
|
||||
event.addJson(path, json)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
const registerTFCHeatingRecipes = (event) => {
|
||||
for (const [tfcMetalName, metalSpecifications] of Object.entries(Metals)) {
|
||||
metalSpecifications.props.forEach(propertyName => {
|
||||
let path = `tfc:recipes/metal/${tfcMetalName}_${propertyName}`
|
||||
let itemType = ItemHeats[propertyName]
|
||||
let metalName = (metalSpecifications.customName != undefined) ? metalSpecifications.customName : tfcMetalName
|
||||
|
||||
if (itemType.heat_capacity == null) {
|
||||
event.addJson(path, emptyJson)
|
||||
}
|
||||
else {
|
||||
let ingredient = itemType.input(metalName)
|
||||
|
||||
let json
|
||||
|
||||
if (typeof(itemType.metal_amount) == "object")
|
||||
{
|
||||
console.log(itemType.metal_amount)
|
||||
if (itemType.metal_amount[metalName] != undefined)
|
||||
{
|
||||
let customMetalName = itemType.metal_amount[metalName].metalName
|
||||
let metalAmount = itemType.metal_amount[metalName].amount
|
||||
|
||||
json = {
|
||||
type: "tfc:heating",
|
||||
ingredient: ingredient,
|
||||
result_fluid: {
|
||||
fluid: `gtceu:${customMetalName}`,
|
||||
amount: metalAmount
|
||||
},
|
||||
temperature: metalSpecifications.melt_temp,
|
||||
use_durability: (propertyName.includes('head') || propertyName.includes('blade')) ? true : false
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
json = {
|
||||
type: "tfc:heating",
|
||||
ingredient: ingredient,
|
||||
result_fluid: {
|
||||
fluid: `gtceu:${metalName}`,
|
||||
amount: itemType.metal_amount
|
||||
},
|
||||
temperature: metalSpecifications.melt_temp,
|
||||
use_durability: (propertyName.includes('head') || propertyName.includes('blade')) ? true : false
|
||||
}
|
||||
}
|
||||
|
||||
event.addJson(path, json)
|
||||
}
|
||||
})
|
||||
|
|
@ -88,5 +27,4 @@ const registerTFCHeatingRecipes = (event) => {
|
|||
|
||||
const registerTFCData = (event) => {
|
||||
registerTFCItemHeats(event)
|
||||
registerTFCHeatingRecipes(event)
|
||||
}
|
||||
|
|
@ -1,12 +1,14 @@
|
|||
// priority: 0
|
||||
|
||||
const registerTFCRecipes = (event) => {
|
||||
//event.remove({ id: /tfc:anvil.*/ })
|
||||
//event.remove({ id: /tfc:welding.*/ })
|
||||
//event.remove({ id: /tfc:casting.*/ })
|
||||
// event.remove({ id: /tfc:anvil.*/ })
|
||||
// event.remove({ id: /tfc:welding.*/ })
|
||||
// event.remove({ id: /tfc:casting.*/ })
|
||||
event.remove({ id: /tfc:heating\/metal.*/ })
|
||||
event.remove({ id: /tfc:heating\/ore.*/ })
|
||||
|
||||
registerTFCHeatingRecipes(event)
|
||||
registerTFCCastingRecipes(event)
|
||||
|
||||
event.remove({ id: 'tfc:crafting/vanilla/lapis_block' })
|
||||
|
||||
|
|
@ -343,4 +345,62 @@ const registerTFCRecipes = (event) => {
|
|||
{ tag: "forge:rich_raw_materials/borax" },
|
||||
{ item: "tfc:powder/flux", count: 6 }
|
||||
)
|
||||
}
|
||||
|
||||
const registerTFCHeatingRecipes = (event) => {
|
||||
for (const [tfcMetalName, metalSpecifications] of Object.entries(Metals)) {
|
||||
metalSpecifications.props.forEach(propertyName => {
|
||||
let jsonRecipePath = `tfc:recipes/metal/${tfcMetalName}_${propertyName}`
|
||||
let itemTypeSpecifications = ItemHeats[propertyName]
|
||||
let finalMetalName = (metalSpecifications.customName != undefined) ? metalSpecifications.customName : tfcMetalName
|
||||
|
||||
if (itemTypeSpecifications.heat_capacity != null) {
|
||||
let ingredient = itemTypeSpecifications.input(finalMetalName)
|
||||
|
||||
let json
|
||||
|
||||
if (typeof(itemTypeSpecifications.metal_amount) == "object")
|
||||
{
|
||||
if (itemTypeSpecifications.metal_amount[finalMetalName] != undefined)
|
||||
{
|
||||
let customMetalName = itemTypeSpecifications.metal_amount[finalMetalName].metalName
|
||||
let metalAmount = itemTypeSpecifications.metal_amount[finalMetalName].amount
|
||||
|
||||
json = {
|
||||
id: jsonRecipePath,
|
||||
type: "tfc:heating",
|
||||
ingredient: ingredient,
|
||||
result_fluid: {
|
||||
fluid: `gtceu:${customMetalName}`,
|
||||
amount: metalAmount
|
||||
},
|
||||
temperature: metalSpecifications.melt_temp,
|
||||
use_durability: false
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
json = {
|
||||
id: jsonRecipePath,
|
||||
type: "tfc:heating",
|
||||
ingredient: ingredient,
|
||||
result_fluid: {
|
||||
fluid: `gtceu:${finalMetalName}`,
|
||||
amount: itemTypeSpecifications.metal_amount
|
||||
},
|
||||
temperature: metalSpecifications.melt_temp,
|
||||
use_durability: false
|
||||
}
|
||||
}
|
||||
|
||||
console.log(json)
|
||||
if (json != undefined) event.custom(json)
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
const registerTFCCastingRecipes = (event) => {
|
||||
|
||||
}
|
||||
|
|
@ -1,5 +1,11 @@
|
|||
// priority: 0
|
||||
|
||||
const emptyJson = {
|
||||
conditions: [
|
||||
{ type: "forge:false" }
|
||||
]
|
||||
}
|
||||
|
||||
const customWelding = (event, [input1, input2], result, tier) => {
|
||||
event.custom({
|
||||
type: "tfc:welding",
|
||||
|
|
@ -68,4 +74,5 @@ const addQuernRecipe = (event, input, output) => {
|
|||
ingredient: input,
|
||||
result: output
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue