added potin, cobalt, and cobalt brass as tfc metals, fixed ratios of tfc brass/bronze
This commit is contained in:
Pyritie
parent
4327da326f
commit
cbad72ecf8
15 changed files with 2780 additions and 2694 deletions
|
|
@ -5,6 +5,8 @@
|
|||
- Added links from quests directly to field guide entries (#854) @Zippity
|
||||
- Added a second EBF recipe but from LV furnaces @Pyritie
|
||||
- Added GT machine recipes for maple/birch saps (#1524) @BlueBoat29
|
||||
- Changed the TFC ratios of bronze and brass to match GregTech's (3:1 instead of 9:1) @Pyritie
|
||||
- Added Potin, Cobalt, and Cobalt Brass as TFC metals @Pyritie
|
||||
### Bug fixes
|
||||
- Fixed chain conveyors not connecting (#1520) @BlueBoat29
|
||||
- Fixed a crash when opening a world with a railgun logistics monitor (#1526) @Redeix
|
||||
|
|
|
|||
|
|
@ -95,6 +95,7 @@
|
|||
"material.gtceu.ostrum": "Ostrum",
|
||||
"material.gtceu.calorite": "Calorite",
|
||||
"material.gtceu.etrium": "Etrium",
|
||||
"material.gtceu.aluminium_silicate": "Aluminium Silicate",
|
||||
"material.gtceu.rocket_alloy_t1": "R-Aluminosteel Rocket Alloy",
|
||||
"material.gtceu.rocket_alloy_t3": "45-Ti Tungstensteel Rocket Alloy",
|
||||
"material.gtceu.vitrified_asbestos": "Vitrified Asbestos",
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -378,7 +378,6 @@
|
|||
"item.tfg.soaked_hardwood_strip": "Soaked Hardwood Strip",
|
||||
"item.tfg.prepared_leather_gloves": "Prepared Leather Gloves",
|
||||
"item.tfg.latex_soaked_gloves": "Latex-Soaked Gloves",
|
||||
"item.tfg.spade_head_extruder_mold": "Extruder Mold (Spade Head)",
|
||||
"item.tfg.unfired_chalk": "Unfired Chalk Stick",
|
||||
"item.tfg.armor_stand_arms": "Armor Stand with Arms",
|
||||
"item.tfg.flint_club_head": "Flint Club Head",
|
||||
|
|
@ -528,7 +527,32 @@
|
|||
"item.tfg.universal_compost_browns": "Brown Universal Compost",
|
||||
"item.tfg.universal_compost_greens": "Green Universal Compost",
|
||||
"item.tfg.etching_diamond_tip": "Etching Diamond Tip",
|
||||
"item.tfg.glacian_wool": "Glacian Ram Wool",
|
||||
"item.tfg.spade_head_extruder_mold": "Extruder Mold (Spade Head)",
|
||||
"item.tfg.mining_hammer_head_extruder_mold": "Extruder Mold (Mining Hammer Head)",
|
||||
"item.tfg.sword_head_extruder_mold": "Extruder Mold (Sword Head)",
|
||||
"item.tfg.pickaxe_head_extruder_mold": "Extruder Mold (Pickaxe Head)",
|
||||
"item.tfg.shovel_head_extruder_mold": "Extruder Mold (Shovel Head)",
|
||||
"item.tfg.axe_head_extruder_mold": "Extruder Mold (Axe Head)",
|
||||
"item.tfg.hoe_head_extruder_mold": "Extruder Mold (Hoe Head)",
|
||||
"item.tfg.scythe_head_extruder_mold": "Extruder Mold (Sycthe Head)",
|
||||
"item.tfg.file_head_extruder_mold": "Extruder Mold (File Head)",
|
||||
"item.tfg.hammer_head_extruder_mold": "Extruder Mold (Hammer Head)",
|
||||
"item.tfg.saw_head_extruder_mold": "Extruder Mold (Saw Head)",
|
||||
"item.tfg.knife_head_extruder_mold": "Extruder Mold (Knife Head)",
|
||||
"item.tfg.butchery_knife_head_extruder_mold": "Extruder Mold (Butchery Knife Head)",
|
||||
"item.tfg.propick_head_extruder_mold": "Extruder Mold (Prospector's Pick Head)",
|
||||
"item.tfg.javelin_head_extruder_mold": "Extruder Mold (Javelin Head)",
|
||||
"item.tfg.chisel_head_extruder_mold": "Extruder Mold (Chisel Head)",
|
||||
"item.tfg.mace_head_extruder_mold": "Extruder Mold (Mace Head)",
|
||||
"item.tfg.mattock_head_extruder_mold": "Extruder Mold (Mattock Head)",
|
||||
"item.tfg.fish_hook_extruder_mold": "Extruder Mold (Fish Hook)",
|
||||
"item.tfg.whisk_extruder_mold": "Extruder Mold (Whisk)",
|
||||
"item.tfg.screwdriver_tip_extruder_mold": "Extruder Mold (Screwdriver Tip)",
|
||||
"item.tfg.wrench_tip_extruder_mold": "Extruder Mold (Wrench Tip)",
|
||||
"item.tfg.wire_cutter_head_extruder_mold": "Extruder Mold (Wire Cutter Head)",
|
||||
"item.tfg.small_casing_extruder_mold": "Extruder Mold (Small Bullet Casing)",
|
||||
"item.tfg.shell_casing_extruder_mold": "Extruder Mold (Shell Bullet Casing)",
|
||||
"item.tfg.large_casing_extruder_mold": "Extruder Mold (Large Bullet Casing)",
|
||||
"material.tfg.latex": "Latex",
|
||||
"material.tfg.vulcanized_latex": "Vulcanized Latex",
|
||||
"material.tfg.fluix": "Fluix",
|
||||
|
|
@ -1678,7 +1702,7 @@
|
|||
"quests.medium_voltage.mv_ethanol.desc": "Put your previously made &aBiomass&r into a &3MV Distillery&r to make &aEthanol&r.\n\nYou will need this for &dEthylene&r by reacting it with &aSulfuric Acid&r in a &3MV Chemical Reactor&r... unless you chose to go down the Oil path.\n\nOnce you have a hefty starting stock of Ethanol, consider making and distilling &9Fermented Biomass&r in a &3Distillation Tower&r (when you get there!) for extra chemicals.\n\n&cDo not try&r to use Ethanol as a Power source... it's quite possibly its worst use. If it's organic &9Power&r that you want, we suggest taking a look at &dBenzene&r instead!",
|
||||
"quests.medium_voltage.mv_bio_diesel.title": "The Church of Bio Diesel",
|
||||
"quests.medium_voltage.mv_bio_diesel.subtitle": "Flower Power",
|
||||
"quests.medium_voltage.mv_bio_diesel.desc": "Want to try something plant-based but without a tree farm? Give &3Bio Diesel&r a shot! The best route for it is through &dSeed Oil&r from either Sunflowers or Rapeseed. Just mix it with a little Ethanol and Sodium Hydroxide (from Sea Water!) in a Chemical Reactor and you're done! As a bonus, this route also outputs Glycerol which you can turn into &dEthlene&r!",
|
||||
"quests.medium_voltage.mv_bio_diesel.desc": "Want to try something plant-based but without a tree farm? Give &3Bio Diesel&r a shot! The best route for it is through &dSeed Oil&r from either Sunflowers or Rapeseed. Just mix it with a little Ethanol and Sodium Hydroxide (from Sea Water!) in a Chemical Reactor and you're done! As a bonus, this route also outputs Glycerol which you can turn into &dEthylene&r!",
|
||||
"quests.medium_voltage.mv_mutli_channel.title": "Multiple Channel Pipes",
|
||||
"quests.medium_voltage.mv_mutli_channel.subtitle": "Is it already AE2?",
|
||||
"quests.medium_voltage.mv_mutli_channel.desc": "Regular &o&dGregTech&r Fluid Pipes can only transport one fluid type at a time.\n\n&3Quadruple Fluid Pipes&r can transfer four different types of fluids. &3Nonuple Fluid Pipes&r can transfer nine different types! Useful for compact setups.\n\n&3Nonuple Fluid Pipes&r will be useful in &5EV&r for handling the many outputs of the &3Distillation Tower&r.\n\nGet &eeither&r to finish this quest.",
|
||||
|
|
@ -1781,7 +1805,7 @@
|
|||
"quests.medium_voltage.mv_kanthal_ingot.title": "Kanthal",
|
||||
"quests.medium_voltage.mv_kanthal_ingot.subtitle": "This one is hot",
|
||||
"quests.medium_voltage.mv_kanthal_ingot.desc.1": "Oh good lord, that’s a lot of &cKanthal&r needed here... And what the heck is this &chot ingot&r thing again? &cYes, again!&r\n\nHere we are with a mechanic you should remember from &aTerrafirmaCraft&r—it hasn't been that long, right?\n\n&cHot ingots&r will &cburn you&r if you carry them around and you don't have &cany way&r to counter it using Tongs...\n\nAlso unlike &aTFC&r, &cthey don’t cool down naturally&r! You’ll need to actively &acool them&r down.",
|
||||
"quests.medium_voltage.mv_kanthal_ingot.desc.2": "To do that, place them into a &dChemical Bath&r with &9Water&r—or even better, &9Distilled Water&r for a &e50 percent faster&r cooling time.\n\nWe highly recommend you &aautomate&r this process to avoid carrying those hot ingots yourself. Use &apipes&r to send them directly from your &dEBF&r to your &dOre Washer&r.\n\nYou can also set up an &aItem Tag Filter&r to help with sorting the hot ingots &7#forge:hot_ingots*&r.",
|
||||
"quests.medium_voltage.mv_kanthal_ingot.desc.2": "To do that, place them into a &dChemical Bath&r with &9Water&r—or even better, &9Distilled Water&r for a &e50 percent faster&r cooling time.\n\nWe highly recommend you &aautomate&r this process to avoid carrying those hot ingots yourself. Use &apipes&r to send them directly from your &dEBF&r to your &dChem Bath&r.\n\nYou can also set up an &aItem Tag Filter&r to help with sorting the hot ingots &7#forge:hot_ingots*&r.",
|
||||
"quests.medium_voltage.mv_assembler.title": "Advanced Assembler",
|
||||
"quests.medium_voltage.mv_assembler.subtitle": "Assengers, Avemble",
|
||||
"quests.medium_voltage.mv_assembler.desc": "The &3Assembler&r is a staple for every Tier; an important goal to unlock more recipes and progress further into the Age. Many in the community see crafting a voltage tier's Assembler as a sign of &oproperly&r reaching said voltage.\n\nThat being said, welcome to &bMV&r!\n\nThe &bMV &3Assembler&r unlocks &eTransistors&r, &eCapacitors&r and &eInductors&r, used for the next tiers of Circuits.",
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 389 B |
BIN
kubejs/assets/tfg/textures/block/metal/smooth/cobalt.png
Normal file
BIN
kubejs/assets/tfg/textures/block/metal/smooth/cobalt.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 396 B |
BIN
kubejs/assets/tfg/textures/block/metal/smooth/cobalt_brass.png
Normal file
BIN
kubejs/assets/tfg/textures/block/metal/smooth/cobalt_brass.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 406 B |
|
|
@ -116,6 +116,10 @@ const registerGTCEUMetals = (event) => {
|
|||
event.metal('gtceu:tin_alloy', 1250, 0.00829, '#forge:ingots/tin_alloy', '#forge:double_ingots/tin_alloy', '#forge:plates/tin_alloy', 3, 'tfg:tin_alloy')
|
||||
event.metal('gtceu:lead', 330, 0.01729, '#forge:ingots/lead', '#forge:double_ingots/lead', '#forge:plates/lead', 2, 'tfg:lead')
|
||||
event.metal('gtceu:invar', 1494, 0.00741, '#forge:ingots/invar', '#forge:double_ingots/invar', '#forge:plates/invar', 3, 'tfg:invar')
|
||||
event.metal('gtceu:potin', 807, 0.0124, '#forge:ingots/potin', '#forge:double_ingots/potin', '#forge:plates/potin', 2, 'tfg:potin')
|
||||
event.metal('gtceu:cobalt', 1495, 0.00857, '#forge:ingots/cobalt', '#forge:double_ingots/cobalt', '#forge:plates/cobalt', 3, 'tfg:cobalt')
|
||||
event.metal('gtceu:cobalt_brass', 1060, 0.00857, '#forge:ingots/cobalt_brass', '#forge:double_ingots/cobalt_brass', '#forge:plates/cobalt_brass', 3, 'tfg:cobalt_brass')
|
||||
event.metal('gtceu:aluminium_silicate', 1540, 0.00857, '#forge:ingots/aluminium_silicate', null, null, 1, 'tfg:aluminium_silicate')
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1355,5 +1355,4 @@ const registerGTCEURecipes = (event) => {
|
|||
event.replaceOutput({ id: 'gtceu:cutter/treated_button' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button')
|
||||
event.replaceOutput({ id: 'gtceu:cutter/treated_button_water' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button')
|
||||
event.replaceOutput({ id: 'gtceu:cutter/treated_button_distilled_water' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button')
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -241,10 +241,10 @@ function registerGTCEUMetalRecipes(event) {
|
|||
|
||||
event.remove({ id: `gtceu:shaped/plate_double_${material.getName()}` })
|
||||
|
||||
if (material === GTMaterials.CobaltBrass || material === GTMaterials.Potin) {
|
||||
if (material.getProperty(TFGPropertyKey.TFC_PROPERTY) === null) {
|
||||
event.recipes.greate.compacting(doublePlateItem, [plateItem, plateItem, 'tfc:powder/flux'])
|
||||
.heated()
|
||||
.recipeTier(1)
|
||||
.recipeTier(2)
|
||||
.id(`greate:compacting/${material.getName()}_double_plate`)
|
||||
|
||||
event.remove({ id: `gtceu:bender/bend_${material.getName()}_plate_to_double_plate` })
|
||||
|
|
@ -254,11 +254,6 @@ function registerGTCEUMetalRecipes(event) {
|
|||
.circuit(2)
|
||||
.duration(20 * 5.8)
|
||||
.EUt(24)
|
||||
} else if (material.getProperty(TFGPropertyKey.TFC_PROPERTY) === null) {
|
||||
event.recipes.greate.compacting(doublePlateItem, [plateItem, plateItem, 'tfc:powder/flux'])
|
||||
.heated()
|
||||
.recipeTier(2)
|
||||
.id(`greate:compacting/${material.getName()}_double_plate`)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -305,7 +300,7 @@ function registerGTCEUMetalRecipes(event) {
|
|||
event.remove({ id: `gtceu:shaped/stick_long_stick_${material.getName()}` })
|
||||
|
||||
// Rod welding recipes for all of the other non-tfc materials, since those were handled in tfc/recipes.materials.js
|
||||
if (material.getProperty(TFGPropertyKey.TFC_PROPERTY) === null) {
|
||||
if (!material.hasProperty(TFGPropertyKey.TFC_PROPERTY)) {
|
||||
event.recipes.greate.compacting(longRodItem, [shortRodItem, shortRodItem, 'tfc:powder/flux'])
|
||||
.heated()
|
||||
.recipeTier(1)
|
||||
|
|
@ -1078,7 +1073,7 @@ function registerGTCEUMetalRecipes(event) {
|
|||
const doublePlateItem = ChemicalHelper.get(TagPrefix.plateDouble, material, 1)
|
||||
if (buzzsawBladeItem === null || doublePlateItem === null) return;
|
||||
|
||||
let isLowTier = material === GTMaterials.CobaltBrass || material.hasProperty(TFGPropertyKey.TFC_PROPERTY)
|
||||
let isLowTier = material.hasProperty(TFGPropertyKey.TFC_PROPERTY)
|
||||
|
||||
event.recipes.gtceu.lathe(`buzzsaw_gear_${material.getName()}`)
|
||||
.itemInputs(doublePlateItem)
|
||||
|
|
@ -1167,6 +1162,7 @@ function registerGTCEUMetalRecipes(event) {
|
|||
const toolProperty = material.getProperty(PropertyKey.TOOL)
|
||||
const ingotProperty = material.getProperty(PropertyKey.INGOT)
|
||||
const oreProperty = material.getProperty(PropertyKey.ORE)
|
||||
|
||||
if (toolProperty !== null) {
|
||||
let circuit = 1;
|
||||
makeToolRecipe(GTToolType.SWORD, TFGTagPrefix.toolHeadSword, 'tfg:sword_head_extruder_mold', circuit++, material)
|
||||
|
|
|
|||
|
|
@ -10,9 +10,6 @@ function registerTFCMaterialsRecipes(event) {
|
|||
return;
|
||||
}
|
||||
|
||||
// Add any other early game metals here with GT tools but no TFC ones
|
||||
const onlyHasGTTools = material === GTMaterials.Invar;
|
||||
|
||||
let outputMaterial = (tfcProperty.getOutputMaterial() === null) ? material : tfcProperty.getOutputMaterial()
|
||||
|
||||
// Ingots
|
||||
|
|
@ -227,7 +224,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
}
|
||||
|
||||
// Tools (From Double Plate)
|
||||
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL) && !onlyHasGTTools) {
|
||||
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) {
|
||||
//#region Фурма
|
||||
|
||||
// Декрафт инструмента в жидкость
|
||||
|
|
@ -301,7 +298,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
}
|
||||
|
||||
// Tools (From Plate)
|
||||
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL) && !onlyHasGTTools) {
|
||||
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) {
|
||||
//#region Удочка
|
||||
|
||||
// Декрафт оголовья в жидкость
|
||||
|
|
@ -328,7 +325,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
}
|
||||
|
||||
// Tools (From Double Ingots)
|
||||
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) {
|
||||
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL) || material.hasFlag(TFGMaterialFlags.HAS_GT_TOOL)) {
|
||||
//#region Меч
|
||||
|
||||
// Крафт инструмента
|
||||
|
|
@ -378,7 +375,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
|
||||
//#region Дубина
|
||||
|
||||
if (!onlyHasGTTools) {
|
||||
if (!material.hasFlag(TFGMaterialFlags.HAS_GT_TOOL)) {
|
||||
// Декрафт инструмента в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/mace/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 288))
|
||||
|
|
@ -643,7 +640,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
}
|
||||
|
||||
// Tools (From Ingot)
|
||||
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) {
|
||||
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL) || material.hasFlag(TFGMaterialFlags.HAS_GT_TOOL)) {
|
||||
|
||||
//#region pickaxe
|
||||
|
||||
|
|
@ -693,7 +690,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
//#endregion
|
||||
|
||||
// #region mattock
|
||||
if (!onlyHasGTTools) {
|
||||
if (!material.hasFlag(TFGMaterialFlags.HAS_GT_TOOL)) {
|
||||
event.recipes.tfc.heating(`rnr:metal/mattock/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
.useDurability(true)
|
||||
|
|
@ -1106,7 +1103,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
//#region shears
|
||||
|
||||
// Сварка оголовий
|
||||
if (!onlyHasGTTools) {
|
||||
if (!material.hasFlag(TFGMaterialFlags.HAS_GT_TOOL)) {
|
||||
event.recipes.tfc.welding(`tfc:metal/shears/${material.getName()}`, knifeHeadItem, knifeHeadItem, tfcProperty.getTier())
|
||||
.id(`tfc:welding/${material.getName()}_shears`)
|
||||
|
||||
|
|
@ -1135,7 +1132,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
|
||||
//#region prospector pick
|
||||
|
||||
if (!onlyHasGTTools) {
|
||||
if (!material.hasFlag(TFGMaterialFlags.HAS_GT_TOOL)) {
|
||||
// Декрафт инструмента в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/propick/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
|
|
@ -1164,7 +1161,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
//#endregion
|
||||
|
||||
//#region chisel
|
||||
if (!onlyHasGTTools) {
|
||||
if (!material.hasFlag(TFGMaterialFlags.HAS_GT_TOOL)) {
|
||||
// Декрафт инструмента в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/chisel/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
|
|
@ -1193,7 +1190,7 @@ function registerTFCMaterialsRecipes(event) {
|
|||
//#endregion
|
||||
|
||||
//#region javelin
|
||||
if (!onlyHasGTTools) {
|
||||
if (!material.hasFlag(TFGMaterialFlags.HAS_GT_TOOL)) {
|
||||
// Декрафт инструмента в жидкость
|
||||
event.recipes.tfc.heating(`tfc:metal/javelin/${material.getName()}`, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,21 @@
|
|||
|
||||
function registerTFCMetalsRecipes(event) {
|
||||
|
||||
//#region Рецепты для новых сплавов
|
||||
//#region Alloying
|
||||
|
||||
// Fix ratios of TFC alloys to match GT's
|
||||
|
||||
event.recipes.tfc.alloy('tfc:bronze', [
|
||||
TFC.alloyPart('tfc:copper', 0.7, 0.8),
|
||||
TFC.alloyPart('tfc:tin', 0.2, 0.3)
|
||||
]).id('tfc:alloy/bronze')
|
||||
|
||||
event.recipes.tfc.alloy('tfc:brass', [
|
||||
TFC.alloyPart('tfc:copper', 0.7, 0.8),
|
||||
TFC.alloyPart('tfc:zinc', 0.2, 0.3)
|
||||
]).id('tfc:alloy/brass')
|
||||
|
||||
// New alloys
|
||||
|
||||
event.recipes.tfc.alloy('tfg:red_alloy', [
|
||||
TFC.alloyPart('tfg:redstone', 0.75, 0.85),
|
||||
|
|
@ -20,6 +34,18 @@ function registerTFCMetalsRecipes(event) {
|
|||
TFC.alloyPart('tfc:cast_iron', 0.30, 0.40)
|
||||
]).id('tfg:alloy/invar')
|
||||
|
||||
event.recipes.tfc.alloy('tfg:potin', [
|
||||
TFC.alloyPart('tfc:copper', 0.63, 0.69),
|
||||
TFC.alloyPart('tfc:tin', 0.19, 0.25),
|
||||
TFC.alloyPart('tfg:lead', 0.08, 0.14)
|
||||
]).id('tfg:alloy/potin')
|
||||
|
||||
event.recipes.tfc.alloy('tfg:cobalt_brass', [
|
||||
TFC.alloyPart('tfc:brass', 0.74, 0.81),
|
||||
TFC.alloyPart('tfg:cobalt', 0.08, 0.14),
|
||||
TFC.alloyPart('tfg:aluminium_silicate', 0.08, 0.14)
|
||||
]).id('tfg:alloy/cobalt_brass')
|
||||
|
||||
//#endregion
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -75,6 +75,9 @@ const registerTFCItemTags = (event) => {
|
|||
event.add('tfc:pileable_double_ingots', 'gtceu:red_alloy_double_ingot')
|
||||
event.add('tfc:pileable_double_ingots', 'gtceu:lead_double_ingot')
|
||||
event.add('tfc:pileable_double_ingots', 'gtceu:invar_double_ingot')
|
||||
event.add('tfc:pileable_double_ingots', 'gtceu:potin_double_ingot')
|
||||
event.add('tfc:pileable_double_ingots', 'gtceu:cobalt_double_ingot')
|
||||
event.add('tfc:pileable_double_ingots', 'gtceu:cobalt_brass_double_ingot')
|
||||
|
||||
// Рыба
|
||||
event.add('minecraft:fishes', 'tfc:food/calamari')
|
||||
|
|
@ -490,6 +493,10 @@ const registerTFCFluidTags = (event) => {
|
|||
event.add('tfc:usable_in_ingot_mold', 'gtceu:tin_alloy')
|
||||
event.add('tfc:usable_in_ingot_mold', 'gtceu:lead')
|
||||
event.add('tfc:usable_in_ingot_mold', 'gtceu:invar')
|
||||
event.add('tfc:usable_in_ingot_mold', 'gtceu:potin')
|
||||
event.add('tfc:usable_in_ingot_mold', 'gtceu:cobalt')
|
||||
event.add('tfc:usable_in_ingot_mold', 'gtceu:cobalt_brass')
|
||||
event.add('tfc:usable_in_ingot_mold', 'gtceu:aluminium_silicate')
|
||||
|
||||
event.add('tfc:usable_in_bell_mold', 'gtceu:bronze')
|
||||
event.add('tfc:usable_in_bell_mold', 'gtceu:gold')
|
||||
|
|
|
|||
|
|
@ -20,8 +20,9 @@ const registerGTCEuMaterialModification = (event) => {
|
|||
const $FluidStorageKeys = Java.loadClass('com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys')
|
||||
|
||||
const {
|
||||
HAS_TFC_TOOL,
|
||||
HAS_TFC_ARMOR,
|
||||
HAS_TFC_TOOL, // used to generate new TFC items like javelins
|
||||
HAS_GT_TOOL, // does not generate items, just TFC recipes for GT tools
|
||||
HAS_TFC_ARMOR,
|
||||
HAS_TFC_UTILITY,
|
||||
CAN_BE_UNMOLDED,
|
||||
GENERATE_BELL,
|
||||
|
|
@ -133,8 +134,20 @@ const registerGTCEuMaterialModification = (event) => {
|
|||
GTMaterials.Redstone.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(240, 320, 460, 1));
|
||||
GTMaterials.RedAlloy.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(570, 650, 740, 2));
|
||||
GTMaterials.TinAlloy.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1000, 1100, 1250, 3));
|
||||
GTMaterials.Lead.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(170, 250, 330, 2));
|
||||
GTMaterials.Invar.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(896, 1195, 1494, 3));
|
||||
GTMaterials.Lead.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(330 * 0.6, 330 * 0.8, 330, 2));
|
||||
GTMaterials.Galena.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(330 * 0.6, 330 * 0.8, 330, GTMaterials.Lead, 2, 85));
|
||||
GTMaterials.Invar.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1494 * 0.6, 1494 * 0.8, 1494, 3));
|
||||
GTMaterials.Potin.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(807 * 0.6, 807 * 0.8, 807, 2));
|
||||
GTMaterials.Cobalt.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1495 * 0.6, 1495 * 0.8, 1495, 3));
|
||||
GTMaterials.Cobaltite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1495 * 0.6, 1495 * 0.8, 1495, GTMaterials.Cobalt, 3, 85));
|
||||
GTMaterials.CobaltOxide.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1495 * 0.6, 1495 * 0.8, 1495, GTMaterials.Cobalt, 3));
|
||||
GTMaterials.CobaltBrass.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1060 * 0.6, 1060 * 0.8, 1060, 3));
|
||||
let AlSi = GTMaterials.get('aluminium_silicate')
|
||||
AlSi.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1540, 1540, 1540, 1))
|
||||
GTMaterials.Kyanite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1540, 1540, 1540, AlSi, 1, 95))
|
||||
GTMaterials.Mica.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1540, 1540, 1540, AlSi, 1, 90))
|
||||
GTMaterials.Spodumene.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1540, 1540, 1540, AlSi, 1, 85))
|
||||
GTMaterials.Pollucite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1540, 1540, 1540, AlSi, 1, 85))
|
||||
|
||||
|
||||
GTMaterials.Gold.addFlags(GENERATE_BELL);
|
||||
|
|
@ -183,10 +196,13 @@ const registerGTCEuMaterialModification = (event) => {
|
|||
GTMaterials.Silver.addFlags(HAS_SMALL_NATIVE_TFC_ORE);
|
||||
//
|
||||
// /* Имеют двойные слитки */
|
||||
GTMaterials.RedAlloy.addFlags(GENERATE_DOUBLE_INGOTS, GENERATE_SMALL_GEAR);
|
||||
GTMaterials.RedAlloy.addFlags(GENERATE_DOUBLE_INGOTS, GENERATE_SMALL_GEAR, CAN_BE_UNMOLDED);
|
||||
GTMaterials.TinAlloy.addFlags(GENERATE_DOUBLE_INGOTS);
|
||||
GTMaterials.Lead.addFlags(GENERATE_DOUBLE_INGOTS);
|
||||
GTMaterials.Invar.addFlags(GENERATE_DOUBLE_INGOTS, HAS_TFC_TOOL);
|
||||
GTMaterials.Invar.addFlags(GENERATE_DOUBLE_INGOTS, HAS_GT_TOOL);
|
||||
GTMaterials.Potin.addFlags(GENERATE_DOUBLE_INGOTS, CAN_BE_UNMOLDED);
|
||||
GTMaterials.Cobalt.addFlags(GENERATE_DOUBLE_INGOTS);
|
||||
GTMaterials.CobaltBrass.addFlags(GENERATE_DOUBLE_INGOTS, HAS_GT_TOOL);
|
||||
//
|
||||
// /* Superconductors */
|
||||
GTMaterials.ManganesePhosphide.addFlags(GENERATE_FINE_WIRE);
|
||||
|
|
|
|||
|
|
@ -43,6 +43,16 @@ const registerTFGMaterials = (event) => {
|
|||
.secondaryColor('0xeddcad')
|
||||
.components('12x carbon', '22x hydrogen', '11x oxygen')
|
||||
|
||||
// Used as a TFC aluminium substitute so you can't make actual aluminium ingots early
|
||||
event.create('aluminium_silicate')
|
||||
.dust()
|
||||
.ingot()
|
||||
.liquid(new GTFluidBuilder().state(GTFluidState.LIQUID).temperature(1520))
|
||||
.components('2x aluminium', '1x silicon', '5x oxygen')
|
||||
.iconSet('metallic')
|
||||
.color(0xB6D3FF)
|
||||
.secondaryColor(0x6F4AB3)
|
||||
|
||||
// Space Rocket Materials
|
||||
|
||||
event.create('rocket_alloy_t1')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue