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

merge

Browse source
This commit is contained in:
Pyritie 2025-06-12 13:33:44 +01:00
commit b7cc04f188
26 changed files with 544 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/build.yml vendored
View file

@ -388,12 +388,12 @@ jobs:
fi fi
echo "✔️ All artifacts found" echo "✔️ All artifacts found"
- name: 🚫 Сlose label "Done" # - name: 🚫 Сlose label "Done"
uses: Xikaro/close-issues-based-on-label@master # uses: Xikaro/close-issues-based-on-label@master
env: # env:
LABEL: "Status: Done" # LABEL: "Status: Done"
COMMENT: In ${{ needs.info.outputs.project_version }} # COMMENT: In ${{ needs.info.outputs.project_version }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: 📄 Format diff - name: 📄 Format diff
id: format_diff id: format_diff

7
CHANGELOG.md
View file

@ -3,7 +3,12 @@
### New features ### New features
- Added back the vanilla stonecutter @Pyritie - Added back the vanilla stonecutter @Pyritie
- Added our own recipes for crafting GregTech facades - 3 cast iron plates for 8 facades, or 3 titanium plates for 32 facades (#1145) @BlueBoat29 - Added our own recipes for crafting GregTech facades - 3 cast iron plates for 8 facades, or 3 titanium plates for 32 facades (#1145) @BlueBoat29
- Added create conductor recipes (#1144) @JeanRdSz
- Added lunch boxes! They keep your food cool and you can even eat right out of them! @Thomasx0
### Changes ### Changes
- Added cinnabar to piglin bartering and changed the deep cave enderman loot table to raw gold instead of coal @Pyritie
- Nerfed extraction of latex from logs to encourage tree taps instead @Pyritie
- Adjusted temperature tolerance of latex trees, check the field guide for specifics @Pyritie
### Bug fixes ### Bug fixes
- Fixed trowel being consumed on use (#1143) @Redeix - Fixed trowel being consumed on use (#1143) @Redeix
- Fixed glass dust dupe with unfinished lamps (#1134) @Pyritie - Fixed glass dust dupe with unfinished lamps (#1134) @Pyritie
@ -11,6 +16,8 @@
- Fixed assembler recipe conflicts with certain wrought iron create items (#1142) @TomPlop & @Pyritie - Fixed assembler recipe conflicts with certain wrought iron create items (#1142) @TomPlop & @Pyritie
- Quest fixes (#1119, #1142) @TomPlop - Quest fixes (#1119, #1142) @TomPlop
- Fixed recipe conflicts with scaffolding and paintings, and wine glasses and jars (#1141) @JeanRdSz - Fixed recipe conflicts with scaffolding and paintings, and wine glasses and jars (#1141) @JeanRdSz
- Fixed piglin disguise loot table giving the wrong item (#1151) @Redeix
- Fixed create encased large cogwheel drops (#1148) @Taskeren
## [0.9.10] - 05.06.2025 ## [0.9.10] - 05.06.2025
### New features ### New features

10
config/ftbquests/quests/chapters/lv__low_voltage.snbt
View file

@ -117,7 +117,7 @@
description: ["{quests.low_voltage.lv_amp_explanation.desc}"] description: ["{quests.low_voltage.lv_amp_explanation.desc}"]
id: "7B0FF43022F6C2EC" id: "7B0FF43022F6C2EC"
optional: true optional: true
shape: "rsquare" shape: "heart"
size: 1.0d size: 1.0d
subtitle: "{quests.low_voltage.lv_amp_explanation.subtitle}" subtitle: "{quests.low_voltage.lv_amp_explanation.subtitle}"
tasks: [{ tasks: [{
@ -673,7 +673,8 @@
] ]
icon: "gtceu:fluid_cell" icon: "gtceu:fluid_cell"
id: "292938760AB9A12B" id: "292938760AB9A12B"
shape: "square" optional: true
shape: "heart"
size: 1.0d size: 1.0d
subtitle: "{quests.low_voltage.universal_cell.subtitle}" subtitle: "{quests.low_voltage.universal_cell.subtitle}"
tasks: [{ tasks: [{
@ -691,6 +692,7 @@
icon: "gtceu:rotor_casting_mold" icon: "gtceu:rotor_casting_mold"
id: "115C4226F6473F0C" id: "115C4226F6473F0C"
optional: true optional: true
shape: "heart"
size: 1.0d size: 1.0d
subtitle: "{quests.low_voltage.mold_rotor.subtitle}" subtitle: "{quests.low_voltage.mold_rotor.subtitle}"
tasks: [ tasks: [
@ -1112,6 +1114,7 @@
icon: "gtceu:lv_rock_crusher" icon: "gtceu:lv_rock_crusher"
id: "1F2359106FC95603" id: "1F2359106FC95603"
optional: true optional: true
shape: "heart"
size: 1.0d size: 1.0d
subtitle: "{quests.low_voltage.lv_rock_crusher.subtitle}" subtitle: "{quests.low_voltage.lv_rock_crusher.subtitle}"
tasks: [{ tasks: [{
@ -1139,6 +1142,7 @@
icon: "gtceu:lv_charger_4x" icon: "gtceu:lv_charger_4x"
id: "2DB259568F347C0E" id: "2DB259568F347C0E"
optional: true optional: true
shape: "heart"
size: 1.0d size: 1.0d
subtitle: "{quests.low_voltage.lv_turbo_charge.subtitle}" subtitle: "{quests.low_voltage.lv_turbo_charge.subtitle}"
tasks: [{ tasks: [{
@ -1166,6 +1170,7 @@
icon: "gtceu:lv_fisher" icon: "gtceu:lv_fisher"
id: "3B26CA44EA955B07" id: "3B26CA44EA955B07"
optional: true optional: true
shape: "heart"
size: 1.0d size: 1.0d
subtitle: "{quests.low_voltage.lv_fisher.subtitle}" subtitle: "{quests.low_voltage.lv_fisher.subtitle}"
tasks: [{ tasks: [{
@ -1409,6 +1414,7 @@
icon: "tfg:lv_aqueous_accumulator" icon: "tfg:lv_aqueous_accumulator"
id: "47E6F8AC20D51814" id: "47E6F8AC20D51814"
optional: true optional: true
shape: "heart"
subtitle: "{quests.low_voltage.lv_aqueous_accumulator.subtitle}" subtitle: "{quests.low_voltage.lv_aqueous_accumulator.subtitle}"
tasks: [{ tasks: [{
id: "685FCAE71ECE04BC" id: "685FCAE71ECE04BC"

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

@ -1228,6 +1228,7 @@
dependency_requirement: "one_completed" dependency_requirement: "one_completed"
description: ["{quests.tfg_tips.refrigerator.desc}"] description: ["{quests.tfg_tips.refrigerator.desc}"]
id: "58EC77A796979E68" id: "58EC77A796979E68"
shape: "gear"
size: 2.0d size: 2.0d
subtitle: "{quests.tfg_tips.refrigerator.subtitle}" subtitle: "{quests.tfg_tips.refrigerator.subtitle}"
tasks: [{ tasks: [{
@ -1236,8 +1237,8 @@
type: "item" type: "item"
}] }]
title: "{quests.tfg_tips.refrigerator.title}" title: "{quests.tfg_tips.refrigerator.title}"
x: 9.0d x: 5.5d
y: -17.0d y: -18.0d
} }
{ {
dependencies: ["2EFB241490502DB3"] dependencies: ["2EFB241490502DB3"]
@ -1398,8 +1399,7 @@
dependency_requirement: "one_completed" dependency_requirement: "one_completed"
description: ["{quests.tfg_tips.cellar.desc}"] description: ["{quests.tfg_tips.cellar.desc}"]
id: "3D1FF501DE2E56FE" id: "3D1FF501DE2E56FE"
shape: "gear" size: 1.5d
size: 4.0d
subtitle: "{quests.tfg_tips.cellar.subtitle}" subtitle: "{quests.tfg_tips.cellar.subtitle}"
tasks: [ tasks: [
{ {
@ -1422,8 +1422,8 @@
} }
] ]
title: "{quests.tfg_tips.cellar.title}" title: "{quests.tfg_tips.cellar.title}"
x: 3.5d x: 3.0d
y: -17.0d y: -16.0d
} }
{ {
dependencies: ["3D1FF501DE2E56FE"] dependencies: ["3D1FF501DE2E56FE"]
@ -1443,8 +1443,8 @@
type: "item" type: "item"
}] }]
title: "{quests.tfg_tips.cellar_blocks.title}" title: "{quests.tfg_tips.cellar_blocks.title}"
x: 3.5d x: 3.0d
y: -20.0d y: -17.5d
} }
{ {
dependencies: ["2EFB241490502DB3"] dependencies: ["2EFB241490502DB3"]
@ -1611,7 +1611,7 @@
}] }]
title: "{quests.tfg_tips.passive_preservation.title}" title: "{quests.tfg_tips.passive_preservation.title}"
x: 6.5d x: 6.5d
y: -15.5d y: -16.0d
} }
{ {
dependencies: ["4047EE998BC4CD03"] dependencies: ["4047EE998BC4CD03"]
@ -3637,8 +3637,8 @@
type: "item" type: "item"
}] }]
title: "{quests.tfg_tips.vessel_preservation.title}" title: "{quests.tfg_tips.vessel_preservation.title}"
x: 6.5d x: 8.0d
y: -16.5d y: -16.0d
} }
{ {
dependencies: ["173F6FA60A5B280B"] dependencies: ["173F6FA60A5B280B"]
@ -5318,6 +5318,68 @@
x: 4.75d x: 4.75d
y: -12.5d y: -12.5d
} }
{
dependencies: ["13F7066858E923FF"]
description: ["{quests.tfg_tips.lunchbox.desc}"]
icon: {
Count: 1
id: "tfclunchbox:lunchbox"
tag: {
SelectedSlot: 0
}
}
id: "6C18E8F79A841620"
shape: "gear"
size: 2.0d
subtitle: "{quests.tfg_tips.lunchbox.subtitle}"
tasks: [
{
id: "33971FCF02C81741"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfclunchbox:lunchbox)item(tfclunchbox:cooling_lunchbox))"
}
}
title: "{quests.tfg_tips.lunchbox.task}"
type: "item"
}
{
id: "5439AF9F5493A3D1"
item: {
Count: 1
id: "tfclunchbox:universal_capsule"
tag: {
Damage: 0
Durability: 10
display: {
Name: "{\"translate\":\"item.tfclunchbox.universal_capsule.filled\"}"
}
}
}
match_nbt: false
optional_task: true
type: "item"
}
{
id: "134E8B8345E6DEE2"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfclunchbox:ice)"
}
}
optional_task: true
title: "Any #tfclunchbox:ice"
type: "item"
}
]
title: "{quests.tfg_tips.lunchbox.title}"
x: 7.5d
y: -18.0d
}
] ]
subtitle: ["{quests.tfg_tips.subtitle}"] subtitle: ["{quests.tfg_tips.subtitle}"]
title: "{quests.tfg_tips}" title: "{quests.tfg_tips}"

6
kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/arborfirmacraft/tapping_index.json
View file

@ -47,7 +47,7 @@
"title": "Hevea", "title": "Hevea",
"item": "afc:wood/log/hevea,afc:wood/wood/hevea,afc:wood/leaves/hevea,afc:wood/sapling/hevea", "item": "afc:wood/log/hevea,afc:wood/wood/hevea,afc:wood/leaves/hevea,afc:wood/sapling/hevea",
"link_recipe": false, "link_recipe": false,
"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 17.1°C$(br)$(thing)Maximum Temperature$(): 26.2°C$(br)$(thing)Minimum Rainfall$(): 390$(br)$(thing)Maximum Rainfall$(): 500$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 22°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 3mb" "text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 17.1°C$(br)$(thing)Maximum Temperature$(): 26.2°C$(br)$(thing)Minimum Rainfall$(): 390$(br)$(thing)Maximum Rainfall$(): 500$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 8°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 2mb"
}, },
{ {
"type": "patchouli:image", "type": "patchouli:image",
@ -61,7 +61,7 @@
"title": "Rubber Fig", "title": "Rubber Fig",
"item": "afc:wood/log/rubber_fig,afc:wood/wood/rubber_fig,afc:wood/leaves/rubber_fig,afc:wood/sapling/rubber_fig", "item": "afc:wood/log/rubber_fig,afc:wood/wood/rubber_fig,afc:wood/leaves/rubber_fig,afc:wood/sapling/rubber_fig",
"link_recipe": false, "link_recipe": false,
"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 9.8°C$(br)$(thing)Maximum Temperature$(): 20.7°C$(br)$(thing)Minimum Rainfall$(): 290$(br)$(thing)Maximum Rainfall$(): 400$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 12°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 2mb" "text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 9.8°C$(br)$(thing)Maximum Temperature$(): 20.7°C$(br)$(thing)Minimum Rainfall$(): 290$(br)$(thing)Maximum Rainfall$(): 400$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 4°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 1mb"
}, },
{ {
"type": "patchouli:image", "type": "patchouli:image",
@ -75,7 +75,7 @@
"title": "Kapok", "title": "Kapok",
"item": "tfc:wood/log/kapok,tfc:wood/wood/kapok,tfc:wood/leaves/kapok,tfc:wood/sapling/kapok", "item": "tfc:wood/log/kapok,tfc:wood/wood/kapok,tfc:wood/leaves/kapok,tfc:wood/sapling/kapok",
"link_recipe": false, "link_recipe": false,
"text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 17.1°C$(br)$(thing)Maximum Temperature$(): 38°C$(br)$(thing)Minimum Rainfall$(): 320$(br)$(thing)Maximum Rainfall$(): 500$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 1°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 1mb" "text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): 17.1°C$(br)$(thing)Maximum Temperature$(): 38°C$(br)$(thing)Minimum Rainfall$(): 320$(br)$(thing)Maximum Rainfall$(): 500$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): 12°C$(br)$(thing)Max Temp for Production$(): N/A$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 3mb"
}, },
{ {
"type": "patchouli:image", "type": "patchouli:image",

4
kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/piglins.json
View file

@ -18,11 +18,11 @@
{ {
"type": "patchouli:text", "type": "patchouli:text",
"title": "Trade Results", "title": "Trade Results",
"text": "$(li)1 Copper Ingot$(li)1 Tin Ingot$(li)1 Silver Ingot$(li)1 Bronze Ingot$(li)1 Bismuth Bronze Ingot$(li)1 Cast Iron Ingot$(li)1 Zinc Ingot$(li)1 Brass Ingot$(li)1 Bismuth Ingot$(li)1 Nickel Ingot$(li)4-6 Sulfur Powder" "text": "$(li)1 Copper Ingot$(li)1 Tin Ingot$(li)1 Silver Ingot$(li)1 Bronze Ingot$(li)1 Bismuth Bronze Ingot$(li)1 Cast Iron Ingot$(li)1 Zinc Ingot$(li)1 Brass Ingot$(li)1 Bismuth Ingot$(li)1 Nickel Ingot$(li)1 Cinnabar Gem"
}, },
{ {
"type": "patchouli:text", "type": "patchouli:text",
"text": "$(li)1-2 Leather$(li)6-12 String$(li)6-12 Nether Quartz$(li)12-18 Mangrove Lumber$(li)6-8 Mangrove Logs$(li)4-6 Cooked Venison$(li)4-6 Ghost Peppers$(li)4-6 Gunpowder$(li)4-8 Charcoal$(li)6-12 Arrows$(li)6-12 Flux$(li)8-12 Blackstone Bricks$(li)8-12 Deepslate Bricks$(li)8-16 Sticks" "text": "$(li)4-6 Sulfur Powder$(li)1-2 Leather$(li)6-12 String$(li)6-12 Nether Quartz$(li)12-18 Mangrove Lumber$(li)6-8 Mangrove Logs$(li)4-6 Cooked Venison$(li)4-6 Ghost Peppers$(li)4-6 Gunpowder$(li)4-8 Charcoal$(li)6-12 Arrows$(li)6-12 Flux$(li)8-12 Blackstone Bricks$(li)8-12 Deepslate Bricks$(li)8-16 Sticks"
}, },
{ {
"type": "patchouli:text", "type": "patchouli:text",

6
kubejs/assets/tfg/lang/en_us.json
View file

@ -2418,5 +2418,9 @@
"quests.tfg_tips.piglin_disguise.desc": "Do you feel like you don't belong?\n Do the &4Piglin&r attack you at your school because of your appearance?\n Try wearing a &aPiglin Disguise&r to ward off unwanted attention and blend right in.", "quests.tfg_tips.piglin_disguise.desc": "Do you feel like you don't belong?\n Do the &4Piglin&r attack you at your school because of your appearance?\n Try wearing a &aPiglin Disguise&r to ward off unwanted attention and blend right in.",
"quests.tfg_tips.trowel.title": "Trowel", "quests.tfg_tips.trowel.title": "Trowel",
"quests.tfg_tips.trowel.subtitle": "Inspired by Quark!", "quests.tfg_tips.trowel.subtitle": "Inspired by Quark!",
"quests.tfg_tips.trowel.desc": "A &4Trowel&r is a tool for builders that can &brandomly place blocks&r located in the hotbar. Trowels can also use bricks and other useable items to randomize tiles for &5RNR Roads&r." "quests.tfg_tips.trowel.desc": "A &4Trowel&r is a tool for builders that can &brandomly place blocks&r located in the hotbar. Trowels can also use bricks and other useable items to randomize tiles for &5RNR Roads&r.",
"quests.tfg_tips.lunchbox.title": "Lunch Box",
"quests.tfg_tips.lunchbox.subtitle": "A refrigerator in your pocket!",
"quests.tfg_tips.lunchbox.desc": "Lunch boxes have 9 slots for food, keeping it cold and longer lasting.\nThe Cooling Lunchbox has a stronger effect than the regular one, but needs to be provided with ice or capsules that will thaw over time.",
"quests.tfg_tips.lunchbox.task": "Any Lunch Box"
} }

2
kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json
View file

@ -31,7 +31,7 @@
"function": "minecraft:set_count" "function": "minecraft:set_count"
} }
], ],
"name": "gtceu:raw_coal" "name": "tfc:ore/normal_native_gold"
}, },
{ {
"type": "minecraft:item", "type": "minecraft:item",

5
kubejs/data/minecraft/loot_tables/gameplay/piglin_bartering.json
View file

@ -115,6 +115,11 @@
"name": "gtceu:nickel_ingot", "name": "gtceu:nickel_ingot",
"weight": 100 "weight": 100
}, },
{
"type": "minecraft:item",
"name": "gtceu:cinnabar_gem",
"weight": 100
},
{ {
"type": "minecraft:item", "type": "minecraft:item",
"name": "minecraft:leather", "name": "minecraft:leather",

4
kubejs/data/tfg/loot_tables/blocks/piglin_disguise_block.json
View file

@ -7,7 +7,7 @@
"entries": [ "entries": [
{ {
"type": "minecraft:item", "type": "minecraft:item",
"name": "tfg:piglin_disguise_block" "name": "tfg:piglin_disguise"
} }
], ],
"conditions": [ "conditions": [
@ -17,4 +17,4 @@
] ]
} }
] ]
} }

