From 2855552f11ee725f321e4ff75a8607acd897a92f Mon Sep 17 00:00:00 2001 From: Redeix <59435925+Redeix@users.noreply.github.com> Date: Wed, 16 Jul 2025 03:18:54 -0500 Subject: [PATCH] Some fixes (#1353) * - Yeast recipe conflict fix * - Fixed seed oil voiding in barrels. And item weight inconsistency. * - Reduced loading screen logo size by 4MB * - Update Changelog * - Compressed loading screen images to maybe help with ram * - Added default gui scale to make the main menu look better on first launch * - Update Changelog * - Added utility script for adding circuits to existing recipes * fixed changelog conflict Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com> * - Added harvest baskets * - Fixed baked potato recipe mixing from oven * - Allowed elytras to be repaired regardless of damage * - Fixed sea water barrel recipe * - Gave plants tags to bushes so they can have other uses * - Pushed stubborn models * - updated Changelog * - Changelog typo * - Integrated Ad Astra wood * - Updated changelog * - Treated chipboard composite barrel lang * - Some Tacz fixes * - Jar dupe fix * - tacz data * - updated changelog --------- Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com> --- CHANGELOG.md | 5 +++++ kubejs/assets/tfg/lang/en_us.json | 3 ++- kubejs/server_scripts/main_server_script.js | 1 + kubejs/server_scripts/tacz/data.js | 7 +++++++ kubejs/server_scripts/tacz/recipes.misc.js | 2 +- kubejs/server_scripts/tfg/recipes.food.js | 4 ++-- 6 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 kubejs/server_scripts/tacz/data.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b7749c4e..8e4ddf580 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Gave plants tag to bushes so they can be used for other things (#1338) @Redeix - Allowed elytra's to be repaired regardless of damage (#1338) @Redeix - Increased maximum range of rope/elevator pulleys to 400 blocks (#1347) @Pyritie +- Added tfc data to tacz guns and attachments (#1353) Redeix ### Bug fixes - Fixed yeast food processor conflict (#1310) @Redeix - Fixed seed oil voiding in barrels (#1310) @Redeix @@ -31,6 +32,10 @@ - Fixed Quests #1318 #1291 and finish other quests related stuffs @TomPlop - Integrated Ad Astra wood types with tfc (#1346) @Redeix - Fixed duplicate pizza dough recipe @Pyritie +- Fixed treated composite barrel recipe lang (#1353) Redeix +- Fixed food processor jam recipe duping jars (#1353) Redeix +- Fixed Ad Astra space suit quest mentioning oxygen instead of breathable gas (#1353) Redeix +- Fixed flintlock not being craftable before LV (#1353) Redeix ## [0.10.0] - 13.07.2025 - [!WARNING] If you're upgrading your world from 0.9 to 0.10, please read the upgrade guide [here](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/wiki/%5BEN%5D-Upgrading-from-0.9-to-0.10). We do not recommend using Alpha versions for progression, but if you do, please make frequent backups! diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 3d689fa21..0ab2f898a 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -688,6 +688,7 @@ "tfc.recipe.barrel.tfg.sealed_barrel.prepared_leather_gloves": "Soaking Leather Gloves", "tfc.recipe.barrel.tfg.barrel.rapeseed_to_oil": "Extracting Rapeseed Oil", "tfc.recipe.barrel.tfg.barrel.sunflower_to_oil": "Extracting Sunflower Oil", + "tfc.recipe.barrel.tfg.barrel.treated_chipboard_composite": "Treating Chipboard Composite", "gtceu.aqueous_accumulator": "Aqueous Accumulator", "tfg.food_recipe.brining": "Brining", "tfg.food_recipe.smoking": "Smoking", @@ -1213,7 +1214,7 @@ "quests.high_voltage.rocket_fuel.desc": "&6For each travel you will need Rocket Fuel&r, it seems complicated and it is quite a long process but you can make Rocket Fuel from &bChlorine&r, &bMethane&r, &bNitrogen&r, &bOxygen&r and &bWater&r. Nothing too bad, also if you already have your &5Large Chemical Reactor&r you could unlock some bypass.\n\n&7We advise you to use EMI Recipe Tree to have an easier time understanding each step. Simply click on the small icon with 4 squares on the right of the crafting recipe.&r", "quests.high_voltage.space_suit.title": "Space Suit", "quests.high_voltage.space_suit.subtitle": "Let's be honest, this may be the hardest", - "quests.high_voltage.space_suit.desc": "&6Before crossing the last Earth boundary,&r you should be sure to not die when you arrive on the moon.\n\nTo do that, you're gonna need a full set of Space Suit loaded with &ba breathable gas&r — and if you're careful, even a &ebackup can&r.\n\n&cThe hardest part&r will definitely be the &dPolycaprolactam Fabric&r.\n\nYou will need an &cEBF&r and a &6HV&r &eChemical Reactor&r.\n\nFrom there, you'll be able to craft it using &aBenzene&r, &bHydrogen&r, &9Chlorine&r, &bOxygen&r and &3Ammonia&r.\n\nWe won't tell you every step, but you should be able to figure it out yourself through &aEMI&r now that you're a fierce Gregtech player.\n\nOnce everything is ready, to fill your space suit and can, simply &eRight-Click&r a drum or tank filled with &bOxygen&r.", + "quests.high_voltage.space_suit.desc": "&6Before crossing the last Earth boundary,&r you should be sure to not die when you arrive on the moon.\n\nTo do that, you're gonna need a full set of Space Suit loaded with &ba breathable gas&r — and if you're careful, even a &ebackup can&r.\n\n&cThe hardest part&r will definitely be the &dPolycaprolactam Fabric&r.\n\nYou will need an &cEBF&r and a &6HV&r &eChemical Reactor&r.\n\nFrom there, you'll be able to craft it using &aBenzene&r, &bHydrogen&r, &9Chlorine&r, &bOxygen&r and &3Ammonia&r.\n\nWe won't tell you every step, but you should be able to figure it out yourself through &aEMI&r now that you're a fierce Gregtech player.\n\nOnce everything is ready, to fill your space suit and can, simply &eRight-Click&r a drum or tank filled with a gas like &bNitrox&r.", "quests.high_voltage.space_suit.task": "Fill it and drink it", "quests.high_voltage.welcome_moon.title": "I'm on the &3Moon&r", "quests.high_voltage.welcome_moon.subtitle": "Hope you have everything to come back", diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 802b2c80c..673ef131a 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -149,6 +149,7 @@ TFCEvents.data(event => { registerTFCDataForImmersiveAircraft(event); registerTFCDataForMinecraft(event) registerTFCDataForSophisticatedBackpacks(event) + registerTFCDataForTACZ(event) registerTFCDataForTFC(event) registerTFCDataForTFCBetterBF(event) registerTFCDataForTFCLunchbox(event) diff --git a/kubejs/server_scripts/tacz/data.js b/kubejs/server_scripts/tacz/data.js new file mode 100644 index 000000000..77bf1eb84 --- /dev/null +++ b/kubejs/server_scripts/tacz/data.js @@ -0,0 +1,7 @@ +// priority: 0 + +function registerTFCDataForTACZ(event) { + + event.itemSize('tacz:modern_kinetic_gun', 'large', 'medium') + event.itemSize('tacz:attachment', 'normal', 'light') +} \ No newline at end of file diff --git a/kubejs/server_scripts/tacz/recipes.misc.js b/kubejs/server_scripts/tacz/recipes.misc.js index a5a77d751..0bea6867e 100644 --- a/kubejs/server_scripts/tacz/recipes.misc.js +++ b/kubejs/server_scripts/tacz/recipes.misc.js @@ -66,7 +66,7 @@ function registerTACZMiscRecipes(event) { A: '#forge:tools/screwdrivers', B: '#forge:gems/flint', C: '#forge:tools/files', - D: '#forge:springs/steel', + D: '#forge:springs', E: '#forge:bolts/steel', F: '#forge:plates/steel', G: '#forge:tools/wire_cutters', diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index b3fd3c73f..c0735e759 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -441,14 +441,14 @@ function registerTFGFoodRecipes(event) { global.TFC_JAMS.forEach(name => { processorRecipe(`${name}_jam`, 200, 8, { circuit: 15, - itemInputs: [`4x tfc:food/${name}`, "#tfg:sugars", "#tfc:empty_jar_with_lid"], + itemInputs: [`4x tfc:food/${name}`, "#tfg:sugars", "4x #tfc:empty_jar_with_lid"], itemOutputs: [`4x tfc:jar/${name}`], itemOutputProvider: TFC.isp.of(`4x tfc:jar/${name}`).copyFood() }).inputFluids(JsonIO.of({ amount: 100, value: { tag: "tfg:clean_water" }})) processorRecipe(`${name}_jam_no_seal`, 200, 8, { circuit: 16, - itemInputs: [`4x tfc:food/${name}`, "#tfg:sugars", "tfc:empty_jar"], + itemInputs: [`4x tfc:food/${name}`, "#tfg:sugars", "4x tfc:empty_jar"], itemOutputs: [`4x tfc:jar/${name}_unsealed`], itemOutputProvider: TFC.isp.of(`4x tfc:jar/${name}_unsealed`).copyFood() }).inputFluids(JsonIO.of({ amount: 100, value: { tag: "tfg:clean_water" }}))