illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove some jsons again

Browse source
This commit is contained in:
SpeeeDCraft 2023-11-13 11:06:36 +07:00
parent 05a47c183a
commit 01e4ed5168
21 changed files with 85 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

0
kubejs/data/tfc/tfc/fuels/raw_coal.json → kubejs/data/tfc/tfc/fuels/normal_raw_coal.json
View file

10
kubejs/data/tfc/tfc/fuels/poor_raw_coal.json Normal file
View file

@ -0,0 +1,10 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": [
{
"item": "gtceu:poor_raw_coal"
}
],
"duration": 1600,
"temperature": 1415
}

10
kubejs/data/tfc/tfc/fuels/rich_raw_coal.json Normal file
View file

@ -0,0 +1,10 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": [
{
"item": "gtceu:rich_raw_coal"
}
],
"duration": 2200,
"temperature": 1415
}

17
kubejs/data/tfc/tfc/item_heats/ore/tfg_bismuth.json
View file

@ -1,17 +0,0 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": [
{
"tag": "forge:poor_raw_materials/bismuth"
},
{
"tag": "forge:raw_materials/bismuth"
},
{
"tag": "forge:rich_raw_materials/bismuth"
}
],
"heat_capacity": 2.857,
"forging_temperature": 162,
"welding_temperature": 216
}

17
kubejs/data/tfc/tfc/item_heats/ore/tfg_cassiterite.json
View file

@ -1,17 +0,0 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": [
{
"tag": "forge:poor_raw_materials/cassiterite"
},
{
"tag": "forge:raw_materials/cassiterite"
},
{
"tag": "forge:rich_raw_materials/cassiterite"
}
],
"heat_capacity": 2.857,
"forging_temperature": 138,
"welding_temperature": 184
}

17
kubejs/data/tfc/tfc/item_heats/ore/tfg_copper.json
View file

@ -1,17 +0,0 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": [
{
"tag": "forge:poor_raw_materials/copper"
},
{
"tag": "forge:raw_materials/copper"
},
{
"tag": "forge:rich_raw_materials/copper"
}
],
"heat_capacity": 1.143,
"forging_temperature": 648,
"welding_temperature": 864
}

17
kubejs/data/tfc/tfc/item_heats/ore/tfg_garnierite.json
View file

@ -1,17 +0,0 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": [
{
"tag": "forge:poor_raw_materials/garnierite"
},
{
"tag": "forge:raw_materials/garnierite"
},
{
"tag": "forge:rich_raw_materials/garnierite"
}
],
"heat_capacity": 0.833,
"forging_temperature": 872,
"welding_temperature": 1162
}

17
kubejs/data/tfc/tfc/item_heats/ore/tfg_gold.json
View file

@ -1,17 +0,0 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": [
{
"tag": "forge:poor_raw_materials/gold"
},
{
"tag": "forge:raw_materials/gold"
},
{
"tag": "forge:rich_raw_materials/gold"
}
],
"heat_capacity": 0.667,
"forging_temperature": 636,
"welding_temperature": 848
}

17
kubejs/data/tfc/tfc/item_heats/ore/tfg_hematite.json
View file

@ -1,17 +0,0 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": [
{
"tag": "forge:poor_raw_materials/hematite"
},
{
"tag": "forge:raw_materials/hematite"
},
{
"tag": "forge:rich_raw_materials/hematite"
}
],
"heat_capacity": 1.143,
"forging_temperature": 921,
"welding_temperature": 1228
}

17
kubejs/data/tfc/tfc/item_heats/ore/tfg_iron.json
View file

@ -1,17 +0,0 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": [
{
"tag": "forge:poor_raw_materials/iron"
},
{
"tag": "forge:raw_materials/iron"
},
{
"tag": "forge:rich_raw_materials/iron"
}
],
"heat_capacity": 1.143,
"forging_temperature": 921,
"welding_temperature": 1228
}

17
kubejs/data/tfc/tfc/item_heats/ore/tfg_limonite.json
View file