41
kubejs/server_scripts/afc/recipes.js
View file

@ -86,39 +86,36 @@ const registerAFCRecipes = (event) => {
.id('tfg:heating/tree_tap') .id('tfg:heating/tree_tap')
//Custom rubber and hevea tappings //Custom rubber and hevea tappings
//Hevea is the most efficient but requires the warmest temperatures
//Rubber fig requires average temperatures and its mildly efficient
event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/hevea"))
.resultFluid(Fluid.of("tfg:latex", 3))
.minTemp(22)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/latex/hevea")
event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/ancient_hevea"))
.resultFluid(Fluid.of("tfg:latex", 3))
.minTemp(22)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/latex/ancient_hevea")
event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/rubber_fig")) event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/rubber_fig"))
.resultFluid(Fluid.of("tfg:latex", 2)) .resultFluid(Fluid.of("tfg:latex", 1))
.minTemp(12) .minTemp(4)
.requiresNaturalLog(true) .requiresNaturalLog(true)
.id("tfg:tree_tapping/latex/rubber_fig") .id("tfg:tree_tapping/latex/rubber_fig")
event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/ancient_rubber_fig")) event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/ancient_rubber_fig"))
.resultFluid(Fluid.of("tfg:latex", 2)) .resultFluid(Fluid.of("tfg:latex", 1))
.minTemp(12) .minTemp(4)
.requiresNaturalLog(true) .requiresNaturalLog(true)
.id("tfg:tree_tapping/latex/ancient_rubber_fig") .id("tfg:tree_tapping/latex/ancient_rubber_fig")
//Kapok Grandfathered, least efficient but works as long as the temperature is not freezing event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/hevea"))
.resultFluid(Fluid.of("tfg:latex", 2))
.minTemp(8)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/latex/hevea")
event.recipes.afc.tree_tapping(TFC.blockIngredient("afc:wood/log/ancient_hevea"))
.resultFluid(Fluid.of("tfg:latex", 2))
.minTemp(8)
.requiresNaturalLog(true)
.id("tfg:tree_tapping/latex/ancient_hevea")
event.recipes.afc.tree_tapping(TFC.blockIngredient("tfc:wood/log/kapok")) event.recipes.afc.tree_tapping(TFC.blockIngredient("tfc:wood/log/kapok"))
.resultFluid(Fluid.of("tfg:latex", 1)) .resultFluid(Fluid.of("tfg:latex", 3))
.minTemp(1) .minTemp(12)
.requiresNaturalLog(true) .requiresNaturalLog(true)
.id("tfg:tree_tapping/kapok_latex") .id("tfg:tree_tapping/kapok_latex")
event.recipes.afc.tree_tapping(TFC.blockIngredient("tfc:wood/log/ancient_kapok")) event.recipes.afc.tree_tapping(TFC.blockIngredient("tfc:wood/log/ancient_kapok"))
.resultFluid(Fluid.of("tfg:latex", 1)) .resultFluid(Fluid.of("tfg:latex", 3))
.minTemp(1) .minTemp(12)
.requiresNaturalLog(true) .requiresNaturalLog(true)
.id("tfg:tree_tapping/ancient_kapok_latex") .id("tfg:tree_tapping/ancient_kapok_latex")

