Merge branch 'dev' into feature/create-6

2025-06-02 22:43:49 +01:00 · 2025-06-02 22:43:49 +01:00 · ed33568944
commit ed33568944
parent c955b8ab04 6a26c9b6e2
14 changed files with 139 additions and 59 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -19,6 +19,8 @@
 - Added Wine utensils recipes for GT (#1111) @JeanRdS
 - Fixed kaolin clay duping (#1099) @SpicyNoodle5
 - Fixed TFC sugar recipes so they can now use any sugar (#1099) @SpicyNoodle5
+- Added optional quest for bacon (#1122) @SpicyNoodle5
+- Add the create toolbox to the list of unsortable inventories (#1120) @esotericist

 ## [0.9.9] - 30.05.2025
 ### Changes
--- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt
+++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt
@ -650,7 +650,13 @@
 				}
 				{
 					id: "7DA8B08CC879617F"
-					item: "gtceu:rubber_bucket"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(nbt(fuzzy:{fluid:{FluidName:\"gtceu:rubber\"}})nbt(fuzzy:{Fluid:{FluidName:\"gtceu:rubber\"}})item(gtceu:rubber_bucket))"
+						}
+					}
 					type: "item"
 				}
 			]
--- a/config/ftbquests/quests/chapters/queststfc_tips.snbt
+++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt
@ -1236,7 +1236,7 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.refrigerator.title}"
-			x: 8.0d
+			x: 9.0d
 			y: -17.0d
 		}
 		{
@ -1606,7 +1606,7 @@
 				type: "checkmark"
 			}]
 			title: "{quests.tfg_tips.passive_preservation.title}"
-			x: 6.0d
+			x: 6.5d
 			y: -15.5d
 		}
 		{
@ -1627,7 +1627,7 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.get_milk.title}"
-			x: 4.0d
+			x: 4.5d
 			y: -8.5d
 		}
 		{
@ -1648,7 +1648,7 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.get_meat.title}"
-			x: 5.0d
+			x: 5.5d
 			y: -8.5d
 		}
 		{
@ -1669,7 +1669,7 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.get_fruit.title}"
-			x: 7.0d
+			x: 7.5d
 			y: -8.5d
 		}
 		{
@ -1690,7 +1690,7 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.get_grain.title}"
-			x: 8.0d
+			x: 8.5d
 			y: -8.5d
 		}
 		{
@ -1711,7 +1711,7 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.get_veggie.title}"
-			x: 6.0d
+			x: 6.5d
 			y: -8.5d
 		}
 		{
@ -1746,7 +1746,7 @@
 				}
 			]
 			title: "{quests.tfg_tips.process_grain.title}"
-			x: 8.0d
+			x: 8.5d
 			y: -12.5d
 		}
 		{
@ -1809,7 +1809,7 @@
 				}
 			]
 			title: "{quests.tfg_tips.brine_something.title}"
-			x: 6.0d
+			x: 6.5d
 			y: -9.5d
 		}
 		{
@ -1873,7 +1873,7 @@
 				}
 			]
 			title: "{quests.tfg_tips.pickle_something.title}"
-			x: 6.0d
+			x: 6.5d
 			y: -12.5d
 		}
 		{
@ -1918,7 +1918,7 @@
 				}
 			]
 			title: "{quests.tfg_tips.dry_fruit.title}"
-			x: 7.0d
+			x: 7.5d
 			y: -11.0d
 		}
 		{
@ -1960,7 +1960,7 @@
 				}
 			]
 			title: "{quests.tfg_tips.salt_meat.title}"
-			x: 5.0d
+			x: 5.5d
 			y: -10.5d
 		}
 		{
@ -2009,7 +2009,7 @@
 				}
 			]
 			title: "{quests.tfg_tips.smoke_meat.title}"
-			x: 5.0d
+			x: 5.5d
 			y: -11.5d
 		}
 		{
@ -2049,7 +2049,7 @@
 				}
 			]
 			title: "{quests.tfg_tips.cook_meat.title}"
-			x: 5.0d
+			x: 5.5d
 			y: -13.5d
 		}
 		{
@ -3626,7 +3626,7 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.vessel_preservation.title}"
-			x: 6.0d
+			x: 6.5d
 			y: -16.5d
 		}
 		{
@ -5225,6 +5225,84 @@
 			x: -2.5d
 			y: 6.0d
 		}
