diff --git a/config/ftbquests/quests/chapters/tips__tools.snbt b/config/ftbquests/quests/chapters/tips__tools.snbt index 4089e4c5e..c9bd49915 100644 --- a/config/ftbquests/quests/chapters/tips__tools.snbt +++ b/config/ftbquests/quests/chapters/tips__tools.snbt @@ -70,7 +70,7 @@ type: "item" }] title: "{quests.tfg_tips.first_backpack.title}" - x: 13.0d + x: 16.0d y: 2.0d } { @@ -87,7 +87,7 @@ type: "item" }] title: "{quests.tfg_tips.red_steel_backpack.title}" - x: 15.0d + x: 18.0d y: 2.0d } { @@ -104,7 +104,7 @@ type: "item" }] title: "{quests.tfg_tips.backpack_upgrades.title}" - x: 14.5d + x: 16.5d y: 4.0d } { @@ -121,7 +121,7 @@ type: "item" }] title: "{quests.tfg_tips.aluminium_backpack.title}" - x: 16.0d + x: 19.0d y: 2.0d } { @@ -138,7 +138,7 @@ type: "item" }] title: "{quests.tfg_tips.titanium_backpack.title}" - x: 17.0d + x: 20.0d y: 2.0d } { @@ -152,7 +152,7 @@ type: "item" }] title: "{quests.tfg_tips.crafting_upgrade.title}" - x: 16.0d + x: 18.0d y: 4.5d } { @@ -173,7 +173,7 @@ } ] title: "{quests.tfg_tips.advanced_upgrades.title}" - x: 16.0d + x: 18.0d y: 3.5d } { @@ -294,7 +294,7 @@ } ] title: "{quests.tfg_tips.all_backpack_upgrades.title}" - x: 17.5d + x: 19.5d y: 4.0d } { @@ -331,7 +331,7 @@ } ] title: "{quests.tfg_tips.256m_portable_cells.title}" - x: 12.0d + x: 12.5d y: 3.0d } { @@ -369,8 +369,8 @@ type: "item" }] title: "{quests.tfg_tips.maxed_out_toolbelt.title}" - x: 12.0d - y: 4.0d + x: 12.5d + y: 4.5d } { dependencies: ["7FA5B6354A49C396"] @@ -390,8 +390,8 @@ } ] title: "{quests.tfg_tips.toolbelt.title}" - x: 11.0d - y: 4.0d + x: 10.5d + y: 4.5d } { dependencies: ["7FA5B6354A49C396"] @@ -431,50 +431,38 @@ size: 1.0d subtitle: "{quests.tfg_tips.backpack_materials.subtitle}" tasks: [ - { - id: "3D54644D50E1904E" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(forge:string)" - } - } - title: "Any #forge:string" - type: "item" - } - { - id: "40410856739CAF06" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(forge:leather)" - } - } - title: "Any #forge:leather" - type: "item" - } - { - id: "62219AEA780A9850" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(forge:chests/wooden)" - } - } - title: "{quests.tasktype.item.any} #forge:chests/wooden" - type: "item" - } { id: "56622AE6FBE714A2" item: "minecraft:name_tag" type: "item" } + { + id: "26C63DDBFC21E987" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "sns:pack_frame" + } + type: "item" + } + { + id: "51D50469150985C8" + item: "sns:reinforced_fiber" + type: "item" + } + { + id: "441FD9DFB12362DB" + item: "sns:bound_leather_strip" + type: "item" + } ] title: "{quests.tfg_tips.backpack_materials.title}" - x: 11.0d + x: 13.5d y: 2.0d } { @@ -509,14 +497,24 @@ } ] title: "{quests.tfg_tips.vessels.title}" - x: 11.0d - y: 1.0d + x: 10.5d + y: -0.5d } { dependencies: ["72B3EA6588E18CCC"] description: ["{quests.tfg_tips.portable_storage.desc}"] disable_toast: true - icon: "sophisticatedbackpacks:backpack" + icon: { + Count: 1 + ForgeCaps: { + Parent: { + Items: [ ] + voidSlots: [I; ] + weight: 0b + } + } + id: "sns:leather_sack" + } id: "7FA5B6354A49C396" shape: "octagon" size: 2.0d @@ -548,8 +546,8 @@ type: "item" }] title: "{quests.tfg_tips.tungstensteel_backpack.title}" - x: 19.5d - y: 2.0d + x: 22.964285714285722d + y: 2.0357142857142847d } { dependencies: ["74AE7DB845B88CF3"] @@ -1476,7 +1474,7 @@ type: "item" }] title: "{quests.tfg_tips.fishing_net.title}" - x: -5.5d + x: -3.0d y: 7.0d } { @@ -1497,8 +1495,8 @@ type: "item" }] title: "{quests.tfg_tips.cane.title}" - x: -3.5d - y: 7.0d + x: -2.5d + y: 8.5d } { dependencies: ["72B3EA6588E18CCC"] @@ -2340,8 +2338,8 @@ type: "item" }] title: "{quests.tfg_tips.digger_helmet.title}" - x: -2.5d - y: 8.5d + x: -6.0d + y: 7.0d } { dependencies: ["72B3EA6588E18CCC"] @@ -2579,6 +2577,193 @@ x: -2.5d y: 0.5d } + { + dependencies: ["7FA5B6354A49C396"] + description: ["{quests.tfg_tips.first_sacks.desc}"] + id: "509C064AA92FD78F" + subtitle: "{quests.tfg_tips.first_sacks.subtitle}" + tasks: [ + { + id: "5166FB8DE88DF0CA" + item: { + Count: 1 + ForgeCaps: { + Parent: { + Items: [ ] + voidSlots: [I; ] + weight: 0b + } + } + id: "sns:leather_sack" + } + optional_task: true + type: "item" + } + { + id: "064BB0E0D6295650" + item: { + Count: 1 + ForgeCaps: { + Parent: { + Items: [ ] + voidSlots: [I; ] + weight: 0b + } + } + id: "sns:burlap_sack" + } + optional_task: true + type: "item" + } + ] + title: "{quests.tfg_tips.first_sacks.title}" + x: 11.0d + y: 1.0d + } + { + dependencies: ["7178843BCD50A012"] + description: ["{quests.tfg_tips.frame_pack.desc}"] + id: "5443F4F5AE53B91A" + shape: "octagon" + size: 2.0d + subtitle: "{quests.tfg_tips.frame_pack.subtitle}" + tasks: [{ + id: "54D2B434FC11CEB6" + item: { + Count: 1 + ForgeCaps: { + Parent: { + Items: [ ] + voidSlots: [I; ] + weight: 0b + } + } + id: "sns:frame_pack" + } + type: "item" + }] + title: "{quests.tfg_tips.frame_pack.title}" + x: 16.0d + y: -0.5d + } + { + dependencies: ["509C064AA92FD78F"] + description: ["{quests.tfg_tips.special_sacks.desc}"] + id: "21C58B2541BFA2EE" + shape: "heart" + subtitle: "{quests.tfg_tips.special_sacks.subtitle}" + tasks: [ + { + id: "174C280F11DC3D85" + item: { + Count: 1 + ForgeCaps: { + Parent: { + Items: [ ] + voidSlots: [I; ] + weight: 0b + } + } + id: "sns:seed_pouch" + } + optional_task: true + type: "item" + } + { + id: "3B5EC702928D4E22" + item: { + Count: 1 + ForgeCaps: { + Parent: { + Items: [ ] + voidSlots: [I; ] + weight: 0b + } + } + id: "sns:ore_sack" + } + optional_task: true + type: "item" + } + ] + title: "{quests.tfg_tips.special_sacks.title}" + x: 12.5d + y: 1.0d + } + { + dependencies: ["7FA5B6354A49C396"] + description: ["{quests.tfg_tips.toolbox.desc}"] + icon: "create:brown_toolbox" + id: "1652649B64E7C04C" + subtitle: "{quests.tfg_tips.toolbox.subtitle}" + tasks: [{ + id: "7712BDD1CF0760F5" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(create:toolboxes)" + } + } + title: "{quests.tasktype.item.any} #create:toolboxes" + type: "item" + }] + title: "{quests.tfg_tips.toolbox.title}" + x: 9.0d + y: 5.0d + } + { + dependencies: ["7FA5B6354A49C396"] + description: ["{quests.tfg_tips.straw_basket.desc}"] + id: "67F40A90844EC0FC" + subtitle: "{quests.tfg_tips.straw_basket.subtitle}" + tasks: [{ + id: "542549225517097C" + item: { + Count: 1 + ForgeCaps: { + Parent: { + Items: [ ] + voidSlots: [I; ] + weight: 0b + } + } + id: "sns:straw_basket" + } + type: "item" + }] + title: "{quests.tfg_tips.straw_basket.title}" + x: 9.0d + y: -1.0d + } + { + dependencies: ["150B7C5CD152E1BA"] + description: ["{quests.tfg_tips.hiking.desc}"] + icon: { + Count: 1 + id: "sns:hiking_boots" + tag: { + Damage: 0 + } + } + id: "21042F13F754E6E6" + subtitle: "{quests.tfg_tips.hiking.subtitle}" + tasks: [{ + id: "263569419A799471" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(sns:hiking_boots)item(sns:steel_toe_hiking_boots)item(sns:black_steel_toe_hiking_boots)item(sns:blue_steel_toe_hiking_boots)item(sns:red_steel_toe_hiking_boots))" + } + } + title: "{quests.tfg_tips.hiking.task}" + type: "item" + }] + title: "{quests.tfg_tips.hiking.title}" + x: -3.0d + y: 10.0d + } ] subtitle: ["{quests.tfg_tips.tools_tips.subtitle}"] title: "Tips - Tools" diff --git a/config/ftbquests/quests/chapters/tips__transportation.snbt b/config/ftbquests/quests/chapters/tips__transportation.snbt index 0f959f3f6..a88a4b21f 100644 --- a/config/ftbquests/quests/chapters/tips__transportation.snbt +++ b/config/ftbquests/quests/chapters/tips__transportation.snbt @@ -968,7 +968,7 @@ type: "item" }] title: "{quests.tfg_tips.supply_cart.title}" - x: 6.0d + x: 4.5d y: -1.5d } { @@ -999,7 +999,7 @@ } ] title: "{quests.tfg_tips.equines.title}" - x: 5.0d + x: 6.5d y: -1.5d } { @@ -1020,7 +1020,7 @@ type: "item" }] title: "{quests.tfg_tips.animal_cart.title}" - x: 7.0d + x: 5.5d y: -1.5d } { @@ -1041,7 +1041,7 @@ type: "item" }] title: "{quests.tfg_tips.plow.title}" - x: 8.0d + x: 8.5d y: -1.5d } { @@ -1418,6 +1418,40 @@ x: 18.0d y: -2.0d } + { + dependencies: ["05528D09F7EE6E33"] + description: ["{quests.tfg_tips.horseshoes.desc}"] + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "sns:metal/horseshoes/steel" + tag: { + Damage: 0 + } + } + id: "40566F6665A095C6" + subtitle: "{quests.tfg_tips.horseshoes.subtitle}" + tasks: [{ + id: "75C43AA489BAE404" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(sns:metal/horseshoes/steel)item(sns:metal/horseshoes/black_steel)item(sns:metal/horseshoes/blue_steel)item(sns:metal/horseshoes/red_steel))" + } + } + title: "{quests.tfg_tips.horseshoes.task}" + type: "item" + }] + title: "{quests.tfg_tips.horseshoes.title}" + x: 7.5d + y: -1.5d + } ] subtitle: ["{quests.tfg_tips.transportation_tips.subtitle}"] title: "Tips - Transportation" diff --git a/defaultconfigs/sns-server.toml b/defaultconfigs/sns-server.toml index 47e9f1658..c4cf88814 100644 --- a/defaultconfigs/sns-server.toml +++ b/defaultconfigs/sns-server.toml @@ -16,7 +16,7 @@ slotCap = 32 #The maximum item size allowed in the container #Allowed Values: TINY, VERY_SMALL, SMALL, NORMAL, LARGE, VERY_LARGE, HUGE - allowedSize = "SMALL" + allowedSize = "NORMAL" ["Container Item Config"."Leather Sack"] #Determines if this container will automatically pickup items @@ -81,7 +81,7 @@ slotCount = 27 #Item stack max for the type of container #Range: 1 ~ 512 - slotCap = 64 + slotCap = 128 #The maximum item size allowed in the container #Allowed Values: TINY, VERY_SMALL, SMALL, NORMAL, LARGE, VERY_LARGE, HUGE allowedSize = "SMALL" diff --git a/defaultconfigs/sophisticatedbackpacks-server.toml b/defaultconfigs/sophisticatedbackpacks-server.toml index c937a3214..9584e4406 100644 --- a/defaultconfigs/sophisticatedbackpacks-server.toml +++ b/defaultconfigs/sophisticatedbackpacks-server.toml @@ -26,7 +26,7 @@ [server.leatherBackpack] #Number of inventory slots in the backpack #Range: 1 ~ 144 - inventorySlotCount = 27 + inventorySlotCount = 36 #Number of upgrade slots in the backpack #Range: 0 ~ 10 upgradeSlotCount = 1 diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 42ba86651..7f432525b 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -2996,6 +2996,21 @@ "quests.tfg_tips.vessels.title": "Large and Small Vessels", "quests.tfg_tips.vessels.subtitle": "Clay can be quite useful", "quests.tfg_tips.vessels.desc": "&dSmall Vessels&r have 4 inventory slots while &6Large Vessels&r have 9! The &dSmall Vessel&r is not just for item storage, but is also necessary for smelting and alloying basic metals.\nThe &6Large Vessel&r is heavier to carry, but is great for preserving food.\n\n&l&3Tip:&r&o Large Vessels double as early backpacks!", + "quests.tfg_tips.straw_basket.title": "Straw Basket", + "quests.tfg_tips.straw_basket.subtitle": "As simple as it gets", + "quests.tfg_tips.straw_basket.desc": "The &6Straw Basket&r is a simple basket that can be incredibly useful for managing your inventory before better options are available.\n\nSimply knap some straw to get your very own &6Straw Basket&r!", + "quests.tfg_tips.toolbox.title": "Toolboxes", + "quests.tfg_tips.toolbox.subtitle": "A builders dream", + "quests.tfg_tips.toolbox.desc": "The &dToolbox&r has 8 inventory slots which can each hold 4 stacks of items. Additionally, you can use a &ckeybind&r to access your placed &dToolbox&r from a few blocks away. You can even &bdye&r your &dToolbox&r to personalize it!", + "quests.tfg_tips.first_sacks.title": "Storage Sacks", + "quests.tfg_tips.first_sacks.subtitle": "A step up from vessels", + "quests.tfg_tips.first_sacks.desc": "The &6Leather Sack&r and &3Burlap Sack&r are two options for portable storage with their own pros and cons. It is a good idea to view the container info for each one to know how many &ditem slots&r, the &dstack size&r, and the max &ditem size&r for each sack.\n\n&l&3Tip:&r The &4&oField Guide&r has more specific info on some of the special features of the sacks.", + "quests.tfg_tips.special_sacks.title": "Specialized Sacks", + "quests.tfg_tips.special_sacks.subtitle": "Wait, it can hold how much?", + "quests.tfg_tips.special_sacks.desc": "The &2Seed Pouch&r and &9Ore Sack&r are two sacks that can only hold specific types of items, but make up for it with much larger &dstack sizes&r.\n\nThe &2Seed Pouch&r can hold up to &c128&r of &327&r different types seeds.\n\nThe &9Ore Sack&r can hold up to &c512&r of &39&r different mined resources. That means it can hold items like ores, rocks, powders, and clays!", + "quests.tfg_tips.frame_pack.title": "Frame Pack", + "quests.tfg_tips.frame_pack.subtitle": "Options can be good!", + "quests.tfg_tips.frame_pack.desc": "The &5Frame Pack&r gives you &318&r slots that can each hold up to &c64&r items. The benefit of the &5Frame Pack&r is that it ignores the default stack size of the items you put into it. That means you can hold up to &c1152&r items in total!", "quests.tfg_tips.portable_cells.title": "Portable Item and Fluid Cells", "quests.tfg_tips.portable_cells.subtitle": "Isn't this too advanced?", "quests.tfg_tips.portable_cells.desc": "With &dApplied Energistics 2&r, you can create &aPortable Item&r and &bFluid Cells&r, which allow you to store large amounts of items and fluids as pure, raw data. Sadly, &dApplied Energistics 2&r is locked behind &6HV&r, so it might be a while until you can create these.", @@ -3004,10 +3019,10 @@ "quests.tfg_tips.256m_portable_cells.desc": "With &dMEGA Cells&r, you can create cells with &lLudicrous&r data storage!\n\n&l&3Fun Fact:&r&o A single 256M Portable Item Cell can store up to one billion of a single item type! That's enough to fill over 58 thousand chests!", "quests.tfg_tips.backpack_materials.title": "Materials for a Backpack", "quests.tfg_tips.backpack_materials.subtitle": "Sleeping bag not included", - "quests.tfg_tips.backpack_materials.desc": "A &3Sophisticated Backpack&r is the primary way to expand your portable inventory size. The first tier will double your normal inventory, and further tiers increase it even more! It also comes with a wide variety of &afunctional upgrades&r, and different parts of it can be dyed different colors!", + "quests.tfg_tips.backpack_materials.desc": "There are two options for backpacks: the &5Frame Pack&r or the &3Sophisticated Backpack&r\n\nA &5Frame Pack&r is a dense backpack allowing you to store up to &c64&r items in each slot no &omatter their standard stack size&r.\n\nA &3Sophisticated Backpack&r is the primary way to expand your portable inventory size going forward. The first tier will more than double your normal inventory, and further tiers increase it even more! It also comes with a wide variety of &afunctional upgrades&r, and different parts of it can be dyed different colors!", "quests.tfg_tips.first_backpack.title": "Your First Backpack", "quests.tfg_tips.first_backpack.subtitle": "No, the map won't magically appear.", - "quests.tfg_tips.first_backpack.desc": "This is your first &3Sophisticated Backpack.&r It has a total of &c27&r inventory slots and can hold &aone upgrade.&r Check the two branches after this to learn about inventory and backpack upgrades.", + "quests.tfg_tips.first_backpack.desc": "This is your first &3Sophisticated Backpack.&r It has a total of &c36&r inventory slots and can hold &aone upgrade.&r Check the two branches after this to learn about inventory and backpack upgrades.", "quests.tfg_tips.red_steel_backpack.title": "Red Steel Backpack", "quests.tfg_tips.red_steel_backpack.subtitle": "Cooler than a Blue Steel Backpack", "quests.tfg_tips.red_steel_backpack.desc": "A &4Red Steel Backpack&r is your first proper backpack inventory upgrade. It has a total slot count of &c54&r and can hold &atwo upgrades.&r", @@ -3051,6 +3066,10 @@ "quests.tfg_tips.cane.subtitle": "You can even whack people with them!", "quests.tfg_tips.cane.desc": "A &dWalking Cane&r allows you to completely ignore any block that slows your movement, such as &asnow&r, as long as you're carrying it in your &cmain&r or &coff-hand.&r\nAs a bonus, it &bincrease step-height.&r In other words, allows you to walk up one block without jumping. The &dIron Cane&r even allows to walk over fences!", "quests.tfg_tips.cane.task": "Any Cane", + "quests.tfg_tips.hiking.title": "Hiking Boots", + "quests.tfg_tips.hiking.subtitle": "&oThese boots are made for walking", + "quests.tfg_tips.hiking.desc": "&dHiking Boots&r allow you to more easily explore your world! All &dHiking Boots&r allow you to pass through tall grass without resistance. Additionally, each tier of &dHiking Boots&r have progressively more &9armor&r, &9walk speed&r, and &9fall resistance&r along with other boosts.", + "quests.tfg_tips.hiking.task": "Any Hiking Boots", "quests.tfg_tips.glassblowing.title": "Glassblowing", "quests.tfg_tips.glassblowing.subtitle": "Realistic Glassworking!", "quests.tfg_tips.glassblowing.desc": "To make any sort of &dGlass Pane&r or &dBlock&r, you'll need a &3glassblowing&r setup.\n\n&3Glassblowing&r will require some sort of &aBlowpipe&r, and a platform made out of glassblowing blocks to pour the molten glass. Check out the &2Field Guide&r for more information on the shape of the platform and what blocks are valid. You'll have access to glassblowing as soon as you can shape &aBrass!&r", @@ -3428,6 +3447,10 @@ "quests.tfg_tips.plow.title": "Plow", "quests.tfg_tips.plow.subtitle": "Large Scale Farming", "quests.tfg_tips.plow.desc": "If there ever comes the need to till large sections of land for some megafarms, the &dPlow&r can come in clutch.", + "quests.tfg_tips.horseshoes.title": "Horseshoes", + "quests.tfg_tips.horseshoes.subtitle": "Fashionable Equine Footwear", + "quests.tfg_tips.horseshoes.desc": "&aHorseshoes&r are an accessory for your equine companions that boost their &9speed&r, &dfall resistance&r, and &cstep height&r at higher tiers.", + "quests.tfg_tips.horseshoes.task": "Any Horseshoes", "quests.tfg_tips.firmalife.title": "Firmalife", "quests.tfg_tips.firmalife.subtitle": "Thrive in TerraFirmaCraft", "quests.tfg_tips.firmalife.desc": "&2Firmalife&r is a mod all about extending the agricultural and gastronomic experience in TerraFirmaCraft, with touches of miscellaneous features. Includes things such as decorations, more preservation methods, new foods, bees and a plethora of useful gadgets!", diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 017305501..1eb613313 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1948,18 +1948,20 @@ const registerCreateRecipes = (event) => { event.shaped('create:brown_toolbox', [ 'CEC', - 'BAB', + 'BFB', 'DAD' ], { A: '#forge:chests/wooden', B: '#forge:plates/brass', C: '#forge:bolts/brass', D: '#forge:screws', - E: '#forge:tools/screwdrivers' + E: '#forge:tools/screwdrivers', + F: 'gtceu:treated_wood_frame' }).id('tfg:create/shaped/brown_toolbox') event.recipes.gtceu.assembler('create:brown_toolbox') - .itemInputs('2x #forge:chests/wooden', '2x #forge:plates/brass', '2x #forge:bolts/brass', '2x #forge:screws') + .itemInputs('#forge:chests/wooden', 'gtceu:treated_wood_frame', '2x #forge:plates/brass', + '2x #forge:bolts/brass', '2x #forge:screws') .itemOutputs('create:brown_toolbox') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) diff --git a/kubejs/server_scripts/sacksnstuff/recipes.js b/kubejs/server_scripts/sacksnstuff/recipes.js index b29697338..0a0649719 100644 --- a/kubejs/server_scripts/sacksnstuff/recipes.js +++ b/kubejs/server_scripts/sacksnstuff/recipes.js @@ -14,6 +14,7 @@ const registerSNSRecipes = (event) => { event.remove({ id: 'sns:crafting/burlap_sack'}) event.remove({ id: 'sns:crafting/seed_pouch'}) event.remove({ id: 'sns:crafting/straw_basket'}) + event.remove({ id: 'sns:crafting/frame_pack'}) event.remove({ output: 'sns:pack_frame'}) @@ -57,12 +58,12 @@ const registerSNSRecipes = (event) => { event.shaped('sns:leather_sack', [ 'AAA', 'BCB', - 'DBE' + ' BE' ], { A: '#tfg:burlap_fiber', B: 'sns:leather_strip', C: 'sns:unfinished_leather_sack', - D: 'minecraft:name_tag', + //D: 'minecraft:name_tag', E: 'tfc:bone_needle' } ) @@ -109,6 +110,22 @@ const registerSNSRecipes = (event) => { .outsideSlotRequired(false) .id('sns:straw_knapping/straw_basket') + + event.recipes.tfc.damage_inputs_shaped_crafting( + event.shaped('sns:frame_pack', [ + 'ABA', + 'ACA', + 'DBE' + ], { + A: 'sns:bound_leather_strip', + B: 'sns:reinforced_fabric', + C: 'sns:pack_frame', + D: 'minecraft:name_tag', + E: 'tfc:bone_needle' + } + ) + ).id('sns:crafting/frame_pack') + //#region helper items event.recipes.tfc.anvil( @@ -168,11 +185,27 @@ const registerSNSRecipes = (event) => { 'A A', 'AAA' ], { - A: '#forge:rods/wrought_iron' + A: '#forge:rods/any_bronze' }).id('sns:shaped/pack_frame') - event.shaped('2x sns:reinforced_fiber', [ + event.shaped('sns:pack_frame', [ + ' A ', + 'A A', + ' A ' + ], { + A: '#forge:rods/wrought_iron' + + }).id('sns:shaped/pack_frame_iron') + + event.recipes.gtceu.assembler('sns:pack_frame') + .itemInputs('4x #forge:rods/wrought_iron') + .itemOutputs('sns:pack_frame') + .circuit(4) + .duration(80) + .EUt(GTValues.VA[GTValues.LV]) + + event.shaped('3x sns:reinforced_fiber', [ 'AAA', 'BBB', 'AAA' diff --git a/kubejs/server_scripts/sophisticated_backpacks/recipes.js b/kubejs/server_scripts/sophisticated_backpacks/recipes.js index 375727909..0dc396760 100644 --- a/kubejs/server_scripts/sophisticated_backpacks/recipes.js +++ b/kubejs/server_scripts/sophisticated_backpacks/recipes.js @@ -10,14 +10,15 @@ const registerSophisticatedBackpacksRecipes = (event) => { // Базовый рюкзак event.shaped('sophisticatedbackpacks:backpack', [ - 'ABD', - 'ACA', + 'AED', + 'BCB', 'BBB' ], { - A: '#forge:string', - B: '#forge:leather', - C: '#forge:chests/wooden', - D: 'minecraft:name_tag' + A: 'sns:reinforced_fiber', + B: 'sns:bound_leather_strip', + C: 'sns:pack_frame', + D: 'minecraft:name_tag', + E: 'sns:reinforced_fabric' }).id('tfg:sophisticated_backpacks/shaped/backpack') // Железный рюкзак diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 2a3a3f3b7..d4b7a77ae 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -218,9 +218,14 @@ const registerTFGItemTags = (event) => { event.add('tfg:any_iron_double_ingot', '#forge:double_ingots/iron') event.add('tfg:any_iron_double_ingot', '#forge:double_ingots/wrought_iron') + // Allow any bronze type event.add('tfg:any_bronze_frame', '#forge:frames/bronze') event.add('tfg:any_bronze_frame', '#forge:frames/bismuth_bronze') event.add('tfg:any_bronze_frame', '#forge:frames/black_bronze') + + event.add('forge:rods/any_bronze', '#forge:rods/bronze') + event.add('forge:rods/any_bronze', '#forge:rods/bismuth_bronze') + event.add('forge:rods/any_bronze', '#forge:rods/black_bronze') //#region Food const RAW_MEATS = [