From 9479e233091af586dbf86b0d581b256abeefe0a8 Mon Sep 17 00:00:00 2001 From: theMegaTech <36931007+theMegaTech@users.noreply.github.com> Date: Thu, 30 Oct 2025 05:44:52 +0200 Subject: [PATCH 1/4] syrup buff (#2126) * tapping recipes Signed-off-by: theMegaTech <36931007+theMegaTech@users.noreply.github.com> * update the field guide Signed-off-by: theMegaTech <36931007+theMegaTech@users.noreply.github.com> --------- Signed-off-by: theMegaTech <36931007+theMegaTech@users.noreply.github.com> --- .../arborfirmacraft/tapping_index.json | 4 ++-- kubejs/server_scripts/afc/recipes.js | 20 ++++++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/arborfirmacraft/tapping_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/arborfirmacraft/tapping_index.json index ba02fe550..ad4a1d409 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/arborfirmacraft/tapping_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/arborfirmacraft/tapping_index.json @@ -18,7 +18,7 @@ "title": "Maple", "item": "tfc:wood/log/maple,tfc:wood/wood/maple,tfc:wood/leaves/maple,tfc:wood/sapling/maple", "link_recipe": false, - "text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): -8.4°C$(br)$(thing)Maximum Temperature$(): 8°C$(br)$(thing)Minimum Rainfall$(): 240$(br)$(thing)Maximum Rainfall$(): 470$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): -4°C$(br)$(thing)Max Temp for Production$(): 6°C$(br)$(thing)Spring Exclusive$(): Yes$(br)$(thing)Flow Rate$(): 5mb" + "text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): -8.4°C$(br)$(thing)Maximum Temperature$(): 8°C$(br)$(thing)Minimum Rainfall$(): 240$(br)$(thing)Maximum Rainfall$(): 470$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): -15°C$(br)$(thing)Max Temp for Production$(): 5°C$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 5mb" }, { "type": "patchouli:image", @@ -32,7 +32,7 @@ "title": "Birch", "item": "tfc:wood/log/birch,tfc:wood/wood/birch,tfc:wood/leaves/birch,tfc:wood/sapling/birch", "link_recipe": false, - "text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): -12.1°C$(br)$(thing)Maximum Temperature$(): 6.1°C$(br)$(thing)Minimum Rainfall$(): 125$(br)$(thing)Maximum Rainfall$(): 310$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): -4°C$(br)$(thing)Max Temp for Production$(): 6°C$(br)$(thing)Spring Exclusive$(): Yes$(br)$(thing)Flow Rate$(): 5mb" + "text": "$(bold)Climate Data$()$(br)$(thing)Minimum Temperature$(): -12.1°C$(br)$(thing)Maximum Temperature$(): 6.1°C$(br)$(thing)Minimum Rainfall$(): 125$(br)$(thing)Maximum Rainfall$(): 310$(br2)$(bold)Tapping Data$()$(br)$(thing)Min Temp for Production$(): -15°C$(br)$(thing)Max Temp for Production$(): 5°C$(br)$(thing)Spring Exclusive$(): No$(br)$(thing)Flow Rate$(): 5mb" }, { "type": "patchouli:image", diff --git a/kubejs/server_scripts/afc/recipes.js b/kubejs/server_scripts/afc/recipes.js index 683c43cb6..4bc552380 100644 --- a/kubejs/server_scripts/afc/recipes.js +++ b/kubejs/server_scripts/afc/recipes.js @@ -188,6 +188,24 @@ const registerAFCRecipes = (event) => { .requiresNaturalLog(true) .id("tfg:tree_tapping/ancient_douglas_fir_resin") + //Syrups + event.remove({ id: "afc:tree_tapping/maple_syrup" }) + event.remove({ id: "afc:tree_tapping/birch_syrup" }) + + event.recipes.afc.tree_tapping(TFC.blockIngredient('tfc:wood/log/maple')) + .resultFluid(Fluid.of('afc:maple_sap', 5)) + .minTemp(-15) + .maxTemp(5) + .requiresNaturalLog(true) + .id("tfg:tree_tapping/maple_log") + + event.recipes.afc.tree_tapping(TFC.blockIngredient('tfc:wood/log/birch')) + .resultFluid(Fluid.of('afc:birch_sap', 5)) + .minTemp(-15) + .maxTemp(5) + .requiresNaturalLog(true) + .id("tfg:tree_tapping/birch_log") + // Mars stuff event.recipes.afc.tree_tapping(TFC.blockIngredient('beneath:wood/log/crimson')) @@ -456,4 +474,4 @@ const registerAFCRecipes = (event) => { processingTime: 50 }).id(`tfg:vi/lathe/stripping_${x.wood}_wood`) }) -} \ No newline at end of file +} From 64d28c7efd414b904329003c83b469660d8beca9 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Wed, 29 Oct 2025 22:46:00 -0500 Subject: [PATCH 2/4] Tweak the spawn of tfg earth crops (#2125) * this was broken I guess * tweak these so they are a little less idk they still seem to spawn everywhere lol * these are better lol * is this not in tools? --- .../field_guide/en_us/entries/mechanics/crops.json | 2 +- .../tfg/worldgen/configured_feature/earth/flax_patch.json | 4 ++-- .../worldgen/configured_feature/earth/rapeseed_patch.json | 2 +- .../worldgen/configured_feature/earth/sunflower_patch.json | 2 +- .../data/tfg/worldgen/placed_feature/earth/flax_patch.json | 4 ++-- .../tfg/worldgen/placed_feature/earth/rapeseed_patch.json | 2 +- .../tfg/worldgen/placed_feature/earth/sunflower_patch.json | 2 +- kubejs/server_scripts/immersive_aircraft/tags.js | 6 +++--- kubejs/server_scripts/main_server_script.js | 1 + 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/crops.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/crops.json index 12928e76d..4d4630e96 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/crops.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/crops.json @@ -3769,7 +3769,7 @@ } } ], - "text": "$(thing)Wild Flax$() grows between -5 and 27C, and 175 to 475mm of rainfall." + "text": "$(thing)Wild Flax$() grows between -5 and 23C, and 175 to 475mm of rainfall." } ], "read_by_default": true, diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/flax_patch.json b/kubejs/data/tfg/worldgen/configured_feature/earth/flax_patch.json index a45b5eb4e..fe477af77 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/flax_patch.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/flax_patch.json @@ -33,8 +33,8 @@ } ] }, - "tries": 20, - "xz_spread": 16, + "tries": 5, + "xz_spread": 8, "y_spread": 1 } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/rapeseed_patch.json b/kubejs/data/tfg/worldgen/configured_feature/earth/rapeseed_patch.json index b065550a9..e7468c60e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/rapeseed_patch.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/rapeseed_patch.json @@ -33,7 +33,7 @@ } ] }, - "tries": 16, + "tries": 12, "xz_spread": 10, "y_spread": 1 } diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/sunflower_patch.json b/kubejs/data/tfg/worldgen/configured_feature/earth/sunflower_patch.json index 9407d6def..365e267a5 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/sunflower_patch.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/sunflower_patch.json @@ -34,7 +34,7 @@ ] }, "tries": 16, - "xz_spread": 10, + "xz_spread": 20, "y_spread": 1 } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/earth/flax_patch.json b/kubejs/data/tfg/worldgen/placed_feature/earth/flax_patch.json index 15312c13a..4e4310e7b 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/earth/flax_patch.json +++ b/kubejs/data/tfg/worldgen/placed_feature/earth/flax_patch.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 55 + "chance": 150 }, { "type": "minecraft:in_square" @@ -11,7 +11,7 @@ { "type": "tfc:climate", "min_temperature": -5, - "max_temperature": 27, + "max_temperature": 23, "min_rainfall": 175, "max_rainfall": 475, "max_forest": "sparse" diff --git a/kubejs/data/tfg/worldgen/placed_feature/earth/rapeseed_patch.json b/kubejs/data/tfg/worldgen/placed_feature/earth/rapeseed_patch.json index 0ec90d6ee..5ec6d5f2a 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/earth/rapeseed_patch.json +++ b/kubejs/data/tfg/worldgen/placed_feature/earth/rapeseed_patch.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 80 + "chance": 100 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/earth/sunflower_patch.json b/kubejs/data/tfg/worldgen/placed_feature/earth/sunflower_patch.json index 9b0003914..b5743cd7c 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/earth/sunflower_patch.json +++ b/kubejs/data/tfg/worldgen/placed_feature/earth/sunflower_patch.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 80 + "chance": 100 }, { "type": "minecraft:in_square" diff --git a/kubejs/server_scripts/immersive_aircraft/tags.js b/kubejs/server_scripts/immersive_aircraft/tags.js index 6ea391132..93ff827a4 100644 --- a/kubejs/server_scripts/immersive_aircraft/tags.js +++ b/kubejs/server_scripts/immersive_aircraft/tags.js @@ -4,7 +4,7 @@ * * @param {TagEvent.Item} evt */ -const registerImmersiveAircraftItemTags = (evt) => { - evt.add('c:hidden_from_recipe_viewers', 'immersive_aircraft:propeller'); - evt.add('c:hidden_from_recipe_viewers', 'immersive_aircraft:boiler') +const registerImmersiveAircraftItemTags = (event) => { + event.add('c:hidden_from_recipe_viewers', 'immersive_aircraft:propeller') + event.add('c:hidden_from_recipe_viewers', 'immersive_aircraft:boiler') } \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index ef5913e00..3b762633b 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -36,6 +36,7 @@ ServerEvents.tags('item', event => { registerGrapplemodItemTags(event) registerGreateItemTags(event) registerGTCEUItemTags(event) + registerImmersiveAircraftItemTags(event) registerMegaCellsItemTags(event) registerMinecraftItemTags(event) registerModernMarkingsItemTags(event) From 2b4d2912f4462717feb514fa359511828e952127 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Thu, 30 Oct 2025 11:33:22 +0500 Subject: [PATCH 3/4] fix: side third-person-shooting --- pakku-lock.json | 1 + pakku.json | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pakku-lock.json b/pakku-lock.json index c499fd0ee..b5dbaa450 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -13819,6 +13819,7 @@ { "pakku_id": "UUgCxePdwRd5MyWw", "type": "MOD", + "side": "CLIENT", "slug": { "curseforge": "third-person-shooting" }, diff --git a/pakku.json b/pakku.json index ad46b672f..6b92cd98b 100644 --- a/pakku.json +++ b/pakku.json @@ -244,6 +244,9 @@ "pick-up-notifier": { "side": "CLIENT" }, + "third-person-shooting": { + "side": "CLIENT" + }, "inventory-tweaks-refoxed": { "side": "BOTH" }, From 4335ecf06642c9e52dd895dca6ae1fb7a66844f7 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 30 Oct 2025 15:20:38 +0000 Subject: [PATCH 4/4] remove leftover mech press -> curving press conversion recipe --- kubejs/server_scripts/vintage_improvements/recipes.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 787387461..4fbcea0c1 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -77,9 +77,6 @@ function registerVintageImprovementsRecipes(event) { F: '#forge:springs/wrought_iron' }).addMaterialInfo().id('tfg:vi/shaped/curving_press') - event.shapeless('vintageimprovements:curving_press', ['create:mechanical_press', '#forge:tools/files']) - .id('tfg:shapeless/mech_press_converting') - event.shaped('vintageimprovements:helve_hammer', [ 'F A', 'BBE',