diff --git a/CHANGELOG.md b/CHANGELOG.md index f49c31f40..d6541bcfb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - You can now also use soybean oil to make pizza dough via machines. (#1056) @Pyritie - Create Deco's metal bars are now breakable with a pickaxe. (#1053) @Pyritie - Aircraft engine recipes now use the correct tier cables. @Pyritie +- Added Piglin disguise item to prevent Piglin aggro. (#1058) @Redeix ## [0.9.8] - 19.05.2025 ### Changes diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index cce2c779b..56bbe7f8d 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -5,12 +5,6 @@ group: "3C4612A920658A7E" icon: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } id: "gtceu:wrought_iron_ingot" } id: "5F560FF28458A555" @@ -71,29 +65,19 @@ id: "7218CBCCA313343B" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } id: "tfc:metal/bucket/red_steel" } type: "item" + weak_nbt_match: true } { id: "41001037515E3120" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } id: "tfc:metal/bucket/blue_steel" } type: "item" + weak_nbt_match: true } ] title: "{quests.metal_age.redblu_buckets.title}" @@ -111,15 +95,10 @@ id: "5E7E9401FF7C5402" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } id: "tfc:metal/anvil/black_steel" } type: "item" + weak_nbt_match: true }] title: "{quests.metal_age.black_steel_anvil.title}" x: 27.5d @@ -136,15 +115,10 @@ id: "338F94FE331E0954" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } id: "tfc:metal/anvil/steel" } type: "item" + weak_nbt_match: true }] title: "{quests.metal_age.steel_anvil.title}" x: 27.5d @@ -161,15 +135,10 @@ id: "0E566B2921529CFE" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } id: "tfc:metal/anvil/wrought_iron" } type: "item" + weak_nbt_match: true }] title: "{quests.metal_age.wrought_iron_anvil.title}" x: 9.0d @@ -204,7 +173,7 @@ id: "133DB645B6E0585A" subtitle: "{quests.metal_age.weld_bronze_ingots.subtitle}" tasks: [{ - count: 7L + count: 1L id: "497C431206F498A5" item: { Count: 1 @@ -239,29 +208,19 @@ id: "15B937178A5E5D8E" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } id: "tfc:raw_iron_bloom" } type: "item" + weak_nbt_match: true } { id: "38651A52735D8872" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } id: "gtceu:wrought_iron_ingot" } type: "item" + weak_nbt_match: true } ] title: "{quests.metal_age.bloomery.title}" @@ -306,29 +265,19 @@ id: "5115EB2096C8E86C" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } id: "tfc:metal/ingot/pig_iron" } type: "item" + weak_nbt_match: true } { id: "2153FE85D0898117" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } id: "gtceu:steel_ingot" } type: "item" + weak_nbt_match: true } ] title: "{quests.metal_age.blast_furnace.title}" @@ -345,19 +294,14 @@ id: "358571B6E692F198" subtitle: "{quests.metal_age.weld_wrought_iron_ingots.subtitle}" tasks: [{ - count: 7L + count: 1L id: "05AD17F66DFE3C56" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } id: "gtceu:wrought_iron_double_ingot" } type: "item" + weak_nbt_match: true }] title: "{quests.metal_age.weld_wrought_iron_ingots.title}" x: 7.0d @@ -385,19 +329,14 @@ id: "4310B619B57276ED" subtitle: "{quests.metal_age.weld_steel_ingots.subtitle}" tasks: [{ - count: 7L + count: 1L id: "0EDB1D851E198274" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } id: "gtceu:steel_double_ingot" } type: "item" + weak_nbt_match: true }] title: "{quests.metal_age.weld_steel_ingots.title}" x: 25.5d diff --git a/config/ftbquests/quests/chapters/questsstoneage.snbt b/config/ftbquests/quests/chapters/questsstoneage.snbt index 9f6d6f74c..c07caa174 100644 --- a/config/ftbquests/quests/chapters/questsstoneage.snbt +++ b/config/ftbquests/quests/chapters/questsstoneage.snbt @@ -631,11 +631,9 @@ item: { Count: 1 id: "tfc:firestarter" - tag: { - Damage: 0 - } } type: "item" + weak_nbt_match: true } { icon: "tfc:firepit" @@ -662,12 +660,6 @@ id: "3F1120F05AD5FB2B" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } id: "tfc:metal/anvil/copper" } type: "item" @@ -689,16 +681,10 @@ id: "45A09AD0043FF92B" subtitle: "{quests.stone_age.weld_copper_ingots.subtitle}" tasks: [{ - count: 7L + count: 1L id: "5A6EF9EBF232601C" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } id: "gtceu:copper_double_ingot" } type: "item" @@ -714,12 +700,6 @@ description: ["{quests.stone_age.flux.desc}"] icon: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } id: "tfc:powder/flux" } id: "30E26DC33FD019FE" @@ -741,13 +721,8 @@ id: "655B1B05EE4BABF7" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } id: "tfc:powder/flux" + weak_nbt_match: true } type: "item" } @@ -770,12 +745,6 @@ id: "302196CB1816F316" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } id: "minecraft:copper_ingot" } type: "item" @@ -795,17 +764,6 @@ icon: { Count: 1 id: "gtceu:stone_hammer" - tag: { - DisallowContainerItem: 0b - GT.Behaviours: { } - GT.Tool: { - Damage: 0 - HarvestLevel: 1 - MaxDamage: 47 - ToolSpeed: 5.2f - } - HideFlags: 2 - } } id: "0425FDD03AEC4F0D" item: { diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 838c35264..48c411a22 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -48,7 +48,7 @@ } id: "2B84F34BFA37C828" shape: "octagon" - size: 1.0d + size: 2.0d subtitle: "{quests.tfg_tips.firmaciv.subtitle}" tasks: [{ id: "41793C99EC45695A" @@ -56,8 +56,8 @@ type: "checkmark" }] title: "{quests.tfg_tips.firmaciv.title}" - x: -8.0d - y: -4.0d + x: -8.5d + y: -6.5d } { dependencies: ["173F6FA60A5B280B"] @@ -285,51 +285,10 @@ x: -4.0d y: 4.0d } - { - dependencies: ["59F36AD7A3E81B45"] - description: ["{quests.tfg_tips.canoe_beginning.desc}"] - id: "30CEFFD95E39CB00" - subtitle: "{quests.tfg_tips.canoe_beginning.subtitle}" - tasks: [{ - id: "0DB7D5B3389DF2E0" - title: "{quests.tasktype.checkmark}" - type: "checkmark" - }] - title: "{quests.tfg_tips.canoe_beginning.title}" - x: -8.0d - y: -8.0d - } - { - dependencies: ["2B84F34BFA37C828"] - description: ["{quests.tfg_tips.kayak_beginning.desc}"] - id: "42FBA46B48001F67" - subtitle: "{quests.tfg_tips.kayak_beginning.subtitle}" - tasks: [{ - id: "4DB876B78C0C3FDF" - title: "{quests.tasktype.checkmark}" - type: "checkmark" - }] - title: "{quests.tfg_tips.kayak_beginning.title}" - x: -10.0d - y: -2.5d - } - { - dependencies: ["59F36AD7A3E81B45"] - description: ["{quests.tfg_tips.rowboat_beginning.desc}"] - id: "0C2DEF0B4B612621" - subtitle: "{quests.tfg_tips.rowboat_beginning.subtitle}" - tasks: [{ - id: "33395E0EDE754E6D" - title: "{quests.tasktype.checkmark}" - type: "checkmark" - }] - title: "{quests.tfg_tips.rowboat_beginning.title}" - x: -9.5d - y: -8.0d - } { dependencies: ["3DF4F4848B231980"] description: ["{quests.tfg_tips.create_rowboat.desc}"] + icon: "firmaciv:rowboat_icon_only" id: "4F9A15016C9F51A1" size: 2.0d subtitle: "{quests.tfg_tips.create_rowboat.subtitle}" @@ -351,11 +310,11 @@ } ] title: "{quests.tfg_tips.create_rowboat.title}" - x: -12.0d - y: -8.0d + x: -14.5d + y: -8.5d } { - dependencies: ["3CDA0C20D0FF9BE0"] + dependencies: ["2746958D3D4A0885"] description: ["{quests.tfg_tips.create_sloop.desc}"] id: "78358ED2C6F6FCFD" shape: "gear" @@ -371,13 +330,13 @@ type: "observation" }] title: "{quests.tfg_tips.create_sloop.title}" - x: -14.0d - y: -12.0d + x: -14.5d + y: -11.5d } { dependencies: [ - "0C2DEF0B4B612621" "0A92F5C4BB6AF972" + "2B84F34BFA37C828" ] description: ["{quests.tfg_tips.rowboat_materials.desc}"] id: "3DF4F4848B231980" @@ -446,26 +405,13 @@ } ] title: "{quests.tfg_tips.rowboat_materials.title}" - x: -10.5d - y: -8.0d - } - { - dependencies: ["59F36AD7A3E81B45"] - description: ["{quests.tfg_tips.sloop_beginning.desc}"] - id: "4ED4FF2581241118" - subtitle: "{quests.tfg_tips.sloop_beginning.subtitle}" - tasks: [{ - id: "0B9B2ADB2D0CA719" - title: "{quests.tasktype.checkmark}" - type: "checkmark" - }] - title: "{quests.tfg_tips.sloop_beginning.title}" - x: -12.0d - y: -6.0d + x: -12.5d + y: -8.5d } { dependencies: ["32C854110D49A77D"] description: ["{quests.tfg_tips.create_canoe.desc}"] + icon: "firmaciv:canoe_icon_only" id: "22DA27A8E2D11106" size: 2.0d subtitle: "{quests.tfg_tips.create_canoe.subtitle}" @@ -486,14 +432,11 @@ } ] title: "{quests.tfg_tips.create_canoe.title}" - x: -10.0d - y: -10.0d + x: -14.5d + y: -4.5d } { - dependencies: [ - "30CEFFD95E39CB00" - "59F36AD7A3E81B45" - ] + dependencies: ["2B84F34BFA37C828"] dependency_requirement: "one_completed" description: ["{quests.tfg_tips.canoe_materials.desc}"] id: "32C854110D49A77D" @@ -550,11 +493,11 @@ } ] title: "{quests.tfg_tips.canoe_materials.title}" - x: -8.0d - y: -10.0d + x: -12.5d + y: -4.5d } { - dependencies: ["42FBA46B48001F67"] + dependencies: ["2B84F34BFA37C828"] description: ["{quests.tfg_tips.kayak_materials.desc}"] id: "03696C9BBC53AB26" subtitle: "{quests.tfg_tips.kayak_materials.subtitle}" @@ -593,12 +536,13 @@ } ] title: "{quests.tfg_tips.kayak_materials.title}" - x: -12.0d - y: -2.5d + x: -12.5d + y: -6.5d } { dependencies: ["03696C9BBC53AB26"] description: ["{quests.tfg_tips.create_kayak.desc}"] + icon: "firmaciv:kayak" id: "7B824CC8BD6E4E30" size: 2.0d subtitle: "{quests.tfg_tips.create_kayak.subtitle}" @@ -615,22 +559,8 @@ } ] title: "{quests.tfg_tips.create_kayak.title}" - x: -12.0d - y: -4.0d - } - { - dependencies: ["2B84F34BFA37C828"] - description: ["{quests.tfg_tips.entity_boats.desc}"] - id: "59F36AD7A3E81B45" - subtitle: "{quests.tfg_tips.entity_boats.subtitle}" - tasks: [{ - id: "1F374E01715FD9D1" - item: "minecraft:lead" - type: "item" - }] - title: "{quests.tfg_tips.entity_boats.title}" - x: -8.0d - y: -6.0d + x: -14.5d + y: -6.5d } { dependencies: ["2B84F34BFA37C828"] @@ -689,14 +619,11 @@ } ] title: "{quests.tfg_tips.firmaciv_info.title}" - x: -10.0d - y: -4.0d + x: -8.5d + y: -4.5d } { - dependencies: [ - "4ED4FF2581241118" - "59F36AD7A3E81B45" - ] + dependencies: ["2B84F34BFA37C828"] dependency_requirement: "one_completed" description: ["{quests.tfg_tips.sloop_under_construction_materials.desc}"] id: "2746958D3D4A0885" @@ -730,7 +657,7 @@ type: "item" } { - count: 96L + count: 116L id: "10929AC1C1B89579" item: { Count: 1 @@ -757,20 +684,22 @@ } type: "item" } - ] - title: "{quests.tfg_tips.sloop_under_construction_materials.title}" - x: -14.0d - y: -6.0d - } - { - dependencies: ["2746958D3D4A0885"] - description: ["{quests.tfg_tips.sloop_materials.desc}"] - id: "3CDA0C20D0FF9BE0" - subtitle: "{quests.tfg_tips.sloop_materials.subtitle}" - tasks: [ + { + count: 16L + id: "269828143DC2013C" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(afc:wood/lumber/ironwood)item(tfc:wood/lumber/acacia)item(tfc:wood/lumber/ash)item(tfc:wood/lumber/aspen)item(tfc:wood/lumber/birch)item(tfc:wood/lumber/blackwood)item(tfc:wood/lumber/chestnut)item(tfc:wood/lumber/hickory)item(tfc:wood/lumber/maple)item(tfc:wood/lumber/oak)item(tfc:wood/lumber/rosewood)item(tfc:wood/lumber/sycamore)item(afc:wood/lumber/baobab)item(afc:wood/lumber/eucalyptus)item(afc:wood/lumber/mahogany)item(afc:wood/lumber/hevea)item(afc:wood/lumber/teak)item(afc:wood/lumber/ipe)item(beneath:wood/lumber/warped))" + } + } + title: "{quests.tfg_tips.sloop_under_construction_materials.task}" + type: "item" + } { count: 34L - id: "35D3A0129EBBA52D" + id: "5979FB98DD21EE7E" item: { Count: 1 id: "ftbfiltersystem:smart_filter" @@ -782,43 +711,17 @@ type: "item" } { - count: 20L - id: "478C0EE68D796411" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(firmaciv:hard_wood)" - } - } - title: "{quests.tasktype.item.any} #firmaciv:hard_wood" - type: "item" - } - { - count: 16L - id: "6B373905A5E7C841" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "or(item(afc:wood/lumber/ironwood)item(tfc:wood/lumber/acacia)item(tfc:wood/lumber/ash)item(tfc:wood/lumber/aspen)item(tfc:wood/lumber/birch)item(tfc:wood/lumber/blackwood)item(tfc:wood/lumber/chestnut)item(tfc:wood/lumber/hickory)item(tfc:wood/lumber/maple)item(tfc:wood/lumber/oak)item(tfc:wood/lumber/rosewood)item(tfc:wood/lumber/sycamore)item(afc:wood/lumber/baobab)item(afc:wood/lumber/eucalyptus)item(afc:wood/lumber/mahogany)item(afc:wood/lumber/hevea)item(afc:wood/lumber/teak)item(afc:wood/lumber/ipe)item(beneath:wood/lumber/warped))" - } - } - title: "{quests.tfg_tips.sloop_materials.task}" - type: "item" - } - { - id: "2ADFC23B73EDA409" + id: "6AD81FFA674BD0FB" item: "firmaciv:medium_triangular_sail" type: "item" } { - id: "559ACF5AE45ACA9B" + id: "3DCFE31A3B0F0F8C" item: "firmaciv:small_triangular_sail" type: "item" } { - id: "261592FC7CA10FFA" + id: "40505BFC804F7516" item: { Count: 1 ForgeCaps: { @@ -833,17 +736,17 @@ } { count: 8L - id: "160EB11FBEA25CFF" + id: "43971DE8A74AA81D" item: { Count: 8, id: "firmaciv:rope_coil" } type: "item" } ] - title: "{quests.tfg_tips.sloop_materials.title}" - x: -14.0d - y: -8.0d + title: "{quests.tfg_tips.sloop_under_construction_materials.title}" + x: -10.5d + y: -8.5d } { - dependencies: ["2B84F34BFA37C828"] + dependencies: ["78358ED2C6F6FCFD"] description: ["{quests.tfg_tips.warfare.desc}"] id: "66FDACC7E7F9180C" subtitle: "{quests.tfg_tips.warfare.subtitle}" @@ -869,8 +772,8 @@ } ] title: "{quests.tfg_tips.warfare.title}" - x: -10.0d - y: -5.0d + x: -10.5d + y: -11.5d } { dependencies: [ @@ -2241,7 +2144,7 @@ type: "checkmark" }] title: "{quests.tfg_tips.greenhouse.title}" - x: 2.0d + x: 3.5d y: -6.0d } { @@ -2744,8 +2647,8 @@ type: "item" }] title: "{quests.tfg_tips.glider.title}" - x: -4.0d - y: -2.5d + x: -2.0d + y: -4.0d } { dependencies: ["7EE13BE102F323F3"] @@ -2767,8 +2670,8 @@ type: "item" }] title: "{quests.tfg_tips.reinforced_glider.title}" - x: -4.0d - y: -1.5d + x: -2.0d + y: -5.0d } { dependencies: ["7FA5B6354A49C396"] @@ -3368,10 +3271,10 @@ { dependencies: ["150B7C5CD152E1BA"] description: ["{quests.tfg_tips.fishing_net.desc}"] - id: "75C6BF1C9405B4BF" + id: "2A57C41D681E4611" subtitle: "{quests.tfg_tips.fishing_net.subtitle}" tasks: [{ - id: "37DD99D32072ADBF" + id: "10826B1E02F646D4" item: { Count: 1 id: "ftbfiltersystem:smart_filter" @@ -3689,10 +3592,12 @@ y: -2.0d } { - dependencies: ["59F36AD7A3E81B45"] + dependencies: ["2B84F34BFA37C828"] description: ["{quests.tfg_tips.beneathxfirmaciv.desc}"] icon: "createdeco:decal_fire" id: "252EB7FA56D1F88E" + shape: "diamond" + size: 2.0d subtitle: "{quests.tfg_tips.beneathxfirmaciv.subtitle}" tasks: [{ id: "6C19AB80033D5E24" @@ -3700,8 +3605,8 @@ type: "checkmark" }] title: "{quests.tfg_tips.beneathxfirmaciv.title}" - x: -10.5d - y: -7.0d + x: -8.5d + y: -8.5d } { dependencies: ["13F7066858E923FF"] @@ -3782,7 +3687,7 @@ }] title: "{quests.tfg_tips.immersive_aircraft.title}" x: -4.0d - y: -6.0d + y: -7.5d } { dependencies: ["62FD3E7A836D2E0A"] @@ -3796,7 +3701,7 @@ }] title: "{quests.tfg_tips.quadrocopter.title}" x: -4.0d - y: -8.0d + y: -9.5d } { dependencies: ["5D7E9840A5A7AD7E"] @@ -3810,7 +3715,7 @@ }] title: "{quests.tfg_tips.gyrodyne.title}" x: -4.0d - y: -10.0d + y: -11.5d } { dependencies: ["62FD3E7A836D2E0A"] @@ -3824,7 +3729,7 @@ }] title: "{quests.tfg_tips.airship.title}" x: -5.0d - y: -8.0d + y: -9.5d } { dependencies: ["598BD589D3C3057A"] @@ -3838,7 +3743,7 @@ }] title: "{quests.tfg_tips.cargo_airship.title}" x: -5.0d - y: -10.0d + y: -11.5d } { dependencies: ["6E5195824D12ED1F"] @@ -3852,7 +3757,7 @@ }] title: "{quests.tfg_tips.waghship.title}" x: -5.0d - y: -12.0d + y: -13.5d } { dependencies: ["62FD3E7A836D2E0A"] @@ -3866,7 +3771,7 @@ }] title: "{quests.tfg_tips.economy_plane.title}" x: -3.0d - y: -8.0d + y: -9.5d } { dependencies: ["037E11CB318CADAC"] @@ -3880,7 +3785,7 @@ }] title: "{quests.tfg_tips.biplane.title}" x: -3.0d - y: -10.0d + y: -11.5d } { dependencies: ["6E4754288899732B"] @@ -3894,7 +3799,7 @@ }] title: "{quests.tfg_tips.scarlet_biplane.title}" x: -3.0d - y: -12.0d + y: -13.5d } { dependencies: ["4AA0EBFBA5D8788C"] @@ -3947,8 +3852,8 @@ } ] title: "{quests.tfg_tips.beneath_temp_management.title}" - x: 9.0d - y: -3.0d + x: 7.5d + y: -2.5d } { dependencies: ["70DA01DFDAE54224"] @@ -4025,8 +3930,8 @@ type: "checkmark" }] title: "{quests.tfg_tips.beneath_clothes.title}" - x: 9.0d - y: -4.0d + x: 8.5d + y: -2.5d } { dependencies: ["4A8910950F638BB5"] @@ -4039,8 +3944,8 @@ type: "item" }] title: "{quests.tfg_tips.juicer.title}" - x: 9.0d - y: -5.0d + x: 9.5d + y: -3.5d } { dependencies: ["70DA01DFDAE54224"] @@ -4103,8 +4008,8 @@ } ] title: "{quests.tfg_tips.aircraft_upgrades.title}" - x: -3.0d - y: -6.5d + x: -2.5d + y: -8.0d } { dependencies: ["62FD3E7A836D2E0A"] @@ -4136,8 +4041,8 @@ } ] title: "{quests.tfg_tips.aircraft_weapons.title}" - x: -3.0d - y: -5.5d + x: -2.5d + y: -7.0d } { dependencies: ["62FD3E7A836D2E0A"] @@ -4158,7 +4063,7 @@ }] title: "{quests.tfg_tips.steam_upgrades.title}" x: -6.0d - y: -6.0d + y: -7.5d } { dependencies: ["414A9A145910A9D4"] @@ -4179,7 +4084,7 @@ }] title: "{quests.tfg_tips.lv_upgrades.title}" x: -6.0d - y: -8.0d + y: -9.5d } { dependencies: ["2F39D369639C40FD"] @@ -4200,7 +4105,7 @@ }] title: "{quests.tfg_tips.mv_upgrades.title}" x: -6.0d - y: -10.0d + y: -11.5d } { dependencies: ["614CC5FB31A030B3"] @@ -4221,7 +4126,7 @@ }] title: "{quests.tfg_tips.hv_upgrades.title}" x: -6.0d - y: -12.0d + y: -13.5d } { dependencies: ["70DA01DFDAE54224"] @@ -4300,7 +4205,7 @@ }] title: "{quests.tfg_tips.grappling_hook.title}" x: -9.5d - y: 3.5d + y: 3.0d } { dependencies: ["7A200766AAC1EE19"] @@ -4315,7 +4220,7 @@ }] title: "{quests.tfg_tips.grapple_repair.title}" x: -15.0d - y: 3.5d + y: 3.0d } { dependencies: ["6C64C20FF5DF972A"] @@ -4343,7 +4248,7 @@ ] title: "{quests.tfg_tips.grapple_length.title}" x: -17.0d - y: 4.5d + y: 4.0d } { dependencies: ["6C64C20FF5DF972A"] @@ -4364,7 +4269,7 @@ }] title: "{quests.tfg_tips.grapple_motor.title}" x: -17.0d - y: 5.5d + y: 5.0d } { dependencies: ["1F93C858F1D02F7C"] @@ -4382,7 +4287,7 @@ }] title: "{quests.tfg_tips.grapple_upgrades.title}" x: -15.0d - y: 4.5d + y: 4.0d } { dependencies: ["212E5863D8D919E1"] @@ -4396,7 +4301,7 @@ }] title: "{quests.tfg_tips.grapple_smart_motor.title}" x: -18.0d - y: 5.5d + y: 5.0d } { dependencies: ["6C64C20FF5DF972A"] @@ -4410,7 +4315,7 @@ }] title: "{quests.tfg_tips.grapple_sticky.title}" x: -15.0d - y: 8.0d + y: 7.5d } { dependencies: ["6C64C20FF5DF972A"] @@ -4424,7 +4329,7 @@ }] title: "{quests.tfg_tips.grapple_gravity_50.title}" x: -13.0d - y: 5.5d + y: 5.0d } { dependencies: ["7CA1496B662BFD3A"] @@ -4438,7 +4343,7 @@ }] title: "{quests.tfg_tips.grapple_gravity_0.title}" x: -12.0d - y: 5.5d + y: 5.0d } { dependencies: ["6C64C20FF5DF972A"] @@ -4473,7 +4378,7 @@ ] title: "{quests.tfg_tips.grapple_tweaks.title}" x: -13.0d - y: 4.5d + y: 4.0d } { dependencies: ["6C64C20FF5DF972A"] @@ -4494,7 +4399,7 @@ }] title: "{quests.tfg_tips.grapple_field.title}" x: -16.5d - y: 6.5d + y: 6.0d } { dependencies: ["6C64C20FF5DF972A"] @@ -4515,7 +4420,7 @@ }] title: "{quests.tfg_tips.grapple_magnet.title}" x: -16.0d - y: 7.5d + y: 7.0d } { dependencies: ["6C64C20FF5DF972A"] @@ -4536,7 +4441,7 @@ }] title: "{quests.tfg_tips.grapple_throw_speed.title}" x: -14.0d - y: 7.5d + y: 7.0d } { dependencies: ["6C64C20FF5DF972A"] @@ -4559,7 +4464,7 @@ }] title: "{quests.tfg_tips.grapple_double.title}" x: -13.5d - y: 6.5d + y: 6.0d } { dependencies: ["02FDECC931B5E8EF"] @@ -5157,6 +5062,149 @@ x: 12.0d y: 11.5d } + { + dependencies: ["47409DED94FCC2BC"] + description: ["{quests.tfg_tips.ev_upgrades.desc}"] + id: "3317B9525E02F617" + subtitle: "{quests.tfg_tips.ev_upgrades.subtitle}" + tasks: [{ + id: "2224FC4D297B983F" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(tfg:ev_aircraft_engine)item(tfg:titanium_plated_airplane_propeller)item(tfg:titanium_landing_gear)item(tfg:titanium_hull_reinforcement))" + } + } + title: "{quests.tfg_tips.ev_upgrades.task}" + type: "item" + }] + title: "{quests.tfg_tips.ev_upgrades.title}" + x: -6.0d + y: -15.0d + } + { + dependencies: ["05528D09F7EE6E33"] + description: ["{quests.tfg_tips.equines.desc}"] + id: "1594C2564FC7982D" + subtitle: "{quests.tfg_tips.equines.subtitle}" + tasks: [ + { + icon: { + Count: 1 + id: "ftbquests:custom_icon" + tag: { + Icon: "ftbchunks:textures/faces/minecraft/horse.png" + } + } + id: "39B185B16CC5E612" + observe_type: 6 + timer: 0L + title: "{quests.tasktype.lookat} #tfc:horses" + to_observe: "#tfc:horses" + type: "observation" + } + { + id: "1B207BDB3745F667" + item: "minecraft:saddle" + type: "item" + } + ] + title: "{quests.tfg_tips.equines.title}" + x: -8.0d + y: -2.5d + } + { + dependencies: ["60497014785301EB"] + description: ["{quests.tfg_tips.astikorcarts.desc}"] + icon: "tfcastikorcarts:wheel/ash" + id: "05528D09F7EE6E33" + subtitle: "{quests.tfg_tips.astikorcarts.subtitle}" + tasks: [{ + id: "7D268BC46A5F6014" + title: "{quests.tasktype.checkmark}" + type: "checkmark" + }] + title: "{quests.tfg_tips.astikorcarts.title}" + x: -6.5d + y: -4.0d + } + { + dependencies: ["05528D09F7EE6E33"] + description: ["{quests.tfg_tips.supply_cart.desc}"] + id: "6CC2DE7963434FAD" + subtitle: "{quests.tfg_tips.supply_cart.subtitle}" + tasks: [{ + id: "2F45CE2D7364E06B" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfcastikorcarts:supply_cart)" + } + } + title: "{quests.tasktype.item.any} #tfcastikorcarts:supply_cart" + type: "item" + }] + title: "{quests.tfg_tips.supply_cart.title}" + x: -7.0d + y: -2.5d + } + { + dependencies: ["05528D09F7EE6E33"] + description: ["{quests.tfg_tips.animal_cart.desc}"] + id: "3C4B7CE42195A466" + subtitle: "{quests.tfg_tips.animal_cart.subtitle}" + tasks: [{ + id: "661B1D97980E0D09" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfcastikorcarts:animal_cart)" + } + } + title: "{quests.tasktype.item.any} #tfcastikorcarts:animal_cart" + type: "item" + }] + title: "{quests.tfg_tips.animal_cart.title}" + x: -6.0d + y: -2.5d + } + { + dependencies: ["05528D09F7EE6E33"] + description: ["{quests.tfg_tips.plow.desc}"] + id: "68B4990C3A20E27C" + subtitle: "{quests.tfg_tips.plow.subtitle}" + tasks: [{ + id: "579F6AF5B08FC4CC" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfcastikorcarts:plow)" + } + } + title: "{quests.tasktype.item.any} #tfcastikorcarts:plow" + type: "item" + }] + title: "{quests.tfg_tips.plow.title}" + x: -5.0d + y: -2.5d + } + { + dependencies: ["4A8910950F638BB5"] + description: ["{quests.tfg_tips.piglin_disguise.desc}"] + id: "02956D3A63429E39" + subtitle: "{quests.tfg_tips.piglin_disguise.subtitle}" + tasks: [{ + id: "5D1F456A3A96FC33" + item: "tfg:piglin_disguise" + type: "item" + }] + x: 9.5d + y: -4.5d + } ] subtitle: ["{quests.tfg_tips.subtitle}"] title: "{quests.tfg_tips}" diff --git a/defaultconfigs/ftbchunks/ftbchunks-world.snbt b/defaultconfigs/ftbchunks/ftbchunks-world.snbt index d10edbf74..11a4441d6 100644 --- a/defaultconfigs/ftbchunks/ftbchunks-world.snbt +++ b/defaultconfigs/ftbchunks/ftbchunks-world.snbt @@ -49,7 +49,7 @@ # If true, "Location Visibility" team settings are ignored, and all players can see each other anywhere on the map. # Default: false - location_mode_override: false + location_mode_override: true # Interval in ticks to send updates to clients with long-range player tracking data. # Lower values mean more frequent updates but more server load and network traffic; be careful with this, especially on busy servers. @@ -82,7 +82,7 @@ # Default of 0 means no automatic loss of forceloading. # Default: 0.0 # Range: 0.0 ~ 3650.0 - max_idle_days_before_unforce: 0.0d + max_idle_days_before_unforce: 30.0d # Maximum time in days to keep logs of prevented fakeplayer access to a team's claims. # Default: 7 @@ -104,7 +104,7 @@ # AVERAGE: use the average of all members' limits. # Default: "largest" # Valid values: "largest", "owner", "sum", "average" - party_limit_mode: "largest" + party_limit_mode: "sum" # If true, pistons are prevented from pushing/pulling blocks across claims owned by different teams (unless the target claim has public 'edit block' permissions defined). If 'disable_protection' is set to true, this setting is ignored. # Default: true @@ -118,7 +118,7 @@ # Should PvP combat be allowed in claimed chunks? Default is ALWAYS; NEVER prevents it in all claimed chunks; PER_TEAM allows teams to decide if PvP is allowed in their claims # Default: "always" # Valid values: "always", "never", "per_team" - pvp_mode: "always" + pvp_mode: "per_team" # If true, the player must have the 'ftbchunks_mapping' Game stage to be able to use the map and minimap. # Requires KubeJS and/or Gamestages to be installed. diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/piglins.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/piglins.json index 97cd1a423..531438937 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/piglins.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/piglins.json @@ -28,6 +28,12 @@ "type": "patchouli:text", "title": "Bastions", "text": "Raiding a $(thing)Bastion$() might be very dangerous, but they can also be very rewarding! You can find things like:$(li)Gold, Rose Gold, Pig Iron, Black Bronze, and Silver ingots$(li)Black Bronze weapons, tools, and armor$(li)Kaolin clay and graphite$(li)Permanent light sources$(li)Cloth, leather, seeds, and food$(li)And other treasures!" + }, + { + "type": "patchouli:spotlight", + "item": "tfg:piglin_disguise", + "title": "Piglin Disguise", + "text": "If you want to ensure an easy time trading--or simply mingling with the locals--Put on a $(thing)Piglin Disguise$() to prevent $(thing)Piglins$() from being hostile with you on first sight. But beware! They only put up with so much..." } ], "read_by_default": true diff --git a/kubejs/assets/tfg/blockstates/piglin_disguise.json b/kubejs/assets/tfg/blockstates/piglin_disguise.json new file mode 100644 index 000000000..65c9b7043 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/piglin_disguise.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/piglin_disguise", + "y": 270 + }, + "facing=north": { + "model": "tfg:block/piglin_disguise", + "y": 180 + }, + "facing=south": { + "model": "tfg:block/piglin_disguise" + }, + "facing=west": { + "model": "tfg:block/piglin_disguise", + "y": 90 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/piglin_disguise_block.json b/kubejs/assets/tfg/blockstates/piglin_disguise_block.json new file mode 100644 index 000000000..0c617a550 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/piglin_disguise_block.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "tfg:block/piglin_disguise_block" }, + "facing=south": { "model": "tfg:block/piglin_disguise_block", "y": 180 }, + "facing=west": { "model": "tfg:block/piglin_disguise_block", "y": 270 }, + "facing=east": { "model": "tfg:block/piglin_disguise_block", "y": 90 } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index cb997c86b..760d2c5d6 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -160,6 +160,8 @@ "block.tfg.lunar_sprouts": "Lunar Lightgrass", "block.tfg.lunar_chorus_plant": "Chorus Plant", "block.tfg.lunar_chorus_flower": "Chorus Flower", + "block.tfg.piglin_disguise_block": "Piglin Disguise", + "item.tfg.piglin_disguise": "Piglin Disguise", "item.tfg.antipoison_pill": "Antipoison Pill", "item.tfg.haste_pill": "Haste Pill", "item.tfg.night_vision_pill": "Night Vision Pill", @@ -2281,5 +2283,7 @@ "quests.tfg_tips.fuck_go_back.desc": "To escape &4The Beneath&r, you need to reach the upper levels of the cave system, near the &dBedrock Ceiling.&r Staying still for a couple of seconds near the roof will transport you back to the &bOverworld&r, right where you stood on to get in.", "quests.tfg_tips.piglin_bartering.title": "Piglin Bartering", "quests.tfg_tips.piglin_bartering.subtitle": "We are not alone apparently", - "quests.tfg_tips.piglin_bartering.desc": "The curious inhabitants of &4The Beneath&r have items to offer... Trade gold with them to get some useful resources, such as small amounts of &aMetals&r or &aLeather.&r\nCheck out the &2Field Guide&r for details about barter trades." + "quests.tfg_tips.piglin_bartering.desc": "The curious inhabitants of &4The Beneath&r have items to offer... Trade gold with them to get some useful resources, such as small amounts of &aMetals&r or &aLeather.&r\nCheck out the &2Field Guide&r for details about barter trades.", + "quests.tfg_tips.piglin_disguise.subtitle": "They'll never know...", + "quests.tfg_tips.piglin_disguise.desc": "Do you feel like you don't belong?\n Do the &4Piglin&r attack you at your school because of your appearance?\n Try wearing a &aPiglin Disguise&r to ward off unwanted attention and blend right in." } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/piglin_disguise.json b/kubejs/assets/tfg/models/block/piglin_disguise.json new file mode 100644 index 000000000..8dd0e8521 --- /dev/null +++ b/kubejs/assets/tfg/models/block/piglin_disguise.json @@ -0,0 +1,203 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "textures": { + "1": "tfg:block/piglin_disguise", + "particle": "minecraft:block/soul_sand" + }, + "elements": [ + { + "from": [3, 0, 4], + "to": [13, 8, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 0, 4]}, + "faces": { + "north": {"uv": [2, 2, 4.5, 4], "texture": "#1"}, + "east": {"uv": [0, 2, 2, 4], "texture": "#1"}, + "south": {"uv": [6.5, 2, 9, 4], "texture": "#1"}, + "west": {"uv": [4.5, 2, 6.5, 4], "texture": "#1"}, + "up": {"uv": [4.5, 2, 2, 0], "texture": "#1"}, + "down": {"uv": [7, 0, 4.5, 2], "texture": "#1"} + } + }, + { + "from": [5, 0, 3], + "to": [6, 3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 1, 3]}, + "faces": { + "north": {"uv": [0.75, 1, 1, 1.75], "texture": "#1"}, + "east": {"uv": [0.5, 1.25, 0.75, 2], "texture": "#1"}, + "south": {"uv": [1.25, 1.25, 1.5, 2], "texture": "#1"}, + "west": {"uv": [0.75, 1, 1, 1.75], "texture": "#1"}, + "up": {"uv": [1, 1.25, 0.75, 1], "texture": "#1"}, + "down": {"uv": [1.25, 1, 1, 1.25], "texture": "#1"} + } + }, + { + "from": [10, 0, 3], + "to": [11, 3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 1, 3]}, + "faces": { + "north": {"uv": [0.75, 0, 1, 0.75], "texture": "#1"}, + "east": {"uv": [0.75, 0, 1, 0.75], "texture": "#1"}, + "south": {"uv": [1.5, 0.25, 1.75, 1], "texture": "#1"}, + "west": {"uv": [1.25, 0.25, 1.5, 1], "texture": "#1"}, + "up": {"uv": [1.25, 0.25, 1, 0], "texture": "#1"}, + "down": {"uv": [1.5, 0, 1.25, 0.25], "texture": "#1"} + } + }, + { + "from": [6, 0, 3], + "to": [10, 4, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 1, 3]}, + "faces": { + "north": {"uv": [8, 0.5, 9, 1.5], "texture": "#1"}, + "east": {"uv": [7.75, 0.5, 8, 1.5], "texture": "#1"}, + "south": {"uv": [9.25, 0.5, 10.25, 1.5], "texture": "#1"}, + "west": {"uv": [9, 0.5, 9.25, 1.5], "texture": "#1"}, + "up": {"uv": [9, 0.5, 8, 0.25], "texture": "#1"}, + "down": {"uv": [10, 0.25, 9, 0.5], "texture": "#1"} + } + }, + { + "from": [14, 2, 6], + "to": [15, 7, 10], + "rotation": {"angle": 22.5, "axis": "z", "origin": [15, 2, 6]}, + "faces": { + "north": {"uv": [11, 2.5, 10.75, 3.75], "texture": "#1"}, + "east": {"uv": [12, 2.5, 11, 3.75], "texture": "#1"}, + "south": {"uv": [12.25, 2.5, 12, 3.75], "texture": "#1"}, + "west": {"uv": [10.75, 2.5, 9.75, 3.75], "texture": "#1"}, + "up": {"uv": [10.75, 2.5, 11, 1.5], "texture": "#1"}, + "down": {"uv": [11, 1.5, 11.25, 2.5], "texture": "#1"} + } + }, + { + "from": [1.53284, -0.67878, 6], + "to": [2.53284, 4.32122, 10], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 2, 6]}, + "faces": { + "north": {"uv": [13.75, 2.5, 14, 3.75], "texture": "#1"}, + "east": {"uv": [12.75, 2.5, 13.75, 3.75], "texture": "#1"}, + "south": {"uv": [15, 2.5, 15.25, 3.75], "texture": "#1"}, + "west": {"uv": [14, 2.5, 15, 3.75], "texture": "#1"}, + "up": {"uv": [14, 2.5, 13.75, 1.5], "texture": "#1"}, + "down": {"uv": [14.25, 1.5, 14, 2.5], "texture": "#1"} + } + }, + { + "from": [5, 3.6, 3.95], + "to": [7, 5.6, 3.95], + "rotation": {"angle": 45, "axis": "z", "origin": [5, 3.6, 3.95]}, + "faces": { + "north": {"uv": [12, 0.75, 12.5, 1.25], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "up": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "down": {"uv": [0, 0, 0.5, 0], "texture": "#1"} + } + }, + { + "from": [4, 4.5, 3.9], + "to": [6, 5.5, 3.9], + "rotation": {"angle": -45, "axis": "z", "origin": [5, 5, 3.9]}, + "faces": { + "north": {"uv": [11.25, 0.75, 11.5, 1.25], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 0, 0.25, 0], "rotation": 270, "texture": "#1"}, + "south": {"uv": [0, 0, 0.25, 0.5], "rotation": 270, "texture": "#1"}, + "west": {"uv": [0, 0, 0.25, 0], "rotation": 270, "texture": "#1"}, + "up": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [4, 4.5, 3.85], + "to": [6, 5.5, 3.85], + "rotation": {"angle": 45, "axis": "z", "origin": [5, 5, 3.85]}, + "faces": { + "north": {"uv": [11.25, 0.75, 11.5, 1.25], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 0, 0.25, 0], "rotation": 270, "texture": "#1"}, + "south": {"uv": [0, 0, 0.25, 0.5], "rotation": 270, "texture": "#1"}, + "west": {"uv": [0, 0, 0.25, 0], "rotation": 270, "texture": "#1"}, + "up": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [11, 3.6, 3.95], + "to": [13, 5.6, 3.95], + "rotation": {"angle": 45, "axis": "z", "origin": [11, 3.6, 3.95]}, + "faces": { + "north": {"uv": [12.5, 0.75, 13, 1.25], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "up": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "down": {"uv": [0, 0, 0.5, 0], "texture": "#1"} + } + }, + { + "from": [10, 4.5, 3.9], + "to": [12, 5.5, 3.9], + "rotation": {"angle": -45, "axis": "z", "origin": [11, 5, 3.9]}, + "faces": { + "north": {"uv": [13.25, 0.75, 13.5, 1.25], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 0, 0.25, 0], "rotation": 270, "texture": "#1"}, + "south": {"uv": [0, 0, 0.25, 0.5], "rotation": 270, "texture": "#1"}, + "west": {"uv": [0, 0, 0.25, 0], "rotation": 270, "texture": "#1"}, + "up": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [10, 4.5, 3.85], + "to": [12, 5.5, 3.85], + "rotation": {"angle": 45, "axis": "z", "origin": [11, 5, 3.85]}, + "faces": { + "north": {"uv": [13.25, 0.75, 13.5, 1.25], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 0, 0.25, 0], "rotation": 270, "texture": "#1"}, + "south": {"uv": [0, 0, 0.25, 0.5], "rotation": 270, "texture": "#1"}, + "west": {"uv": [0, 0, 0.25, 0], "rotation": 270, "texture": "#1"}, + "up": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "translation": [0, 2.5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0, 3.5, 0] + }, + "head": { + "translation": [0, 7, 0], + "scale": [1.75, 1.75, 2.25] + }, + "fixed": { + "translation": [0, 4, 0] + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/piglin_disguise_block.json b/kubejs/assets/tfg/models/block/piglin_disguise_block.json new file mode 100644 index 000000000..8dd0e8521 --- /dev/null +++ b/kubejs/assets/tfg/models/block/piglin_disguise_block.json @@ -0,0 +1,203 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "textures": { + "1": "tfg:block/piglin_disguise", + "particle": "minecraft:block/soul_sand" + }, + "elements": [ + { + "from": [3, 0, 4], + "to": [13, 8, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 0, 4]}, + "faces": { + "north": {"uv": [2, 2, 4.5, 4], "texture": "#1"}, + "east": {"uv": [0, 2, 2, 4], "texture": "#1"}, + "south": {"uv": [6.5, 2, 9, 4], "texture": "#1"}, + "west": {"uv": [4.5, 2, 6.5, 4], "texture": "#1"}, + "up": {"uv": [4.5, 2, 2, 0], "texture": "#1"}, + "down": {"uv": [7, 0, 4.5, 2], "texture": "#1"} + } + }, + { + "from": [5, 0, 3], + "to": [6, 3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 1, 3]}, + "faces": { + "north": {"uv": [0.75, 1, 1, 1.75], "texture": "#1"}, + "east": {"uv": [0.5, 1.25, 0.75, 2], "texture": "#1"}, + "south": {"uv": [1.25, 1.25, 1.5, 2], "texture": "#1"}, + "west": {"uv": [0.75, 1, 1, 1.75], "texture": "#1"}, + "up": {"uv": [1, 1.25, 0.75, 1], "texture": "#1"}, + "down": {"uv": [1.25, 1, 1, 1.25], "texture": "#1"} + } + }, + { + "from": [10, 0, 3], + "to": [11, 3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 1, 3]}, + "faces": { + "north": {"uv": [0.75, 0, 1, 0.75], "texture": "#1"}, + "east": {"uv": [0.75, 0, 1, 0.75], "texture": "#1"}, + "south": {"uv": [1.5, 0.25, 1.75, 1], "texture": "#1"}, + "west": {"uv": [1.25, 0.25, 1.5, 1], "texture": "#1"}, + "up": {"uv": [1.25, 0.25, 1, 0], "texture": "#1"}, + "down": {"uv": [1.5, 0, 1.25, 0.25], "texture": "#1"} + } + }, + { + "from": [6, 0, 3], + "to": [10, 4, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 1, 3]}, + "faces": { + "north": {"uv": [8, 0.5, 9, 1.5], "texture": "#1"}, + "east": {"uv": [7.75, 0.5, 8, 1.5], "texture": "#1"}, + "south": {"uv": [9.25, 0.5, 10.25, 1.5], "texture": "#1"}, + "west": {"uv": [9, 0.5, 9.25, 1.5], "texture": "#1"}, + "up": {"uv": [9, 0.5, 8, 0.25], "texture": "#1"}, + "down": {"uv": [10, 0.25, 9, 0.5], "texture": "#1"} + } + }, + { + "from": [14, 2, 6], + "to": [15, 7, 10], + "rotation": {"angle": 22.5, "axis": "z", "origin": [15, 2, 6]}, + "faces": { + "north": {"uv": [11, 2.5, 10.75, 3.75], "texture": "#1"}, + "east": {"uv": [12, 2.5, 11, 3.75], "texture": "#1"}, + "south": {"uv": [12.25, 2.5, 12, 3.75], "texture": "#1"}, + "west": {"uv": [10.75, 2.5, 9.75, 3.75], "texture": "#1"}, + "up": {"uv": [10.75, 2.5, 11, 1.5], "texture": "#1"}, + "down": {"uv": [11, 1.5, 11.25, 2.5], "texture": "#1"} + } + }, + { + "from": [1.53284, -0.67878, 6], + "to": [2.53284, 4.32122, 10], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 2, 6]}, + "faces": { + "north": {"uv": [13.75, 2.5, 14, 3.75], "texture": "#1"}, + "east": {"uv": [12.75, 2.5, 13.75, 3.75], "texture": "#1"}, + "south": {"uv": [15, 2.5, 15.25, 3.75], "texture": "#1"}, + "west": {"uv": [14, 2.5, 15, 3.75], "texture": "#1"}, + "up": {"uv": [14, 2.5, 13.75, 1.5], "texture": "#1"}, + "down": {"uv": [14.25, 1.5, 14, 2.5], "texture": "#1"} + } + }, + { + "from": [5, 3.6, 3.95], + "to": [7, 5.6, 3.95], + "rotation": {"angle": 45, "axis": "z", "origin": [5, 3.6, 3.95]}, + "faces": { + "north": {"uv": [12, 0.75, 12.5, 1.25], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "up": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "down": {"uv": [0, 0, 0.5, 0], "texture": "#1"} + } + }, + { + "from": [4, 4.5, 3.9], + "to": [6, 5.5, 3.9], + "rotation": {"angle": -45, "axis": "z", "origin": [5, 5, 3.9]}, + "faces": { + "north": {"uv": [11.25, 0.75, 11.5, 1.25], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 0, 0.25, 0], "rotation": 270, "texture": "#1"}, + "south": {"uv": [0, 0, 0.25, 0.5], "rotation": 270, "texture": "#1"}, + "west": {"uv": [0, 0, 0.25, 0], "rotation": 270, "texture": "#1"}, + "up": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [4, 4.5, 3.85], + "to": [6, 5.5, 3.85], + "rotation": {"angle": 45, "axis": "z", "origin": [5, 5, 3.85]}, + "faces": { + "north": {"uv": [11.25, 0.75, 11.5, 1.25], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 0, 0.25, 0], "rotation": 270, "texture": "#1"}, + "south": {"uv": [0, 0, 0.25, 0.5], "rotation": 270, "texture": "#1"}, + "west": {"uv": [0, 0, 0.25, 0], "rotation": 270, "texture": "#1"}, + "up": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [11, 3.6, 3.95], + "to": [13, 5.6, 3.95], + "rotation": {"angle": 45, "axis": "z", "origin": [11, 3.6, 3.95]}, + "faces": { + "north": {"uv": [12.5, 0.75, 13, 1.25], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "up": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "down": {"uv": [0, 0, 0.5, 0], "texture": "#1"} + } + }, + { + "from": [10, 4.5, 3.9], + "to": [12, 5.5, 3.9], + "rotation": {"angle": -45, "axis": "z", "origin": [11, 5, 3.9]}, + "faces": { + "north": {"uv": [13.25, 0.75, 13.5, 1.25], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 0, 0.25, 0], "rotation": 270, "texture": "#1"}, + "south": {"uv": [0, 0, 0.25, 0.5], "rotation": 270, "texture": "#1"}, + "west": {"uv": [0, 0, 0.25, 0], "rotation": 270, "texture": "#1"}, + "up": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [10, 4.5, 3.85], + "to": [12, 5.5, 3.85], + "rotation": {"angle": 45, "axis": "z", "origin": [11, 5, 3.85]}, + "faces": { + "north": {"uv": [13.25, 0.75, 13.5, 1.25], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 0, 0.25, 0], "rotation": 270, "texture": "#1"}, + "south": {"uv": [0, 0, 0.25, 0.5], "rotation": 270, "texture": "#1"}, + "west": {"uv": [0, 0, 0.25, 0], "rotation": 270, "texture": "#1"}, + "up": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "translation": [0, 2.5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 145, 0], + "translation": [0, 3.5, 0] + }, + "head": { + "translation": [0, 7, 0], + "scale": [1.75, 1.75, 2.25] + }, + "fixed": { + "translation": [0, 4, 0] + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/piglin_disguise.json b/kubejs/assets/tfg/models/item/piglin_disguise.json new file mode 100644 index 000000000..7aa85aec4 --- /dev/null +++ b/kubejs/assets/tfg/models/item/piglin_disguise.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/piglin_disguise_block" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/piglin_disguise_block.json b/kubejs/assets/tfg/models/item/piglin_disguise_block.json new file mode 100644 index 000000000..7aa85aec4 --- /dev/null +++ b/kubejs/assets/tfg/models/item/piglin_disguise_block.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/piglin_disguise_block" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/piglin_disguise.png b/kubejs/assets/tfg/textures/block/piglin_disguise.png new file mode 100644 index 000000000..c9d15b8eb Binary files /dev/null and b/kubejs/assets/tfg/textures/block/piglin_disguise.png differ diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 5234d345b..c0118ce26 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -397,4 +397,20 @@ function registerTFGMiscellaneousRecipes(event) { event.shapeless('1x minecraft:armor_stand', [ 'tfg:armor_stand_arms' ]).id(`tfg:shapeless/armor_stand`) + + event.recipes.tfc.sewing( + '1x tfg:piglin_disguise', + [ + 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 1, 0, 0, 0, 1, 1, 0, + 0, 1, 1, 1, 0, 1, 1, 1, 0, + 0, 0, 1, 1, 0, 1, 1, 0, 0, + 0, 0, 1, 1, 0, 1, 1, 0, 0 + ], [ + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 0, 1, 0, 0, 1, 0, 1, + 1, -1, 0, 0, 0, 0, -1, 1, + 1, -1, 0, 0, 0, 0, -1, 1 + ] + ).id('tfg:sewing/piglin_disguise') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 939ad92e4..e09c1f8a9 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -2,6 +2,12 @@ const registerTFGItemTags = (event) => { registerTFGTrimTags(event) + //temporary hidden items + event.add('c:hidden_from_recipe_viewers', 'tfg:geyser_source_small') + event.add('c:hidden_from_recipe_viewers', 'tfg:geyser_source') + event.add('c:hidden_from_recipe_viewers', 'tfg:stromatolite_cluster_small') + event.add('c:hidden_from_recipe_viewers', 'tfg:stromatolite_cluster_medium') + //Decorative Vases global.MINECRAFT_DYE_NAMES.forEach(color => { event.add('c:hidden_from_recipe_viewers', `tfg:decorative_vase/generated/${color}`) @@ -15,7 +21,7 @@ const registerTFGItemTags = (event) => { //Knapping event.add('tfc:any_knapping', 'minecraft:flint') - //Tools + //Tools & Armor event.add('forge:tools/fishing_nets', 'tfg:fishing_net/wood') event.add('forge:tools/fishing_nets', 'tfg:fishing_net/brass') event.add('forge:tools/fishing_nets', 'tfg:fishing_net/rose_gold') @@ -24,6 +30,8 @@ const registerTFGItemTags = (event) => { event.add('forge:tools/fishing_nets', 'tfg:fishing_net/tin_alloy') event.add('forge:tools/fishing_nets', 'tfg:fishing_net/cupronickel') event.add('forge:tools/fishing_nets', 'tfg:fishing_net/magnalium') + + event.add('minecraft:piglin_loved', 'tfg:piglin_disguise') // #region Paper from wood diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index e20c36827..bb74c3452 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -197,7 +197,8 @@ function registerVintageImprovementsRecipes(event) { { material: GTMaterials.Gold, blows: STARTING_BLOWS }, { material: GTMaterials.Bismuth, blows: STARTING_BLOWS }, { material: GTMaterials.RoseGold, blows: STARTING_BLOWS }, - { material: GTMaterials.SterlingSilver, blows: STARTING_BLOWS } + { material: GTMaterials.SterlingSilver, blows: STARTING_BLOWS }, + { material: GTMaterials.Tin, blows: STARTING_BLOWS } ] let HAMMERING_ITEMS = [ @@ -413,7 +414,7 @@ function registerVintageImprovementsRecipes(event) { results: [ChemicalHelper.get(TFGTagPrefix.ingotDouble, material, 1)], processingTime: material.getMass() * 6 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER }).id(`tfg:vi/pressurizing/${material.getName()}_double_ingot`) - + const plateItem = ChemicalHelper.get(TagPrefix.plate, material, 1); event.custom({ @@ -511,9 +512,9 @@ function registerVintageImprovementsRecipes(event) { event.custom({ type: 'vintageimprovements:curving', - ingredients: [ input ], + ingredients: [input], itemAsHead: r.inputs.item[1].content.ingredient.item, - results: [ output ], + results: [output], processingTime: r.duration * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER }).id(`tfg:vi/curving/${recipe.getId().split(':')[1]}`) } @@ -604,10 +605,10 @@ function registerVintageImprovementsRecipes(event) { event.custom({ type: 'vintageimprovements:vacuumizing', ingredients: [{ fluid: 'tfg:vulcanized_latex', amount: 250 }], - results: [{ item: 'gtceu:raw_rubber_dust'}], + results: [{ item: 'gtceu:raw_rubber_dust' }], processingTime: 120 }).id('tfg:vi/vacuumizing/vulcanized_latex_to_raw_rubber') - + // #endregion }