Jika/TFG
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

Browse Source
This commit is contained in:
TomPlop
2026-03-16 10:32:16 -04:00
parent 80fbf7324e 319ad805b0
commit c9ee749329
114 changed files with 14284 additions and 11034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kubejs/server_scripts/createdeco/tags.js
View File

@@ -67,6 +67,8 @@ function registerCreateDecoBlockTags(event) {
event.add("minecraft:mineable/pickaxe", `createdeco:${metalBars}_bars`);
event.add("minecraft:mineable/pickaxe", `createdeco:${metalBars}_bars_overlay`);
});
event.add('create:chest_mounted_storage', '#createdeco:shipping_containers')
const lampColors = ['blue', 'green', 'red', 'yellow'];
const lampTypes = ['zinc', 'brass', 'iron', 'industrial_iron', 'copper', 'andesite'];

22
kubejs/server_scripts/diggerhelmet/recipes.js
View File

@@ -104,18 +104,15 @@ function registerDiggerHelmetRecipes(event) {
type: 'diggerhelmet:helmet_repair',
pattern: [
' C ',
'RHT',
'BAB'
'RHT'
],
key: {
'H': { item: `diggerhelmet:${metal}_digger_helmet` },
'R': { tag: `forge:plates/${metal}` },
'R': ChemicalHelper.get(TFGTagPrefix.repairKit, TFGHelpers.getMaterial(metal), 1),
'T': { tag: 'tfc:hammers' },
'C': { tag: 'tfc:candles' },
'A': { tag: 'forge:tools/screwdrivers'},
'B': { tag: `forge:screws/${metal}`}
'C': { tag: 'tfc:candles' }
},
repairPercentage: 0.75,
repairPercentage: 0.25,
toolDamagePercentage: 0.01
}).id(`tfg:diggerhelmet/repair_${metal}_helmet`)
@@ -124,18 +121,15 @@ function registerDiggerHelmetRecipes(event) {
type: 'diggerhelmet:helmet_repair',
pattern: [
' C ',
'RHT',
'BAB'
'RHT'
],
key: {
'H': { item: `diggerhelmet:broken_${metal}_digger_helmet` },
'R': { tag: `forge:plates/${metal}` },
'R': ChemicalHelper.get(TFGTagPrefix.repairKit, TFGHelpers.getMaterial(metal), 1),
'T': { tag: 'tfc:hammers' },
'C': { tag: 'tfc:candles' },
'A': { tag: 'forge:tools/screwdrivers'},
'B': { tag: `forge:screws/${metal}`}
'C': { tag: 'tfc:candles' }
},
repairPercentage: 0.75,
repairPercentage: 0.25,
toolDamagePercentageBroken: 0.02
}).id(`tfg:diggerhelmet/repair_broken_${metal}_helmet`)
})

2
kubejs/server_scripts/grapplemod/recipes.js
View File