9
kubejs/server_scripts/greate/recipes.js
View file

@ -186,18 +186,19 @@ function registerGreateRecipes(event) {
event.shaped('greate:steel_millstone', [ event.shaped('greate:steel_millstone', [
'FBF', 'FBF',
'DCE', 'DCE',
'AAA' 'AGA'
], { ], {
A: '#forge:smooth_stone', A: '#forge:smooth_stone',
B: 'gtceu:treated_wood_slab', B: 'gtceu:treated_wood_slab',
C: '#forge:small_gears/wrought_iron', C: '#forge:small_gears/steel',
D: '#forge:tools/hammers', D: '#forge:tools/hammers',
E: '#forge:tools/wrenches', E: '#forge:tools/wrenches',
F: '#forge:dusts/diamond' F: '#forge:dusts/diamond',
G: 'greate:steel_shaft'
}).id('greate:shaped/steel_millstone') }).id('greate:shaped/steel_millstone')
event.recipes.gtceu.assembler('greate:steel_millstone') event.recipes.gtceu.assembler('greate:steel_millstone')
.itemInputs('3x #forge:smooth_stone', 'gtceu:treated_wood_slab', '#forge:small_gears/wrought_iron', '2x #forge:dusts/diamond') .itemInputs('2x #forge:smooth_stone', 'gtceu:treated_wood_slab', '#forge:small_gears/steel', '2x #forge:dusts/diamond', 'greate:steel_shaft')
.itemOutputs('greate:steel_millstone') .itemOutputs('greate:steel_millstone')
.duration(200) .duration(200)
.EUt(GTValues.VA[GTValues.ULV]) .EUt(GTValues.VA[GTValues.ULV])

13
kubejs/server_scripts/greate/recipes.recycling.js
View file

@ -103,19 +103,20 @@ function registerGreateRecyclingRecipes(event) {
event.recipes.gtceu.macerator('greate:steel_millstone') event.recipes.gtceu.macerator('greate:steel_millstone')
.itemInputs('greate:steel_millstone') .itemInputs('greate:steel_millstone')
.itemOutputs( .itemOutputs(
ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 3), ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Steel, 10),
ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 1), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Stone, 2),
ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 2),
ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.TreatedWood, 2)) ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.TreatedWood, 2))
.duration(GTMaterials.Steel.getMass() * 4) .duration(GTMaterials.Stone.getMass() * 4)
.category(GTRecipeCategories.MACERATOR_RECYCLING) .category(GTRecipeCategories.MACERATOR_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV]) .EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.arc_furnace('greate:steel_millstone') event.recipes.gtceu.arc_furnace('greate:steel_millstone')
.itemInputs('greate:steel_millstone') .itemInputs('greate:steel_millstone')
.itemOutputs( .itemOutputs(
ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 3), ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Steel, 10),
ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 1)) ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 2))
.duration(GTMaterials.Steel.getMass() * 4) .duration(GTMaterials.Stone.getMass() * 4)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
.EUt(GTValues.VA[GTValues.LV]) .EUt(GTValues.VA[GTValues.LV])