+		{
+			dependencies: ["1FC019B45383695E"]
+			description: ["{quests.tfg_tips.bacon.desc}"]
+			icon: {
+				Count: 1
+				ForgeCaps: {
+					"tfc:food": {
+						creationDate: -2L
+						traits: [ ]
+					}
+					"tfc:item_heat": {
+						heat: 0.0f
+						ticks: 0L
+					}
+				}
+				id: "firmalife:food/bacon"
+			}
+			id: "27FD6D86233B3C8D"
+			shape: "heart"
+			subtitle: "{quests.tfg_tips.bacon.subtitle}"
+			tasks: [
+				{
+					icon: {
+						Count: 1
+						ForgeCaps: {
+							"tfc:food": {
+								creationDate: -9223372036854775808L
+								traits: [
+									"tfc:brined"
+									"firmalife:smoked"
+								]
+							}
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
+						}
+						id: "tfc:food/pork"
+					}
+					id: "450B578B4B128D69"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "custom(HasPreservation/firmaciv:smoked)item(tfc:food/pork)"
+						}
+					}
+					title: "{quests.tfg_tips.bacon.task}"
+					type: "item"
+				}
+				{
+					id: "7B835DA2FEF500F1"
+					item: "tfc:powder/salt"
+					type: "item"
+				}
+				{
+					id: "267439967946EA29"
+					item: {
+						Count: 1
+						ForgeCaps: {
+							"tfc:food": {
+								creationDate: -2L
+								traits: [ ]
+							}
+							"tfc:item_heat": {
+								heat: 0.0f
+								ticks: 0L
+							}
+						}
+						id: "firmalife:food/bacon"
+					}
+					type: "item"
+				}
+			]
+			title: "{quests.tfg_tips.bacon.title}"
+			x: 4.75d
+			y: -12.5d
+		}
 	]
 	subtitle: ["{quests.tfg_tips.subtitle}"]
 	title: "{quests.tfg_tips}"
--- a/config/invtweaks-client.toml
+++ b/config/invtweaks-client.toml
@ -133,6 +133,10 @@
 		containerClass = "net.dries007.tfc.client.screen.*"
 		sortRange = ""

+	[[sorting.containerOverrides]]
+		containerClass = "com.simibubi.create.content.equipment.toolbox.ToolboxMenu"
+		sortRange = ""
+
 #Tweaks
 [tweaks]
 	#Enable auto-refill
--- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/fishing_nets.json
+++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/fishing_nets.json
@ -2,7 +2,7 @@
 	"name": "Fishing Nets",
 	"icon": "tfg:fishing_net/brass",
 	"category": "tfc:mechanics",
-	"priority": true,
+	"read_by_default": true,
 	"pages": [
 		{
 			"type": "patchouli:spotlight",
--- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/anvil_working_guide.json
+++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/anvil_working_guide.json
@ -2,7 +2,7 @@
    "name": "Anvil Working Guide",
    "icon": "gtceu:red_steel_hammer",
    "category": "tfc:tfg_tips",
-    "read_by_default": false,
+    "read_by_default": true,
    "priority": false,
    "pages":
    [
--- a/kubejs/assets/tfg/lang/en_us.json
+++ b/kubejs/assets/tfg/lang/en_us.json
@ -2226,6 +2226,10 @@
  "quests.tfg_tips.smoke_meat.subtitle": "Smokey",
  "quests.tfg_tips.smoke_meat.desc": "You can hang up to 8 slices of &aRaw Meat&r on a &bString&r that's placed over a &cLit Campfire&r to smoke it. Keep in mind that the meat &lmust be brined first.&r \nIt may also be &dsalted&r before smoking.",
  "quests.tfg_tips.smoke_meat.task": "A hunk of Smoked Meat",
+  "quests.tfg_tips.bacon.title": "Bacon",
+  "quests.tfg_tips.bacon.subtitle": "Crispy",
+  "quests.tfg_tips.bacon.desc": "&aBacon&r can be made from &bSmoked Pork&r and a pinch of salt giving &d4 times&r the amount of meat!\n\nNote that the pork &lhas to be smoked&r before it can be turned into bacon.",
+  "quests.tfg_tips.bacon.task": "A hunk of Smoked Pork",
  "quests.tfg_tips.cook_meat.title": "Meat Preservation: Cooking",
  "quests.tfg_tips.cook_meat.subtitle": "Pretty obvious in hindsight.",
  "quests.tfg_tips.cook_meat.desc": "Cooking can potentially provide its own preservation traits. You should cook &aMeat&r either in a &bWrought Iron Grill&r or a &bTop Oven!&r\nOther cooking methods may not provide any trait at all or may even give negative traits that lower shelf life.\n\n&3&lTip:&r&o &bWrought Iron Grills&f can be part of the &dOven&f structure.",
--- a/kubejs/assets/tfg/textures/block/piglin_disguise.png
+++ b/kubejs/assets/tfg/textures/block/piglin_disguise.png
--- a/kubejs/data/tfg/loot_tables/blocks/piglin_disguise_block.json
+++ b/kubejs/data/tfg/loot_tables/blocks/piglin_disguise_block.json
@ -0,0 +1,20 @@
+{
+	"type": "minecraft:block",
+	"pools": [
+		{
+			"name": "loot_pool",
+			"rolls": 1,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"name": "tfg:piglin_disguise_block"
+				}
+			],
+			"conditions": [
+				{
+					"condition": "minecraft:survives_explosion"
+				}
+			]
+		}
+	]
+}
--- a/kubejs/server_scripts/beneath/tags.js
+++ b/kubejs/server_scripts/beneath/tags.js
@ -30,4 +30,6 @@ const registerBeneathItemTags = (event) => {

 	event.add('forge:ores', 'beneath:ore/nether_cursecoal')
 	event.add('forge:ores', 'beneath:ore/blackstone_sylvite')
+	
+	event.remove('beneath:sparks_on_sulfur')
 }
--- a/kubejs/server_scripts/create_connected/recipes.js
+++ b/kubejs/server_scripts/create_connected/recipes.js
@ -47,7 +47,7 @@ const registerCreateConnectedRecipes = (event) => {
 	}).id('create_connected:crafting/kinetics/item_silo')

 	event.recipes.gtceu.assembler('tfg:create_connected/item_silo')