@@ -285,7 +285,7 @@ function registerGrapplingHookRecipes(event) {
}).id('tfg:grapplemod/shapeless/grapplinghook');
//Repair
event.recipes.kubejs.shapeless(Item.of('grapplemod:grapplinghook').withName(Text.translate("tfg.grapplemod.repair")), ['grapplemod:grapplinghook', 'gtceu:wrought_iron_dust'])
event.recipes.kubejs.shapeless(Item.of('grapplemod:grapplinghook').withName(Text.translate("tfg.grapplemod.repair")), ['grapplemod:grapplinghook', 'gtceu:repair_kit_wrought_iron'])
.modifyResult((craftingGrid, result) => {
try {
let fallbackItem = Item.of("minecraft:air");

8
kubejs/server_scripts/greate/recipes.removes.js
View File

@@ -47,8 +47,6 @@ function removeGreateRecipes(event) {
event.remove({ id: `gtceu:extractor/extract_${tier}_gearbox` })
event.remove({ id: `gtceu:extractor/extract_${tier}_vertical_gearbox` })
})
event.remove({ id: 'greate:milling/integration/gtceu/macerator/macerate_marble'})
event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_andesite_alloy' })
event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_chromatic_compound' })
@@ -74,11 +72,17 @@ function removeGreateRecipes(event) {
event.remove({ id: 'greate:cutting/integration/create/cutting/runtime_generated/compat/minecraft/bamboo_planks_to_bamboo_button' })
event.remove({ id: 'greate:mixing/integration/gtceu/mixer/fire_charge' })
event.remove({ id: 'greate:milling/integration/gtceu/macerator/macerate_cocoa' })
event.remove({ id: 'greate:milling/integration/gtceu/macerator/macerate_honeycomb' })
event.remove({ id: 'greate:milling/integration/gtceu/macerator/macerate_honeycomb_block'})
event.remove({ id: 'greate:milling/integration/gtceu/macerator/quartz_sand_from_sand' })
event.remove({ id: 'greate:crushing/integration/gtceu/macerator/macerate_cocoa' })
event.remove({ id: 'greate:crushing/integration/gtceu/macerator/macerate_honeycomb' })
event.remove({ id: 'greate:crushing/integration/gtceu/macerator/macerate_honeycomb_block'})
event.remove({ id: 'greate:crushing/integration/gtceu/macerator/quartz_sand_from_sand' })
event.remove({ id: 'greate:mixing/brass_ingot' })
event.remove({ id: 'greate:shaped/copper_diving_helmet' })

20
kubejs/server_scripts/gregtech/recipes.js
View File

@@ -421,13 +421,17 @@ const registerGTCEURecipes = (event) => {
// Modify HV Dynamo Hatch to be craftable before Cleanroom
event.replaceInput({ id: 'gtceu:assembler/dynamo_hatch_hv' }, 'gtceu:lpic_chip', 'gtceu:ulpic_chip')
event.recipes.gtceu.assembler('gtceu:voltage_coil_hv')
.itemInputs('#forge:rods/magnetic_steel', '#forge:fine_wires/black_steel')
.itemOutputs('gtceu:hv_voltage_coil')
.circuit(1)
.duration(20*20)
.EUt(GTValues.VA[GTValues.MV])
global.modifyRecipe(event, "gtceu:assembler/dynamo_hatch_hv", {
newId: "gtceu:assembler/dynamo_hatch_hv",
duration: 20 * 10,
eut: GTValues.VA[GTValues.MV]
})
event.replaceInput({ id: 'gtceu:assembler/assembler/dynamo_hatch_hv' }, 'gtceu:lpic_chip', 'gtceu:ulpic_chip')
event.recipes.gtceu.assembler('gtceu:dynamo_hatch_hv')
.itemInputs('gtceu:hv_machine_hull', '2x #forge:springs/gold', '2x gtceu:ulpic_chip', 'gtceu:hv_voltage_coil')
.inputFluids('gtceu:sodium_potassium 1000')
.itemOutputs('gtceu:hv_energy_output_hatch')
.duration(20*20)
.EUt(GTValues.VA[GTValues.MV])
}

1
kubejs/server_scripts/gregtech/recipes.removes.js
View File

@@ -931,6 +931,7 @@ function removeGTCEURecipes(event) {
function removeMaceratorRecipe(event, id) {
event.remove({ id: `gtceu:macerator/${id}` })
event.remove({ id: `greate:milling/integration/gtceu/macerator/${id}` })
event.remove({ id: `greate:crushing/integration/gtceu/macerator/${id}` })
}
function removeCutterRecipe(event, id) {

3
kubejs/server_scripts/gregtech/tags.js
View File

@@ -75,6 +75,9 @@ function registerGTCEUItemTags(event) {
event.add('gtceu:lamps', `gtceu:${color}_lamp`)
event.add('gtceu:lamps', `gtceu:${color}_borderless_lamp`)
})
// any rubber plate
event.add('tfg:rubber_plates', '#forge:plates/rubber', '#forge:plates/silicone_rubber', '#forge:plates/styrene_butadiene_rubber')
}
/** @param {TagEvent.Block} event */

141
kubejs/server_scripts/immersive_aircraft/recipes.js
View File

@@ -116,6 +116,12 @@ function registerImmersiveAircraftRecipes(event) {
E: 'create:andesite_casing'
}).id('tfg:immersive_aircraft/shaped/engine');
event.recipes.gtceu.assembler('tfg:immersive_aircraft/assembler/engine')
.itemInputs('gtceu:tin_alloy_small_fluid_pipe', 'create:andesite_casing', '2x #tfg:metal_bars')
.itemOutputs('immersive_aircraft:engine')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
event.shaped('immersive_aircraft:sail', [
'ABA',
'BCB',
@@ -194,6 +200,12 @@ function registerImmersiveAircraftRecipes(event) {
E: '#forge:tools/screwdrivers',
}).id('tfg:immersive_aircraft/shaped/sturdy_pipes')
event.recipes.gtceu.assembler('tfg:immersive_aircraft/assembler/sturdy_pipes')
.itemInputs('gtceu:red_steel_plate', 'gtceu:blue_steel_plate', '3x #forge:small_fluid_pipes', '2x gtceu:black_steel_screw')
.itemOutputs('immersive_aircraft:sturdy_pipes')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
event.shaped('immersive_aircraft:gyroscope', [
'ABC',
'DED',
@@ -208,6 +220,12 @@ function registerImmersiveAircraftRecipes(event) {
G: '#forge:tools/screwdrivers'
}).id('tfg:immersive_aircraft/shaped/gyroscope')
event.recipes.gtceu.assembler('tfg:immersive_aircraft/assembler/gyroscope')
.itemInputs('create:precision_mechanism', 'firmaciv:firmaciv_compass', '#forge:gems/quartzite', '3x gtceu:small_brass_gear', '#forge:screws/blue_steel')
.itemOutputs('immersive_aircraft:gyroscope')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
event.shaped('immersive_aircraft:gyroscope_dials', [
'ABC',
'DED',
@@ -222,6 +240,12 @@ function registerImmersiveAircraftRecipes(event) {
G: '#forge:tools/screwdrivers'
}).id('tfg:immersive_aircraft/shaped/gyroscope_dials')
event.recipes.gtceu.assembler('tfg:immersive_aircraft/assembler/gyroscope_dials')
.itemInputs('immersive_aircraft:gyroscope', 'gtceu:lv_sensor', '#gtceu:circuits/lv', '3x gtceu:small_aluminium_gear', '#forge:screws/vanadium_steel')
.itemOutputs('immersive_aircraft:gyroscope_dials')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
event.shaped('immersive_aircraft:gyroscope_hud', [
'ABC',
'DED',
@@ -236,6 +260,12 @@ function registerImmersiveAircraftRecipes(event) {
G: '#forge:tools/screwdrivers'
}).id('tfg:immersive_aircraft/shaped/gyroscope_hud')
event.recipes.gtceu.assembler('tfg:immersive_aircraft/assembler/gyroscope_hud')
.itemInputs('immersive_aircraft:gyroscope_dials', 'gtceu:mv_sensor', '3x #gtceu:circuits/mv', 'gtceu:computer_monitor_cover', '#forge:screws/stainless_steel')
.itemOutputs('immersive_aircraft:gyroscope_hud')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
event.shaped('tfg:black_steel_plated_airplane_propeller', [
'CA ',
'ABA',
@@ -247,6 +277,12 @@ function registerImmersiveAircraftRecipes(event) {
D: '#forge:tools/wrenches'
}).id('tfg:shaped/black_steel_plated_airplane_propeller');
event.recipes.gtceu.assembler('tfg:assembler/black_steel_plated_airplane_propeller')
.itemInputs('#forge:rotors', '4x gtceu:black_steel_plate')
.itemOutputs('tfg:black_steel_plated_airplane_propeller')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
generateRecyclingRecipe('tfg:recycling/black_steel_plated_airplane_propeller',
createRecyclingRecipeArgs('tfg:black_steel_plated_airplane_propeller', [GTMaterials.BlackSteel], [createMaterialsToResults(TagPrefix.dust, TagPrefix.ingot, 3)]))
@@ -262,6 +298,12 @@ function registerImmersiveAircraftRecipes(event) {
F: '#forge:tools/wrenches'
}).id('tfg:shaped/redblu_steel_plated_airplane_propeller');
event.recipes.gtceu.assembler('tfg:assembler/redblu_steel_plated_airplane_propeller')
.itemInputs('#forge:rotors', '2x gtceu:red_steel_plate', '2x gtceu:blue_steel_plate')
.itemOutputs('tfg:redblu_steel_plated_airplane_propeller')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
generateRecyclingRecipe('tfg:recycling/redblu_steel_plated_airplane_propeller',
createRecyclingRecipeArgs('tfg:redblu_steel_plated_airplane_propeller', [
GTMaterials.RedSteel,
@@ -283,6 +325,12 @@ function registerImmersiveAircraftRecipes(event) {
D: '#forge:tools/wrenches'
}).id('tfg:immersive_aircraft/shaped/enhanced_propeller');
event.recipes.gtceu.assembler('tfg:immersive_aircraft/assembler/enhanced_propeller')
.itemInputs('#forge:rotors', '4x vintageimprovements:aluminum_sheet')
.itemOutputs('immersive_aircraft:enhanced_propeller')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
generateRecyclingRecipe('immersive_aircraft:recycling/enhanced_propeller',
createRecyclingRecipeArgs('immersive_aircraft:enhanced_propeller', [GTMaterials.Aluminium], [createMaterialsToResults(TagPrefix.dust, TagPrefix.ingot, 3)]))
@@ -297,6 +345,12 @@ function registerImmersiveAircraftRecipes(event) {
D: '#forge:tools/wrenches'
}).id('tfg:shaped/stainless_steel_plated_airplane_propeller');
event.recipes.gtceu.assembler('tfg:assembler/stainless_steel_plated_airplane_propeller')
.itemInputs('#forge:rotors', '4x gtceu:stainless_steel_plate')
.itemOutputs('tfg:stainless_steel_plated_airplane_propeller')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
generateRecyclingRecipe('tfg:recycling/stainless_steel_plated_airplane_propeller',
createRecyclingRecipeArgs('tfg:stainless_steel_plated_airplane_propeller', [GTMaterials.StainlessSteel], [createMaterialsToResults(TagPrefix.dust, TagPrefix.ingot, 3)]))
@@ -311,6 +365,12 @@ function registerImmersiveAircraftRecipes(event) {
D: '#forge:tools/wrenches'
}).id('tfg:shaped/titanium_plated_airplane_propeller');
event.recipes.gtceu.assembler('tfg:assembler/titanium_plated_airplane_propeller')
.itemInputs('#forge:rotors', '4x gtceu:titanium_plate')
.itemOutputs('tfg:titanium_plated_airplane_propeller')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
generateRecyclingRecipe('tfg:recycling/titanium_plated_airplane_propeller',
createRecyclingRecipeArgs('tfg:titanium_plated_airplane_propeller', [GTMaterials.Titanium], [createMaterialsToResults(TagPrefix.dust, TagPrefix.ingot, 3)]))
@@ -326,6 +386,12 @@ function registerImmersiveAircraftRecipes(event) {
E: 'gtceu:double_sterling_silver_plate'
}).id('tfg:immersive_aircraft/shaped/eco_engine');
event.recipes.gtceu.assembler('tfg:immersive_aircraft/assembler/eco_engine')
.itemInputs('immersive_aircraft:engine', '3x gtceu:double_sterling_silver_plate', '3x gtceu:double_rose_gold_plate')
.itemOutputs('immersive_aircraft:eco_engine')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
event.shaped('immersive_aircraft:steel_boiler', [
'ABA',
'ACA',
@@ -496,6 +562,12 @@ function registerImmersiveAircraftRecipes(event) {
D: '#forge:tools/wrenches'
}).id('tfg:immersive_aircraft/shaped/hull_reinforcement');
event.recipes.gtceu.assembler('tfg:immersive_aircraft/assembler/hull_reinforcement')
.itemInputs('immersive_aircraft:hull', '4x gtceu:black_steel_plate')
.itemOutputs('immersive_aircraft:hull_reinforcement')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
generateRecyclingRecipe('immersive_aircraft:recycling/hull_reinforcement',
createRecyclingRecipeArgs('immersive_aircraft:hull_reinforcement', [
GTMaterials.BlackSteel,
@@ -519,6 +591,12 @@ function registerImmersiveAircraftRecipes(event) {
F: 'gtceu:red_alloy_dust'
}).id('tfg:shaped/redblu_steel_hull_reinforcement');
event.recipes.gtceu.assembler('tfg:assembler/redblu_steel_hull_reinforcement')
.itemInputs('immersive_aircraft:hull', '2x gtceu:red_steel_plate', '2x gtceu:blue_steel_plate', '2x gtceu:red_alloy_dust')
.itemOutputs('tfg:redblu_steel_hull_reinforcement')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
generateRecyclingRecipe('tfg:recycling/redblu_steel_hull_reinforcement',
createRecyclingRecipeArgs('tfg:redblu_steel_hull_reinforcement', [
GTMaterials.BlueSteel,
@@ -544,6 +622,12 @@ function registerImmersiveAircraftRecipes(event) {
D: '#forge:tools/wrenches'
}).id('tfg:shaped/aluminium_hull_reinforcement');
event.recipes.gtceu.assembler('tfg:assembler/aluminium_hull_reinforcement')
.itemInputs('immersive_aircraft:hull', '4x vintageimprovements:aluminum_sheet')
.itemOutputs('tfg:aluminium_hull_reinforcement')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
generateRecyclingRecipe('tfg:recycling/aluminium_hull_reinforcement',
createRecyclingRecipeArgs('tfg:aluminium_hull_reinforcement', [
GTMaterials.Aluminium,
@@ -565,6 +649,12 @@ function registerImmersiveAircraftRecipes(event) {
D: '#forge:tools/wrenches'
}).id('tfg:shaped/stainless_steel_hull_reinforcement');
event.recipes.gtceu.assembler('tfg:assembler/stainless_steel_hull_reinforcement')
.itemInputs('immersive_aircraft:hull', '4x gtceu:stainless_steel_plate')
.itemOutputs('tfg:stainless_steel_hull_reinforcement')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
generateRecyclingRecipe('tfg:recycling/stainless_steel_hull_reinforcement',
createRecyclingRecipeArgs('tfg:stainless_steel_hull_reinforcement', [
GTMaterials.StainlessSteel,
@@ -586,6 +676,12 @@ function registerImmersiveAircraftRecipes(event) {
D: '#forge:tools/wrenches'
}).id('tfg:shaped/titanium_hull_reinforcement');
event.recipes.gtceu.assembler('tfg:assembler/titanium_hull_reinforcement')
.itemInputs('immersive_aircraft:hull', '4x gtceu:titanium_plate')
.itemOutputs('tfg:titanium_hull_reinforcement')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
generateRecyclingRecipe('tfg:recycling/titanium_hull_reinforcement',
createRecyclingRecipeArgs('tfg:titanium_hull_reinforcement', [
GTMaterials.Titanium,
@@ -604,11 +700,17 @@ function registerImmersiveAircraftRecipes(event) {
A: '#forge:tools/wrenches',
B: 'gtceu:black_steel_plate',
C: 'gtceu:black_steel_rod',
D: 'gtceu:rubber_plate',
D: '#tfg:rubber_plates',
E: 'gtceu:small_brass_gear',
F: '#forge:tools/screwdrivers'
}).id('tfg:immersive_aircraft/shaped/improved_landing_gear');
event.recipes.gtceu.assembler('tfg:immersive_aircraft/assembler/improved_landing_gear')
.itemInputs('3x #tfg:rubber_plates', 'gtceu:small_brass_gear', '2x gtceu:black_steel_plate', 'gtceu:black_steel_rod')
.itemOutputs('immersive_aircraft:improved_landing_gear')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
generateRecyclingRecipe('immersive_aircraft:recycling/improved_landing_gear',
createRecyclingRecipeArgs('immersive_aircraft:improved_landing_gear', [
GTMaterials.BlackSteel,
@@ -627,11 +729,17 @@ function registerImmersiveAircraftRecipes(event) {
A: '#forge:tools/wrenches',
B: 'gtceu:red_steel_plate',
C: 'gtceu:blue_steel_rod',
D: 'gtceu:rubber_plate',
D: '#tfg:rubber_plates',
E: 'gtceu:small_brass_gear',
F: '#forge:tools/screwdrivers'
}).id('tfg:shaped/redblu_steel_landing_gear')
event.recipes.gtceu.assembler('tfg:assembler/redblu_steel_landing_gear')
.itemInputs('3x #tfg:rubber_plates', 'gtceu:small_brass_gear', '2x gtceu:red_steel_plate', 'gtceu:blue_steel_rod')
.itemOutputs('tfg:redblu_steel_landing_gear')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
generateRecyclingRecipe('tfg:recycling/redblu_steel_landing_gear',
createRecyclingRecipeArgs('tfg:redblu_steel_landing_gear', [
GTMaterials.RedSteel,
@@ -652,11 +760,17 @@ function registerImmersiveAircraftRecipes(event) {
A: '#forge:tools/wrenches',
B: 'vintageimprovements:aluminum_sheet',
C: 'gtceu:aluminium_rod',
D: 'gtceu:rubber_plate',
D: '#tfg:rubber_plates',
E: 'gtceu:cobalt_brass_gear',
F: '#forge:tools/screwdrivers'
}).id('tfg:shaped/aluminium_landing_gear')
event.recipes.gtceu.assembler('tfg:assembler/aluminium_landing_gear')
.itemInputs('3x #tfg:rubber_plates', 'gtceu:cobalt_brass_gear', '2x vintageimprovements:aluminum_sheet', 'gtceu:aluminium_rod')
.itemOutputs('tfg:aluminium_landing_gear')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
generateRecyclingRecipe('tfg:recycling/aluminium_landing_gear',
createRecyclingRecipeArgs('tfg:aluminium_landing_gear', [
GTMaterials.Aluminium,
@@ -675,11 +789,16 @@ function registerImmersiveAircraftRecipes(event) {
A: '#forge:tools/wrenches',
B: 'gtceu:stainless_steel_plate',
C: 'gtceu:stainless_steel_rod',
D: 'gtceu:rubber_plate',
D: '#tfg:rubber_plates',
E: 'gtceu:cobalt_brass_gear',
F: '#forge:tools/screwdrivers'
}).id('tfg:shaped/stainless_steel_landing_gear');
event.recipes.gtceu.assembler('tfg:assembler/stainless_steel_landing_gear')
.itemInputs('3x #tfg:rubber_plates', 'gtceu:cobalt_brass_gear', '2x gtceu:stainless_steel_plate', 'gtceu:stainless_steel_rod')
.itemOutputs('tfg:stainless_steel_landing_gear')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
generateRecyclingRecipe('tfg:recycling/stainless_steel_landing_gear',
createRecyclingRecipeArgs('tfg:stainless_steel_landing_gear', [
@@ -699,11 +818,17 @@ function registerImmersiveAircraftRecipes(event) {
A: '#forge:tools/wrenches',
B: 'gtceu:titanium_plate',
C: 'gtceu:titanium_rod',
D: 'gtceu:rubber_plate',
D: '#tfg:rubber_plates',
E: 'gtceu:cobalt_brass_gear',
F: '#forge:tools/screwdrivers'
}).id('tfg:shaped/titanium_landing_gear');
event.recipes.gtceu.assembler('tfg:assembler/titanium_landing_gear')
.itemInputs('3x #tfg:rubber_plates', 'gtceu:cobalt_brass_gear', '2x gtceu:titanium_plate', 'gtceu:titanium_rod')
.itemOutputs('tfg:titanium_landing_gear')
.duration(5 * 20)
.EUt(GTValues.VA[GTValues.LV])
generateRecyclingRecipe('tfg:recycling/titanium_landing_gear',
createRecyclingRecipeArgs('tfg:titanium_landing_gear', [
GTMaterials.Titanium,
@@ -756,6 +881,12 @@ function registerImmersiveAircraftRecipes(event) {
F: '#forge:tools/screwdrivers'
}).id('tfg:immersive_aircraft/shaped/cargo_airship')
event.recipes.gtceu.assembler('tfg:immersive_aircraft/assembler/cargo_airship')
.itemInputs('immersive_aircraft:airship', '2x immersive_aircraft:engine', '2x gtceu:wood_crate', '2x #forge:rotors')
.itemOutputs('immersive_aircraft:cargo_airship')
.duration(10 * 20)
.EUt(GTValues.VA[GTValues.LV])
//WAAGH!
event.recipes.create.mechanical_crafting('immersive_aircraft:warship', [
'ABCC ',

1
kubejs/server_scripts/tfc/recipes.js
View File

@@ -179,6 +179,7 @@ const registerTFCRecipes = (event) => {
// jute net -> burlap net
event.replaceInput({ id: 'tfc:crafting/jute_net' }, 'tfc:jute_fiber', '#tfg:burlap_fiber')
event.replaceInput({ input: 'minecraft:slime_ball' }, 'minecraft:slime_ball', 'tfc:glue')
// horse armor to use burlap
global.TFC_EQUIPMENT_METALS.forEach(material => {

1
kubejs/server_scripts/tfc/recipes.removes.js
View File

@@ -122,6 +122,7 @@ function removeTFCRecipes(event) {
event.remove({ id: 'tfc:crafting/cake' })
event.remove({ id: 'tfc:crafting/pumpkin_chunks' })
event.remove({ id: 'tfc:crafting/alabaster_brick' })
event.remove({ id: 'tfc:crafting/vanilla/redstone/sticky_piston' })
global.TFC_DOUGHS.forEach(dough => {
for (let i = 1; i <= 8; i++) {

360
kubejs/server_scripts/tfg/equipment/recipes.repair_tools.js
View File

@@ -5,238 +5,172 @@
function registerTFGRepairKitRecipes(event) {
const ELECTRIC_TOOLS = ['drill', 'buzzsaw', 'wrench', 'chainsaw', 'wire_cutter', 'screwdriver'];
const MANUAL_TOOLS = ['knife', 'hoe', 'scythe', 'hammer', 'file', 'sword', 'butchery_knife', 'crowbar'];
const ONLY_MANUAL_TOOLS = ['spade', 'pickaxe', 'shovel', 'axe', 'wrench', 'mortar', 'saw', 'screwdriver', 'wire_cutter', 'mining_hammer'];
const ONLY_COLORED_TOOLS = ['buzzsaw'];
const ELECTRIC_TOOLS = ['drill', 'buzzsaw', 'wrench', 'chainsaw', 'wire_cutter', 'screwdriver'];
const MANUAL_TOOLS = ['knife', 'hoe', 'scythe', 'hammer', 'file', 'sword', 'butchery_knife', 'crowbar'];
const ONLY_MANUAL_TOOLS = ['spade', 'pickaxe', 'shovel', 'axe', 'wrench', 'mortar', 'saw', 'screwdriver', 'wire_cutter', 'mining_hammer'];
const ONLY_COLORED_TOOLS = ['buzzsaw'];
function repairElectricTools(namespace, tierMaterial, repairKitMaterial, repairPercent) {
ELECTRIC_TOOLS.forEach(tool => {
let toolId = `${namespace}:${tierMaterial}_${repairKitMaterial}_${tool}`;
let repairKitId = `${namespace}:repair_kit_${repairKitMaterial}`;
if (!Item.of(toolId).isEmpty() && !Item.of(repairKitId).isEmpty()) {
event.recipes.tfc.no_remainder_shapeless_crafting(
event.shapeless(
toolId,
[
toolId,
Item.of(repairKitId, `{RepairPercent:${repairPercent}f}`)
]
)
);
}
});
}
function repairElectricTools(namespace, tierMaterial, repairKitMaterial, repairPercent) {
ELECTRIC_TOOLS.forEach(tool => {
let toolId = `${namespace}:${tierMaterial}_${repairKitMaterial}_${tool}`;
let repairKitId = `${namespace}:repair_kit_${repairKitMaterial}`;
if (!Item.of(toolId).isEmpty() && !Item.of(repairKitId).isEmpty()) {
event.recipes.tfc.no_remainder_shapeless_crafting(
event.shapeless(
toolId,
[
toolId,
Item.of(repairKitId, `{RepairPercent:${repairPercent}f}`)
]
)
);
}
});
}
function repairManualTools(namespace, material, repairPercent) {
MANUAL_TOOLS.forEach(tool => {
let toolId = `${namespace}:${material}_${tool}`;
let repairKitId = `${namespace}:repair_kit_${material}`;
if (!Item.of(toolId).isEmpty() && !Item.of(repairKitId).isEmpty()) {
event.recipes.tfc.no_remainder_shapeless_crafting(
event.shapeless(
toolId,
[
toolId,
Item.of(repairKitId, `{RepairPercent:${repairPercent}f}`)
]
)
);
}
});
}
function repairManualTools(namespace, material, repairPercent) {
MANUAL_TOOLS.forEach(tool => {
let toolId = `${namespace}:${material}_${tool}`;
let repairKitId = `${namespace}:repair_kit_${material}`;
if (!Item.of(toolId).isEmpty() && !Item.of(repairKitId).isEmpty()) {
event.recipes.tfc.no_remainder_shapeless_crafting(
event.shapeless(
toolId,
[
toolId,
Item.of(repairKitId, `{RepairPercent:${repairPercent}f}`)
]
)
);
}
});
}
function repairOnlyManualTools(namespace, material, repairPercent) {
ONLY_MANUAL_TOOLS.forEach(tool => {
let toolId = `${namespace}:${material}_${tool}`;
let repairKitId = `${namespace}:repair_kit_${material}`;
if (!Item.of(toolId).isEmpty() && !Item.of(repairKitId).isEmpty()) {
event.recipes.tfc.no_remainder_shapeless_crafting(
event.shapeless(
toolId,
[
toolId,
Item.of(repairKitId, `{RepairPercent:${repairPercent}f}`)
]
)
);
}
});
}
function repairOnlyManualTools(namespace, material, repairPercent) {
ONLY_MANUAL_TOOLS.forEach(tool => {
let toolId = `${namespace}:${material}_${tool}`;
let repairKitId = `${namespace}:repair_kit_${material}`;
if (!Item.of(toolId).isEmpty() && !Item.of(repairKitId).isEmpty()) {
event.recipes.tfc.no_remainder_shapeless_crafting(
event.shapeless(
toolId,
[
toolId,
Item.of(repairKitId, `{RepairPercent:${repairPercent}f}`)
]
)
);
}
});
}
function repairColoredSteel(namespace, material, repairPercent) {
ONLY_COLORED_TOOLS.forEach(tool => {
let toolId = `${namespace}:${material}_${tool}`;
let repairKitId = `${namespace}:repair_kit_${material}`;
if (!Item.of(toolId).isEmpty() && !Item.of(repairKitId).isEmpty()) {
event.recipes.tfc.no_remainder_shapeless_crafting(
event.shapeless(
toolId,
[
toolId,
Item.of(repairKitId, `{RepairPercent:${repairPercent}f}`)
]
)
);
}
});
}
function repairColoredSteel(namespace, material, repairPercent) {
ONLY_COLORED_TOOLS.forEach(tool => {
let toolId = `${namespace}:${material}_${tool}`;
let repairKitId = `${namespace}:repair_kit_${material}`;
if (!Item.of(toolId).isEmpty() && !Item.of(repairKitId).isEmpty()) {
event.recipes.tfc.no_remainder_shapeless_crafting(
event.shapeless(
toolId,
[
toolId,
Item.of(repairKitId, `{RepairPercent:${repairPercent}f}`)
]
)
);
}
});
}
// 'namespace':'tier if electric'_material' Amount repaired in percentage
// 'namespace':'tier if electric'_material' Amount repaired in percentage
repairColoredSteel('gtceu', 'red_steel', 0.25);
repairColoredSteel('gtceu', 'blue_steel', 0.25);
repairColoredSteel('gtceu', 'red_steel', 0.25);
repairColoredSteel('gtceu', 'blue_steel', 0.25);
repairElectricTools('tfg', 'hv', 'boron_carbide', 0.25);
repairElectricTools('tfg', 'mv', 'diamond_tipped_mo_50_re', 0.25);
repairElectricTools('gtceu', 'iv', 'hsse', 0.25);
repairElectricTools('gtceu', 'iv', 'naquadah_alloy', 0.25);
repairElectricTools('gtceu', 'iv', 'duranium', 0.25);
repairElectricTools('gtceu', 'ev', 'ostrum_iodide', 0.25);
repairElectricTools('gtceu', 'ev', 'tungsten_carbide', 0.25);
repairElectricTools('gtceu', 'hv', 'ultimet', 0.25);
repairElectricTools('gtceu', 'lv', 'blue_steel', 0.25);
repairElectricTools('gtceu', 'lv', 'red_steel', 0.25);
repairElectricTools('gtceu', 'mv', 'vanadium_steel', 0.25);
repairElectricTools('tfg', 'hv', 'boron_carbide', 0.25);
repairElectricTools('tfg', 'mv', 'diamond_tipped_mo_50_re', 0.25);
repairElectricTools('gtceu', 'iv', 'hsse', 0.25);
repairElectricTools('gtceu', 'iv', 'naquadah_alloy', 0.25);
repairElectricTools('gtceu', 'iv', 'duranium', 0.25);
repairElectricTools('gtceu', 'ev', 'ostrum_iodide', 0.25);
repairElectricTools('gtceu', 'ev', 'tungsten_carbide', 0.25);
repairElectricTools('gtceu', 'hv', 'ultimet', 0.25);
repairElectricTools('gtceu', 'lv', 'blue_steel', 0.25);
repairElectricTools('gtceu', 'lv', 'red_steel', 0.25);
repairElectricTools('gtceu', 'mv', 'vanadium_steel', 0.25);
repairManualTools('tfg', 'boron_carbide', 0.25);
repairManualTools('tfg', 'diamond_tipped_mo_50_re', 0.25);
repairManualTools('gtceu', 'hsse', 0.25);
repairManualTools('gtceu', 'naquadah_alloy', 0.25);
repairManualTools('gtceu', 'duranium', 0.25);
repairManualTools('gtceu', 'ostrum_iodide', 0.25);
repairManualTools('gtceu', 'tungsten_carbide', 0.25);
repairManualTools('gtceu', 'ultimet', 0.25);
repairManualTools('gtceu', 'blue_steel', 0.25);
repairManualTools('gtceu', 'red_steel', 0.25);
repairManualTools('gtceu', 'vanadium_steel', 0.25);
repairManualTools('tfg', 'boron_carbide', 0.25);
repairManualTools('tfg', 'diamond_tipped_mo_50_re', 0.25);
repairManualTools('gtceu', 'hsse', 0.25);
repairManualTools('gtceu', 'naquadah_alloy', 0.25);
repairManualTools('gtceu', 'duranium', 0.25);
repairManualTools('gtceu', 'ostrum_iodide', 0.25);
repairManualTools('gtceu', 'tungsten_carbide', 0.25);
repairManualTools('gtceu', 'ultimet', 0.25);
repairManualTools('gtceu', 'blue_steel', 0.25);
repairManualTools('gtceu', 'red_steel', 0.25);
repairManualTools('gtceu', 'vanadium_steel', 0.25);
repairOnlyManualTools('gtceu', 'black_bronze', 0.25);
repairOnlyManualTools('gtceu', 'black_steel', 0.25);
repairOnlyManualTools('gtceu', 'steel', 0.25);
repairOnlyManualTools('gtceu', 'wrought_iron', 0.25);
repairOnlyManualTools('gtceu', 'bronze', 0.25);
repairOnlyManualTools('gtceu', 'copper', 0.25);
repairOnlyManualTools('gtceu', 'bismuth_bronze', 0.25);
repairOnlyManualTools('gtceu', 'black_bronze', 0.25);
repairOnlyManualTools('gtceu', 'black_steel', 0.25);
repairOnlyManualTools('gtceu', 'steel', 0.25);
repairOnlyManualTools('gtceu', 'wrought_iron', 0.25);
repairOnlyManualTools('gtceu', 'bronze', 0.25);
repairOnlyManualTools('gtceu', 'copper', 0.25);
repairOnlyManualTools('gtceu', 'bismuth_bronze', 0.25);
repairOnlyManualTools('gtceu', 'blue_steel', 0.25);
repairOnlyManualTools('gtceu', 'red_steel', 0.25);
repairOnlyManualTools('gtceu', 'blue_steel', 0.25);
repairOnlyManualTools('gtceu', 'red_steel', 0.25);
repairManualTools('gtceu', 'black_bronze', 0.25);
repairManualTools('gtceu', 'black_steel', 0.25);
repairManualTools('gtceu', 'steel', 0.25);
repairManualTools('gtceu', 'wrought_iron', 0.25);
repairManualTools('gtceu', 'bronze', 0.25);
repairManualTools('gtceu', 'copper', 0.25);
repairManualTools('gtceu', 'bismuth_bronze', 0.25);
repairManualTools('gtceu', 'black_bronze', 0.25);
repairManualTools('gtceu', 'black_steel', 0.25);
repairManualTools('gtceu', 'steel', 0.25);
repairManualTools('gtceu', 'wrought_iron', 0.25);
repairManualTools('gtceu', 'bronze', 0.25);
repairManualTools('gtceu', 'copper', 0.25);
repairManualTools('gtceu', 'bismuth_bronze', 0.25);
//#region Generate recipe for Repair Kit
// Generate recipe for Repair Kit
function materialUnfiredRepairKit(namespace, material) {
event.shapeless(
Item.of(`${namespace}:unfired_repair_kit_${material}`, 16), // arg 1: output
[
'gtceu:brick_wooden_form',
'#tfg:stone_dusts',
'minecraft:clay_ball',
`#forge:dusts/${material}`
]
)
forEachMaterial(material => {
if (!material.hasProperty(PropertyKey.TOOL))
return;
event.recipes.gtceu.assembler(`tfg:unfired_repair_kit_${namespace}_${material}`)
.notConsumable('gtceu:brick_wooden_form')
.itemInputs(
'#tfg:stone_dusts',
'minecraft:clay_ball',
`#forge:dusts/${material}`)
.itemOutputs(Item.of(`${namespace}:unfired_repair_kit_${material}`, 16))
.duration(20 * 5)
.EUt(GTValues.VHA[GTValues.LV])
.circuit(7)
}
var unfiredKit = ChemicalHelper.get(TFGTagPrefix.unfiredRepairKit, material, 1);
var firedKit = ChemicalHelper.get(TFGTagPrefix.repairKit, material, 1);
materialUnfiredRepairKit('tfg', 'boron_carbide');
materialUnfiredRepairKit('gtceu', 'hsse');
materialUnfiredRepairKit('gtceu', 'naquadah_alloy');
materialUnfiredRepairKit('gtceu', 'duranium');
materialUnfiredRepairKit('gtceu', 'ostrum_iodide');
materialUnfiredRepairKit('gtceu', 'tungsten_carbide');
materialUnfiredRepairKit('gtceu', 'ultimet');
materialUnfiredRepairKit('gtceu', 'blue_steel');
materialUnfiredRepairKit('gtceu', 'red_steel');
materialUnfiredRepairKit('gtceu', 'vanadium_steel');
materialUnfiredRepairKit('gtceu', 'black_bronze');
materialUnfiredRepairKit('gtceu', 'black_steel');
materialUnfiredRepairKit('gtceu', 'steel');
materialUnfiredRepairKit('gtceu', 'wrought_iron');
materialUnfiredRepairKit('gtceu', 'bronze');
materialUnfiredRepairKit('gtceu', 'copper');
materialUnfiredRepairKit('gtceu', 'bismuth_bronze');
if (unfiredKit.isEmpty() || firedKit.isEmpty())
return;
event.recipes.gtceu.assembler(`tfg:unfired_repair_kit_tfg_unfired_repair_kit_diamond_tipped_mo_50_re}`)
.notConsumable('gtceu:brick_wooden_form')
.itemInputs(
'#tfg:stone_dusts',
'minecraft:clay_ball',
`#forge:ingots/diamond_tipped_mo_50_re`)
.itemOutputs(Item.of(`tfg:unfired_repair_kit_diamond_tipped_mo_50_re`, 16))
.duration(20 * 5)
.EUt(GTValues.VHA[GTValues.LV])
.circuit(7)
let materialInput = ChemicalHelper.get(material == GTMaterials.get('tfg:diamond_tipped_mo_50_re')
? TagPrefix.ingot : TagPrefix.dust, material, 1);
event.shapeless(unfiredKit.withCount(16), [
'gtceu:brick_wooden_form',
'#tfg:stone_dusts',
'tfc:ceramic/unfired_brick',
materialInput
]).id(`tfg:shapeless/unfired_repair_kit_${material.getName()}`)
event.shapeless(
Item.of(`tfg:unfired_repair_kit_diamond_tipped_mo_50_re`, 16), // arg 1: output
[
'gtceu:brick_wooden_form',
'#tfg:stone_dusts',
'minecraft:clay_ball',
`#forge:ingots/diamond_tipped_mo_50_re`
]
)
event.recipes.gtceu.forming_press(`tfg:unfired_repair_kit_${material.getName()}`)
.notConsumable('gtceu:ingot_casting_mold')
.itemInputs(
'#tfg:stone_dusts',
['minecraft:clay_ball', 'tfc:ceramic/unfired_brick'],
materialInput)
.itemOutputs(unfiredKit.withCount(16))
.duration(20 * 5)
.EUt(GTValues.VHA[GTValues.LV])
event.smelting(firedKit, unfiredKit)
.id(`tfg:smelting/repair_kit_${material.getName()}`)
function materialPrimalKit(namespace, repairKitMaterial) {
event.recipes.tfc.heating(`${namespace}:unfired_repair_kit_${repairKitMaterial}`, 1399)
.resultItem(`${namespace}:repair_kit_${repairKitMaterial}`)
.id(`tfg:heating/repair_kit_${namespace}_${repairKitMaterial}`)
}
materialPrimalKit('gtceu', 'black_bronze');
materialPrimalKit('gtceu', 'black_steel');
materialPrimalKit('gtceu', 'steel');
materialPrimalKit('gtceu', 'wrought_iron');
materialPrimalKit('gtceu', 'bronze');
materialPrimalKit('gtceu', 'copper');
materialPrimalKit('gtceu', 'bismuth_bronze');
materialPrimalKit('gtceu', 'blue_steel');
materialPrimalKit('gtceu', 'red_steel');
function materialElectricKit(namespace, repairKitMaterial) {
event.smelting(
Item.of(`${namespace}:repair_kit_${repairKitMaterial}`),
`${namespace}:unfired_repair_kit_${repairKitMaterial}`
)
.id(`tfg:smelting/repair_kit_${namespace}_${repairKitMaterial}`)
}
materialElectricKit('tfg', 'boron_carbide');
materialElectricKit('tfg', 'diamond_tipped_mo_50_re');
materialElectricKit('gtceu', 'hsse');
materialElectricKit('gtceu', 'naquadah_alloy');
materialElectricKit('gtceu', 'duranium');
materialElectricKit('gtceu', 'ostrum_iodide');
materialElectricKit('gtceu', 'tungsten_carbide');
materialElectricKit('gtceu', 'ultimet');
materialElectricKit('gtceu', 'blue_steel');
materialElectricKit('gtceu', 'red_steel');
materialElectricKit('gtceu', 'vanadium_steel');
materialElectricKit('gtceu', 'black_bronze');
materialElectricKit('gtceu', 'black_steel');
materialElectricKit('gtceu', 'steel');
materialElectricKit('gtceu', 'wrought_iron');
materialElectricKit('gtceu', 'bronze');
materialElectricKit('gtceu', 'copper');
materialElectricKit('gtceu', 'bismuth_bronze');
if (material.hasProperty(TFGPropertyKey.TFC_PROPERTY)) {
event.recipes.tfc.heating(unfiredKit, 1399)
.resultItem(firedKit)
.id(`tfg:heating/repair_kit_${material.getName()}`)
}
})
};

14
kubejs/server_scripts/tfg/food/data.food.js
View File

@@ -109,6 +109,20 @@ function registerTFGFoodData(event) {
food.decayModifier(2.25);
});
// Bison Meat
event.foodItem("tfg:food/raw_bison_meat", (food) => {
food.hunger(2);
food.protein(1.5);
food.decayModifier(3);
});
event.foodItem("tfg:food/cooked_bison_meat", (food) => {
food.hunger(4);
food.saturation(2);
food.protein(3);
food.decayModifier(2.25);
});
// Springling Collar
event.foodItem("tfg:food/raw_springling_collar", (food) => {
food.hunger(2);

3
kubejs/server_scripts/tfg/food/recipes.food.js
View File

@@ -1300,6 +1300,9 @@ function registerTFGFoodRecipes(event) {
event.recipes.tfc.heating('tfg:food/raw_wraptor', 200)
.resultItem(TFC.isp.of('tfg:food/cooked_wraptor').copyFood())
event.recipes.tfc.heating('tfg:food/raw_bison_meat', 200)
.resultItem(TFC.isp.of('tfg:food/cooked_bison_meat').copyFood())
event.recipes.tfc.heating('tfg:food/raw_springling_collar', 200)
.resultItem(TFC.isp.of('tfg:food/cooked_springling_collar').copyFood())

3
kubejs/server_scripts/tfg/food/tags.food.js
View File

@@ -128,6 +128,8 @@ function registerTFGFoodItemTags(event) {
'tfg:food/cooked_walker_steak',
'tfg:food/raw_crusher_meat',
'tfg:food/cooked_crusher_meat',
'tfg:food/raw_bison_meat',
'tfg:food/cooked_bison_meat',
'wan_ancient_beasts:raw_ancient_meat',
'wan_ancient_beasts:cooked_ancient_meat'
];
@@ -185,6 +187,7 @@ function registerTFGFoodItemTags(event) {
'tfc:food/venison',
'tfg:food/raw_sniffer_beef',
'tfg:food/raw_crusher_meat',
'tfg:food/raw_bison_meat',
'wan_ancient_beasts:raw_ancient_meat'
];
burgerMeats.forEach(item => {

22
kubejs/server_scripts/tfg/loot.js
View File

@@ -169,4 +169,26 @@ function registerTFGLoots(event) {
event.addEntityLootModifier('tfg:wraptor')
.matchMainHand('#forge:tools/butchery_knives')
.addWeightedLoot([2, 3], ['tfg:food/raw_wraptor'])
// Leopard seal normal loot table
event.addEntityLootModifier('tfg:leopard_seal')
.addWeightedLoot([3, 6], ['tfc:blubber'])
.addWeightedLoot([1, 4], ['minecraft:bone'])
.addWeightedLoot([1], ['tfc:medium_raw_hide'])
// Leopard seal extra with butchery knife
event.addEntityLootModifier('tfg:leopard_seal')
.matchMainHand('#forge:tools/butchery_knives')
.addWeightedLoot([2, 3], ['tfc:blubber'])
// Bison normal loot table
event.addEntityLootModifier('tfg:bison')
.addWeightedLoot([12, 20], ['tfg:food/raw_bison_meat'])
.addWeightedLoot([7, 10], ['minecraft:bone'])
.addWeightedLoot([1], ['tfc:large_raw_hide'])
// Bison drop extra with butchery knife
event.addEntityLootModifier('tfg:bison')
.matchMainHand('#forge:tools/butchery_knives')
.addWeightedLoot([4, 6], ['tfg:food/raw_bison_meat'])
};

32
kubejs/server_scripts/tfg/machines/tags.facades.js
View File

@@ -12,6 +12,8 @@ function registerTFGFacadeWhitelistItemTags(event) {
'#tfc:rock/chiseled',
'#tfc:rock/raw',
'#tfc:metal_plated_blocks',
'#tfc:dirt',
'#tfc:grass',
'#tfc:colored_raw_alabaster',
'#tfc:colored_bricks_alabaster',
@@ -149,13 +151,23 @@ function registerTFGFacadeWhitelistItemTags(event) {
'everycomp:c/domum_ornamentum/cactus_extra_window',
'ae2:quartz_glass',
//create deco
//create + deco
'createdeco:andesite_sheet_metal',
'createdeco:brass_sheet_metal',
'createdeco:iron_sheet_metal',
'createdeco:copper_sheet_metal',
'createdeco:industrial_iron_sheet_metal',
'createdeco:zinc_sheet_metal'
'createdeco:zinc_sheet_metal',
'create:industrial_iron_block',
'create:weathered_iron_block',
'create:rose_quartz_block',
'create:rose_quartz_tiles',
'create:small_rose_quartz_tiles',
// better end
'betterend:brimstone',
'betterend:lacugrove_bark',
'betterend:lucernia_bark',
];
const createdeco_bricks_fm =
@@ -194,14 +206,14 @@ function registerTFGFacadeWhitelistItemTags(event) {
'calcite',
'dripstone',
'deepslate',
'limestone'
//'ochrum',
//'scoria',
//'scorchia',
//'veridium'
//'tuff',
//'asurine',
//'crimsite',
'limestone',
'ochrum',
'scoria',
'scorchia',
'veridium',
'tuff',
'asurine',
'crimsite',
]
//misc blocks

1
kubejs/server_scripts/tfg/mv_rework/material.recipes.js
View File

@@ -5,6 +5,7 @@ function registerTFGMVMaterialRecipes(event) {
event.remove({ id: 'gtceu:electric_blast_furnace/blast_rough_silicon_carbide' })
event.remove({ id: 'gtceu:electric_blast_furnace/blast_rough_silicon_carbide_gas' })
event.remove({ id: 'gtceu:alloy_smelter/alloy_smelt_silicon_carbide_to_nugget' })
event.remove({ id: 'gtceu:alloy_smelter/alloy_smelt_weak_inconel_718_to_nugget' })
event.recipes.gtceu.electric_blast_furnace('tfg:rough_sic_gem')
.itemInputs(Item.of('gtceu:quartzite_gem', 9), Item.of('gtceu:graphite_dust', 27))

1
kubejs/server_scripts/tfg/ores_and_materials/recipes.material_ores.js
View File

@@ -189,6 +189,7 @@ function processNormalRawOre(event, material) {
}
event.remove({ id: `greate:milling/integration/gtceu/macerator/macerate_raw_${materialName}_ore_to_crushed_ore` })
event.remove({ id: `greate:crushing/integration/gtceu/macerator/macerate_raw_${materialName}_ore_to_crushed_ore` })
// Macerator
event.recipes.gtceu.macerator(`macerate_raw_${materialName}_ore_to_crushed_ore`)