diff --git a/CHANGELOG.md b/CHANGELOG.md index b9901be5b..d6541bcfb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## [Unreleased] ### Changes +- Disabled ability to sort items in the crucible and vessels, which let you stack things that shouldn't be stacked. (#1045) @esotericist +- Other TFC waters also work for bulk washing now. (#1051) @Pyritie +- Added machine recipes for compost and humus. (#1049) @Pyritie +- 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/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 838c35264..9e3f275a5 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -3368,10 +3368,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" @@ -3947,8 +3947,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 +4025,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 +4039,8 @@ type: "item" }] title: "{quests.tfg_tips.juicer.title}" - x: 9.0d - y: -5.0d + x: 9.5d + y: -3.5d } { dependencies: ["70DA01DFDAE54224"] @@ -5157,6 +5157,19 @@ x: 12.0d y: 11.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/config/invtweaks-client.toml b/config/invtweaks-client.toml index 0949d0f05..bfe04c8fc 100644 --- a/config/invtweaks-client.toml +++ b/config/invtweaks-client.toml @@ -129,6 +129,10 @@ containerClass = "gripe._90.megacells.menu.MEGAInterfaceMenu" sortRange = "" + [[sorting.containerOverrides]] + containerClass = "net.dries007.tfc.client.screen.*" + sortRange = "" + #Tweaks [tweaks] #Enable auto-refill 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/createdeco/tags.js b/kubejs/server_scripts/createdeco/tags.js index 853de5e72..bd5a7cb04 100644 --- a/kubejs/server_scripts/createdeco/tags.js +++ b/kubejs/server_scripts/createdeco/tags.js @@ -1,4 +1,6 @@ -const registerCreatedecoItemTags = (event) => { +const metalBars = ['andesite', 'brass', 'iron', 'copper', 'industrial_iron', 'zinc']; + +const registerCreateDecoItemTags = (event) => { //#region Hidden Items global.CREATEDECO_DISABLED_ITEMS.forEach(item => { @@ -10,14 +12,9 @@ const registerCreatedecoItemTags = (event) => { event.remove('createdeco:internal/blocks/iron_blocks', '#forge:storage_blocks/iron') //#region Apply Tags - const metalBars = ['andesite', 'brass', 'iron', 'copper', 'industrial_iron', 'zinc']; - metalBars.forEach(metalBars => { event.add('tfg:metal_bars', `createdeco:${metalBars}_bars`) event.add('tfg:metal_bars', `createdeco:${metalBars}_bars_overlay`) - // The bars are missing mineable tags for some reason - event.add('minecraft:mineable/pickaxe', `createdeco:${metalBars}_bars`) - event.add('minecraft:mineable/pickaxe', `createdeco:${metalBars}_bars_overlay`) }); event.add("createdeco:internal/plates/iron_plates", "#forge:plates/wrought_iron") @@ -48,4 +45,12 @@ const registerCreatedecoItemTags = (event) => { event.add("createdeco:internal/blocks/zinc_blocks", "#forge:storage_blocks/zinc") event.add("createdeco:internal/blocks/andesite_blocks", "#forge:storage_blocks/tin_alloy") //#endregion -}; \ No newline at end of file +}; + +const registerCreateDecoBlockTags = (event) => { + metalBars.forEach(metalBars => { + // The bars are missing mineable tags for some reason + event.add('minecraft:mineable/pickaxe', `createdeco:${metalBars}_bars`) + event.add('minecraft:mineable/pickaxe', `createdeco:${metalBars}_bars_overlay`) + }); +} \ No newline at end of file diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 4deca8cf9..257b3c329 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -753,7 +753,7 @@ const registerFirmaLifeRecipes = (event) => { event.smelting('firmalife:food/dehydrated_soybeans', 'tfc:food/soybean') - event.recipes.gtce.fermenter('soybean_oil') + event.recipes.gtceu.fermenter('soybean_oil') .itemInputs('firmalife:food/soybean_paste') .inputFluids(Fluid.of('minecraft:water', 100)) .outputFluids(Fluid.of('firmalife:soybean_oil', 250)) diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 0745c3183..dc1538047 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -18,7 +18,7 @@ ServerEvents.tags('item', event => { registerCreateItemTags(event) registerCreateAdditionsItemTags(event) registerCreateConnectedItemTags(event) - registerCreatedecoItemTags(event) + registerCreateDecoItemTags(event) registerDiggerHelmetItemTags(event) registerEndermanOverhaulItemTags(event) registerEveryCompatItemTags(event) @@ -57,6 +57,7 @@ ServerEvents.tags('block', event => { registerComputerCraftBlockTags(event) registerCreateBlockTags(event) registerCreateAdditionsBlockTags(event) + registerCreateDecoBlockTags(event) registerDomumOrnamentumBlockTags(event) registerEndermanOverhaulBlockTags(event) registerExtendedAE2BlockTags(event) diff --git a/kubejs/server_scripts/tfc/recipes.machines.js b/kubejs/server_scripts/tfc/recipes.machines.js index bedbd6941..bfda4437b 100644 --- a/kubejs/server_scripts/tfc/recipes.machines.js +++ b/kubejs/server_scripts/tfc/recipes.machines.js @@ -520,13 +520,13 @@ function registerTFCMachineRecipes(event) { .EUt(2) event.recipes.gtceu.fermenter('tfg:fertilizer_to_compost') - .itemInputs('gtceu:fertilizer') + .itemInputs('4x gtceu:fertilizer') .itemOutputs('tfc:compost') .duration(1200) .EUt(2) - const BROWNS = [ '16x #tfc:compost_browns/low', '8x #tfc:compost_browns/medium', '4x #tfc:compost_browns/high' ]; - const GREENS = [ '16x #tfc:compost_greens/low', '8x #tfc:compost_greens/medium', '4x #tfc:compost_greens/high' ]; + const BROWNS = [ '16x #tfc:compost_browns_low', '4x #tfc:compost_browns_high' ]; + const GREENS = [ '16x #tfc:compost_greens_low', '4x #tfc:compost_greens_high' ]; let i = 0; BROWNS.forEach(brown => { @@ -538,4 +538,10 @@ function registerTFCMachineRecipes(event) { .EUt(2) }) }) + + event.recipes.gtceu.centrifuge('tfg:soot') + .itemInputs('tfc:soot') + .itemOutputs('#forge:dusts/carbon') + .duration(20) + .EUt(2) } 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 503fc92d1..75265c4a0 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