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

Updates from the alpha feedback/tweaks branch (#856)

Browse source
This commit is contained in:
Pyritie 2025-04-16 18:14:14 +01:00 • committed by GitHub
parent 77673218fd
commit c172f50db1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 140 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/fallingtrees_common.json
View file

@ -5,7 +5,7 @@
"treeLifetimeLength": 4.0,
"dynamicMiningSpeed": {
"disable": false,
"speedMultiplication": 0.1,
"speedMultiplication": 0.05,
"maxSpeedMultiplication": 16.0
},
"trees": {

17
config/ftbquests/quests/chapters/questssteam_age.snbt
View file

@ -1165,21 +1165,20 @@
subtitle: "{quests.steam_age.create_tools.subtitle}"
tasks: [
{
id: "272B2620E00219B5"
id: "12C909F6EB4BB615"
item: "create:goggles"
optional_task: true
type: "item"
}
{
id: "7721793B4C0AFD2C"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(forge:tools/wrench)"
"ftbfiltersystem:filter": "or(item(gtceu:copper_wrench)item(gtceu:bronze_wrench)item(gtceu:black_bronze_wrench)item(gtceu:bismuth_bronze_wrench)item(gtceu:wrought_iron_wrench)item(gtceu:steel_wrench))"
}
}
title: "Any #forge:tools/wrench"
type: "item"
}
{
id: "12C909F6EB4BB615"
item: "create:goggles"
optional_task: true
type: "item"
}
]

1
config/ftbquests/quests/chapters/queststfc_tips.snbt
View file

@ -2284,6 +2284,7 @@
"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfc:glass_basin_blocks)"
}
}
optional_task: true
title: "Any #tfc:glass_basin_blocks"
type: "item"
}

20
kubejs/server_scripts/create/recipes.js
View file

@ -1517,16 +1517,14 @@ const registerCreateRecipes = (event) => {
}).id('tfg:create/shaped/contraption_controls')
event.shaped('create:wrench', [
'FBB',
'CAD',
'AE '
' BB',
' C ',
'AD '
], {
A: '#forge:rods/treated_wood',
A: '#forge:rods/wooden',
B: '#forge:plates/brass',
C: '#forge:small_gears/wood',
D: '#forge:screws',
E: '#forge:tools/screwdrivers',
F: '#forge:tools/hammers'
C: '#tfg:small_cogwheels',
D: '#forge:tools/hammers'
}).id('tfg:create/shaped/wrench')
event.shaped('create:goggles', [
@ -1534,11 +1532,11 @@ const registerCreateRecipes = (event) => {
'AEA',
'C C'
], {
A: '#forge:rings/gold',
A: '#forge:rings/brass',
B: '#forge:leather',
C: 'tfc:lens',
D: '#forge:screws',
E: '#forge:tools/screwdrivers'
D: 'tfc:glue',
E: '#forge:tools/hammers'
}).id('tfg:create/shaped/goggles')
event.shaped('create:analog_lever', [

7
kubejs/server_scripts/endermanoverhaul/recipes.js Normal file
View file

@ -0,0 +1,7 @@
// priority: 0
function registerEndermanOverhaulRecipes(event) {
event.remove({ id: 'endermanoverhaul:corrupted_shield' })
}

29
kubejs/server_scripts/framed_blocks/recipes.js
View file

@ -510,4 +510,33 @@ const registerFramedBlocksRecipes = (event) => {
}
}).id('framedblocks:framing_saw/framed_stone_button')
// Lever
event.shapeless(
Item.of('framedblocks:framed_lever', 1),
[
'framedblocks:framed_cube',
'minecraft:redstone',
'#forge:rods/wooden',
]
).id('framedblocks:framed_lever')
event.custom({
type: "framedblocks:frame",
additives: [
{
"count": 1,
"ingredient": { tag: "forge:rods/wooden" }
},
{
"count": 1,
"ingredient": { item: "minecraft:redstone" }
}
],
material: 6144,
result: {
item: "framedblocks:framed_lever",
count: 4
}
}).id('framedblocks:framing_saw/framed_lever')
}

90
kubejs/server_scripts/gregtech/recipes.js
View file

