Merge branch 'feature/space' into dev

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
This commit is contained in:
Redeix 2025-06-22 00:40:02 -05:00 committed by GitHub
commit 2138a8b0dc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
988 changed files with 238425 additions and 5714 deletions

View file

@ -1,18 +1,185 @@
// priority: 0
const registerTFCDataForGTCEU = (event) => {
registerGTCEUHeats(event)
registerGTCEUHeats(event)
registerGTCEUMetals(event)
}
/**
* event.itemHeat(
ingredient: Ingredient,
heatCapacity: number,
forgingTemperature: @Nullable number,
weldingTemperature: @Nullable number,
name?: string
)
ingredient: Ingredient,
heatCapacity: number,
forgingTemperature: @Nullable number,
weldingTemperature: @Nullable number,
name?: string
)
*/
const registerGTCEUHeats = (event) => {
event.itemHeat('gtceu:compressed_coke_clay', 0.1242, null, null)
function makeItemHeatByTagPrefix(tagPrefix, material, tfcProperty, heatCapacity) {
let item = ChemicalHelper.get(tagPrefix, material, 1)
if (!item.isEmpty()) event.itemHeat(item, heatCapacity, tfcProperty.getForgingTemp(), tfcProperty.getWeldingTemp())
}
function makeItemHeatByToolType(toolType, material, tfcProperty, heatCapacity) {
let tool = ToolHelper.get(toolType, material)
if (!tool.isEmpty()) event.itemHeat(tool, heatCapacity, tfcProperty.getForgingTemp(), tfcProperty.getWeldingTemp())
}
forEachMaterial(material => {
let tfcProperty = material.getProperty(TFGPropertyKey.TFC_PROPERTY)
if (tfcProperty != null) {
makeItemHeatByTagPrefix(TagPrefix.dustTiny, material, tfcProperty, 0.357)
makeItemHeatByTagPrefix(TagPrefix.dustSmall, material, tfcProperty, 0.714)
makeItemHeatByTagPrefix(TagPrefix.dust, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TagPrefix.rod, material, tfcProperty, 0.567)
makeItemHeatByTagPrefix(TagPrefix.bolt, material, tfcProperty, 0.245)
makeItemHeatByTagPrefix(TagPrefix.screw, material, tfcProperty, 0.567)
makeItemHeatByTagPrefix(TagPrefix.nugget, material, tfcProperty, 0.124)
makeItemHeatByTagPrefix(TagPrefix.block, material, tfcProperty, 20)
makeItemHeatByTagPrefix(TagPrefix.rodLong, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TagPrefix.ingot, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TagPrefix.rawOre, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.richRawOre, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.poorRawOre, material, tfcProperty, 1.429)
// Ore processing stages
makeItemHeatByTagPrefix(TagPrefix.dustImpure, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TagPrefix.dustPure, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TagPrefix.crushed, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TagPrefix.crushedPurified, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TagPrefix.crushedRefined, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadSword, material, tfcProperty, 2.875)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadShovel, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadScythe, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadPickaxe, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadSaw, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadKnife, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadHoe, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadHammer, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadAxe, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadFile, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadButcheryKnife, material, tfcProperty, 2.875)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadMiningHammer, material, tfcProperty, 2.875)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadSpade, material, tfcProperty, 2.875)
makeItemHeatByToolType(GTToolType.SWORD, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.PICKAXE, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.SHOVEL, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.AXE, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.HOE, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.SAW, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.HARD_HAMMER, material, tfcProperty, 2.875)
makeItemHeatByToolType(GTToolType.FILE, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.SCYTHE, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.KNIFE, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.BUTCHERY_KNIFE, material, tfcProperty, 2.875)
makeItemHeatByToolType(GTToolType.MINING_HAMMER, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.SPADE, material, tfcProperty, 2.875)
}
})
event.itemHeat('gtceu:compressed_coke_clay', 0.1242, null, null)
}
const registerGTCEUMetals = (event) => {
event.metal('gtceu:copper', 1080, 0.00857, '#forge:ingots/copper', '#forge:double_ingots/copper', '#forge:plates/copper', 1, 'tfc:copper')
event.metal('gtceu:bismuth_bronze', 985, 0.00857, '#forge:ingots/bismuth_bronze', '#forge:double_ingots/bismuth_bronze', '#forge:plates/bismuth_bronze', 2, 'tfc:bismuth_bronze')
event.metal('gtceu:bronze', 950, 0.00857, '#forge:ingots/bronze', '#forge:double_ingots/bronze', '#forge:plates/bronze', 2, 'tfc:bronze')
event.metal('gtceu:black_bronze', 1070, 0.00857, '#forge:ingots/black_bronze', '#forge:double_ingots/black_bronze', '#forge:plates/black_bronze', 2, 'tfc:black_bronze')
event.metal('gtceu:wrought_iron', 1535, 0.00857, '#forge:ingots/wrought_iron', '#forge:double_ingots/wrought_iron', '#forge:plates/wrought_iron', 3, 'tfc:wrought_iron')
event.metal('gtceu:steel', 1540, 0.00857, '#forge:ingots/steel', '#forge:double_ingots/steel', '#forge:plates/steel', 4, 'tfc:steel')
event.metal('gtceu:black_steel', 1485, 0.00857, '#forge:ingots/black_steel', '#forge:double_ingots/black_steel', '#forge:plates/black_steel', 5, 'tfc:black_steel')
event.metal('gtceu:blue_steel', 1540, 0.00857, '#forge:ingots/blue_steel', '#forge:double_ingots/blue_steel', '#forge:plates/blue_steel', 6, 'tfc:blue_steel')
event.metal('gtceu:red_steel', 1540, 0.00857, '#forge:ingots/red_steel', '#forge:double_ingots/red_steel', '#forge:plates/red_steel', 6, 'tfc:red_steel')
event.metal('gtceu:iron', 1535, 0.00857, '#forge:ingots/iron', '#forge:double_ingots/iron', '#forge:plates/iron', 3, 'tfc:cast_iron')
event.metal('gtceu:tin', 230, 0.02143, '#forge:ingots/tin', '#forge:double_ingots/tin', '#forge:plates/tin', 1, 'tfc:tin')
event.metal('gtceu:bismuth', 270, 0.02143, '#forge:ingots/bismuth', '#forge:double_ingots/bismuth', '#forge:plates/bismuth', 1, 'tfc:bismuth')
event.metal('gtceu:zinc', 420, 0.01429, '#forge:ingots/zinc', '#forge:double_ingots/zinc', '#forge:plates/zinc', 1, 'tfc:zinc')
event.metal('gtceu:sterling_silver', 950, 0.00857, '#forge:ingots/sterling_silver', '#forge:double_ingots/sterling_silver', '#forge:plates/sterling_silver', 1, 'tfc:sterling_silver')
event.metal('gtceu:rose_gold', 960, 0.00857, '#forge:ingots/rose_gold', '#forge:double_ingots/rose_gold', '#forge:plates/rose_gold', 1, 'tfc:rose_gold')
event.metal('gtceu:silver', 961, 0.00625, '#forge:ingots/silver', '#forge:double_ingots/silver', '#forge:plates/silver', 1, 'tfc:silver')
event.metal('gtceu:gold', 1060, 0.005, '#forge:ingots/gold', '#forge:double_ingots/gold', '#forge:plates/gold', 1, 'tfc:gold')
event.metal('gtceu:nickel', 1453, 0.00625, '#forge:ingots/nickel', '#forge:double_ingots/nickel', '#forge:plates/nickel', 1, 'tfc:nickel')
event.metal('gtceu:brass', 930, 0.00857, '#forge:ingots/brass', '#forge:double_ingots/brass', '#forge:plates/brass', 2, 'tfc:brass')
event.metal('gtceu:redstone', 460, 0.01729, null, null, null, 1, 'tfg:redstone')
event.metal('gtceu:red_alloy', 740, 0.01529, '#forge:ingots/red_alloy', '#forge:double_ingots/red_alloy', '#forge:plates/red_alloy', 2, 'tfg:red_alloy')
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')
}
const registerGTCEUBedrockOreVeins = (event) => {
// Tin, Magnesium
event.add('tfg:moon_tin', vein => {
vein.weight(75)
.size(2)
.yield(1, 4)
.material(GTMaterials.Cassiterite, 5)
.material(GTMaterials.Tin, 2)
.material(GTMaterials.Olivine, 1)
.dimensions('ad_astra:moon')
})
// Iron, Gold, Magnesium
event.add('tfg:moon_magnetite', vein => {
vein.weight(75)
.size(2)
.yield(1, 4)
.material(GTMaterials.Magnetite, 8)
.material(GTMaterials.Gold, 3)
.material(GTMaterials.Olivine, 1)
.dimensions('ad_astra:moon')
})
// Copper, Arsenic, Tin
event.add('tfg:moon_copper', vein => {
vein.weight(100)
.size(2)
.yield(1, 4)
.material(GTMaterials.Chalcopyrite, 10)
.material(GTMaterials.Zeolite, 4)
.material(GTMaterials.Cassiterite, 3)
.material(GTMaterials.Realgar, 2)
.dimensions('ad_astra:moon')
})
// Certus Quartz, Barium
event.add('tfg:moon_certus', vein => {
vein.weight(20)
.size(1)
.yield(1, 2)
.material(GTMaterials.CertusQuartz, 6)
.material(GTMaterials.Barite, 2)
.material(GTMaterials.Quartzite, 7)
.dimensions('ad_astra:moon')
})
// Asbestos, Tin, Calcium
event.add('tfg:moon_asbestos', vein => {
vein.weight(100)
.size(2)
.yield(1, 5)
.material(GTMaterials.Asbestos, 3)
.material(GTMaterials.CassiteriteSand, 4)
.material(GTMaterials.Diatomite, 1)
.dimensions('ad_astra:moon')
})
// Mica - Talc Silicon Aluminium Potassium Fluorine Caesium
event.add('tfg:moon_mica', vein => {
vein.weight(50)
.size(1)
.yield(1, 3)
.material(GTMaterials.Mica, 5)
.material(GTMaterials.Kyanite, 2)
.material(GTMaterials.Pollucite, 1)
.dimensions('ad_astra:moon')
})
}

