From 7c0c3cd3417eba044f8b2b42ef8cd06dba93cb28 Mon Sep 17 00:00:00 2001 From: Redeix <59435925+Redeix@users.noreply.github.com> Date: Wed, 9 Jul 2025 02:28:16 -0500 Subject: [PATCH] Added dry ice support for lunchboxes (#1262) * - Lots of ui updates. And a couple fixes. * - New button textures. - Fixed campfire loot table. - Made anvil rod recipes easier. - Added assembler recipes for multiblock tank parts. * - Added assembler recipes for multiblock tank parts. * - Updated Changelog * - Some more UI tweaks. - Added modern-markings mod with integration. * - Updated stromatolite textures - Added some more WIP venus foliage * - Moved some blocks over from tfg-core. * - Updated textures for tier-1 rocket and food oven. * - Updated textures for more ad-astra stuff + new panorama * - Biodiesel stuff * - Quests re-ordering and some new ones * - Hide wild crops from emi * - Hide wild crops from emi * - Moon rabbit meat * - Moon rabbit meat * - Moon rabbit meat textures and casings for tom * - models * - oops * - rocket * - ooops * - Added dry ice support for lunchboxes * - Fixed soybean oil quest * - Added dry ice block * - Assets for dry ice block --------- Co-authored-by: Pyritie --- .../ftbquests/quests/chapters/tips__tools.snbt | 8 +++++++- kubejs/assets/tfg/lang/en_us.json | 1 + kubejs/assets/tfg/models/item/dry_ice.json | 6 ++++++ kubejs/assets/tfg/textures/block/dry_ice.png | Bin 0 -> 365 bytes kubejs/server_scripts/tfclunchbox/tags.js | 1 + .../server_scripts/tfg/recipes.miscellaneous.js | 13 +++++++++++++ kubejs/startup_scripts/tfg/blocks.js | 16 ++++++++++++++++ kubejs/startup_scripts/tfg/items.js | 6 +----- 8 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 kubejs/assets/tfg/models/item/dry_ice.json create mode 100644 kubejs/assets/tfg/textures/block/dry_ice.png diff --git a/config/ftbquests/quests/chapters/tips__tools.snbt b/config/ftbquests/quests/chapters/tips__tools.snbt index a394d1838..ea8dc2477 100644 --- a/config/ftbquests/quests/chapters/tips__tools.snbt +++ b/config/ftbquests/quests/chapters/tips__tools.snbt @@ -2457,7 +2457,13 @@ subtitle: "{quests.tfg_tips.tools_tips.soybean_oil.subtitle}" tasks: [{ id: "627EFBAAD0A86E02" - item: "ftbfiltersystem:smart_filter" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "item(firmalife:bucket/soybean_oil)" + } + } title: "{quests.tfg_tips.tools_tips.soybean_oil.task}" type: "item" }] diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index ed576afb3..59d5042ab 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -262,6 +262,7 @@ "block.tfg.sandstone.stairs.smooth.fluorapatite.yellow": "Smooth Yellow Fluorapatite Sandstone Stairs", "block.tfg.sandstone.fluorapatite.yellow": "Cut Yellow Fluorapatite Sandstone", "block.tfg.sandstone.smooth.chiseled.fluorapatite.yellow": "Chiseled Yellow Fluorapatite Sandstone", + "block.tfg.dry_ice": "Dry Ice", "item.tfg.antipoison_pill": "Antipoison Pill", "item.tfg.haste_pill": "Haste Pill", "item.tfg.night_vision_pill": "Night Vision Pill", diff --git a/kubejs/assets/tfg/models/item/dry_ice.json b/kubejs/assets/tfg/models/item/dry_ice.json new file mode 100644 index 000000000..3e14fce89 --- /dev/null +++ b/kubejs/assets/tfg/models/item/dry_ice.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/dry_ice" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/dry_ice.png b/kubejs/assets/tfg/textures/block/dry_ice.png new file mode 100644 index 0000000000000000000000000000000000000000..6fed884f6e3f1d340b4754a866151a58cf96ebde GIT binary patch literal 365 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_nlXPZ!4!i{8@7hS`S=1X|-;Q+TBA1iV?=>hqWV=fj_@veu<9t}G1@%HZCp*~i}4 zIi2rY@O+W)X7^w2uC7wQ|7QOEc^h1+`4}3m_vhcaAG$*OyiiRf0|Vc3yJxRX9e!3| z-ctY2AWrGUX{LQ8#mxqOp5eT$yA@Ro7$W?>r3$KRc+9w;SvN~GBWQM^(DKZJ4QJmk z_Z8uJJY~+ywi^dj1JihU*@Ql*UX*}Iky>}lU7L~ca;@AtX+r=II?#exvlRmJTm4}8;-_L(G zaHi$9zgiRC$G)CremkxB>%Ol7qR%e!GU~sdzoGPLxbNxu%+TXg^JeqbF+TXaS53)% S(p?4y1_n=8KbLh*2~7aMlA9<1 literal 0 HcmV?d00001 diff --git a/kubejs/server_scripts/tfclunchbox/tags.js b/kubejs/server_scripts/tfclunchbox/tags.js index b6ce2806e..f54646903 100644 --- a/kubejs/server_scripts/tfclunchbox/tags.js +++ b/kubejs/server_scripts/tfclunchbox/tags.js @@ -11,4 +11,5 @@ function registerTFCLunchboxItemTags(event) { event.add('c:hidden_from_recipe_viewers', item) }) + event.add('tfclunchbox:ice', 'tfg:dry_ice') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 4a7c721e8..e370f72b3 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -260,7 +260,20 @@ function registerTFGMiscellaneousRecipes(event) { event.shapeless('4x firmalife:ice_shavings', ['#forge:dusts/ice', '#forge:tools/hammers']) + event.recipes.gtceu.mixer('tfg:ice_slush_from_dry_ice') + .itemInputs('1x tfg:dry_ice') + .inputFluids( JsonIO.of({ amount: 8000, value: { tag: "tfc:water" }})) + .outputFluids(Fluid.of('gtceu:ice', 8000)) + .duration(80) + .EUt(GTValues.VA[GTValues.ULV]) + // Cooling water + event.recipes.tfc.barrel_sealed(250) + .inputItem('1x tfg:dry_ice') + .inputFluid(Fluid.of('minecraft:water', 5000)) + .outputFluid(Fluid.of('gtceu:ice', 5000)) + .id('tfg:barrel/cooling_water_0') + event.recipes.tfc.barrel_sealed(1000) .inputItem('1x #forge:dusts/ice') .inputFluid(Fluid.of('minecraft:water', 144)) diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index 17b9cf992..d22c46210 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -15,6 +15,22 @@ const registerTFGBlocks = (event) => { item.modelJson({ parent: 'minecraft:block/end_portal_frame' }) }) + event.create('tfg:dry_ice', 'tfg:particle_emitter') + .textureAll('tfg:block/dry_ice') + .soundType('bone_block') + .hardness(1) + .resistance(1) + .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('tfcambiental:cold_stuff') + .defaultTranslucent() + .mapColor('color_white') + .speedFactor(1.2) + .particleOffset(1, 1, 1) + .particleVelocity(0.05, 0, 0.05) + .particle('minecraft:campfire_cosy_smoke') + .particleCount(2) + .particleForced(false) + // #region Machine Casings global.TFG_MACHINE_CASINGS.forEach(type => { diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index 2aa0e40ed..6c0ee1ddd 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -167,11 +167,7 @@ const registerTFGItems = (event) => { event.create('tfg:clean_foil_pack') .translationKey('item.tfg.clean_foil_pack') - .texture('tfg:item/clean_foil_pack') - - event.create('tfg:dry_ice') - .translationKey('item.tfg.dry_ice') - .texture('tfg:item/dry_ice') + .texture('tfg:item/clean_foil_pack') //#endregion //#region Cloth & String