-		.itemInputs('3x #forge:chests/wooden', '#forge:sheets/wrought_iron', '2x #forge:screws/wrought_iron')
+		.itemInputs('#forge:chests/wooden', '#forge:sheets/wrought_iron', '2x #forge:screws/wrought_iron')
 		.circuit(10)
 		.itemOutputs('create_connected:item_silo')
 		.duration(200)
--- a/kubejs/server_scripts/main_server_script.js
+++ b/kubejs/server_scripts/main_server_script.js
@ -141,6 +141,7 @@ LootJS.modifiers((event) => {
    registerLootrLoots(event)
    registerPrimitiveCreatesLoots(event)
    registerTFCLoots(event)
+    registerTFGLoots(event)
 });

 /**
--- a/kubejs/server_scripts/tfg/loot_tables.block.js
+++ b/kubejs/server_scripts/tfg/loot_tables.block.js
@ -1,7 +1,6 @@
+function registerTFGLoots(event) {

-LootJS.modifiers((event) => {
-
-    //Generated Vases Loot
+    //#region Vase Loot
 	global.MINECRAFT_DYE_NAMES.forEach(color => {
        event.addBlockLootModifier(`tfg:decorative_vase/generated/${color}`)
        .removeLoot(Ingredient.all)
@ -81,4 +80,4 @@ LootJS.modifiers((event) => {
            );
        })
    });
-});
+};
--- a/pakku-lock.json
+++ b/pakku-lock.json
@ -3385,42 +3385,6 @@
                }
            ]
        },
-        {
-            "pakku_id": "oMcIAiCt9qNIFN4G",
-            "type": "MOD",
-            "slug": {
-                "curseforge": "ftb-quests-optimizer"
-            },
-            "name": {
-                "curseforge": "FTB Quests Optimizer"
-            },
-            "id": {
-                "curseforge": "912469"
-            },
-            "files": [
-                {
-                    "type": "curseforge",
-                    "file_name": "FTBQuestsOptimizer-forge-2.0.5-1.20.1.jar",
-                    "mc_versions": [
-                        "1.20.1"
-                    ],
-                    "loaders": [
-                        "forge"
-                    ],
-                    "release_type": "release",
-                    "url": "https://edge.forgecdn.net/files/6083/498/FTBQuestsOptimizer-forge-2.0.5-1.20.1.jar",
-                    "id": "6083498",
-                    "parent_id": "912469",
-                    "hashes": {
-                        "sha1": "18458645cbc3436142332eeab910e679f13a76b9",
-                        "md5": "f6decadcb493728713782fe4d95bed8f"
-                    },
-                    "required_dependencies": [],
-                    "size": 14007,
-                    "date_published": "2025-01-13T14:18:12.917Z"
-                }
-            ]
-        },
        {
            "pakku_id": "f6XvOldUCm8jt51o",
            "pakku_links": [