@ -1591,38 +1591,84 @@ const registerGTCEURecipes = (event) => {
// #region Fix TFC hanging sign metal dupe for Macerator and Arc Furnace
const SIGN_METALS = [
"copper",
"bronze",
"black_bronze",
"bismuth_bronze",
"wrought_iron",
"steel",
"black_steel",
"red_steel",
"blue_steel"
GTMaterials.Copper,
GTMaterials.Bronze,
GTMaterials.BlackBronze,
GTMaterials.BismuthBronze,
GTMaterials.WroughtIron,
GTMaterials.Steel,
GTMaterials.BlackSteel,
GTMaterials.RedSteel,
GTMaterials.BlueSteel
];
SIGN_METALS.forEach(metal => {
// Arc furnace
global.TFC_WOOD_TYPES.forEach(wood => {
event.remove(`gtceu:macerator/macerate_wood/hanging_sign/${metal}/${wood}`)
event.recipes.gtceu.macerator(`gtceu:macerator/macerate_wood/hanging_sign/${metal}/${wood}`)
.itemInputs(`tfc:wood/hanging_sign/${metal}/${wood}`)
.itemOutputs('gtceu:wood_dust')
.chancedOutput(`gtceu:tiny_${metal}_dust`, 3750, 0)
.duration(108)
.EUt(8)
.category(GTRecipeCategories.MACERATOR_RECYCLING)
event.remove(`gtceu:arc_furnace/arc_wood/hanging_sign/${metal}/${wood}`)
event.recipes.gtceu.arc_furnace(`gtceu:arc_furnace/macerate_wood/hanging_sign/${metal}/${wood}`)
.itemInputs(`tfc:wood/hanging_sign/${metal}/${wood}`)
event.remove(`gtceu:arc_furnace/arc_wood/hanging_sign/${metal.getName()}/${wood}`)
event.recipes.gtceu.arc_furnace(`gtceu:arc_furnace/macerate_wood/hanging_sign/${metal.getName()}/${wood}`)
.itemInputs(`tfc:wood/hanging_sign/${metal.getName()}/${wood}`)
.itemOutputs('gtceu:tiny_ash_dust')
.chancedOutput(`gtceu:${metal}_nugget`, 3750, 0)
.chancedOutput(ChemicalHelper.get(TagPrefix.nugget, metal, 1), 3750, 0)
.inputFluids(Fluid.of('gtceu:oxygen', 12))
.duration(12)
.EUt(30)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
})
global.AFC_WOOD_TYPES.forEach(wood => {
event.recipes.gtceu.arc_furnace(`gtceu:arc_furnace/macerate_wood/hanging_sign/${metal.getName()}/${wood}`)
.itemInputs(`afc:wood/hanging_sign/${metal.getName()}/${wood}`)
.itemOutputs('gtceu:tiny_ash_dust')
.chancedOutput(ChemicalHelper.get(TagPrefix.nugget, metal, 1), 3750, 0)
.inputFluids(Fluid.of('gtceu:oxygen', 12))
.duration(12)
.EUt(30)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
})
// Macerator
global.TFC_HARDWOOD_TYPES.forEach(wood => {
event.remove(`gtceu:macerator/macerate_wood/hanging_sign/${metal.getName()}/${wood}`)
event.recipes.gtceu.macerator(`gtceu:macerator/macerate_wood/hanging_sign/${metal.getName()}/${wood}`)
.itemInputs(`tfc:wood/hanging_sign/${metal.getName()}/${wood}`)
.itemOutputs('gtceu:hardwood_dust')
.chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, metal, 1), 3750, 0)
.duration(108)
.EUt(8)
.category(GTRecipeCategories.MACERATOR_RECYCLING)
})
global.TFC_SOFTWOOD_TYPES.forEach(wood => {
event.remove(`gtceu:macerator/macerate_wood/hanging_sign/${metal.getName()}/${wood}`)
event.recipes.gtceu.macerator(`gtceu:macerator/macerate_wood/hanging_sign/${metal.getName()}/${wood}`)
.itemInputs(`tfc:wood/hanging_sign/${metal.getName()}/${wood}`)
.itemOutputs('gtceu:wood_dust')
.chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, metal, 1), 3750, 0)
.duration(108)
.EUt(8)
.category(GTRecipeCategories.MACERATOR_RECYCLING)
})
global.AFC_HARDWOOD_TYPES.forEach(wood => {
event.recipes.gtceu.macerator(`gtceu:macerator/macerate_wood/hanging_sign/${metal.getName()}/${wood}`)
.itemInputs(`afc:wood/hanging_sign/${metal.getName()}/${wood}`)
.itemOutputs('gtceu:hardwood_dust')
.chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, metal, 1), 3750, 0)
.duration(108)
.EUt(8)
.category(GTRecipeCategories.MACERATOR_RECYCLING)
})
global.AFC_SOFTWOOD_TYPES.forEach(wood => {
event.recipes.gtceu.macerator(`gtceu:macerator/macerate_wood/hanging_sign/${metal.getName()}/${wood}`)
.itemInputs(`afc:wood/hanging_sign/${metal.getName()}/${wood}`)
.itemOutputs('gtceu:wood_dust')
.chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, metal, 1), 3750, 0)
.duration(108)
.EUt(8)
.category(GTRecipeCategories.MACERATOR_RECYCLING)
})
})
// #endregion

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