2
kubejs/server_scripts/gregtech/recipes.machines.js
View file

@ -722,7 +722,7 @@ function registerGTCEuMachineRecipes(event) {
event.recipes.gtceu.assembly_line('ultimate_battery') event.recipes.gtceu.assembly_line('ultimate_battery')
.itemInputs('16x #forge:double_plates/darmstadtium', .itemInputs('16x #forge:double_plates/darmstadtium',
'4x #gtceu:circuits/uhv', '4x #gtceu:circuits/uhv',
'16x #gtceu:batteries/uv', '16x gtceu:energy_cluster',
'4x gtceu:uv_field_generator', '4x gtceu:uv_field_generator',
'64x gtceu:uhpic_wafer', '64x gtceu:uhpic_wafer',
'64x gtceu:uhpic_wafer', '64x gtceu:uhpic_wafer',

3
kubejs/server_scripts/gregtech/recipes.materials.js
View file

@ -221,7 +221,7 @@ function registerGTCEUMetalRecipes(event) {
.outputFluids(Fluid.of(material.getFluid(), 288)) .outputFluids(Fluid.of(material.getFluid(), 288))
.duration(material.getMass()) .duration(material.getMass())
.category(GTRecipeCategories.EXTRACTOR_RECYCLING) .category(GTRecipeCategories.EXTRACTOR_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV]) .EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV])
} }
if (material.hasProperty(PropertyKey.DUST)) { if (material.hasProperty(PropertyKey.DUST)) {
@ -843,7 +843,6 @@ function registerGTCEUMetalRecipes(event) {
.itemOutputs(barsStack) .itemOutputs(barsStack)
.duration(100) .duration(100)
.EUt(GTValues.VA[GTValues.LV]) .EUt(GTValues.VA[GTValues.LV])
.circuit(1)
} }
forEachMaterial(material => { forEachMaterial(material => {

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

@ -645,6 +645,13 @@ function removeGTCEURecipes(event) {
event.remove({ id: 'gtceu:wiremill/string_from_polycaprolactam' }) event.remove({ id: 'gtceu:wiremill/string_from_polycaprolactam' })
event.remove({ id: 'gtceu:chemical_bath/black_steel_cool_down' })
event.remove({ id: 'gtceu:chemical_bath/black_steel_cool_down_distilled_water' })
event.remove({ id: 'gtceu:chemical_bath/red_steel_cool_down' })
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/compress_certus_quartz_to_raw_ore_block' })
// Remove vanilla Eye of Ender // Remove vanilla Eye of Ender

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

@ -123,4 +123,7 @@ const registerGTCEUFluidTags = (event) => {
event.add('c:hidden_from_recipe_viewers', /gtceu.*potion.*/) event.add('c:hidden_from_recipe_viewers', /gtceu.*potion.*/)
event.add('c:hidden_from_recipe_viewers', 'gtceu:molten_black_steel')
event.add('c:hidden_from_recipe_viewers', 'gtceu:molten_red_steel')
event.add('c:hidden_from_recipe_viewers', 'gtceu:molten_blue_steel')
} }

319
kubejs/server_scripts/main_server_script.js
View file

@ -5,46 +5,46 @@
*/ */
ServerEvents.tags('item', event => { ServerEvents.tags('item', event => {
registerAdAstraItemTags(event) registerAdAstraItemTags(event)
registerAdvancedPeripheralsItemTags(event) registerAdvancedPeripheralsItemTags(event)
registerAE2ItemTags(event) registerAE2ItemTags(event)
registerAFCItemTags(event) registerAFCItemTags(event)
registerAlekiroofsItemTags(event) registerAlekiroofsItemTags(event)
registerAlekishipsItemTags(event) registerAlekishipsItemTags(event)
registerAsticorCartsItemTags(event) registerAsticorCartsItemTags(event)
registerBeneathItemTags(event) registerBeneathItemTags(event)
registerChalkItemTags(event); registerChalkItemTags(event);
registerChiselAndBitsItemTags(event) registerChiselAndBitsItemTags(event)
registerComputerCraftItemTags(event) registerComputerCraftItemTags(event)
registerConstructionWandItemTags(event) registerConstructionWandItemTags(event)
registerCreateItemTags(event) registerCreateItemTags(event)
registerCreateAdditionsItemTags(event) registerCreateAdditionsItemTags(event)
registerCreateConnectedItemTags(event) registerCreateConnectedItemTags(event)
registerCreateDecoItemTags(event) registerCreateDecoItemTags(event)
registerDiggerHelmetItemTags(event) registerDiggerHelmetItemTags(event)
registerEndermanOverhaulItemTags(event) registerEndermanOverhaulItemTags(event)
registerEveryCompatItemTags(event) registerEveryCompatItemTags(event)
registerExposureItemTags(event) registerExposureItemTags(event)
registerExtendedAE2ItemTags(event) registerExtendedAE2ItemTags(event)
registerFirmaCivItemTags(event) registerFirmaCivItemTags(event)
registerFirmaLifeItemTags(event) registerFirmaLifeItemTags(event)
registerFramedBlocksItemTags(event) registerFramedBlocksItemTags(event)
registerFTBQuestsItemTags(event) registerFTBQuestsItemTags(event)
registerGrapplemodItemTags(event) registerGrapplemodItemTags(event)
registerGreateItemTags(event) registerGreateItemTags(event)
registerGTCEUItemTags(event) registerGTCEUItemTags(event)
registerMegaCellsItemTags(event) registerMegaCellsItemTags(event)
registerMinecraftItemTags(event) registerMinecraftItemTags(event)
registerMoreRedItemTags(event) registerMoreRedItemTags(event)
registerHotOrNotItemTags(event) registerHotOrNotItemTags(event)
registerRailWaysItemTags(event) registerRailWaysItemTags(event)
registerRnrItemTags(event) registerRnrItemTags(event)
registerSophisticatedBackpacksItemTags(event) registerSophisticatedBackpacksItemTags(event)
registerSpeciesItemTags(event) registerSpeciesItemTags(event)
registerTFCAmbientalItemTags(event) registerTFCAmbientalItemTags(event)
registerTFCItemTags(event) registerTFCItemTags(event)
registerTFCTextileItemTags(event) registerTFCTextileItemTags(event)
registerTFGItemTags(event) registerTFGItemTags(event)
registerVintageImprovementsItemTags(event) registerVintageImprovementsItemTags(event)
}) })
/** /**
@ -52,67 +52,67 @@ ServerEvents.tags('item', event => {
*/ */
ServerEvents.tags('block', event => { ServerEvents.tags('block', event => {
registerAdAstraBlockTags(event) registerAdAstraBlockTags(event)
registerAE2BlockTags(event) registerAE2BlockTags(event)
registerAFCBlockTags(event) registerAFCBlockTags(event)
registerAsticorCartsBlockTags(event) registerAsticorCartsBlockTags(event)
registerBeneathBlockTags(event) registerBeneathBlockTags(event)
registerChiselAndBitsBlockTags(event) registerChiselAndBitsBlockTags(event)
registerComputerCraftBlockTags(event) registerComputerCraftBlockTags(event)
registerCreateBlockTags(event) registerCreateBlockTags(event)
registerCreateAdditionsBlockTags(event) registerCreateAdditionsBlockTags(event)
registerCreateDecoBlockTags(event) registerCreateDecoBlockTags(event)
registerDomumOrnamentumBlockTags(event) registerDomumOrnamentumBlockTags(event)
registerEndermanOverhaulBlockTags(event) registerEndermanOverhaulBlockTags(event)
registerExtendedAE2BlockTags(event) registerExtendedAE2BlockTags(event)
registerFirmaCivBlockTags(event) registerFirmaCivBlockTags(event)
registerFirmaLifeBlockTags(event) registerFirmaLifeBlockTags(event)
registerFramedBlocksBlockTags(event) registerFramedBlocksBlockTags(event)
registerFTBQuestsBlockTags(event) registerFTBQuestsBlockTags(event)
registerGreateBlockTags(event) registerGreateBlockTags(event)
registerGTCEUBlockTags(event) registerGTCEUBlockTags(event)
registerMegaCellsBlockTags(event) registerMegaCellsBlockTags(event)
registerMinecraftBlockTags(event) registerMinecraftBlockTags(event)
registerMoreRedBlockTags(event) registerMoreRedBlockTags(event)
registerHotOrNotBlockTags(event) registerHotOrNotBlockTags(event)
registerRailWaysBlockTags(event) registerRailWaysBlockTags(event)
registerSophisticatedBackpacksBlockTags(event) registerSophisticatedBackpacksBlockTags(event)
registerSpeciesBlockTags(event) registerSpeciesBlockTags(event)
registerTFCBlockTags(event) registerTFCBlockTags(event)
registerTFGBlockTags(event) registerTFGBlockTags(event)
registerVintageImprovementsBlockTags(event) registerVintageImprovementsBlockTags(event)
}) })
/** /**
* Событие регистрации жидкость-тэгов. * Событие регистрации жидкость-тэгов.
*/ */
ServerEvents.tags('fluid', event => { ServerEvents.tags('fluid', event => {
registerAFCFluidTags(event) registerAFCFluidTags(event)
registerAdAstraFluidTags(event) registerAdAstraFluidTags(event)
registerCreateFluidTags(event) registerCreateFluidTags(event)
registerCreateAdditionsFluidTags(event) registerCreateAdditionsFluidTags(event)
registerGTCEUFluidTags(event) registerGTCEUFluidTags(event)
registerGreateFluidTags(event) registerGreateFluidTags(event)
registerFirmaLifeFluidTags(event) registerFirmaLifeFluidTags(event)
registerTFCFluidTags(event) registerTFCFluidTags(event)
registerTFGFluidTags(event) registerTFGFluidTags(event)
registerVintageImprovementsFluidTags(event) registerVintageImprovementsFluidTags(event)
}) })
/** /**
* Событие регистрации тегов структур. * Событие регистрации тегов структур.
*/ */
ServerEvents.tags('worldgen/placed_feature', event => { ServerEvents.tags('worldgen/placed_feature', event => {
// Remove default veins // Remove default veins
event.removeAll('tfc:in_biome/veins') event.removeAll('tfc:in_biome/veins')
registerAdAstraPlacedFeatures(event) registerAdAstraPlacedFeatures(event)
registerTFCPlacedFeatures(event) registerTFCPlacedFeatures(event)
registerTFGPlacedFeatures(event) registerTFGPlacedFeatures(event)
}) })
ServerEvents.tags('worldgen/biome', event => { ServerEvents.tags('worldgen/biome', event => {
registerTFCBiomeTags(event) registerTFCBiomeTags(event)
registerTFGBiomeTags(event) registerTFGBiomeTags(event)
}) })
ServerEvents.tags('worldgen/biome', event => { ServerEvents.tags('worldgen/biome', event => {
@ -128,7 +128,7 @@ ServerEvents.tags('entity_type', event => {
* Срабатывает до инициализации рецептов, но после тегов. * Срабатывает до инициализации рецептов, но после тегов.
*/ */
ServerEvents.highPriorityData(event => { ServerEvents.highPriorityData(event => {
registerComputerCraftData(event) registerComputerCraftData(event)
}) })
/** /**
@ -136,15 +136,17 @@ ServerEvents.highPriorityData(event => {
* Срабатывает до инициализации рецептов, но после тегов. * Срабатывает до инициализации рецептов, но после тегов.
*/ */
TFCEvents.data(event => { TFCEvents.data(event => {
registerTFCDataForAdAstra(event); registerTFCDataForAdAstra(event);
registerTFCDataForArborFirmaCraft(event) registerTFCDataForArborFirmaCraft(event)
registerTFCDataForChalk(event); registerTFCDataForChalk(event);
registerTFCDataForGTCEU(event) registerTFCDataForGTCEU(event)
registerTFCDataForImmersiveAircraft(event); registerTFCDataForImmersiveAircraft(event);
registerTFCDataForTFC(event) registerTFCDataForSophisticatedBackpacks(event)
registerTFCDataForTFCBetterBF(event) registerTFCDataForTFC(event)
registerTFCDataForWaterFlasks(event) registerTFCDataForTFCBetterBF(event)
registerTFCDataForFirmalife(event) registerTFCDataForTFCLunchbox(event)
registerTFCDataForWaterFlasks(event)
registerTFCDataForFirmalife(event)
}) })
/** /**
@ -152,11 +154,11 @@ TFCEvents.data(event => {
* Срабатывает до инициализации рецептов, но после датапаков и тегов. * Срабатывает до инициализации рецептов, но после датапаков и тегов.
*/ */
LootJS.modifiers((event) => { LootJS.modifiers((event) => {
registerGTCEULoots(event) registerGTCEULoots(event)
registerLootrLoots(event) registerLootrLoots(event)
registerPrimitiveCreatesLoots(event) registerPrimitiveCreatesLoots(event)
registerTFCLoots(event) registerTFCLoots(event)
registerTFGLoots(event) registerTFGLoots(event)
}); });
/** /**
@ -164,11 +166,11 @@ LootJS.modifiers((event) => {
* Не представляю когда срабатывает, но явно после тегов и датапаков. * Не представляю когда срабатывает, но явно после тегов и датапаков.
*/ */
GTCEuServerEvents.oreVeins(event => { GTCEuServerEvents.oreVeins(event => {
event.removeAll() event.removeAll()
}) })
GTCEuServerEvents.bedrockOreVeins(event => { GTCEuServerEvents.bedrockOreVeins(event => {
registerGTCEUBedrockOreVeins(event) registerGTCEUBedrockOreVeins(event)
}) })
/** /**
@ -177,61 +179,62 @@ GTCEuServerEvents.bedrockOreVeins(event => {
*/ */
ServerEvents.recipes(event => { ServerEvents.recipes(event => {
registerAdAstraRecipes(event) registerAdAstraRecipes(event)
registerAdvancedPeripheralsRecipes(event) registerAdvancedPeripheralsRecipes(event)
registerAlekishipsRecipes(event) registerAlekishipsRecipes(event)
registerAE2Recipes(event) registerAE2Recipes(event)
registerAFCRecipes(event) registerAFCRecipes(event)
registerAsticorCartsRecipes(event) registerAsticorCartsRecipes(event)
registerAE2InsertExportCardRecipes(event) registerAE2InsertExportCardRecipes(event)
registerAE2NetworkAnalyzerRecipes(event) registerAE2NetworkAnalyzerRecipes(event)
registerAE2WTLibRecipes(event) registerAE2WTLibRecipes(event)
registerBeneathRecipes(event) registerBeneathRecipes(event)
registerBuildingGadgetsRecipes(event) registerBuildingGadgetsRecipes(event)
registerChalkRecipes(event); registerChalkRecipes(event);
registerChiselAndBitsRecipes(event) registerChiselAndBitsRecipes(event)
registerComfortsRecipes(event); registerComfortsRecipes(event);
registerComputerCraftRecipes(event) registerComputerCraftRecipes(event)
registerCccBridgeRecipes(event) registerCccBridgeRecipes(event)
registerConstructionwandRecipes(event) registerConstructionwandRecipes(event)
registerCreateRecipes(event) registerCreateRecipes(event)
registerCreateAdditionsRecipes(event) registerCreateAdditionsRecipes(event)
registerCreateConnectedRecipes(event) registerCreateConnectedRecipes(event)
registerCreatedecoRecipes(event) registerCreatedecoRecipes(event)
registerCreateHorsePowerBlockRecipes(event) registerCreateHorsePowerBlockRecipes(event)
registerDiggerHelmetRecipes(event) registerDiggerHelmetRecipes(event)
registerDomumOrnamentumRecipes(event) registerDomumOrnamentumRecipes(event)
registerEndermanOverhaulRecipes(event) registerEndermanOverhaulRecipes(event)
registerEveryCompatRecipes(event) registerEveryCompatRecipes(event)
registerExtendedAE2Recipes(event) registerExtendedAE2Recipes(event)
registerExposureRecipes(event) registerExposureRecipes(event)
registerEtchedRecipes(event) registerEtchedRecipes(event)
registerFirmaCivRecipes(event) registerFirmaCivRecipes(event)
registerFirmaLifeRecipes(event) registerFirmaLifeRecipes(event)
registerFramedBlocksRecipes(event) registerFramedBlocksRecipes(event)
registerFTBQuestsRecipes(event) registerFTBQuestsRecipes(event)
registerGrapplingHookRecipes(event); registerGrapplingHookRecipes(event);
registerGreateRecipes(event) registerGreateRecipes(event)
registerGTCEURecipes(event); registerGTCEURecipes(event);
registerHandGliderRecipes(event) registerHandGliderRecipes(event)
registerHotOrNotRecipes(event) registerHotOrNotRecipes(event)
registerImmersiveAircraftRecipes(event) registerImmersiveAircraftRecipes(event)
registerMeasurementsRecipes(event) registerMeasurementsRecipes(event)
registerMegaCellsRecipes(event) registerMegaCellsRecipes(event)
registerMERequesterRecipes(event) registerMERequesterRecipes(event)
registerMinecraftRecipes(event) registerMinecraftRecipes(event)
registerMoreRedRecipes(event) registerMoreRedRecipes(event)
registerRailWaysRecipes(event) registerRailWaysRecipes(event)
registerRnrRecipes(event) registerRnrRecipes(event)
registerSophisticatedBackpacksRecipes(event) registerSophisticatedBackpacksRecipes(event)
registerSimplylightRecipes(event) registerSimplylightRecipes(event)
registerTfceaRecipes(event) registerTfceaRecipes(event)
registerTFCRecipes(event) registerTFCRecipes(event)
registerTFCBetterBFRecipes(event) registerTFCBetterBFRecipes(event)
registerTFCGroomingStationRecipes(event) registerTFCLunchBoxRecipes(event)
registerTFGRecipes(event) registerTFCGroomingStationRecipes(event)
registerTFCTextileRecipes(event) registerTFGRecipes(event)
registerToolBeltRecipes(event) registerTFCTextileRecipes(event)
registerTreeTapRecipes(event) registerToolBeltRecipes(event)
registerVintageImprovementsRecipes(event) registerTreeTapRecipes(event)
registerWaterFlasksRecipes(event) registerVintageImprovementsRecipes(event)
registerWaterFlasksRecipes(event)
}) })

11
kubejs/server_scripts/sophisticated_backpacks/data.js Normal file
View file

@ -0,0 +1,11 @@
// priority: 0
function registerTFCDataForSophisticatedBackpacks(event) {
event.itemSize('sophisticatedbackpacks:backpack', 'very_large', 'very_heavy', 'backpack_size')
event.itemSize('sophisticatedbackpacks:iron_backpack', 'very_large', 'very_heavy', 'iron_backpack_size')
event.itemSize('sophisticatedbackpacks:gold_backpack', 'very_large', 'very_heavy', 'gold_backpack_size')
event.itemSize('sophisticatedbackpacks:diamond_backpack', 'very_large', 'very_heavy', 'diamond_backpack_size')
event.itemSize('sophisticatedbackpacks:netherite_backpack', 'very_large', 'very_heavy', 'netherite_backpack_size')
}

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

@ -186,11 +186,6 @@ const registerTFCKnappingTypes = (event) => {
//#region registerTFCItemSize //#region registerTFCItemSize
const registerTFCItemSize = (event) => { const registerTFCItemSize = (event) => {
event.itemSize('sophisticatedbackpacks:backpack', 'very_large', 'very_heavy', 'backpack_size')
event.itemSize('sophisticatedbackpacks:iron_backpack', 'very_large', 'very_heavy', 'iron_backpack_size')
event.itemSize('sophisticatedbackpacks:gold_backpack', 'very_large', 'very_heavy', 'gold_backpack_size')
event.itemSize('sophisticatedbackpacks:diamond_backpack', 'very_large', 'very_heavy', 'diamond_backpack_size')
event.itemSize('sophisticatedbackpacks:netherite_backpack', 'very_large', 'very_heavy', 'netherite_backpack_size')
global.MINECRAFT_DYE_NAMES.forEach (color => { global.MINECRAFT_DYE_NAMES.forEach (color => {
event.itemSize(`tfg:decorative_vase/${color}`, 'normal', 'medium', `decorative_vase/${color}`) event.itemSize(`tfg:decorative_vase/${color}`, 'normal', 'medium', `decorative_vase/${color}`)

8
kubejs/server_scripts/tfclunchbox/data.js Normal file
View file

@ -0,0 +1,8 @@
// priority: 0
function registerTFCDataForTFCLunchbox(event) {
event.itemSize('tfclunchbox:lunchbox', 'large', 'heavy', 'lunchbox_size')
event.itemSize('tfclunchbox:cooling_lunchbox', 'large', 'heavy', 'cooling_lunchbox_size')
}

59
kubejs/server_scripts/tfclunchbox/recipes.js Normal file
View file

@ -0,0 +1,59 @@
// priority: 0
function registerTFCLunchBoxRecipes(event) {
event.shaped('tfclunchbox:lunchbox', [
' CE',
'ABA',
'DAD'
], {
A: '#forge:plates/sterling_silver',
B: '#forge:chests/wooden',
C: '#forge:bolts/brass',
D: '#forge:screws/wrought_iron',
E: '#forge:tools/hammers'
}).id('tfclunchbox:lunchbox')
event.shaped('tfclunchbox:cooling_lunchbox', [
' CE',
'ABA',
'DAD'
], {
A: '#forge:plates/red_steel',
B: '#forge:chests/wooden',
C: '#forge:bolts/brass',
D: '#forge:screws/steel',
E: '#forge:tools/hammers'
}).id('tfclunchbox:cooling_lunchbox')
event.shaped('tfclunchbox:cooling_lunchbox', [
' C ',
'ABA'
], {
A: '#forge:plates/red_steel',
B: 'tfclunchbox:lunchbox',
C: '#forge:tools/hammers'
}).id('tfclunchbox:upgrade_to_cooling_lunchbox')
event.remove({ id: 'tfclunchbox:universal_capsule' })
event.remove({ id: 'tfclunchbox:fill_capsule_with_ice' })
event.recipes.gtceu.assembler('tfclunchbox:universal_capsule')
.itemInputs('1x #forge:foils/red_steel', '1x #forge:rings/sterling_silver')
.itemOutputs('tfclunchbox:universal_capsule')
.duration(100)
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice')
.itemInputs('tfclunchbox:universal_capsule')
.inputFluids(Fluid.of('gtceu:ice', 45 * 144))
.itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:500}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled')))
.duration(100)
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice_solid')
.itemInputs('tfclunchbox:universal_capsule', '5x minecraft:packed_ice')
.itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:500}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled')))
.duration(100)
.EUt(GTValues.VA[GTValues.LV])
}

7
kubejs/server_scripts/tfg/recipes.miscellaneous.js
View file

@ -253,6 +253,13 @@ function registerTFGMiscellaneousRecipes(event) {
.duration(20) .duration(20)
.EUt(GTValues.VA[GTValues.ULV]) .EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.fluid_solidifier('tfg:ice')
.inputFluids(Fluid.of('minecraft:water', 144))
.notConsumable('gtceu:block_casting_mold')
.itemOutputs('minecraft:ice')
.duration(200)
.EUt(GTValues.VA[GTValues.LV])
event.shapeless('4x firmalife:ice_shavings', ['#forge:dusts/ice', '#forge:tools/hammers']) event.shapeless('4x firmalife:ice_shavings', ['#forge:dusts/ice', '#forge:tools/hammers'])
// Cooling water // Cooling water

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

@ -575,21 +575,21 @@ function registerVintageImprovementsRecipes(event) {
event.custom({ event.custom({
type: 'vintageimprovements:vacuumizing', type: 'vintageimprovements:vacuumizing',
ingredients: [{ tag: 'tfg:latex_logs' }], ingredients: [{ tag: 'tfg:latex_logs' }],
results: [{ fluid: 'tfg:latex', amount: 250 }], results: [{ fluid: 'tfg:latex', amount: 100 }],
processingTime: 600 processingTime: 600
}).id('tfg:vi/vacuumizing/latex_from_rubber_logs') }).id('tfg:vi/vacuumizing/latex_from_rubber_logs')
event.custom({ event.custom({
type: 'vintageimprovements:vacuumizing', type: 'vintageimprovements:vacuumizing',
ingredients: [{ tag: 'tfg:rubber_saplings' }], ingredients: [{ tag: 'tfg:rubber_saplings' }],
results: [{ fluid: 'tfg:latex', amount: 100 }], results: [{ fluid: 'tfg:latex', amount: 25 }],
processingTime: 300 processingTime: 300
}).id('tfg:vi/vacuumizing/latex_from_rubber_sapling') }).id('tfg:vi/vacuumizing/latex_from_rubber_sapling')
event.custom({ event.custom({
type: 'vintageimprovements:vacuumizing', type: 'vintageimprovements:vacuumizing',
ingredients: [{ tag: 'tfg:rubber_leaves' }], ingredients: [{ tag: 'tfg:rubber_leaves' }],
results: [{ fluid: 'tfg:latex', amount: 50 }], results: [{ fluid: 'tfg:latex', amount: 10 }],
processingTime: 150 processingTime: 150
}).id('tfg:vi/vacuumizing/latex_from_rubber_leaves') }).id('tfg:vi/vacuumizing/latex_from_rubber_leaves')

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

@ -39,7 +39,8 @@ const registerGTCEuMaterialModification = (event) => {
GENERATE_FRAME, GENERATE_FRAME,
GENERATE_PLATE, GENERATE_PLATE,
GENERATE_DENSE, GENERATE_DENSE,
GENERATE_RING GENERATE_RING,
GENERATE_FOIL
} = $MATERIAL_FLAGS } = $MATERIAL_FLAGS
var metalTooling = [ var metalTooling = [
@ -196,7 +197,7 @@ const registerGTCEuMaterialModification = (event) => {
GTMaterials.Nickel.addFlags(GENERATE_ROD, GENERATE_LONG_ROD); GTMaterials.Nickel.addFlags(GENERATE_ROD, GENERATE_LONG_ROD);
GTMaterials.BlackSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW); GTMaterials.BlackSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW);
GTMaterials.BlueSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW); GTMaterials.BlueSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW);
GTMaterials.RedSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW); GTMaterials.RedSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW, GENERATE_FOIL);
GTMaterials.WroughtIron.addFlags(GENERATE_ROTOR, GENERATE_SPRING, GENERATE_SMALL_GEAR); GTMaterials.WroughtIron.addFlags(GENERATE_ROTOR, GENERATE_SPRING, GENERATE_SMALL_GEAR);
GTMaterials.Copper.addFlags(GENERATE_BOLT_SCREW); GTMaterials.Copper.addFlags(GENERATE_BOLT_SCREW);
@ -257,6 +258,12 @@ const registerGTCEuMaterialModification = (event) => {
GTMaterials.Galena.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.INHALATION, GTMedicalConditions.WEAK_POISON, 1, false)); GTMaterials.Galena.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.INHALATION, GTMedicalConditions.WEAK_POISON, 1, false));
GTMaterials.Chromite.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.SKIN_CONTACT, GTMedicalConditions.IRRITANT, 1, false)); GTMaterials.Chromite.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.SKIN_CONTACT, GTMedicalConditions.IRRITANT, 1, false));
// Make these the lowest tier of EBF instead
GTMaterials.BlackSteel.getProperty(PropertyKey.BLAST).setBlastTemperature(1000)
GTMaterials.RedSteel.getProperty(PropertyKey.BLAST).setBlastTemperature(1000)
GTMaterials.BlueSteel.getProperty(PropertyKey.BLAST).setBlastTemperature(1000)
// Change byproducts so you can't get certus from normal quartzite
GTMaterials.Quartzite.getProperty(PropertyKey.ORE).setOreByProducts(GTMaterials.NetherQuartz, GTMaterials.Barite, GTMaterials.NetherQuartz); GTMaterials.Quartzite.getProperty(PropertyKey.ORE).setOreByProducts(GTMaterials.NetherQuartz, GTMaterials.Barite, GTMaterials.NetherQuartz);
GTMaterials.CertusQuartz.getProperty(PropertyKey.ORE).setOreByProducts(GTMaterials.CertusQuartz, GTMaterials.Quartzite, GTMaterials.CertusQuartz); GTMaterials.CertusQuartz.getProperty(PropertyKey.ORE).setOreByProducts(GTMaterials.CertusQuartz, GTMaterials.Quartzite, GTMaterials.CertusQuartz);

175
pakku-lock.json
View file

@ -314,7 +314,7 @@
"files": [ "files": [
{ {
"type": "curseforge", "type": "curseforge",
"file_name": "AdvancedPeripherals-1.20.1-0.7.43r.jar", "file_name": "AdvancedPeripherals-1.20.1-0.7.44r.jar",
"mc_versions": [ "mc_versions": [
"1.20.1" "1.20.1"
], ],
@ -323,18 +323,18 @@
"forge" "forge"
], ],
"release_type": "release", "release_type": "release",
"url": "https://edge.forgecdn.net/files/6577/898/AdvancedPeripherals-1.20.1-0.7.43r.jar", "url": "https://edge.forgecdn.net/files/6623/216/AdvancedPeripherals-1.20.1-0.7.44r.jar",
"id": "6577898", "id": "6623216",
"parent_id": "431725", "parent_id": "431725",
"hashes": { "hashes": {
"sha1": "a6f544738d3c0bb38712dededf12d0e80bd357c7", "sha1": "7dd9807debcc9eb475bc67a5156bca19a7b46578",
"md5": "3b54478098221219b35146ceac7c6133" "md5": "8731f8e8503a6e7a5f9f87d59b96d13e"
}, },
"required_dependencies": [ "required_dependencies": [
"282001" "282001"
], ],
"size": 885577, "size": 885693,
"date_published": "2025-05-26T17:39:08.747Z" "date_published": "2025-06-06T22:01:06.353Z"
} }
] ]
}, },
@ -474,7 +474,7 @@
"files": [ "files": [
{ {
"type": "curseforge", "type": "curseforge",
"file_name": "appliedenergistics2-forge-15.4.4.jar", "file_name": "appliedenergistics2-forge-15.4.5.jar",
"mc_versions": [ "mc_versions": [
"1.20.1" "1.20.1"
], ],
@ -482,18 +482,18 @@
"forge" "forge"
], ],
"release_type": "release", "release_type": "release",
"url": "https://edge.forgecdn.net/files/6605/410/appliedenergistics2-forge-15.4.4.jar", "url": "https://edge.forgecdn.net/files/6629/570/appliedenergistics2-forge-15.4.5.jar",
"id": "6605410", "id": "6629570",
"parent_id": "223794", "parent_id": "223794",
"hashes": { "hashes": {
"sha1": "8660d742d2f8d8b7bdadae76e84144587811e9d2", "sha1": "7ee55608d1625ec1fb22d60bd73aa31fe80cc896",
"md5": "74cc19c79dd5dbfa3e511597c7fc0592" "md5": "92d85cc2573550525f9b9a647f9f8459"
}, },
"required_dependencies": [ "required_dependencies": [
"1173950" "1173950"
], ],
"size": 8413070, "size": 8413069,
"date_published": "2025-06-01T14:46:39.523Z" "date_published": "2025-06-08T13:24:02.623Z"
} }
] ]
}, },
@ -552,7 +552,7 @@
"files": [ "files": [
{ {
"type": "curseforge", "type": "curseforge",
"file_name": "afc-1.0.17-1.20.1.jar", "file_name": "afc-1.0.18-1.20.1.jar",
"mc_versions": [ "mc_versions": [
"1.20.1" "1.20.1"
], ],
@ -561,18 +561,18 @@
"forge" "forge"
], ],
"release_type": "release", "release_type": "release",
"url": "https://edge.forgecdn.net/files/6549/467/afc-1.0.17-1.20.1.jar", "url": "https://edge.forgecdn.net/files/6635/351/afc-1.0.18-1.20.1.jar",
"id": "6549467", "id": "6635351",
"parent_id": "877545", "parent_id": "877545",
"hashes": { "hashes": {
"sha1": "abd0379e85da6bce0e47341a5f51909cc57e1744", "sha1": "c2cfffcce7ff7c1c978326a674389fcbdfb61fd4",
"md5": "701563a64374eb0825c54e063fdd407d" "md5": "cb8183be65ca88c20b111e9ae9083dd7"
}, },
"required_dependencies": [ "required_dependencies": [
"302973" "302973"
], ],
"size": 5105665, "size": 5117468,
"date_published": "2025-05-20T04:37:38.210Z" "date_published": "2025-06-10T03:09:58.637Z"
} }
] ]
}, },
@ -807,6 +807,45 @@
} }
] ]
}, },
{
"pakku_id": "oKnJXlzNyfYcMTcv",
"type": "MOD",
"slug": {
"curseforge": "baguettelib"
},
"name": {
"curseforge": "BaguetteLib"
},
"id": {
"curseforge": "1264423"
},
"files": [
{
"type": "curseforge",
"file_name": "baguettelib-1.20.1-Forge-1.0.0.jar",
"mc_versions": [
"1.20.2",
"1.20.3",
"1.20.1",
"1.20.4"
],
"loaders": [
"forge"
],
"release_type": "release",
"url": "https://edge.forgecdn.net/files/6523/425/baguettelib-1.20.1-Forge-1.0.0.jar",
"id": "6523425",
"parent_id": "1264423",
"hashes": {
"sha1": "bb17d8ed796efce38eb8fcc72ec477f3373e6c9f",
"md5": "f27a8d6a333579d93a9881100d559b56"
},
"required_dependencies": [],
"size": 26550,
"date_published": "2025-05-12T19:47:40.637Z"
}
]
},
{ {
"pakku_id": "eIMAkTQ4QJiCSZSg", "pakku_id": "eIMAkTQ4QJiCSZSg",
"type": "MOD", "type": "MOD",
@ -1944,7 +1983,7 @@
"files": [ "files": [
{ {
"type": "curseforge", "type": "curseforge",
"file_name": "corpse-forge-1.20.1-1.0.20.jar", "file_name": "corpse-forge-1.20.1-1.0.21.jar",
"mc_versions": [ "mc_versions": [
"1.20.1" "1.20.1"
], ],
@ -1952,21 +1991,24 @@
"forge" "forge"
], ],
"release_type": "release", "release_type": "release",
"url": "https://edge.forgecdn.net/files/6121/243/corpse-forge-1.20.1-1.0.20.jar", "url": "https://edge.forgecdn.net/files/6624/394/corpse-forge-1.20.1-1.0.21.jar",
"id": "6121243", "id": "6624394",
"parent_id": "316582", "parent_id": "316582",
"hashes": { "hashes": {
"sha1": "fc5cd03dd52f24467c879b44296ddc70b85398f4", "sha1": "fb68fba706e0a41f1e46492e0d54fde4945b8a05",
"md5": "143d3e76139de3b9186849f494a41af6" "md5": "346a9e592558c1fde772b39c10be4cdf"
}, },
"required_dependencies": [], "required_dependencies": [],
"size": 244994, "size": 245618,
"date_published": "2025-01-24T21:52:45.963Z" "date_published": "2025-06-07T07:02:24.647Z"
} }
] ]
}, },
{ {
"pakku_id": "v5lo2gHNUaKnn445", "pakku_id": "v5lo2gHNUaKnn445",
"pakku_links": [
"oKnJXlzNyfYcMTcv"
],
"type": "MOD", "type": "MOD",
"slug": { "slug": {
"curseforge": "corpse-x-curios-api-compat" "curseforge": "corpse-x-curios-api-compat"
@ -1980,28 +2022,31 @@
"files": [ "files": [
{ {
"type": "curseforge", "type": "curseforge",
"file_name": "corpsecurioscompat-1.18.x-1.20.x-Forge-2.2.2.jar", "file_name": "corpsecurioscompat-1.20.x-Forge-3.0.2.jar",
"mc_versions": [ "mc_versions": [
"1.20.2", "1.20.2",
"1.20.3", "1.20.3",
"1.20.1", "1.20.1",
"1.20",
"1.20.4" "1.20.4"
], ],
"loaders": [ "loaders": [
"forge" "forge"
], ],
"release_type": "release", "release_type": "release",
"url": "https://edge.forgecdn.net/files/6327/919/corpsecurioscompat-1.18.x-1.20.x-Forge-2.2.2.jar", "url": "https://edge.forgecdn.net/files/6616/671/corpsecurioscompat-1.20.x-Forge-3.0.2.jar",
"id": "6327919", "id": "6616671",
"parent_id": "1138130", "parent_id": "1138130",
"hashes": { "hashes": {
"sha1": "1e00db91b74287eb63f389c6c8cb5a70df41f8e0", "sha1": "946d6cc5055eac39900ff252cd2eb72caf95e4ac",
"md5": "82d54c35a60a963f292dc3f3fd3b3af2" "md5": "f760be75a5b1c4c22c9327e72cd08a2c"
}, },
"required_dependencies": [], "required_dependencies": [
"size": 9117, "309927",
"date_published": "2025-03-21T09:35:57.857Z" "1264423",
"316582"
],
"size": 12495,
"date_published": "2025-06-05T08:45:11.493Z"
} }
] ]
}, },
@ -4636,7 +4681,7 @@
"files": [ "files": [
{ {
"type": "curseforge", "type": "curseforge",
"file_name": "guideme-20.1.7.jar", "file_name": "guideme-20.1.8.jar",
"mc_versions": [ "mc_versions": [
"1.20.1" "1.20.1"
], ],
@ -4644,16 +4689,16 @@
"forge" "forge"
], ],
"release_type": "release", "release_type": "release",
"url": "https://edge.forgecdn.net/files/6489/464/guideme-20.1.7.jar", "url": "https://edge.forgecdn.net/files/6634/593/guideme-20.1.8.jar",
"id": "6489464", "id": "6634593",
"parent_id": "1173950", "parent_id": "1173950",
"hashes": { "hashes": {
"sha1": "fc039093c479b3632b1ab60ea503e79b76b686f9", "sha1": "cc5e96b09949c5f1ad5d6aa5c45695f760715e95",
"md5": "01ca90ca84ab2f886e4c5a2101934d00" "md5": "38d8791dc9114d9cf6bcd5f2af1402e7"
}, },
"required_dependencies": [], "required_dependencies": [],
"size": 9401162, "size": 9401167,
"date_published": "2025-05-03T00:27:09.520Z" "date_published": "2025-06-09T21:54:55.087Z"
} }
] ]
}, },
@ -8049,6 +8094,48 @@
} }
] ]
}, },
{
"pakku_id": "B9nXYwWrLGp1WG43",
"pakku_links": [
"fMkiGcRPRv1DdRC1"
],
"type": "MOD",
"slug": {
"curseforge": "tfc-lunch-box"
},
"name": {
"curseforge": "TFC Lunch Box"
},
"id": {
"curseforge": "1283445"
},
"files": [
{
"type": "curseforge",
"file_name": "tfclunchbox-1.20.1-1.0.0.10.jar",
"mc_versions": [
"1.20.1"
],
"loaders": [
"neoforge",
"forge"
],
"release_type": "beta",
"url": "https://edge.forgecdn.net/files/6633/524/tfclunchbox-1.20.1-1.0.0.10.jar",
"id": "6633524",
"parent_id": "1283445",
"hashes": {
"sha1": "0b3dd4ed090848d136fc15586f5fb8212f1f19b0",
"md5": "c8835a37c829f86448b87601ac58cf9b"
},
"required_dependencies": [
"302973"
],
"size": 93079,
"date_published": "2025-06-09T15:46:48.850Z"
}
]
},
{ {
"pakku_id": "O9o4v50wMwsyPZeQ", "pakku_id": "O9o4v50wMwsyPZeQ",
"pakku_links": [ "pakku_links": [