@ -1,17 +0,0 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": [
{
"tag": "forge:poor_raw_materials/yellow_limonite"
},
{
"tag": "forge:raw_materials/yellow_limonite"
},
{
"tag": "forge:rich_raw_materials/yellow_limonite"
}
],
"heat_capacity": 1.143,
"forging_temperature": 921,
"welding_temperature": 1228
}

17
kubejs/data/tfc/tfc/item_heats/ore/tfg_magnetite.json
View file

@ -1,17 +0,0 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": [
{
"tag": "forge:poor_raw_materials/magnetite"
},
{
"tag": "forge:raw_materials/magnetite"
},
{
"tag": "forge:rich_raw_materials/magnetite"
}
],
"heat_capacity": 1.143,
"forging_temperature": 921,
"welding_temperature": 1228
}

17
kubejs/data/tfc/tfc/item_heats/ore/tfg_malachite.json
View file

@ -1,17 +0,0 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": [
{
"tag": "forge:poor_raw_materials/malachite"
},
{
"tag": "forge:raw_materials/malachite"
},
{
"tag": "forge:rich_raw_materials/malachite"
}
],
"heat_capacity": 1.143,
"forging_temperature": 648,
"welding_temperature": 864
}

17
kubejs/data/tfc/tfc/item_heats/ore/tfg_nickel.json
View file

@ -1,17 +0,0 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": [
{
"tag": "forge:poor_raw_materials/nickel"
},
{
"tag": "forge:raw_materials/nickel"
},
{
"tag": "forge:rich_raw_materials/nickel"
}
],
"heat_capacity": 0.833,
"forging_temperature": 872,
"welding_temperature": 1162
}

17
kubejs/data/tfc/tfc/item_heats/ore/tfg_pyrite.json
View file

@ -1,17 +0,0 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": [
{
"tag": "forge:poor_raw_materials/pyrite"
},
{
"tag": "forge:raw_materials/pyrite"
},
{
"tag": "forge:rich_raw_materials/pyrite"
}
],
"heat_capacity": 1.143,
"forging_temperature": 921,
"welding_temperature": 1228
}

17
kubejs/data/tfc/tfc/item_heats/ore/tfg_silver.json
View file

@ -1,17 +0,0 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": [
{
"tag": "forge:poor_raw_materials/silver"
},
{
"tag": "forge:raw_materials/silver"
},
{
"tag": "forge:rich_raw_materials/silver"
}
],
"heat_capacity": 0.833,
"forging_temperature": 577,
"welding_temperature": 769
}

17
kubejs/data/tfc/tfc/item_heats/ore/tfg_sphalerite.json
View file

@ -1,17 +0,0 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": [
{
"tag": "forge:poor_raw_materials/sphalerite"
},
{
"tag": "forge:raw_materials/sphalerite"
},
{
"tag": "forge:rich_raw_materials/sphalerite"
}
],
"heat_capacity": 1.905,
"forging_temperature": 252,
"welding_temperature": 336
}

17
kubejs/data/tfc/tfc/item_heats/ore/tfg_tetrahedrite.json
View file

@ -1,17 +0,0 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": [
{
"tag": "forge:poor_raw_materials/tetrahedrite"
},
{
"tag": "forge:raw_materials/tetrahedrite"
},
{
"tag": "forge:rich_raw_materials/tetrahedrite"
}
],
"heat_capacity": 1.143,
"forging_temperature": 648,
"welding_temperature": 864
}

17
kubejs/data/tfc/tfc/item_heats/ore/tfg_tin.json
View file

@ -1,17 +0,0 @@
{
"__comment__": "This file was automatically created by mcresources",
"ingredient": [
{
"tag": "forge:poor_raw_materials/tin"
},
{
"tag": "forge:raw_materials/tin"
},
{
"tag": "forge:rich_raw_materials/tin"
}
],
"heat_capacity": 2.857,
"forging_temperature": 138,
"welding_temperature": 184
}

67
kubejs/server_scripts/tfc/constants.js
View file

