diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e091c795..2a359a5e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ If you missed it, [0.11.19](https://github.com/TerraFirmaGreg-Team/Modpack-Moder - Added soybean + sea water to soy mixture recipe (#2984) @Redeix - Added optional [Chimes](https://www.curseforge.com/minecraft/mc-mods/chimes) compat. (#2973) @TreyR9 - Added optional [Create: Sound of Steam](https://www.curseforge.com/minecraft/mc-mods/create-sound-of-steam) compat (#2324) @samtsa +- Added Universal Bags of Composts (#3016) @Nebby1999 ### Bug fixes - Fix the Empty Rod T1 that was uncraftable (#3008) @TomPlop - Fixed fission fuel rods looking for the wrong items to recycle @TomPlop diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 9a5e01028..01852da68 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -2197,6 +2197,57 @@ x: 0.0d y: -12.0d } + { + dependencies: ["2EFB241490502DB3"] + description: ["{quests.tfg_tips.composter.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/composter" + id: "264D138DFFE13BD0" + subtitle: "{quests.tfg_tips.composter.subtitle}" + tasks: [{ + id: "2EE61FD71FE330D3" + item: "tfc:composter" + type: "item" + }] + title: "{quests.tfg_tips.composter.title}" + x: 2.0d + y: -4.0d + } + { + dependencies: ["264D138DFFE13BD0"] + description: ["{quests.tfg_tips.universal_compost.desc}"] + id: "13E4AE4F46A1A1A0" + subtitle: "{quests.tfg_tips.universal_compost.subtitle}" + tasks: [ + { + id: "6F3BD81EAD7CC109" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(tfg:universal_compost_browns)item(tfg:universal_compost_greens))" + } + } + title: "{quests.tfg_tips.universal_compost.task.1}" + type: "item" + } + { + id: "787E7A402B3162B5" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(tfg:universal_compost_browns_bag)item(tfg:universal_compost_greens_bag))" + } + } + optional_task: true + title: "{quests.tfg_tips.universal_compost.task.2}" + type: "item" + } + ] + title: "{quests.tfg_tips.universal_compost.title}" + x: 4.0d + y: -4.0d + } ] subtitle: ["{quests.tfg_tips.subtitle}"] title: "{quests.tfg_tips}" diff --git a/kubejs/assets/tfg/textures/item/universal_compost_browns_bag.png b/kubejs/assets/tfg/textures/item/universal_compost_browns_bag.png new file mode 100644 index 000000000..b18d34ffd Binary files /dev/null and b/kubejs/assets/tfg/textures/item/universal_compost_browns_bag.png differ diff --git a/kubejs/assets/tfg/textures/item/universal_compost_greens_bag.png b/kubejs/assets/tfg/textures/item/universal_compost_greens_bag.png new file mode 100644 index 000000000..2306b1a31 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/universal_compost_greens_bag.png differ diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index 3dc19fcf5..40b7c076c 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -338,6 +338,10 @@ function registerTFGItemSize(event) { "medium", "Molds" ) + + //Universal Compost Bags + event.itemSize("tfg:universal_compost_browns_bag", "tiny", "medium") + event.itemSize("tfg:universal_compost_greens_bag", "tiny", "medium") } //#endregion diff --git a/kubejs/server_scripts/tfg/primitive/recipes.compost.js b/kubejs/server_scripts/tfg/primitive/recipes.compost.js index 80f255cd3..5c82b5541 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.compost.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.compost.js @@ -1,5 +1,9 @@ "use strict"; +/** + * + * @param {Internal.RecipesEventJS} event + */ function registerTFGCompostRecipes(event) { //#region Fertiliser event.recipes.gtceu.mixer('tfg:fertilizer') @@ -208,4 +212,26 @@ function registerTFGCompostRecipes(event) { .itemOutputs(Item.of('tfg:universal_compost_browns', 4)) .duration(20) .EUt(8) + + //Universal Brown Compost Bag + event.shapeless(Item.of('tfg:universal_compost_browns_bag', 1), + [ + "4x tfg:universal_compost_browns" + ]).id('tfg:shapeless/universal_compost_browns_bag') + + event.shapeless(Item.of('tfg:universal_compost_browns', 4), + [ + "tfg:universal_compost_browns_bag" + ]).id("tfg:shapeless/universal_compost_browns_from_bag") + + //Universal Green Compost Bag + event.shapeless(Item.of('tfg:universal_compost_greens_bag', 1), + [ + "4x tfg:universal_compost_greens" + ]).id('tfg:shapeless/universal_compost_greens_bag') + + event.shapeless(Item.of('tfg:universal_compost_greens', 4), + [ + "tfg:universal_compost_greens_bag" + ]).id("tfg:shapeless/universal_compost_greens_from_bag") } diff --git a/kubejs/startup_scripts/tfg/primitive/items.primitive.js b/kubejs/startup_scripts/tfg/primitive/items.primitive.js index fcc217dd5..dc917114e 100644 --- a/kubejs/startup_scripts/tfg/primitive/items.primitive.js +++ b/kubejs/startup_scripts/tfg/primitive/items.primitive.js @@ -101,9 +101,20 @@ function registerTFGPrimitiveItems(event) { // Universal compost items event.create('tfg:universal_compost_browns') .tag('tfc:compost_browns_low') + .translationKey('item.tfg.universal_compost_browns') event.create('tfg:universal_compost_greens') .tag('tfc:compost_greens_low') + .translationKey('item.tfg.universal_compost_greens') + + // Universal compost bag items + event.create('tfg:universal_compost_browns_bag') + .tag('tfc:compost_browns_high') + .translationKey('item.tfg.universal_compost_browns_bag') + + event.create('tfg:universal_compost_greens_bag') + .tag('tfc:compost_greens_high') + .translationKey('item.tfg.universal_compost_greens_bag') // Etched Diamond Etching Tip event.create('tfg:etching_diamond_tip')