diff --git a/CHANGELOG.md b/CHANGELOG.md index 39ad9084c..e08e014ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ### Changes - Create Steam Engine now also accepts river water and GregTech steam as valid inputs (#947) @Zeropol - Changed weird assembler piston recipe (#1092) @Redeix +- Added Trowel tool to randomly place blocks from hotbar (#1106) @Redeix +- Fixed texture clipping on piglin disguise (#1106) @Redeix ## [0.9.9] - 30.05.2025 ### Changes diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index ac3824b1f..4ee385d49 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -3265,8 +3265,8 @@ type: "item" }] title: "{quests.tfg_tips.cane.title}" - x: -1.5d - y: 5.0d + x: -1.0d + y: 4.5d } { dependencies: ["150B7C5CD152E1BA"] @@ -3286,8 +3286,8 @@ type: "item" }] title: "{quests.tfg_tips.fishing_net.title}" - x: -1.5d - y: 6.0d + x: -2.0d + y: 5.0d } { dependencies: ["5C01BDDA66249D7B"] @@ -5205,6 +5205,26 @@ x: 9.5d y: -4.5d } + { + dependencies: ["150B7C5CD152E1BA"] + description: ["{quests.tfg_tips.trowel.desc}"] + id: "26DFC32AD5DED4E9" + subtitle: "{quests.tfg_tips.trowel.subtitle}" + tasks: [{ + id: "694BF83F489646D6" + item: { + Count: 1 + id: "tfg:trowel" + tag: { + Damage: 0 + } + } + type: "item" + }] + title: "{quests.tfg_tips.trowel.title}" + x: -2.5d + y: 6.0d + } ] subtitle: ["{quests.tfg_tips.subtitle}"] title: "{quests.tfg_tips}" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/trowel.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/trowel.json new file mode 100644 index 000000000..0ae5da5ba --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/trowel.json @@ -0,0 +1,18 @@ +{ + "name": "Trowel", + "icon": "tfg:trowel", + "category": "tfc:mechanics", + "priority": true, + "pages": [ + { + "type": "patchouli:crafting", + "title": "Trowel", + "recipe": "tfg:shaped/trowel", + "text": "A $(item)Trowel$() allows a builder to place random blocks from their hotbar when right-clicking a surface.$(br2)Trowels also have built-in functionality with the $(item)Roads and Roofs$() mod--Meaning that they can place filler items like bricks or flagstones randomly as well." + }, + { + "type": "patchouli:text", + "text": "Inspired by the trowel tool from $(item)Quark$()--A mod by Vazkii" + } + ] +} diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index a10ac33b3..282e38d2b 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -257,6 +257,7 @@ "item.tfg.uv_universal_circuit": "UV Universal Circuit", "item.tfg.uhv_universal_circuit": "UHV Universal Circuit", "item.tfg.piglin_disguise": "Piglin Disguise", + "item.tfg.trowel": "Trowel", "material.tfg.latex": "Latex", "material.tfg.vulcanized_latex": "Vulcanized Latex", "material.tfg.fluix": "Fluix", @@ -2294,5 +2295,8 @@ "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 resource, 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." + "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.", + "quests.tfg_tips.trowel.title": "Trowel", + "quests.tfg_tips.trowel.subtitle": "Inspired by Quark!", + "quests.tfg_tips.trowel.desc": "A &4Trowel&r is a tool for builders that can &brandomly place blocks&r located in the hotbar. Trowels can also use bricks and other useable items to randomize tiles for &5RNR Roads&r." } \ 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 index 8dd0e8521..d2e01cb21 100644 --- a/kubejs/assets/tfg/models/block/piglin_disguise.json +++ b/kubejs/assets/tfg/models/block/piglin_disguise.json @@ -3,7 +3,7 @@ "texture_size": [64, 64], "textures": { "1": "tfg:block/piglin_disguise", - "particle": "minecraft:block/soul_sand" + "particle": "block/soul_sand" }, "elements": [ { @@ -193,8 +193,8 @@ "translation": [0, 3.5, 0] }, "head": { - "translation": [0, 7, 0], - "scale": [1.75, 1.75, 2.25] + "translation": [0, 8.5, 0], + "scale": [1.75, 2, 2.25] }, "fixed": { "translation": [0, 4, 0] diff --git a/kubejs/assets/tfg/models/block/piglin_disguise_block.json b/kubejs/assets/tfg/models/block/piglin_disguise_block.json index 8dd0e8521..d2e01cb21 100644 --- a/kubejs/assets/tfg/models/block/piglin_disguise_block.json +++ b/kubejs/assets/tfg/models/block/piglin_disguise_block.json @@ -3,7 +3,7 @@ "texture_size": [64, 64], "textures": { "1": "tfg:block/piglin_disguise", - "particle": "minecraft:block/soul_sand" + "particle": "block/soul_sand" }, "elements": [ { @@ -193,8 +193,8 @@ "translation": [0, 3.5, 0] }, "head": { - "translation": [0, 7, 0], - "scale": [1.75, 1.75, 2.25] + "translation": [0, 8.5, 0], + "scale": [1.75, 2, 2.25] }, "fixed": { "translation": [0, 4, 0] diff --git a/kubejs/assets/tfg/models/item/trowel.json b/kubejs/assets/tfg/models/item/trowel.json new file mode 100644 index 000000000..3674f67c3 --- /dev/null +++ b/kubejs/assets/tfg/models/item/trowel.json @@ -0,0 +1,36 @@ +{ + "credit": "Made with Blockbench", + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/trowel" + }, + "display": { + "thirdperson_righthand": { + "rotation": [-58, -90, -147], + "translation": [0, 1, -1.25], + "scale": [0.55, 0.55, 0.55] + }, + "thirdperson_lefthand": { + "rotation": [-123, 90, -147], + "translation": [0, 1, -1.25], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson_righthand": { + "rotation": [95, -90, 25], + "translation": [1.13, 3.2, 1.13], + "scale": [0.68, 0.68, 0.68] + }, + "firstperson_lefthand": { + "rotation": [66, 90, 41], + "translation": [1.13, 3.2, 1.13], + "scale": [0.68, 0.68, 0.68] + }, + "ground": { + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, 180, 0] + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/trowel.png b/kubejs/assets/tfg/textures/item/trowel.png new file mode 100644 index 000000000..a0e3d8c64 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/trowel.png differ diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index c0118ce26..625ea49ce 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -413,4 +413,23 @@ function registerTFGMiscellaneousRecipes(event) { 1, -1, 0, 0, 0, 0, -1, 1 ] ).id('tfg:sewing/piglin_disguise') + + //trowel + event.shaped('tfg:trowel', [ + 'DBC', + 'AA ', + ' ' + ], { + A: ChemicalHelper.get(TagPrefix.plate, GTMaterials.Invar, 1), + B: '#forge:screws', + C: '#tfc:lumber', + D: '#forge:tools/screwdrivers' + }).id('tfg:shaped/trowel') + + event.recipes.gtceu.assembler('tfg:assembler/trowel') + .itemInputs(ChemicalHelper.get(TagPrefix.plate, GTMaterials.Invar, 2), '1x #forge:screws', '1x #tfc:lumber') + .itemOutputs('1x tfg:trowel') + .duration(40) + .circuit(4) + .EUt(GTValues.VA[GTValues.ULV]) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 527f374f4..bc59f145b 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -33,6 +33,9 @@ const registerTFGItemTags = (event) => { event.add('minecraft:piglin_loved', 'tfg:piglin_disguise') + event.add('forge:tools/trowels', 'tfg:trowel') + event.add('tfc:usable_on_tool_rack', 'tfg:trowel') + // #region Paper from wood event.add('tfg:hardwood_strips', 'tfg:hardwood_strip')