@ -131,35 +131,48 @@ const itemTypeToHeat = {
} }
const metalToSpecs = { const metalToSpecs = {
"bismuth" : { forging_temperature: 162, welding_temperature: 216, customName: null, props: [].concat(defaultProperty, partProperty) }, "bismuth" : { forging_temperature: 162, welding_temperature: 216, hasOre: true, customName: null, props: [].concat(defaultProperty, partProperty) },
"brass" : { forging_temperature: 558, welding_temperature: 744, customName: null, props: [].concat(defaultProperty, partProperty) }, "brass" : { forging_temperature: 558, welding_temperature: 744, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty) },
"gold" : { forging_temperature: 636, welding_temperature: 848, customName: null, props: [].concat(defaultProperty, partProperty) }, "gold" : { forging_temperature: 636, welding_temperature: 848, hasOre: true, customName: null, props: [].concat(defaultProperty, partProperty) },
"nickel" : { forging_temperature: 872, welding_temperature: 1162, customName: null, props: [].concat(defaultProperty, partProperty) }, "nickel" : { forging_temperature: 872, welding_temperature: 1162, hasOre: true, customName: null, props: [].concat(defaultProperty, partProperty) },
"rose_gold" : { forging_temperature: 576, welding_temperature: 768, customName: null, props: [].concat(defaultProperty, partProperty) }, "rose_gold" : { forging_temperature: 576, welding_temperature: 768, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty) },
"silver" : { forging_temperature: 577, welding_temperature: 769, customName: null, props: [].concat(defaultProperty, partProperty) }, "silver" : { forging_temperature: 577, welding_temperature: 769, hasOre: true, customName: null, props: [].concat(defaultProperty, partProperty) },
"tin" : { forging_temperature: 138, welding_temperature: 184, customName: null, props: [].concat(defaultProperty, partProperty) }, "tin" : { forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: [].concat(defaultProperty, partProperty) },
"zinc" : { forging_temperature: 252, welding_temperature: 336, customName: null, props: [].concat(defaultProperty, partProperty) }, "zinc" : { forging_temperature: 252, welding_temperature: 336, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty) },
"sterling_silver": { forging_temperature: 570, welding_temperature: 760, customName: null, props: [].concat(defaultProperty, partProperty) }, "sterling_silver": { forging_temperature: 570, welding_temperature: 760, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty) },
"copper" : { forging_temperature: 648, welding_temperature: 864, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) }, "copper" : { forging_temperature: 648, welding_temperature: 864, hasOre: true, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) },
"bismuth_bronze" : { forging_temperature: 591, welding_temperature: 788, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) }, "bismuth_bronze" : { forging_temperature: 591, welding_temperature: 788, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) },
"bronze" : { forging_temperature: 570, welding_temperature: 760, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) }, "bronze" : { forging_temperature: 570, welding_temperature: 760, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) },
"black_bronze" : { forging_temperature: 642, welding_temperature: 856, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) }, "black_bronze" : { forging_temperature: 642, welding_temperature: 856, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) },
"wrought_iron" : { forging_temperature: 921, welding_temperature: 1228, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) }, "wrought_iron" : { forging_temperature: 921, welding_temperature: 1228, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) },
"cast_iron" : { forging_temperature: 921, welding_temperature: 1228, customName: "iron", props: [].concat(defaultProperty, partProperty) }, "cast_iron" : { forging_temperature: 921, welding_temperature: 1228, hasOre: true, customName: "iron", props: [].concat(defaultProperty, partProperty) },
"pig_iron" : { forging_temperature: 921, welding_temperature: 1228, customName: null, props: defaultProperty}, "pig_iron" : { forging_temperature: 921, welding_temperature: 1228, hasOre: false, customName: null, props: defaultProperty},
"steel" : { forging_temperature: 924, welding_temperature: 1232, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) }, "steel" : { forging_temperature: 924, welding_temperature: 1232, hasOre: false, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) },
"high_carbon_black_steel" : { forging_temperature: 924, welding_temperature: 1232, customName: null, props: defaultProperty }, "high_carbon_black_steel" : { forging_temperature: 924, welding_temperature: 1232, hasOre: false, customName: null, props: defaultProperty },
"high_carbon_red_steel" : { forging_temperature: 924, welding_temperature: 1232, customName: null, props: defaultProperty }, "high_carbon_red_steel" : { forging_temperature: 924, welding_temperature: 1232, hasOre: false, customName: null, props: defaultProperty },
"high_carbon_blue_steel" : { forging_temperature: 924, welding_temperature: 1232, customName: null, props: defaultProperty }, "high_carbon_blue_steel" : { forging_temperature: 924, welding_temperature: 1232, hasOre: false, customName: null, props: defaultProperty },
"weak_steel" : { forging_temperature: 924, welding_temperature: 1232, customName: null, props: defaultProperty }, "weak_steel" : { forging_temperature: 924, welding_temperature: 1232, hasOre: false, customName: null, props: defaultProperty },
"weak_red_steel" : { forging_temperature: 924, welding_temperature: 1232, customName: null, props: defaultProperty }, "weak_red_steel" : { forging_temperature: 924, welding_temperature: 1232, hasOre: false, customName: null, props: defaultProperty },
"weak_blue_steel" : { forging_temperature: 924, welding_temperature: 1232, customName: null, props: defaultProperty }, "weak_blue_steel" : { forging_temperature: 924, welding_temperature: 1232, hasOre: false, customName: null, props: defaultProperty },
"black_steel" : { forging_temperature: 891, welding_temperature: 1188, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) }, "black_steel" : { forging_temperature: 891, welding_temperature: 1188, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) },
"red_steel" : { forging_temperature: 924, welding_temperature: 1232, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) }, "red_steel" : { forging_temperature: 924, welding_temperature: 1232, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) },
"blue_steel" : { forging_temperature: 924, welding_temperature: 1232, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) }, "blue_steel" : { forging_temperature: 924, welding_temperature: 1232, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) },
"unknown" : { forging_temperature: 240, welding_temperature: 320, customName: null, props: defaultProperty } "unknown" : { forging_temperature: 240, welding_temperature: 320, hasOre: false, customName: null, props: defaultProperty },
"cassiterite" : {forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: []},
"garnierite" : {forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: []},
"hematite" : {forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: []},
"limonite" : {forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: []},
"magnetite" : {forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: []},
"malachite" : {forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: []},
"pyrite" : {forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: []},
"sphalerite" : {forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: []},
"tetrahedrite" : {forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: []}
} }
const asd = [
]
const removeAllTagsItems = [ const removeAllTagsItems = [
'tfc:ore/amethyst', 'tfc:ore/amethyst',
'tfc:ore/diamond', 'tfc:ore/diamond',

26
kubejs/server_scripts/tfc/data.js
View file

@ -31,9 +31,11 @@ const registerTFCData = (event) => {
} }
for (const [metal, metalSpecs] of Object.entries(metalToSpecs)) { for (const [metal, metalSpecs] of Object.entries(metalToSpecs)) {
let metalName = (metalSpecs.customName != null) ? metalSpecs.customName : metal
metalSpecs.props.forEach(propName => { metalSpecs.props.forEach(propName => {
let json let json
let metalName = (metalSpecs.customName != null) ? metalSpecs.customName : metal
let property = itemTypeToHeat[propName] let property = itemTypeToHeat[propName]
if (property.useTag) json = tagJson(`forge:${property.hasGTVariant}/${metalName}`, property.heat_capacity, metalSpecs.forging_temperature, metalSpecs.welding_temperature) if (property.useTag) json = tagJson(`forge:${property.hasGTVariant}/${metalName}`, property.heat_capacity, metalSpecs.forging_temperature, metalSpecs.welding_temperature)
@ -51,6 +53,28 @@ const registerTFCData = (event) => {
if (property.heat_capacity == 0.0) event.addJson(path, emptyJson) if (property.heat_capacity == 0.0) event.addJson(path, emptyJson)
else event.addJson(path, json) else event.addJson(path, json)
}); });
if (metalSpecs.hasOre) {
let path = `tfc:tfc/item_heats/ore/${metalName}`
let json = {
ingredient: [
{
"tag": `forge:poor_raw_materials/${metalName}`
},
{
"tag": `forge:raw_materials/${metalName}`
},
{
"tag": `forge:rich_raw_materials/${metalName}`
}
],
heat_capacity: 1.143,
forging_temperature: metalSpecs.forging_temperature,
welding_temperature: metalSpecs.welding_temperature
}
event.addJson(path, json)
}
} }
} }