View file

@ -24,6 +24,13 @@ const STONE_TYPES_TO_COBBLE = {
deepslate: 'minecraft:cobbled_deepslate',
pyroxenite: 'minecraft:blackstone',
dripstone: 'minecraft:dripstone_block',
moon_stone: 'ad_astra:moon_cobblestone',
moon_deepslate: 'ad_astra:moon_sand',
mars_stone: 'ad_astra:mars_cobblestone',
venus_stone: 'ad_astra:venus_cobblestone',
mercury_stone: 'ad_astra:mercury_cobblestone',
glacio_stone: 'ad_astra:glacio_cobblestone',
permafrost: 'gtceu:ice_dust'
}
const registerGTCEULoots = (event) => {
@ -52,7 +59,7 @@ const registerGTCEULoots = (event) => {
event.addBlockLootModifier('tfg:rock/hardened_deepslate')
.matchMainHand('#forge:tools/hammers')
.removeLoot(ItemFilter.ALWAYS_TRUE)
.addLoot('tfc:sand/black')
.addLoot('minecraft:cobbled_deepslate')
event.addBlockLootModifier('tfg:rock/hardened_dripstone')
.matchMainHand('#forge:tools/hammers')
@ -72,8 +79,63 @@ const registerGTCEULoots = (event) => {
.removeLoot(ItemFilter.ALWAYS_TRUE)
.addLoot('tfc:sand/pink')
event.addBlockLootModifier('ad_astra:moon_stone')
.matchMainHand('#forge:tools/hammers')
.removeLoot(ItemFilter.ALWAYS_TRUE)
.addLoot('ad_astra:moon_cobblestone')
event.addBlockLootModifier('ad_astra:moon_cobblestone')
.matchMainHand('#forge:tools/hammers')
.removeLoot(ItemFilter.ALWAYS_TRUE)
.addLoot('ad_astra:moon_sand')
event.addBlockLootModifier('ad_astra:moon_deepslate')
.matchMainHand('#forge:tools/hammers')
.removeLoot(ItemFilter.ALWAYS_TRUE)
.addLoot('ad_astra:moon_sand')
event.addBlockLootModifier('ad_astra:mars_stone')
.matchMainHand('#forge:tools/hammers')
.removeLoot(ItemFilter.ALWAYS_TRUE)
.addLoot('ad_astra:mars_cobblestone')
event.addBlockLootModifier('ad_astra:mars_cobblestone')
.matchMainHand('#forge:tools/hammers')
.removeLoot(ItemFilter.ALWAYS_TRUE)
.addLoot('ad_astra:mars_sand')
event.addBlockLootModifier('ad_astra:venus_stone')
.matchMainHand('#forge:tools/hammers')
.removeLoot(ItemFilter.ALWAYS_TRUE)
.addLoot('ad_astra:venus_cobblestone')
event.addBlockLootModifier('ad_astra:venus_cobblestone')
.matchMainHand('#forge:tools/hammers')
.removeLoot(ItemFilter.ALWAYS_TRUE)
.addLoot('ad_astra:venus_sand')
event.addBlockLootModifier('ad_astra:mercury_stone')
.matchMainHand('#forge:tools/hammers')
.removeLoot(ItemFilter.ALWAYS_TRUE)
.addLoot('ad_astra:mercury_cobblestone')
event.addBlockLootModifier('ad_astra:mercury_cobblestone')
.matchMainHand('#forge:tools/hammers')
.removeLoot(ItemFilter.ALWAYS_TRUE)
.addLoot('tfc:sand/red')
event.addBlockLootModifier('ad_astra:glacio_stone')
.matchMainHand('#forge:tools/hammers')
.removeLoot(ItemFilter.ALWAYS_TRUE)
.addLoot('ad_astra:glacio_cobblestone')
event.addBlockLootModifier('ad_astra:glacio_cobblestone')
.matchMainHand('#forge:tools/hammers')
.removeLoot(ItemFilter.ALWAYS_TRUE)
.addLoot('tfc:sand/white')
// Crush raw rock into cobble
global.ORE_BEARING_STONES.forEach(stoneType => {
global.TFC_STONE_TYPES.forEach(stoneType => {
event.addBlockLootModifier(`tfc:rock/raw/${stoneType}`)
.matchMainHand('#forge:tools/hammers')
.removeLoot(ItemFilter.ALWAYS_TRUE)
@ -82,7 +144,6 @@ const registerGTCEULoots = (event) => {
// Go through all materials
forEachMaterial(material => {
if (material.hasProperty(PropertyKey.ORE)) {
// Indicator buds
@ -108,9 +169,19 @@ const registerGTCEULoots = (event) => {
// I LOVE LOOTJS I LOVE LOOTJS I LOVE LOOTJS
let rawOreBlock = `:${ChemicalHelper.get(TagPrefix.rawOreBlock, material, 1).getItem()}`;
if (material == GTMaterials.Copper || material == GTMaterials.Gold || material == GTMaterials.Iron)
{
rawOreBlock = "minecraft" + rawOreBlock;
}
else if (material == TFGHelpers.getMaterial('desh')
|| material == TFGHelpers.getMaterial('ostrum')
|| material == TFGHelpers.getMaterial('calorite'))
{
rawOreBlock = "ad_astra" + rawOreBlock;
}
else
{
rawOreBlock = "gtceu" + rawOreBlock;
}
event.addBlockLootModifier(rawOreBlock)
.removeLoot(ItemFilter.ALWAYS_TRUE)
@ -136,7 +207,7 @@ const registerGTCEULoots = (event) => {
let stoneTypeDust = ChemicalHelper.get(TagPrefix.dust, stoneTypeMaterial, 1)
// break with pickaxe
// break with pickaxe/mining hammer/drill/mining machine
event.addBlockLootModifier(`gtceu:${stoneType}_${material.getName()}_ore`)
.removeLoot(ItemFilter.ALWAYS_TRUE)
.addWeightedLoot([

View file

@ -166,24 +166,28 @@ const registerGTCEURecipes = (event) => {
event.recipes.gtceu.compressor('plant_ball_from_tfc_seeds')
.itemInputs('8x #tfc:seeds')
.itemOutputs('gtceu:plant_ball')
.circuit(1)
.duration(300)
.EUt(2)
event.recipes.gtceu.compressor('plant_ball_from_tfc_food')
.itemInputs('8x #tfc:foods')
.itemOutputs('gtceu:plant_ball')
.circuit(1)
.duration(300)
.EUt(2)
event.recipes.gtceu.compressor('plant_ball_from_tfc_plants')
.itemInputs('8x #tfc:plants')
.itemOutputs('gtceu:plant_ball')
.circuit(1)
.duration(300)
.EUt(2)
event.recipes.gtceu.compressor('plant_ball_from_tfc_corals')
.itemInputs('8x #tfc:corals')
.itemOutputs('gtceu:plant_ball')
.circuit(1)
.duration(300)
.EUt(2)

View file

@ -744,18 +744,6 @@ function registerGTCEuMachineRecipes(event) {
// #endregion
// Контроллер теплицы
event.shaped('gtceu:greenhouse', [
'ABA',
'CDC',
'BCB'
], {
A: '#gtceu:circuits/mv',
B: 'gtceu:copper_single_cable',
C: 'tfc:compost',
D: 'gtceu:solid_machine_casing'
}).id('tfg:shaped/greenhouse')
// Drums
const DRUMS_AND_CRATES = [
'bismuth_bronze',
@ -901,6 +889,47 @@ function registerGTCEuMachineRecipes(event) {
event.replaceOutput({ id: 'gtceu:macerator/macerate_steam_input_hatch' }, 'gtceu:steel_dust', '6x gtceu:steel_dust')
event.replaceOutput({ id: 'gtceu:arc_furnace/arc_steam_input_hatch' }, 'gtceu:steel_block', '6x gtceu:steel_ingot')
event.replaceOutput({ id: 'gtceu:macerator/macerate_hv_cutter' }, 'gtceu:red_steel_dust', '4x gtceu:diamond_dust')
event.replaceOutput({ id: 'gtceu:arc_furnace/arc_hv_cutter' }, '#forge:ingots/red_steel', '4x gtceu:chipped_diamond_gem')
event.replaceOutput({ id: 'gtceu:macerator/macerate_steam_input_hatch'}, 'gtceu:steel_dust', '6x gtceu:steel_dust')
event.replaceOutput({ id: 'gtceu:arc_furnace/arc_steam_input_hatch'}, 'gtceu:steel_block', '6x gtceu:steel_ingot')
// #region Bedrock Miner
event.recipes.gtceu.assembler('gtceu:mv_bedrock_miner')
.itemInputs('1x gtceu:hv_machine_hull',
'4x #forge:frames/steel',
'4x #gtceu:circuits/iv',
'4x gtceu:hv_electric_motor',
'4x gtceu:hv_robot_arm',
'4x gtceu:hv_conveyor_module',
'4x #forge:gears/blue_steel')
.itemOutputs('gtceu:mv_bedrock_ore_miner')
.duration(400)
.EUt(GTValues.VA[GTValues.HV])
.circuit(2)
event.recipes.gtceu.assembler('gtceu:hv_bedrock_miner')
.itemInputs('1x gtceu:ev_machine_hull',
'4x #forge:frames/titanium',
'4x #gtceu:circuits/luv',
'4x gtceu:luv_electric_motor',
'4x gtceu:luv_robot_arm',
'4x gtceu:luv_conveyor_module',
'4x #forge:gears/ruridit')
.itemOutputs('gtceu:hv_bedrock_ore_miner')
.duration(400)
.EUt(GTValues.VA[GTValues.IV])
.circuit(2)
event.recipes.gtceu.assembler('gtceu:ev_bedrock_miner')
.itemInputs('1x gtceu:iv_machine_hull',
'4x #forge:frames/tungsten_steel',
'4x #gtceu:circuits/zpm',
'4x gtceu:zpm_electric_motor',
'4x gtceu:zpm_robot_arm',
'4x gtceu:zpm_conveyor_module',
'4x #forge:gears/osmiridium')
.itemOutputs('gtceu:ev_bedrock_ore_miner')
.duration(400)
.EUt(GTValues.VA[GTValues.ZPM])
.circuit(2)
}

View file

@ -139,7 +139,7 @@ function registerGTCEUMetalRecipes(event) {
let matAmount = TagPrefix.block.getMaterialAmount(material) / GTValues.M;
if (!plateStack.isEmpty() && !ingotStack.hasTag('c:hidden_from_recipe_viewers')) {
if (!plateStack.isEmpty()) {
event.custom({
type: "createaddition:rolling",
@ -149,6 +149,7 @@ function registerGTCEUMetalRecipes(event) {
}).id(`tfg:rolling/${material.getName()}_plate`)
if (!blockStack.isEmpty() && GTMaterials.Stone != material) {
// 9х Слиток -> Блок
event.recipes.createCompacting(blockStack, ingotStack.withCount(matAmount))
.heated()
@ -157,6 +158,7 @@ function registerGTCEUMetalRecipes(event) {
}
else {
if (!blockStack.isEmpty()) {
// Блок из гемов -> 9 Пластин
event.recipes.createCutting(plateStack.withCount(matAmount).withChance(0.65), blockStack)
.id(`tfg:cutting/${material.getName()}_plate`)
@ -190,7 +192,7 @@ function registerGTCEUMetalRecipes(event) {
const foilItem = ChemicalHelper.get(TagPrefix.foil, material, 4)
const plateItem = ChemicalHelper.get(TagPrefix.plate, material, 1)
if (plateItem != null && foilItem != null && !plateItem.hasTag('c:hidden_from_recipe_viewers')) {
if (plateItem != null && foilItem != null) {
event.custom({
type: "createaddition:rolling",
input: plateItem,

View file

@ -215,4 +215,25 @@ function registerGTCEURecyclingRecipes(event) {
.duration(1792)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
.EUt(GTValues.VA[GTValues.LV])
// Clean Foil pack
event.recipes.gtceu.macerator('gtceu:macerator/recycling/clean_foil_pack')
.itemInputs('tfg:clean_foil_pack')
.itemOutputs(
ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Aluminium, 1),
ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Polyethylene, 1)
)
.duration(GTMaterials.Aluminium.getMass() * 1)
.category(GTRecipeCategories.MACERATOR_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.arc_furnace('gtceu:arc_furnace/recycling/clean_foil_pack')
.itemInputs('tfg:clean_foil_pack')
.itemOutputs(
ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Aluminium, 2),
ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Ash, 1)
)
.duration(GTMaterials.Aluminium.getMass() * 1)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
.EUt(GTValues.VA[GTValues.LV])
}

View file

@ -604,6 +604,7 @@ function removeGTCEURecipes(event) {
event.remove({ id: 'gtceu:shaped/pickaxe_iron' })
event.remove({ id: 'gtceu:shaped/gear_diamond' })
event.remove({ id: 'gtceu:shaped/buzzsaw_blade_diamond' })
event.remove({ id: 'gtceu:shaped/purpur_stair_saw' })
event.remove({ id: 'gtceu:shapeless/glass_full_dust_flint' })
@ -626,6 +627,7 @@ function removeGTCEURecipes(event) {
event.remove({ id: 'gtceu:assembler/spyglass' })
event.remove({ id: 'gtceu:assembler/map' })
event.remove({ id: 'gtceu:assembler/spyglass' })
event.remove({ id: 'gtceu:assembler/assemble_purpur_into_stair' })
event.remove({ id: 'gtceu:chemical_reactor/ghast_tear_separation' })
@ -651,4 +653,13 @@ function removeGTCEURecipes(event) {
event.remove({ id: 'gtceu:chemical_bath/red_steel_cool_down_distilled_water' })
event.remove({ id: 'gtceu:chemical_bath/blue_steel_cool_down' })
event.remove({ id: 'gtceu:chemical_bath/blue_steel_cool_down_distilled_water' })
event.remove({ id: 'gtceu:compressor/compress_certus_quartz_to_raw_ore_block' })
event.remove({ id: 'gtceu:compressor/glowstone' })
event.remove({ id: 'gtceu:forming_press/form_purpur_slab_into_pillar' })
// Remove vanilla Eye of Ender
event.remove({ id: 'minecraft:ender_eye' })
}

View file

@ -43,7 +43,12 @@ const registerGTCEUItemTags = (event) => {
event.add('tfg:stone_dusts', 'gtceu:deepslate_dust')
event.add('tfg:stone_dusts', 'gtceu:blackstone_dust')
event.add('tfg:stone_dusts', 'tfg:dripstone_dust')
event.add('tfg:stone_dusts', 'tfg:moon_stone_dust')
event.add('tfg:stone_dusts', 'tfg:moon_deepslate_dust')
event.add('tfg:stone_dusts', 'tfg:mars_stone_dust')
event.add('tfg:stone_dusts', 'tfg:venus_stone_dust')
event.add('tfg:stone_dusts', 'tfg:mercury_stone_dust')
event.add('tfg:stone_dusts', 'tfg:glacio_stone_dust')
event.add('tfg:stone_dusts', 'gtceu:stone_dust')
//#endregion

View file

@ -23,7 +23,7 @@ const generateCutterRecipe = (event, input, output, duration, EUt, id) => {
.EUt(EUt)
}
const generateGreenHouseRecipe = (event, input, fluid_amount, output, id, overworldExclusive) => {
const generateGreenHouseRecipe = (event, input, fluid_amount, output, id, dimension) => {
// Без удобрения
let r = event.recipes.gtceu.greenhouse(id)
@ -36,8 +36,8 @@ const generateGreenHouseRecipe = (event, input, fluid_amount, output, id, overwo
.duration(36000) // 30 mins
.EUt(GTValues.VA[GTValues.LV])
if (overworldExclusive)
r.dimension('minecraft:overworld')
if (dimension != null)
r.dimension(dimension)
// С удобрением
r = event.recipes.gtceu.greenhouse(`${id}_fertilized`)
@ -51,8 +51,8 @@ const generateGreenHouseRecipe = (event, input, fluid_amount, output, id, overwo
.duration(12000) // 10 mins
.EUt(GTValues.VA[GTValues.LV])
if (overworldExclusive)
r.dimension('minecraft:overworld')
if (dimension != null)
r.dimension(dimension)
}
const getFillingNBT = (material, amount) => {