merge 1.20.x into feature/lead-deco

Author: PssbleTrngle

build.gradle

@@ -41,7 +41,7 @@ minecraft {
         }
 
         data {
-            args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+            args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/'), "--existing-mod", "blueprint"
             taskName 'Data'
         }
 
@@ -61,6 +61,11 @@ minecraft {
 sourceSets.main.resources.srcDir 'src/generated/resources'
 
 repositories {
+    maven {
+        // location of the maven that hosts Blueprint
+        name = "Jackson's Maven"
+        url = "https://maven.jaackson.me"
+    }
     maven {
         // location of the maven that hosts JEI files
         name = "Progwml6 maven"
@@ -88,6 +93,7 @@ repositories {
 
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
+    implementation fg.deobf("com.teamabnormals:blueprint:${minecraft_version}-${blueprint_version}")
     annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
 
     // Compatibilities

gradle.properties

@@ -21,6 +21,7 @@ mixingradle_version = 0.7-SNAPSHOT
 mixin_version = 0.8.5
 
 # Other Dependencies
+blueprint_version=7.1.0
 jei_version = 15.0.0.12
 
 detailab_version = 3920487

src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05

@@ -1,4 +1,4 @@
-// 1.20.1	2024-04-15T19:41:38.9128536	oreganized Block States
+// 1.20.1	2024-06-13T15:46:13.8380616	oreganized Block States
 d85b0fb9e5cad1d9c4f22ed192b0fa621ee3373c assets/oreganized/blockstates/black_crystal_glass.json
 05bb006ff7f48557fe5c5333bc120f7206052717 assets/oreganized/blockstates/black_crystal_glass_pane.json
 5e5002e9c77ee7221425eeacce8834af484db877 assets/oreganized/blockstates/blue_crystal_glass.json
@@ -27,6 +27,7 @@ c72a5228ef929553df57844bee603f560e737100 assets/oreganized/blockstates/gray_crys
 0f0f5654a1123c1bfa032e813f1f6cff21ec1dcb assets/oreganized/blockstates/green_crystal_glass_pane.json
 c9995beec5545d6c6c41d8323c65ae06bbea0cbe assets/oreganized/blockstates/lead_bars.json
 121e6d2788d907261435fceb5c2ed9aec2947965 assets/oreganized/blockstates/lead_block.json
+d43efacf05b2229ee7dad465c3ad83df616ab763 assets/oreganized/blockstates/lead_bolt_crate.json
 ac3dc34ee50ebc5c1ef49b1d5200bbcce6989806 assets/oreganized/blockstates/lead_bricks.json
 3ef194f72e7b5911c4cb174e70906524d82bc695 assets/oreganized/blockstates/lead_bulb.json
 0a8045f4a934dc1d2e7da7e004becf2de17b14d5 assets/oreganized/blockstates/lead_door.json
@@ -306,6 +307,7 @@ d973c46a2238e07b1a2ad219f0c71556e3768cde assets/oreganized/models/block/lead_bar
 c817f48d9b0b502e26c7d4f44f76f9a260c846e4 assets/oreganized/models/block/lead_bars_side.json
 2a78455f914b0bcb8797e0411b8e697e066e7630 assets/oreganized/models/block/lead_bars_side_alt.json
 99f53d2888cb23cc09f497c6ea86063b0e8d7c06 assets/oreganized/models/block/lead_block.json
+3711df98ba5e24c56ca10f080681b0efa52f7a69 assets/oreganized/models/block/lead_bolt_crate.json
 fb1ee9f9c979aabda19fcc48ec167ba711d35ae2 assets/oreganized/models/block/lead_bricks.json
 b93ab0c45a40dc3a5a25a6ccde6e8eb2471e0084 assets/oreganized/models/block/lead_bulb.json
 19d826c306b5753a7c9d5539e5ac76c75dcebec9 assets/oreganized/models/block/lead_door_bottom_left.json

src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5

@@ -1,4 +1,4 @@
-// 1.20.1	2024-04-09T10:14:59.8012031	oreganized Item Models
+// 1.20.1	2024-06-13T15:46:13.8471695	oreganized Item Models
 18fcb236eeab67fa16a0014d9af5ba7dd6f9e7c8 assets/oreganized/models/item/black_crystal_glass.json
 30bbb36792cb2d3f0a8a399f25238120cdf7e659 assets/oreganized/models/item/black_crystal_glass_pane.json
 8dcab59e8c34403761c4aec2c3357b7db80b3f0b assets/oreganized/models/item/blue_crystal_glass.json
@@ -7,71 +7,60 @@ ca77522dcfcf982429256fd99ca0e9f2c195bd73 assets/oreganized/models/item/brown_cry
 cc365240dd7450add26aeaf5e0e689e985a4e5ad assets/oreganized/models/item/brown_crystal_glass_pane.json
 87ae9e55b9b93036e2004b186696da47cbc5ca81 assets/oreganized/models/item/bush_hammer.json
 9cb46711c71fcec37eae98916aa50acbe76cf96d assets/oreganized/models/item/chiseled_glance.json
+0873e5720c3f7d81c4ef7e3f3d333e14a87e6757 assets/oreganized/models/item/crossbow_lead_bolt.json
 cda1abbd4abc8987ee1a6d4ec093a5824260b4e0 assets/oreganized/models/item/cut_lead.json
 1cad99f5b1d9bb26fafe94dd95e758217cb50a78 assets/oreganized/models/item/cyan_crystal_glass.json
 522ec2287a524fc138cb3ebd01e3f4c70c43147e assets/oreganized/models/item/cyan_crystal_glass_pane.json
 20ea18a10ccc6f0cef2ba654ea3358628de49679 assets/oreganized/models/item/deepslate_lead_ore.json
 f4054bc225dbc8d64c33a9be97e3234c6b6aff70 assets/oreganized/models/item/deepslate_silver_ore.json
 90d7ee1955f7b0dafcb1cc8c6e7481f2e798f0b3 assets/oreganized/models/item/electrum_axe.json
 f84407520eae1c14edb63b8f9fb0ac59b392d891 assets/oreganized/models/item/electrum_block.json
-68a476fabf2f0ced629c57df4fe4ddb9e4910286 assets/oreganized/models/item/electrum_boots.json
+921b1f947d298a7993cffee8ce2b9150822d6315 assets/oreganized/models/item/electrum_boots.json
 ebd6c4dd25477fa3aee3da31ba022831eef821f1 assets/oreganized/models/item/electrum_boots_amethyst_trim.json
 8da0044f5663ca8c33a2cf7da2aaeafd6b4f29f3 assets/oreganized/models/item/electrum_boots_copper_trim.json
 ea320d41da3670d7b5f3aa47375825164c881009 assets/oreganized/models/item/electrum_boots_diamond_trim.json
-5d7417043535c8fc0ec47b0768b279bad35401db assets/oreganized/models/item/electrum_boots_electrum_trim.json
 f78e1531df3d1a96a7ddb0156c1bc25f782ef54e assets/oreganized/models/item/electrum_boots_emerald_trim.json
 13ea29eca54fa201527aacb1a3133aa6c2dece0a assets/oreganized/models/item/electrum_boots_gold_trim.json
 eddd2b3a1573aa504c9a9e3ccc2eb54097f25cf3 assets/oreganized/models/item/electrum_boots_iron_trim.json
 cfcd420ac4aeffc816bdbd5b8695ac2ebf5233c3 assets/oreganized/models/item/electrum_boots_lapis_trim.json
-e53e6bd251e36cb36e9da4040aa0caa86d468975 assets/oreganized/models/item/electrum_boots_lead_trim.json
 f58c3a00d7cb1b945dd7c26bf941dd3d0ab8dde4 assets/oreganized/models/item/electrum_boots_netherite_trim.json
 15351d9c3c3754e8ae395c24e878fe2eea9221d2 assets/oreganized/models/item/electrum_boots_quartz_trim.json
 e95d2c96d5c6294cd62446295dd2d308ed2891e0 assets/oreganized/models/item/electrum_boots_redstone_trim.json
-c519635469d1eea7e682c97900f291f15f7f2a93 assets/oreganized/models/item/electrum_boots_silver_trim.json
-fdacf8e0722242bfaf3c2ca6d30f13e109af04c6 assets/oreganized/models/item/electrum_chestplate.json
+861c898cb9483f4a9b6664aaabbcb3494f89d187 assets/oreganized/models/item/electrum_chestplate.json
 a821c6eec823108022ea761f58fa2e6e0b6e0fd1 assets/oreganized/models/item/electrum_chestplate_amethyst_trim.json
 4884dcbad3b98701e23a389b3718df01c8301851 assets/oreganized/models/item/electrum_chestplate_copper_trim.json
 34c91dc494f4c4a67705100e22d1f04982b2c3b8 assets/oreganized/models/item/electrum_chestplate_diamond_trim.json
-20f4fd38be6a8bdfe6418ea921b1ce32188f3d62 assets/oreganized/models/item/electrum_chestplate_electrum_trim.json
 92e972a8eaa567916d535445539a5a5a12936f97 assets/oreganized/models/item/electrum_chestplate_emerald_trim.json
 7c47841331aee6c8ad0334c1bfc86442a034e89d assets/oreganized/models/item/electrum_chestplate_gold_trim.json
 a1d8410db2baca1d6ec1216114ffe0578732c9fb assets/oreganized/models/item/electrum_chestplate_iron_trim.json
 5bcfc00cf5735da8329c976b1c76d29095b04ced assets/oreganized/models/item/electrum_chestplate_lapis_trim.json
-1a5781e46eaf11c19997917eca83709d6cce9423 assets/oreganized/models/item/electrum_chestplate_lead_trim.json
 ebac983a04414e7e5c2a8431d2494ac14dab595a assets/oreganized/models/item/electrum_chestplate_netherite_trim.json
 3661e26ce6c04e6d96a4170ac1c834ad9e73c905 assets/oreganized/models/item/electrum_chestplate_quartz_trim.json
 552cd49fd2bf4e48d8a42112f6252d74d88603ab assets/oreganized/models/item/electrum_chestplate_redstone_trim.json
-2d103d6e69b7239ce71a9bf396bc44992893010f assets/oreganized/models/item/electrum_chestplate_silver_trim.json
-b9f93ec698851de107ee5ddff64da09fd3508c55 assets/oreganized/models/item/electrum_helmet.json
+1f4d67a20bc58c1484c7c550c2401654f293c5f1 assets/oreganized/models/item/electrum_helmet.json
 e87af594a177d4994fe5ed62c7ee9e5e4186a116 assets/oreganized/models/item/electrum_helmet_amethyst_trim.json
 bf0f7c22b7b99c818d45283591a2e4e943227419 assets/oreganized/models/item/electrum_helmet_copper_trim.json
 d34a8e6f6200252932c7589d280d66223a774c55 assets/oreganized/models/item/electrum_helmet_diamond_trim.json
-6630a716fc2024a2bb80e7b3b28c380001354f53 assets/oreganized/models/item/electrum_helmet_electrum_trim.json
 a45d831838687591d6c87dc56fa97d806c4989f5 assets/oreganized/models/item/electrum_helmet_emerald_trim.json
 676c701bb33d5d324ddea74492483d2f08675a5f assets/oreganized/models/item/electrum_helmet_gold_trim.json
 64fcca087ef92636ee7b362a7f00fe28926d1f6f assets/oreganized/models/item/electrum_helmet_iron_trim.json
 1eef08587a817cb4573131f719fe9d106815bb5a assets/oreganized/models/item/electrum_helmet_lapis_trim.json
-83e22a738945c975530f9231b02aed3a856ceddf assets/oreganized/models/item/electrum_helmet_lead_trim.json
 fc91dfa3eda2433202da6e5b35a2daaa798ceb10 assets/oreganized/models/item/electrum_helmet_netherite_trim.json
 6f4e5fb0306a7f4b2687137f015979f24fd470a8 assets/oreganized/models/item/electrum_helmet_quartz_trim.json
 c0994add3605609d1e1e5c5fd8e8a2183965dd6a assets/oreganized/models/item/electrum_helmet_redstone_trim.json
-b5261e76339c841b8c494ddfe47b4f3045b38008 assets/oreganized/models/item/electrum_helmet_silver_trim.json
 dabbb804096b43b53b35e91e6af0be9e3159d7c4 assets/oreganized/models/item/electrum_hoe.json
 a81f54a67369904cffeb3725f1391afced85c5fd assets/oreganized/models/item/electrum_ingot.json
-883c6e38e08d6f2e9e10c57d0a055b421e4a05eb assets/oreganized/models/item/electrum_leggings.json
+95afdd8f132febac54f8a5854a7a3fd68ac451f2 assets/oreganized/models/item/electrum_leggings.json
 2d13f8dc0ed0ec41e0b6a19101658c335f0937af assets/oreganized/models/item/electrum_leggings_amethyst_trim.json
 1c197c2053679693edc08a7440503e27a67a36e9 assets/oreganized/models/item/electrum_leggings_copper_trim.json
 e52bbe67f2142ddd64f61380013f1acecce3efe5 assets/oreganized/models/item/electrum_leggings_diamond_trim.json
-775a743ac1cb151ab1b01ac0114d55afab071518 assets/oreganized/models/item/electrum_leggings_electrum_trim.json
 f3b3e8b89a354acedb2b9f9b2dd09e48d6fe689f assets/oreganized/models/item/electrum_leggings_emerald_trim.json
 604f7994b05f296d68986c23b24528276002fe10 assets/oreganized/models/item/electrum_leggings_gold_trim.json
 9ce1f9a351d5dfc6c9da6c601d123a1763fbac89 assets/oreganized/models/item/electrum_leggings_iron_trim.json
 cb422c237c7d4e168c79cee51375d667fcf1d2fa assets/oreganized/models/item/electrum_leggings_lapis_trim.json
-bf1e8c1274292efd84729599cde4bcf5113b2dd9 assets/oreganized/models/item/electrum_leggings_lead_trim.json
 8d1a23960f88d2cf9e152ed5a630ceb23c79c56f assets/oreganized/models/item/electrum_leggings_netherite_trim.json
 f3871ff234873195dd47e570e62f802f7f67c889 assets/oreganized/models/item/electrum_leggings_quartz_trim.json
 75958844281a29549508f88f396e34b0919b68cb assets/oreganized/models/item/electrum_leggings_redstone_trim.json
-81902b9300da84a1882186e35ac508bf3347771c assets/oreganized/models/item/electrum_leggings_silver_trim.json
 2d8ac3c987dcd961d7505b71cda23b4c149a1348 assets/oreganized/models/item/electrum_nugget.json
 225acc16e9cf1908e9199f83cfe63342fc724cf2 assets/oreganized/models/item/electrum_pickaxe.json
 ba6dafcb3b21faf4eb7886b812f205e91e59a49d assets/oreganized/models/item/electrum_shovel.json
@@ -92,6 +81,8 @@ be766846cf1dac197488418054a28488724b45db assets/oreganized/models/item/green_cry
 0d2774c3473576f2f0e28ec4eaf9c9adaeca3e00 assets/oreganized/models/item/green_crystal_glass_pane.json
 55b5268d1200536fb742606ae34dd2a149e6d5be assets/oreganized/models/item/lead_bars.json
 41e56017441ac21af8e8b9bb05b61e1cf4fbd035 assets/oreganized/models/item/lead_block.json
+ae57922ed2f7a86f2f2228c54fe277a743a93000 assets/oreganized/models/item/lead_bolt.json
+feba1e587044ee5e3b0c0eb5078d2c8e857aaeb5 assets/oreganized/models/item/lead_bolt_crate.json
 e7d8507c908b82cd3a90619142d88fabe131f4b4 assets/oreganized/models/item/lead_bricks.json
 f884e385f339f84b7d27ef8cbaa9d1ecc1fb6fd8 assets/oreganized/models/item/lead_bulb.json
 46d5263663d3b35571d0ffb6025d7fd6c8466a0d assets/oreganized/models/item/lead_door.json

src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0

@@ -1,4 +1,4 @@
-// 1.20.1	2024-04-09T10:14:59.8032029	Oreganized Block Tags
+// 1.20.1	2024-06-13T15:46:13.848169	Oreganized Block Tags
 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/blocks/glass.json
 d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/blocks/glass_panes.json
 d062c23ad5308b7de0b2e86f6531ea724530f898 data/forge/tags/blocks/melts_lead.json
@@ -18,6 +18,7 @@ bff6697a058fddfe9e14615bc043fcb2071fd6fc data/forge/tags/blocks/storage_blocks/s
 82c03c405a971b2a7fc3fd43a9fb6c221f463ce0 data/minecraft/tags/blocks/cauldrons.json
 503ad75af537d0ffef02ada9fb9afb5f5cd8e83b data/minecraft/tags/blocks/doors.json
 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/minecraft/tags/blocks/impermeable.json
+f7079c32fc948b65cb486bea80e2dc93d13ce577 data/minecraft/tags/blocks/mineable/axe.json
 a4f374350d2bc24131c46217f4f8810ba08c33e6 data/minecraft/tags/blocks/mineable/pickaxe.json
 84a13f81c79f0c05f8f7a8cbf1d3c25129a97179 data/minecraft/tags/blocks/mineable/shovel.json
 bb86ac7ab19373da790ec5711f473614e4b62d79 data/minecraft/tags/blocks/needs_iron_tool.json

src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e

@@ -1,2 +1,2 @@
-// 1.20.1	2023-08-24T20:32:13.5574802	Sound Definitions
-496a9e1afe04e05f3f6bfc259ce5b58c03df46bc assets/oreganized/sounds.json
+// 1.20.1	2024-02-29T16:37:03.2403501	Sound Definitions
+47254237d13fdbae0fc8e5a730e2c1370f1a0156 assets/oreganized/sounds.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,4 +1,4 @@
-// 1.20.1	2024-04-09T10:14:59.7962018	Recipes
+// 1.20.1	2024-06-13T15:46:13.8440615	Recipes
 c27d3499944bf522a573dc8987582db2d7349b41 data/oreganized/advancements/recipes/brewing/poisonous_potato_from_lead.json
 ee5e42ab2e9ac549022fadf1c2cbf9faebc2c53c data/oreganized/advancements/recipes/building_blocks/black_crystal_glass_pane.json
 40700c3f2f5c78c617650fdd16e2ba248967353f data/oreganized/advancements/recipes/building_blocks/blue_crystal_glass_pane.json
@@ -21,6 +21,8 @@ cd97e0da4ca12f382f0668a766f7d6cc8fd734bd data/oreganized/advancements/recipes/bu
 1fdc8740e3cb94baa8de7c16c93a25c7d8ba1163 data/oreganized/advancements/recipes/building_blocks/gray_crystal_glass_pane.json
 cb23709fa45885e26600b4c77044a515d0bec180 data/oreganized/advancements/recipes/building_blocks/green_crystal_glass_pane.json
 36e6b6e9acc7a2d1e5d06499c08774b428491e64 data/oreganized/advancements/recipes/building_blocks/lead_block.json
+6c6208eebd6c66cc8a03b2845bbd227dc4a19cae data/oreganized/advancements/recipes/building_blocks/lead_bolt_crate.json
+5ebf44699bc82f68474d6f9b78178750faf6ca24 data/oreganized/advancements/recipes/building_blocks/lead_bolt_from_crate.json
 946c08ec1a613679af7062c7108bb751aebf8252 data/oreganized/advancements/recipes/building_blocks/lead_bricks.json
 eee68e2739bde8977814e2cfc0c04354a5c7f84c data/oreganized/advancements/recipes/building_blocks/lead_bulb.json
 cb45a0e98365b4c03da2b7ce702a72498110fb6a data/oreganized/advancements/recipes/building_blocks/lead_ingot.json
@@ -70,6 +72,7 @@ ab878e34895cc94b31ad5f33433d394b3470eb67 data/oreganized/advancements/recipes/bu
 f14efdf82e5565a7f0c8a03bcbde5df9b8af3073 data/oreganized/advancements/recipes/building_blocks/stonecutting/polished_glance.json
 a73b76343b9abc9d4c082f831be8daf1b62f762a data/oreganized/advancements/recipes/building_blocks/white_crystal_glass_pane.json
 8c7873a88da4761a440798323daf006887973daf data/oreganized/advancements/recipes/building_blocks/yellow_crystal_glass_pane.json
+b47ef8f1cecfb7182ed71b4684219ec469d3f2f3 data/oreganized/advancements/recipes/combat/lead_bolt.json
 68105c4709bbf9a9c38cfea3aef83d7ae761c56c data/oreganized/advancements/recipes/decorations/black_crystal_glass.json
 dcb18c1fb204f38642de3c1e3dc39a29c96d3c2a data/oreganized/advancements/recipes/decorations/blue_crystal_glass.json
 4e458a90cff9efa21ded7e7af6b9325aa2b71b53 data/oreganized/advancements/recipes/decorations/brown_crystal_glass.json
@@ -181,6 +184,9 @@ e1c09f2d1950d7e5186f3a1ebaed0d1d9bc20f2a data/oreganized/recipes/gray_crystal_gl
 716c99397627e656f05017ee28f973380862691f data/oreganized/recipes/green_crystal_glass_pane.json
 fa74ed7a7cbf05b56856f395a780c726c7d4b065 data/oreganized/recipes/lead_bars.json
 65befcd063025cfae493e0f156e69cad8c397843 data/oreganized/recipes/lead_block.json
+86d1472c32c4c0db36539f7929ecde7460d069ef data/oreganized/recipes/lead_bolt.json
+9a3d66b85dc44ff589e742ac94a11a513e3a8e85 data/oreganized/recipes/lead_bolt_crate.json
+b13c740aa1e59139c3ad6e85c0d6692457ae81e2 data/oreganized/recipes/lead_bolt_from_crate.json
 d556fb758fd3dbab160acceee42cd40c0d02170f data/oreganized/recipes/lead_bricks.json
 b280a1dac0963942de582b67ea3803fc9a362398 data/oreganized/recipes/lead_bulb.json
 d1df2355d7d57c58c107d2ef782374ee51cd70e2 data/oreganized/recipes/lead_door.json

src/generated/resources/assets/minecraft/atlases/armor_trims.json

@@ -0,0 +1,20 @@
+{
+  "sources": [
+    {
+      "type": "blueprint:paletted_permutations",
+      "palette_key": "minecraft:trims/color_palettes/trim_palette",
+      "permutations": {
+        "oreganized_electrum": "oreganized:trims/color_palettes/electrum",
+        "oreganized_lead": "oreganized:trims/color_palettes/lead",
+        "oreganized_silver": "oreganized:trims/color_palettes/silver"
+      },
+      "sources": [
+        {
+          "type": "minecraft:directory",
+          "prefix": "trims/models/armor/",
+          "source": "trims/models/armor"
+        }
+      ]
+    }
+  ]
+}