@ -584,4 +584,5 @@ function removeGTCEURecipes(event) {
event.remove({ id: 'gtceu:assembler/treated_door' })
event.remove({ id: 'gtceu:assembler/barrel' })
event.remove({ id: 'gtceu:chemical_reactor/ghast_tear_separation' })
}

1
kubejs/server_scripts/main_server_script.js
View file

@ -173,6 +173,7 @@ ServerEvents.recipes(event => {
registerCreateHorsePowerBlockRecipes(event)
registerDiggerHelmetRecipes(event)
registerDomumOrnamentumRecipes(event)
registerEndermanOverhaulRecipes(event)
registerEveryCompatRecipes(event)
registerExtendedAE2Recipes(event)
registerExposureRecipes(event)

5
kubejs/server_scripts/minecraft/recipes.js
View file

@ -164,7 +164,7 @@ const registerMinecraftRecipes = (event) => {
event.recipes.gtceu.centrifuge('sugar_from_sugarcane')
.itemInputs('tfc:food/sugarcane')
.inputFluids(Fluid.of('minecraft:water', 600))
.itemOutputs('minecraft:sugar')
.itemOutputs('minecraft:sugar', 'gtceu:plant_ball')
.duration(800)
.EUt(6)
@ -842,6 +842,9 @@ const registerMinecraftRecipes = (event) => {
event.shapeless('minecraft:redstone_torch', ['#forge:rods/wooden', 'minecraft:redstone'])
.id('tfg:shapeless/redstone_torch')
event.shapeless('minecraft:lever', ['#forge:rods/wooden', 'minecraft:redstone', '#forge:cobblestone'])
.id('tfg:shapeless/lever')
generateCutterRecipe(event, '#forge:double_plates/wrought_iron', 'minecraft:iron_door', 400, GTValues.VA[GTValues.LV], 'iron_door')
// #endregion

4
kubejs/server_scripts/tfg/recipes.supports.js
View file

@ -18,14 +18,14 @@ function registerTFGSupportRecipes(event) {
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.chemical_bath('tfg:gtceu/chemical_bath/reinforced_dark_concrete_support')
.inputFluids(Fluid.of('minecraft:water', 100))
.inputFluids(Fluid.of('tfc:black_dye', 10))
.itemOutputs('1x tfg:reinforced_dark_concrete_support')
.itemInputs('1x tfg:reinforced_light_concrete_support')
.duration(60)
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.chemical_bath('tfg:gtceu/chemical_bath/dark_concrete_support')
.inputFluids(Fluid.of('minecraft:water', 100))
.inputFluids(Fluid.of('tfc:black_dye', 10))
.itemOutputs('1x tfg:dark_concrete_support')
.itemInputs('1x tfg:light_concrete_support')
.duration(60)

5
kubejs/server_scripts/vintage_improvements/recipes.js
View file

@ -562,10 +562,13 @@ function registerVintageImprovementsRecipes(event) {
ingredients: inputs,
results: outputs,
processingTime: r.duration * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER
}).id(`tfg:vi/centrifuge/${recipe.getId().split(':')[1]}`)
}).id(`tfg:vi/${recipe.getId().split(':')[1]}`)
}
)
// Fix weird inconsistency
event.replaceOutput({ id: 'tfg:vi/centrifuge/sticky_resin_separation' }, 'gtceu:raw_rubber_dust', 'gtceu:carbon_dust')
// #endregion
// #region Vacuum

2
kubejs/startup_scripts/gtceu/constants.js
View file

@ -47,6 +47,8 @@ global.GTCEU_DISABLED_ITEMS = [
'gtceu:stone_buzz_saw_blade',
'gtceu:stone_wrench_tip',
'gtceu:treated_wood_hanging_sign',
'gtceu:rubber_sapling',
'gtceu:rubber_log',
'gtceu:rubber_leaves',

5
kubejs/startup_scripts/gtceu/materials.js
View file

@ -37,7 +37,8 @@ const registerGTCEuMaterialModification = (event) => {
GENERATE_SMALL_GEAR,
GENERATE_GEAR,
GENERATE_FRAME,
GENERATE_PLATE
GENERATE_PLATE,
GENERATE_RING
} = $MATERIAL_FLAGS
var metalTooling = [
@ -182,7 +183,7 @@ const registerGTCEuMaterialModification = (event) => {
GTMaterials.BismuthBronze.addFlags(GENERATE_FRAME);
GTMaterials.Wood.addFlags(GENERATE_SMALL_GEAR);
GTMaterials.Brass.addFlags(GENERATE_SMALL_GEAR);
GTMaterials.Brass.addFlags(GENERATE_SMALL_GEAR, GENERATE_RING);
GTMaterials.BismuthBronze.addFlags(GENERATE_GEAR);
GTMaterials.Nickel.addFlags(GENERATE_ROD, GENERATE_LONG_ROD);