Skip to content

Commit ddd4fad

Browse files
RedeixRedeix
authored
Balancing (#2254)
* moon cheese nutrition * carboard * tool rack and fluid heat * wax * wax 2 * tool rack 2 * broken * changelog
1 parent 0abf0c3 commit ddd4fad

File tree

9 files changed

+114
-60
lines changed

9 files changed

+114
-60
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
# Changelog
22
## [Unreleased]
33
### Changes
4+
- Add shapeless p2p recipes (#2234) @SpicyNoodle5
5+
- Added assembler, smelting and heating recipes for firmalife ovens (#2220) @SpicyNoodle5
6+
- Raised burning fluid threshold from 370K to 1300K @Redeix
7+
- Added partial unification to the gtceu wax material @Redeix
48
### Bug fixes
59
- Fixed brown gravy recipe @Redeix
10+
- Fixed instant mac recipe requiring less cardboard than it gives back @Redeix
11+
- Fixed Ad Astra moon cheese nutrition values being inconsistent @Redeix
612
### Translation updates
713

814
## [0.11.8] - 19-11-2025

‎kubejs/server_scripts/ad_astra/data.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ function registerTFCDataForAdAstra(event) {
1313
event.itemSize('ad_astra:launch_pad', 'very_large', 'very_heavy')
1414

1515
event.foodItem('ad_astra:cheese', food => {
16-
food.hunger(4)
17-
food.saturation(12)
18-
food.dairy(5)
19-
food.decayModifier(10)
16+
food.hunger(3)
17+
food.saturation(3)
18+
food.dairy(1.2)
19+
food.decayModifier(0.9)
2020
})
2121

2222
global.AD_ASTRA_WOOD.forEach(wood => {

‎kubejs/server_scripts/gregtech/recipes.removes.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,8 @@ function removeGTCEURecipes(event) {
659659
event.remove({ id: 'gtceu:assembler/assemble_purpur_into_stair' })
660660
event.remove({ id: 'gtceu:assembler/stonecutter' })
661661

662+
event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__blaze' })
663+
662664
event.remove({ id: 'gtceu:chemical_reactor/ghast_tear_separation' })
663665

664666
event.remove({ id: 'gtceu:assembler/assemble_brick_into_stair' })

‎kubejs/server_scripts/gregtech/tags.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ function registerGTCEUItemTags(event) {
5757

5858
// @ts-expect-error According to KJS docs adding tags to tags is supported.
5959
event.add("gtceu:molds", "#gtceu:casting_molds", "#gtceu:extruder_molds", "gtceu:empty_mold");
60+
61+
event.add('forge:wax', 'gtceu:wax_dust');
6062
}
6163

6264
/** @param {TagEvent.Block} event */

‎kubejs/server_scripts/tfc/tags.js‎

Lines changed: 65 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -18,51 +18,70 @@ function registerTFCItemTags(event) {
1818
}
1919
});
2020

21-
event.add("tfc:usable_on_tool_rack", "#forge:tools/mining_hammers");
22-
event.add("tfc:usable_on_tool_rack", "#forge:tools/spades");
23-
event.add("tfc:usable_on_tool_rack", "#forge:tools/wrenches");
24-
event.add("tfc:usable_on_tool_rack", "#forge:tools/files");
25-
event.add("tfc:usable_on_tool_rack", "#forge:tools/crowbars");
26-
event.add("tfc:usable_on_tool_rack", "#forge:tools/screwdrivers");
27-
event.add("tfc:usable_on_tool_rack", "#forge:tools/wire_cutters");
28-
event.add("tfc:usable_on_tool_rack", "#forge:tools/butchery_knives");
29-
event.add("tfc:usable_on_tool_rack", "#forge:tools/plungers");
30-
event.add("tfc:usable_on_tool_rack", "#forge:tools/mortars");
31-
event.add("tfc:usable_on_tool_rack", "#forge:tools/mallets");
32-
33-
event.add("tfc:usable_on_tool_rack", "#forge:tools/chainsaws");
34-
event.add("tfc:usable_on_tool_rack", "#forge:tools/buzzsaws");
35-
event.add("tfc:usable_on_tool_rack", "#forge:tools/drills");
36-
37-
event.add("tfc:usable_on_tool_rack", "#forge:tools/fishing_nets");
38-
39-
event.add("tfc:usable_on_tool_rack", "#tfc:buckets");
40-
41-
event.add("tfc:usable_on_tool_rack", "buildinggadgets2:gadget_building");
42-
event.add("tfc:usable_on_tool_rack", "buildinggadgets2:gadget_exchanging");
43-
event.add("tfc:usable_on_tool_rack", "buildinggadgets2:gadget_copy_paste");
44-
event.add("tfc:usable_on_tool_rack", "buildinggadgets2:gadget_cut_paste");
45-
event.add("tfc:usable_on_tool_rack", "buildinggadgets2:gadget_destruction");
46-
event.add("tfc:usable_on_tool_rack", "create:super_glue");
47-
event.add("tfc:usable_on_tool_rack", "exposure:camera");
48-
event.add("tfc:usable_on_tool_rack", "measurements:tape_measure");
49-
event.add("tfc:usable_on_tool_rack", "#chalk:chalks");
50-
event.add("tfc:usable_on_tool_rack", "chalk:chalk_box");
51-
event.add("tfc:usable_on_tool_rack", "computercraft:pocket_computer_normal");
52-
event.add("tfc:usable_on_tool_rack", "computercraft:pocket_computer_advanced");
53-
event.add("tfc:usable_on_tool_rack", "grapplemod:grapplinghook");
54-
event.add("tfc:usable_on_tool_rack", "grapplemod:launcheritem");
55-
event.add("tfc:usable_on_tool_rack", "ae2:color_applicator");
56-
event.add("tfc:usable_on_tool_rack", "ae2:matter_cannon");
57-
event.add("tfc:usable_on_tool_rack", "ae2:network_tool");
58-
event.add("tfc:usable_on_tool_rack", "ae2:wireless_terminal");
59-
event.add("tfc:usable_on_tool_rack", "ae2:wireless_crafting_terminal");
60-
event.add("tfc:usable_on_tool_rack", "waterflasks:leather_flask");
61-
event.add("tfc:usable_on_tool_rack", "waterflasks:iron_flask");
62-
event.add("tfc:usable_on_tool_rack", "waterflasks:red_steel_flask");
63-
event.add("tfc:usable_on_tool_rack", "tfc:wool_cloth");
64-
event.add("tfc:usable_on_tool_rack", "firmalife:mixing_bowl");
65-
event.add("tfc:usable_on_tool_rack", "#gtceu:molds");
21+
/**
22+
* @type {string[]} - Item IDs and tags usable on tfc tool racks.
23+
*/
24+
const usableOnToolRack = [
25+
"#forge:tools/mining_hammers",
26+
"#forge:tools/spades",
27+
"#forge:tools/wrenches",
28+
"#forge:tools/files",
29+
"#forge:tools/crowbars",
30+
"#forge:tools/screwdrivers",
31+
"#forge:tools/wire_cutters",
32+
"#forge:tools/butchery_knives",
33+
"#forge:tools/plungers",
34+
"#forge:tools/mortars",
35+
"#forge:tools/mallets",
36+
"#forge:tools/chainsaws",
37+
"#forge:tools/buzzsaws",
38+
"#forge:tools/drills",
39+
"#forge:tools/fishing_nets",
40+
"#tfc:buckets",
41+
"buildinggadgets2:gadget_building",
42+
"buildinggadgets2:gadget_exchanging",
43+
"buildinggadgets2:gadget_copy_paste",
44+
"buildinggadgets2:gadget_cut_paste",
45+
"buildinggadgets2:gadget_destruction",
46+
"create:super_glue",
47+
"exposure:camera",
48+
"measurements:tape_measure",
49+
"#chalk:chalks",
50+
"chalk:chalk_box",
51+
"computercraft:pocket_computer_normal",
52+
"computercraft:pocket_computer_advanced",
53+
"grapplemod:grapplinghook",
54+
"grapplemod:launcheritem",
55+
"ae2:color_applicator",
56+
"ae2:matter_cannon",
57+
"ae2:network_tool",
58+
"ae2:wireless_terminal",
59+
"ae2:wireless_crafting_terminal",
60+
"waterflasks:leather_flask",
61+
"waterflasks:iron_flask",
62+
"waterflasks:red_steel_flask",
63+
"tfc:wool_cloth",
64+
"firmalife:mixing_bowl",
65+
"#gtceu:molds",
66+
"#gtceu:molds",
67+
"create:wrench",
68+
"framedblocks:framed_screwdriver",
69+
"framedblocks:framed_wrench",
70+
"framedblocks:framed_hammer",
71+
"framedblocks:framed_key",
72+
"mcw_tfc_aio:roofing_hammer",
73+
"tfclunchbox:lunchbox",
74+
"tfclunchbox:cooling_lunchbox",
75+
"tfclunchbox:electric_lunchbox",
76+
"primitive_creatures:yhgi",
77+
"primitive_creatures:reh",
78+
"species:harpoon",
79+
"species:crankbow",
80+
"tfg:trowel"
81+
];
82+
usableOnToolRack.forEach((entry) => {
83+
event.add("tfc:usable_on_tool_rack", entry);
84+
});
6685

6786
// Ингредиенты для закваски
6887
event.add("tfg:ferments_to_rennet", "tfc:food/soybean");
@@ -611,7 +630,7 @@ function registerTFCFluidTags(event) {
611630
event.add("tfc:usable_in_red_steel_bucket", idStr);
612631
}
613632
// Burns ya.
614-
if (temp >= 370) {
633+
if (temp >= 1300) {
615634
event.add("tfchotornot:hot_whitelist", idStr);
616635
}
617636
// Blue steel: can do heat, can't do cryo.

‎kubejs/server_scripts/tfg/recipes.food.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1618,7 +1618,7 @@ function registerTFGFoodRecipes(event) {
16181618

16191619
// Instant Mac
16201620
processorRecipe('raw_instant_mac', 20 * 10, GTValues.VA[GTValues.LV], {
1621-
itemInputs: ['firmalife:food/raw_egg_noodles', '#tfg:foods/cheeses', 'create:cardboard'],
1621+
itemInputs: ['firmalife:food/raw_egg_noodles', '#tfg:foods/cheeses', '2x create:cardboard'],
16221622
itemOutputs: ['2x tfg:food/raw_instant_mac'],
16231623
fluidInputs: ['gtceu:polyethylene 100'],
16241624
itemOutputProvider: TFC.isp.of('2x tfg:food/raw_instant_mac').copyFood()

‎kubejs/server_scripts/tfg/recipes.miscellaneous.js‎

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ function registerTFGMiscellaneousRecipes(event) {
759759
A: 'tfg:soaked_hardwood_strip',
760760
B: ChemicalHelper.get(TagPrefix.bolt, GTMaterials.SterlingSilver, 1),
761761
C: 'tfc:glue',
762-
D: ChemicalHelper.get(TagPrefix.rodLong, GTMaterials.TreatedWood, 1),
762+
D: ChemicalHelper.get(TagPrefix.rodLong, GTMaterials.TreatedWood, 1)
763763
}).id('tfg:shaped/harvest_basket_from_wood')
764764

765765
event.recipes.gtceu.assembler('tfg:assembler/harvest_basket_from_wood')
@@ -781,7 +781,7 @@ function registerTFGMiscellaneousRecipes(event) {
781781
A: 'tfc:soaked_papyrus_strip',
782782
B: ChemicalHelper.get(TagPrefix.bolt, GTMaterials.SterlingSilver, 1),
783783
C: 'tfc:glue',
784-
D: ChemicalHelper.get(TagPrefix.rodLong, GTMaterials.TreatedWood, 1),
784+
D: ChemicalHelper.get(TagPrefix.rodLong, GTMaterials.TreatedWood, 1)
785785
}).id('tfg:shaped/harvest_basket_from_papyrus')
786786

787787
event.recipes.gtceu.assembler('tfg:assembler/harvest_basket_from_papyrus')
@@ -877,7 +877,7 @@ function registerTFGMiscellaneousRecipes(event) {
877877
'AAA',
878878
'AAA'
879879
], {
880-
A: 'tfg:aes_insulation_sheet',
880+
A: 'tfg:aes_insulation_sheet'
881881
}).id('tfg:shaped/aes_insulation_roll')
882882

883883
event.recipes.gtceu.assembler('tfg:aes_insulation_sheet')
@@ -1553,5 +1553,36 @@ function registerTFGMiscellaneousRecipes(event) {
15531553
.EUt(GTValues.VA[GTValues.LV])
15541554
});
15551555
TFGHelpers.registerMaterialInfo('tfg:rnr_plow', {'cobalt_brass': 5, 'invar': 2, 'steel': 2, 'wrought_iron': 2, 'rubber': 1, 'treated_wood': 1});
1556+
1557+
//#endregion
1558+
//#region Wax Unification
1559+
1560+
// Recipe Removals
1561+
event.remove({id: 'gtceu:extractor/extract_honeycomb_block'});
1562+
event.remove({id: 'gtceu:extractor/extract_honeycomb'});
1563+
event.remove({id: 'gtceu:extractor/extract_wax_dust'});
1564+
1565+
// Extractor Recipe
1566+
event.recipes.gtceu.extractor('tfg:wax_melting')
1567+
.itemInputs(Ingredient.of('#forge:wax'))
1568+
.outputFluids(Fluid.of('gtceu:wax', 144))
1569+
.duration(20*5)
1570+
.EUt(GTValues.VA[GTValues.LV])
1571+
.category(GTRecipeCategories.EXTRACTOR_RECYCLING);
1572+
1573+
event.recipes.gtceu.extractor('tfg:tiny_wax_dust_melting')
1574+
.itemInputs(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Wax, 1))
1575+
.outputFluids(Fluid.of('gtceu:wax', 16))
1576+
.duration(10)
1577+
.EUt(GTValues.VA[GTValues.LV])
1578+
.category(GTRecipeCategories.EXTRACTOR_RECYCLING);
1579+
1580+
event.recipes.gtceu.extractor('tfg:small_wax_dust_melting')
1581+
.itemInputs(ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Wax, 1))
1582+
.outputFluids(Fluid.of('gtceu:wax', 36))
1583+
.duration(20)
1584+
.EUt(GTValues.VA[GTValues.LV])
1585+
.category(GTRecipeCategories.EXTRACTOR_RECYCLING);
1586+
15561587
//#endregion
15571588
}

‎kubejs/server_scripts/tfg/tags.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ const registerTFGItemTags = (event) => {
9090
event.add('minecraft:piglin_loved', 'tfg:piglin_disguise')
9191

9292
event.add('forge:tools/trowels', 'tfg:trowel')
93-
event.add('tfc:usable_on_tool_rack', 'tfg:trowel')
9493

9594
event.add('tfg:harvester', 'tfg:harvest_basket')
9695
event.add('tfg:harvester', 'tfg:aluminium_harvest_basket')

‎kubejs/startup_scripts/gtceu/constants.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,6 @@ global.GTCEU_DISABLED_ITEMS = /** @type {const} */ ([
156156
"gtceu:titanium_leggings",
157157
"gtceu:titanium_boots",
158158

159-
// Huh
160-
"gtceu:wax_dust",
161-
"gtceu:small_wax_dust",
162-
"gtceu:tiny_wax_dust",
163-
164159
// Sculk
165160
"gtceu:tiny_echo_shard_dust",
166161
"gtceu:small_echo_shard_dust",

0 commit comments

Comments
 (0)