diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..f811f6a --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +# Disable autocrlf on generated files, they always generate with LF +# Add any extra files or paths here to make git stop saying they +# are changed when only line endings change. +src/generated/**/.cache/cache text eol=lf +src/generated/**/*.json text eol=lf diff --git a/build.gradle b/build.gradle index fa2d349..1e8bc09 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ apply plugin: 'eclipse' apply plugin: 'maven-publish' apply plugin: "com.wynprice.cursemaven" -version = '2.0' +version = '4.2.1.50-experimental' group = 'fr.alasdiablo.janoeo.arsenal' archivesBaseName = 'Janoeo-Arsenal' @@ -62,7 +62,7 @@ minecraft { dependencies { minecraft 'net.minecraftforge:forge:1.15.2-31.2.0' - compile fg.deobf('curse.maven:jenoeo:2964713') + compile fg.deobf('curse.maven:jenoeo:3059863') } jar { diff --git a/changelog.md b/changelog.md index 9572d80..55e92b8 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,18 @@ +### 4.2.1.50-experimental ++ back port to 1.15 + +### 4.2.1.44-experimental ++ add tin tools + +### 4.2.0.43-experimental ++ add compatibility with Janoeo 4.4.0.42-experimental ++ internal code rework + +### 2.0.1 ++ port to Minecraft 1.16.1 ++ known problem + + Armor and tools can't be repaired via other mod + ### 2.0 + optimized entity falling event (damage reduction with wool boots) + add new tools diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 57cea34..0680b4d 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,196 +1,206 @@ -4f63c958ff502aae44ce73989f99ce381f80e94a data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\aluminium_boots.json -758e97217e26691245d8ad454b5fb58c147d14a2 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\aluminium_chestplate.json -853c210d298c8f0f81772c9340b3777cc24013cb data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\aluminium_helmet.json -1ef37d226396fc19874c50bd9bb71e938038ec06 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\aluminium_leggings.json -728378086cced81ddef33eca2ffdffe5a48fa021 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\black_wool_boots.json -4052df11b532df69e13f8c570205522899e0bedd data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\black_wool_chestplate.json -0716ec24d16b1ebd0b8babdfa64312a39c3cdfb4 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\black_wool_helmet.json -c323d853c06d29feddb2ae505862b71536acb31d data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\black_wool_leggings.json -399e7b2593f3624c03feed0c4d9e01f211866631 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\blue_wool_boots.json -0ba146f05935cbfff752ec0937819afbc28c1082 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\blue_wool_chestplate.json -8c0f2bafe4abf911581499c3451211f8db001f20 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\blue_wool_helmet.json -d5cf107c8a9211cc2c1693d581d90a8078986fb7 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\blue_wool_leggings.json -72c5ae353016aa6295ab02e4236ac611e0c89e11 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\brown_wool_boots.json -a2734021b963ff4ab723e188c67d23f4c7d89d12 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\brown_wool_chestplate.json -daf31198675912630c7fd6c637e1a86d739e910f data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\brown_wool_helmet.json -da65b858f43e3cbf890212f18465914796d8f645 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\brown_wool_leggings.json -b255ba420f93178cbdbbc689cabbe6e62814ec0e data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\copper_boots.json -9e26461809f26777173847d364de9a0d38760610 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\copper_chestplate.json -2d675bbe689efa2e9974e3670171b2e7412e2f06 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\copper_helmet.json -63cbb2080d2e33e3319538c9b24d5acbe3aaf5de data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\copper_leggings.json -de3909de8377f4c334c10f1233e19ff27bcf1665 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\cyan_wool_boots.json -ab722b02f9a0a238757ff8b65f13b8a019cc4a8f data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\cyan_wool_chestplate.json -f7aad34f889117ce558d58ca56d0e6c0a50f58a9 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\cyan_wool_helmet.json -c5d881f382bae65e27b7af2311c0a7db49b625b6 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\cyan_wool_leggings.json -4ee71ad8e5fda9852d513a56b890fb6f08c1096d data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\gray_wool_boots.json -511dc6ca0d5b9f5be659129f6ad621e270c5ea1d data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\gray_wool_chestplate.json -a5456810aa603d15459128e6d624d5a73dcde811 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\gray_wool_helmet.json -23f0fb73aa673bca9e8a6cb5bafe83ddedceb914 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\gray_wool_leggings.json -4b997324d812db771f89aa6f0fcd2cf25f5ebaf2 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\green_wool_boots.json -28f0bf8dace489461986bc316519d5b6940f06b0 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\green_wool_chestplate.json -6cfb237facb53bc280d1f47e6e4f37fd9a70ebca data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\green_wool_helmet.json -6af6dad5d571d7e2507f9912c1cb2cdacb3ffcb4 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\green_wool_leggings.json -2dec1f31ac9dd52fce505de8e8e04a124bbf4458 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\lead_boots.json -3e7fed602ed999f97bc6576a470a5178c24d5678 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\lead_chestplate.json -82385b3eabb6e82ff0c18e393261b27476bf5812 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\lead_helmet.json -7be1d72433faabfe3ba369e8bb350e0161d25c2a data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\lead_leggings.json -7e295b604eb268ce6953baefbe04809d955b100b data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\light_blue_wool_boots.json -2048067a362051ace2164650ddd6c63a49355a31 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\light_blue_wool_chestplate.json -d23baeb676ce00b26739110d701eb3ba23abda31 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\light_blue_wool_helmet.json -cfd7a9faccb3771366a8342f5352b07561d97f45 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\light_blue_wool_leggings.json -552fe6fc4fb24bd7d7408851cdf07106e9987fbb data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\light_gray_wool_boots.json -dfbb6821cf67c4ecd45c3daa8d30cc0ecae5e712 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\light_gray_wool_chestplate.json -6fc5f11369c459d2ee8f5b7f87df9c2cb59ea073 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\light_gray_wool_helmet.json -34703ffc0799a6a6fe6c64f9362fd0ecfd1e0535 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\light_gray_wool_leggings.json -97b9d664c1cc8c275537bef58ae4d966151db06a data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\lime_wool_boots.json -09131e8532c2da2ce2ed6005cdc484112e678794 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\lime_wool_chestplate.json -56289a4473745924c85ad76b88151862a7de76d0 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\lime_wool_helmet.json -495947c6734e20a89e6046ea6ff236df76234d83 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\lime_wool_leggings.json -0515e7929b16667c33575f38de921d21f7548cb6 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\magenta_wool_boots.json -c6f4b5229a3dcead09ad71925af7aed54c417397 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\magenta_wool_chestplate.json -506998e531444c68a2cc3a6b20faf97ec8d807e9 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\magenta_wool_helmet.json -d9a6cde294f7e75d69d5787b129c2f0b06aa7ce9 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\magenta_wool_leggings.json -49a164061110c63ceccc810b7891ece5252ab882 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\orange_wool_boots.json -a95bf1b768629ac045b9a792a02a8406929303eb data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\orange_wool_chestplate.json -44c057e26a0ace06f57572b7bb9404d35bb6be3a data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\orange_wool_helmet.json -2c4f390fefdc3c22b4481888d68b87778376ac8e data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\orange_wool_leggings.json -fc9288b17ecb2bfe73a0722f8037005512060674 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\pink_wool_boots.json -45c401ae03452d1ff74c5ab02465ee277055c693 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\pink_wool_chestplate.json -6368612d2f70fb9427f388a63f5ef88ba55422ea data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\pink_wool_helmet.json -4e2f79b4060d048c316dd64af8dbf9069738ac6c data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\pink_wool_leggings.json -05fcc72fa0aaf9652a6c93c2c1a82684dfb9f0b0 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\purple_wool_boots.json -f7934fa180f5228ecf29a4efb6fd9bae87430faf data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\purple_wool_chestplate.json -470477a58a8aa0f1e05ad087265bc007419fc27a data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\purple_wool_helmet.json -fe45175675a3076540a08032b2dbeb9b4742ea8f data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\purple_wool_leggings.json -560e50ada3c801c038d5d95b26ffc15e83a36915 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\red_wool_boots.json -d3f694119ccffac1c88e0b049c50354a105882bd data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\red_wool_chestplate.json -be6d0bee32734141399baf2c2177f52f165c135a data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\red_wool_helmet.json -23d144a940bdec41ed0326397c29635c619ff5c9 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\red_wool_leggings.json -eb9e1c982fc17eacb77285c6eae2ef57d62318c3 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\silver_boots.json -d668c5499dda5f622d5447d8a581709fe8a6d2a5 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\silver_chestplate.json -912be65ec92324aabb5dd900e9d22923c5202545 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\silver_helmet.json -6dacf140a0781c250a433ec03b918d0edaaab469 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\silver_leggings.json -062960c94ae34657b006b2db7ef33f8a53b81f44 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\tin_boots.json -b7d3c989e72c9b82941bde48995b53ca47d2c4fc data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\tin_chestplate.json -3d17afe31b0f8e12097e07a72ab85f9f6040a10d data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\tin_helmet.json -42c38471640a73db8fd529d79a0cc79357d31a16 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\tin_leggings.json -0409ac213ce7c0d95a95d2fb4c0f1d4d0d665a56 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\uranium_boots.json -dd38c3b36cbdb5eb2870e31956b88f86ef38a057 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\uranium_chestplate.json -4a2fc0a05969bf5c3d1fb915020f2632a0ea6703 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\uranium_helmet.json -d0408acb05623db03d3a22fa52afbb152e736e88 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\uranium_leggings.json -78281c363c7fcf97c5edcabb9b5c975f3884d677 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\white_wool_boots.json -db4c938a1b332e2f65f5bdbe7311d7a8e5ff2f9b data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\white_wool_chestplate.json -5379ce2f074d8644c0f363e552d17a99b464b391 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\white_wool_helmet.json -c8152eefb20aaa0a8e36d435dd824d7165d85cfa data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\white_wool_leggings.json -6b70821f1472ee10725db0494d93eafc525dba10 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\yellow_wool_boots.json -b2bf11a4e6eefb4db38490d38777da7f3147c084 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\yellow_wool_chestplate.json -acb269e48c09500fc826be8da31982fdd92892b7 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\yellow_wool_helmet.json -effd6e00b0985221d623a510b1493501d9918ce8 data\janoeo_arsenal\advancements\recipes\janoeo.armor.group\yellow_wool_leggings.json -bce73ad4f6ec831d2507c7ea441af4ef141910a9 data\janoeo_arsenal\advancements\recipes\janoeo.tool.group\aluminium_axe.json -df1906713019ed17febecf115c2c76fa6c6c1fbe data\janoeo_arsenal\advancements\recipes\janoeo.tool.group\aluminium_hoe.json -cb9195ef6a7d7c55b5c33dbe030970382ef01229 data\janoeo_arsenal\advancements\recipes\janoeo.tool.group\aluminium_pickaxe.json -48e72875810006d5f7ffbc3fe178089f4771d016 data\janoeo_arsenal\advancements\recipes\janoeo.tool.group\aluminium_shovel.json -cdb2ee5330826df386156679bc0229c0c2467ede data\janoeo_arsenal\advancements\recipes\janoeo.tool.group\aluminium_sword.json -ce95be3bb4eab2b4ebc58eb21e40909ae11b3807 data\janoeo_arsenal\advancements\recipes\janoeo.tool.group\copper_axe.json -602bea9503342608df66019845396c46290344db data\janoeo_arsenal\advancements\recipes\janoeo.tool.group\copper_hoe.json -825d43f6fbd0fac0102e3ebaddc8cbec7f3840c2 data\janoeo_arsenal\advancements\recipes\janoeo.tool.group\copper_pickaxe.json -037d7cb0cc079f6e6393e69f214821fdffde4e61 data\janoeo_arsenal\advancements\recipes\janoeo.tool.group\copper_shovel.json -5e16d8cf1c0b79fda5b47fad1b17c3e08b738093 data\janoeo_arsenal\advancements\recipes\janoeo.tool.group\copper_sword.json -fe4dd01e7204deb70a789274b9b41f4a76dcbee1 data\janoeo_arsenal\recipes\aluminium_axe.json -51e5e565863e2db621e63af5425974dbfc4292ae data\janoeo_arsenal\recipes\aluminium_boots.json -d0110ec2a336e596c7e9c3d6db03e5b1d4787d2c data\janoeo_arsenal\recipes\aluminium_chestplate.json -1989ba0c502df51ff7198d354ac1dba5c0bf501a data\janoeo_arsenal\recipes\aluminium_helmet.json -7d6815b7fd9d5345b8eeb064446ddfeeae94ddc1 data\janoeo_arsenal\recipes\aluminium_hoe.json -b80e0590c36ab46f8df20a122bebdbcb793f4169 data\janoeo_arsenal\recipes\aluminium_leggings.json -15c5b2052cf420bd32a1008c57a842f204816a32 data\janoeo_arsenal\recipes\aluminium_pickaxe.json -03aacf95f7b0a911a87cb59fdb30ffbd015e48ca data\janoeo_arsenal\recipes\aluminium_shovel.json -e6cc39b1dda8a31b1fa269f920171e40baa16c5d data\janoeo_arsenal\recipes\aluminium_sword.json -5603c4e59d6433d58c422970e96b5877b47e4ef5 data\janoeo_arsenal\recipes\black_wool_boots.json -e61a82b034c376b0fd66069932fa6d0ffed8c735 data\janoeo_arsenal\recipes\black_wool_chestplate.json -3f3c5aafb52864b9060ee8df486a6efc62ee6737 data\janoeo_arsenal\recipes\black_wool_helmet.json -d97aec36b888398d27c144ff5fa38c068ddfeb03 data\janoeo_arsenal\recipes\black_wool_leggings.json -c3d0ed511d822e44f2134dca7657dd71476817fa data\janoeo_arsenal\recipes\blue_wool_boots.json -53fca5b232f3220077cd7d6b3e4cdc2374369ff0 data\janoeo_arsenal\recipes\blue_wool_chestplate.json -1a25a8254b2c42f6a5a42c4f13f4e22a1d3fb76d data\janoeo_arsenal\recipes\blue_wool_helmet.json -631d651f91ee2120a0fb291faf8cd0daa8063476 data\janoeo_arsenal\recipes\blue_wool_leggings.json -062f946b38ac2b0f251c34ee64926a3c01e3c648 data\janoeo_arsenal\recipes\brown_wool_boots.json -0a42e67fe06d3c78428c5990a2435a6ceb59595b data\janoeo_arsenal\recipes\brown_wool_chestplate.json -c090a6e9448943cf920102a5e3f5afd1be587051 data\janoeo_arsenal\recipes\brown_wool_helmet.json -1b5f914d6bf9e13299e19a041094956055d352a4 data\janoeo_arsenal\recipes\brown_wool_leggings.json -048a6df14d70c9513cbb7f2d58ed1ba029ce4fb0 data\janoeo_arsenal\recipes\copper_axe.json -85737ce4727614dde8c550d82b47e3e210c47e59 data\janoeo_arsenal\recipes\copper_boots.json -17abe297f9e519d5a9efd0806302c721735d483d data\janoeo_arsenal\recipes\copper_chestplate.json -f67e6f78841e20dcb92c4f44d5daf75ef65253a9 data\janoeo_arsenal\recipes\copper_helmet.json -9ffaad9d2b392fb3669c214545228676a78ea511 data\janoeo_arsenal\recipes\copper_hoe.json -19f789004691e32de409180d310a61651a56ffab data\janoeo_arsenal\recipes\copper_leggings.json -86c20b84765600012255afdb1e30c04975ea0b20 data\janoeo_arsenal\recipes\copper_pickaxe.json -1e6e56a1f798f38946196bfbf9f687d40b8f6daa data\janoeo_arsenal\recipes\copper_shovel.json -f9a1ad321c6a74097a62f46aed92e8b68ff700c2 data\janoeo_arsenal\recipes\copper_sword.json -8c4d956999dec990eddf4ebd1a99875a5ce364f4 data\janoeo_arsenal\recipes\cyan_wool_boots.json -1cbaf65a6ecca39dd4408ac93723a316f3f38817 data\janoeo_arsenal\recipes\cyan_wool_chestplate.json -f67c05706b17740ee0d14dc6988457b5b62b3125 data\janoeo_arsenal\recipes\cyan_wool_helmet.json -56a952bd5c5ddc23dc68e4c94c1f28d87a3078d1 data\janoeo_arsenal\recipes\cyan_wool_leggings.json -a4a23267a56596f360f4bc655d80d39abaccb485 data\janoeo_arsenal\recipes\gray_wool_boots.json -238e128b375c49126d6731dba8e8fb425e22d1fd data\janoeo_arsenal\recipes\gray_wool_chestplate.json -468918f2ca41e8e08b8e8b1970950175e328e32d data\janoeo_arsenal\recipes\gray_wool_helmet.json -9ab451c4cbcc5f82c39e3e121c40a67443580bc0 data\janoeo_arsenal\recipes\gray_wool_leggings.json -a3b9a0931186174f7c8e0b391f8e65000e742498 data\janoeo_arsenal\recipes\green_wool_boots.json -63906b26511b27673b51c86dbc6e7f493a6e66f5 data\janoeo_arsenal\recipes\green_wool_chestplate.json -613ba39b820f542ee66e19b114b2fcc0cbf704bf data\janoeo_arsenal\recipes\green_wool_helmet.json -a07d3a61c32c3a53161bfccb86102112d73b433d data\janoeo_arsenal\recipes\green_wool_leggings.json -a4be620987da5483fe6d334bc8de4f2b6b88c4f3 data\janoeo_arsenal\recipes\lead_boots.json -76f6bb28d30faa67a55631fbab9808a2c945eaa0 data\janoeo_arsenal\recipes\lead_chestplate.json -c52313a0026afe425f89e219f28168bac3528193 data\janoeo_arsenal\recipes\lead_helmet.json -909960f0eccf983dc3fc74bc31eb3de79eabc0e7 data\janoeo_arsenal\recipes\lead_leggings.json -0c38f4c7f101464cf14f0937172d4c9367ea2e43 data\janoeo_arsenal\recipes\light_blue_wool_boots.json -24ca5126bccfa33317874f73f22faf1a7d387db5 data\janoeo_arsenal\recipes\light_blue_wool_chestplate.json -735e33a68ea9dbba75392c272e90e0bb83a9bf5f data\janoeo_arsenal\recipes\light_blue_wool_helmet.json -14678a9da0995e6438c982be00613e6369fffb6f data\janoeo_arsenal\recipes\light_blue_wool_leggings.json -90a5bf4edc9a21c0d6f67e734d2ac1f5e088bc9f data\janoeo_arsenal\recipes\light_gray_wool_boots.json -b3ec9e8d3693732d45d00f83a5fe8528971af169 data\janoeo_arsenal\recipes\light_gray_wool_chestplate.json -de0d0fc0f3ec5255a1ba6e1e0b41d899e4e850a7 data\janoeo_arsenal\recipes\light_gray_wool_helmet.json -bbe48b95729eef5054af50f92cc4936983b1741a data\janoeo_arsenal\recipes\light_gray_wool_leggings.json -88abc86499b5473cf3d8bc0e2a3d144470771025 data\janoeo_arsenal\recipes\lime_wool_boots.json -4137df0198ff4746ae998dde0289e811b7f9470b data\janoeo_arsenal\recipes\lime_wool_chestplate.json -c6d161c2f02aa0ae2d5e20bbbc0f6834f63e41e5 data\janoeo_arsenal\recipes\lime_wool_helmet.json -f2cf265c6664dab54f588eb2a8114716e739cab6 data\janoeo_arsenal\recipes\lime_wool_leggings.json -5c6496a6266e8b1bb16e5425e3fae07334d9bbf1 data\janoeo_arsenal\recipes\magenta_wool_boots.json -3cceed489622bee38e0bc05d1a943e954404a390 data\janoeo_arsenal\recipes\magenta_wool_chestplate.json -4997a214d4a2cb1def783e8c51dd40ccbdb38a19 data\janoeo_arsenal\recipes\magenta_wool_helmet.json -015c06f8f0086c77cddd91c377be336d1b7ed3fe data\janoeo_arsenal\recipes\magenta_wool_leggings.json -6dee6a6a40921706817ae8cfb9d63aad29ce7730 data\janoeo_arsenal\recipes\orange_wool_boots.json -1acb39ae76befd917146aa3b0a56aa89ce4ab567 data\janoeo_arsenal\recipes\orange_wool_chestplate.json -d6830db47467a37e0520fa232b5dbd4c74e22d62 data\janoeo_arsenal\recipes\orange_wool_helmet.json -54d00dad4c6d3d5ac1b0d62a097fe3ce5b459ec1 data\janoeo_arsenal\recipes\orange_wool_leggings.json -46ba75a0867bc39f82433c30da30552fdad3fa10 data\janoeo_arsenal\recipes\pink_wool_boots.json -82e15bc492f9fec2cdcc211af58755b9b677ab4a data\janoeo_arsenal\recipes\pink_wool_chestplate.json -f62650b65c51268de16127deb89d05b3a049556b data\janoeo_arsenal\recipes\pink_wool_helmet.json -95e02111ac70098196f09ed17edf98daf4e16660 data\janoeo_arsenal\recipes\pink_wool_leggings.json -049940affcf48488497b185d0702050abd3be195 data\janoeo_arsenal\recipes\purple_wool_boots.json -63f4b77a5abb4f278337c1d18ca194c1abbea0e3 data\janoeo_arsenal\recipes\purple_wool_chestplate.json -9b4c3116d6572e1bbb4e45f8f5905595b912623e data\janoeo_arsenal\recipes\purple_wool_helmet.json -c14d2fa0f005528d4de73645b3ee827de5b39ad5 data\janoeo_arsenal\recipes\purple_wool_leggings.json -8d122f418442c7176754fcf2f0db98f5ddc2bf73 data\janoeo_arsenal\recipes\red_wool_boots.json -f0c451f11b76f7067ef2851a928fa5ab819b97be data\janoeo_arsenal\recipes\red_wool_chestplate.json -308d87f1816e772daa15d994828a57aa05844dc7 data\janoeo_arsenal\recipes\red_wool_helmet.json -e3bcfa84156990931d18c9cc6ac84900a506c244 data\janoeo_arsenal\recipes\red_wool_leggings.json -b588ca59242a963e4a6e7947e94f94fe55956aef data\janoeo_arsenal\recipes\silver_boots.json -08a5d1890fc080019c6841b8c9b35afc3bd6612f data\janoeo_arsenal\recipes\silver_chestplate.json -2a70519ea0424363a13cb44481b98f94c220df85 data\janoeo_arsenal\recipes\silver_helmet.json -7e208f2c9f23481eaeef444b30abbd831a3d1ae0 data\janoeo_arsenal\recipes\silver_leggings.json -d57dc5a2947e7d8ee7f8f48b619a1c424af744cd data\janoeo_arsenal\recipes\tin_boots.json -490fa8e1e51c6f208cc2ef3772649b2cae4b152a data\janoeo_arsenal\recipes\tin_chestplate.json -4bf5dcdcf8cbdafd4fe0b9d01b5e4dc6e321a407 data\janoeo_arsenal\recipes\tin_helmet.json -0f8b765ed08676de22b5dfd24dd7c34bc986345c data\janoeo_arsenal\recipes\tin_leggings.json -63b1195881a3145257726f9730d46029e3309c9f data\janoeo_arsenal\recipes\uranium_boots.json -fa8c8682e181abe5329228bc0cc2a23f720f7fe5 data\janoeo_arsenal\recipes\uranium_chestplate.json -2dadc4ecc1eb6fdbc59f406ee5480380933794a1 data\janoeo_arsenal\recipes\uranium_helmet.json -f1b08bdab76cbcf1e3fd6c8e70045e78f84c9982 data\janoeo_arsenal\recipes\uranium_leggings.json -6804707ea3fbd055bf7aff27b76cddeb0ed08849 data\janoeo_arsenal\recipes\white_wool_boots.json -a2345f892f4d9de9f4ceffd92318e7b860b96bf4 data\janoeo_arsenal\recipes\white_wool_chestplate.json -f2d3c33587f9726bb99dc5d94671f182751107ef data\janoeo_arsenal\recipes\white_wool_helmet.json -6510e3c88d822bdafcedc75fd1b04c9608c517ae data\janoeo_arsenal\recipes\white_wool_leggings.json -3762efe75b893e9b4bf73e5e6e3907b0328a74c7 data\janoeo_arsenal\recipes\yellow_wool_boots.json -a9b62b031a1596458f54ff051a2cf256f1c1062e data\janoeo_arsenal\recipes\yellow_wool_chestplate.json -46bb465dbad9919fbe67ea756ca5a2a29ced0de6 data\janoeo_arsenal\recipes\yellow_wool_helmet.json -0a21048439ccb543f4aece0be6d8c838c39ddbca data\janoeo_arsenal\recipes\yellow_wool_leggings.json +4f63c958ff502aae44ce73989f99ce381f80e94a data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/aluminium_boots.json +758e97217e26691245d8ad454b5fb58c147d14a2 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/aluminium_chestplate.json +853c210d298c8f0f81772c9340b3777cc24013cb data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/aluminium_helmet.json +1ef37d226396fc19874c50bd9bb71e938038ec06 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/aluminium_leggings.json +728378086cced81ddef33eca2ffdffe5a48fa021 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/black_wool_boots.json +4052df11b532df69e13f8c570205522899e0bedd data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/black_wool_chestplate.json +0716ec24d16b1ebd0b8babdfa64312a39c3cdfb4 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/black_wool_helmet.json +c323d853c06d29feddb2ae505862b71536acb31d data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/black_wool_leggings.json +399e7b2593f3624c03feed0c4d9e01f211866631 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/blue_wool_boots.json +0ba146f05935cbfff752ec0937819afbc28c1082 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/blue_wool_chestplate.json +8c0f2bafe4abf911581499c3451211f8db001f20 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/blue_wool_helmet.json +d5cf107c8a9211cc2c1693d581d90a8078986fb7 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/blue_wool_leggings.json +72c5ae353016aa6295ab02e4236ac611e0c89e11 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/brown_wool_boots.json +a2734021b963ff4ab723e188c67d23f4c7d89d12 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/brown_wool_chestplate.json +daf31198675912630c7fd6c637e1a86d739e910f data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/brown_wool_helmet.json +da65b858f43e3cbf890212f18465914796d8f645 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/brown_wool_leggings.json +b255ba420f93178cbdbbc689cabbe6e62814ec0e data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/copper_boots.json +9e26461809f26777173847d364de9a0d38760610 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/copper_chestplate.json +2d675bbe689efa2e9974e3670171b2e7412e2f06 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/copper_helmet.json +63cbb2080d2e33e3319538c9b24d5acbe3aaf5de data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/copper_leggings.json +de3909de8377f4c334c10f1233e19ff27bcf1665 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/cyan_wool_boots.json +ab722b02f9a0a238757ff8b65f13b8a019cc4a8f data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/cyan_wool_chestplate.json +f7aad34f889117ce558d58ca56d0e6c0a50f58a9 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/cyan_wool_helmet.json +c5d881f382bae65e27b7af2311c0a7db49b625b6 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/cyan_wool_leggings.json +4ee71ad8e5fda9852d513a56b890fb6f08c1096d data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/gray_wool_boots.json +511dc6ca0d5b9f5be659129f6ad621e270c5ea1d data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/gray_wool_chestplate.json +a5456810aa603d15459128e6d624d5a73dcde811 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/gray_wool_helmet.json +23f0fb73aa673bca9e8a6cb5bafe83ddedceb914 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/gray_wool_leggings.json +4b997324d812db771f89aa6f0fcd2cf25f5ebaf2 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/green_wool_boots.json +28f0bf8dace489461986bc316519d5b6940f06b0 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/green_wool_chestplate.json +6cfb237facb53bc280d1f47e6e4f37fd9a70ebca data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/green_wool_helmet.json +6af6dad5d571d7e2507f9912c1cb2cdacb3ffcb4 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/green_wool_leggings.json +2dec1f31ac9dd52fce505de8e8e04a124bbf4458 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/lead_boots.json +3e7fed602ed999f97bc6576a470a5178c24d5678 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/lead_chestplate.json +82385b3eabb6e82ff0c18e393261b27476bf5812 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/lead_helmet.json +7be1d72433faabfe3ba369e8bb350e0161d25c2a data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/lead_leggings.json +7e295b604eb268ce6953baefbe04809d955b100b data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/light_blue_wool_boots.json +2048067a362051ace2164650ddd6c63a49355a31 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/light_blue_wool_chestplate.json +d23baeb676ce00b26739110d701eb3ba23abda31 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/light_blue_wool_helmet.json +cfd7a9faccb3771366a8342f5352b07561d97f45 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/light_blue_wool_leggings.json +552fe6fc4fb24bd7d7408851cdf07106e9987fbb data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/light_gray_wool_boots.json +dfbb6821cf67c4ecd45c3daa8d30cc0ecae5e712 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/light_gray_wool_chestplate.json +6fc5f11369c459d2ee8f5b7f87df9c2cb59ea073 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/light_gray_wool_helmet.json +34703ffc0799a6a6fe6c64f9362fd0ecfd1e0535 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/light_gray_wool_leggings.json +97b9d664c1cc8c275537bef58ae4d966151db06a data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/lime_wool_boots.json +09131e8532c2da2ce2ed6005cdc484112e678794 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/lime_wool_chestplate.json +56289a4473745924c85ad76b88151862a7de76d0 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/lime_wool_helmet.json +495947c6734e20a89e6046ea6ff236df76234d83 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/lime_wool_leggings.json +0515e7929b16667c33575f38de921d21f7548cb6 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/magenta_wool_boots.json +c6f4b5229a3dcead09ad71925af7aed54c417397 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/magenta_wool_chestplate.json +506998e531444c68a2cc3a6b20faf97ec8d807e9 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/magenta_wool_helmet.json +d9a6cde294f7e75d69d5787b129c2f0b06aa7ce9 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/magenta_wool_leggings.json +49a164061110c63ceccc810b7891ece5252ab882 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/orange_wool_boots.json +a95bf1b768629ac045b9a792a02a8406929303eb data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/orange_wool_chestplate.json +44c057e26a0ace06f57572b7bb9404d35bb6be3a data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/orange_wool_helmet.json +2c4f390fefdc3c22b4481888d68b87778376ac8e data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/orange_wool_leggings.json +fc9288b17ecb2bfe73a0722f8037005512060674 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/pink_wool_boots.json +45c401ae03452d1ff74c5ab02465ee277055c693 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/pink_wool_chestplate.json +6368612d2f70fb9427f388a63f5ef88ba55422ea data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/pink_wool_helmet.json +4e2f79b4060d048c316dd64af8dbf9069738ac6c data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/pink_wool_leggings.json +05fcc72fa0aaf9652a6c93c2c1a82684dfb9f0b0 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/purple_wool_boots.json +f7934fa180f5228ecf29a4efb6fd9bae87430faf data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/purple_wool_chestplate.json +470477a58a8aa0f1e05ad087265bc007419fc27a data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/purple_wool_helmet.json +fe45175675a3076540a08032b2dbeb9b4742ea8f data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/purple_wool_leggings.json +560e50ada3c801c038d5d95b26ffc15e83a36915 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/red_wool_boots.json +d3f694119ccffac1c88e0b049c50354a105882bd data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/red_wool_chestplate.json +be6d0bee32734141399baf2c2177f52f165c135a data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/red_wool_helmet.json +23d144a940bdec41ed0326397c29635c619ff5c9 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/red_wool_leggings.json +eb9e1c982fc17eacb77285c6eae2ef57d62318c3 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/silver_boots.json +d668c5499dda5f622d5447d8a581709fe8a6d2a5 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/silver_chestplate.json +912be65ec92324aabb5dd900e9d22923c5202545 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/silver_helmet.json +6dacf140a0781c250a433ec03b918d0edaaab469 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/silver_leggings.json +062960c94ae34657b006b2db7ef33f8a53b81f44 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/tin_boots.json +b7d3c989e72c9b82941bde48995b53ca47d2c4fc data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/tin_chestplate.json +3d17afe31b0f8e12097e07a72ab85f9f6040a10d data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/tin_helmet.json +42c38471640a73db8fd529d79a0cc79357d31a16 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/tin_leggings.json +0409ac213ce7c0d95a95d2fb4c0f1d4d0d665a56 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/uranium_boots.json +dd38c3b36cbdb5eb2870e31956b88f86ef38a057 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/uranium_chestplate.json +4a2fc0a05969bf5c3d1fb915020f2632a0ea6703 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/uranium_helmet.json +d0408acb05623db03d3a22fa52afbb152e736e88 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/uranium_leggings.json +78281c363c7fcf97c5edcabb9b5c975f3884d677 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/white_wool_boots.json +db4c938a1b332e2f65f5bdbe7311d7a8e5ff2f9b data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/white_wool_chestplate.json +5379ce2f074d8644c0f363e552d17a99b464b391 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/white_wool_helmet.json +c8152eefb20aaa0a8e36d435dd824d7165d85cfa data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/white_wool_leggings.json +6b70821f1472ee10725db0494d93eafc525dba10 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/yellow_wool_boots.json +b2bf11a4e6eefb4db38490d38777da7f3147c084 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/yellow_wool_chestplate.json +acb269e48c09500fc826be8da31982fdd92892b7 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/yellow_wool_helmet.json +effd6e00b0985221d623a510b1493501d9918ce8 data/janoeo_arsenal/advancements/recipes/janoeo.armor.group/yellow_wool_leggings.json +bce73ad4f6ec831d2507c7ea441af4ef141910a9 data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/aluminium_axe.json +df1906713019ed17febecf115c2c76fa6c6c1fbe data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/aluminium_hoe.json +cb9195ef6a7d7c55b5c33dbe030970382ef01229 data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/aluminium_pickaxe.json +48e72875810006d5f7ffbc3fe178089f4771d016 data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/aluminium_shovel.json +cdb2ee5330826df386156679bc0229c0c2467ede data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/aluminium_sword.json +ce95be3bb4eab2b4ebc58eb21e40909ae11b3807 data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/copper_axe.json +602bea9503342608df66019845396c46290344db data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/copper_hoe.json +825d43f6fbd0fac0102e3ebaddc8cbec7f3840c2 data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/copper_pickaxe.json +037d7cb0cc079f6e6393e69f214821fdffde4e61 data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/copper_shovel.json +5e16d8cf1c0b79fda5b47fad1b17c3e08b738093 data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/copper_sword.json +af1bb0e0622bcbed1ced85bd6932d88e8ddb898c data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_axe.json +a075e73361a373a498ba1143ae05c931e3d1b17a data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_hoe.json +43162436afa1326d81fc87e8764a8ebe82fdb88b data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_pickaxe.json +a55cadce6556c5d8b160d2bb235711cfdb5fc1c0 data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_shovel.json +f5a06fd38f2f8bbf86f7840795c6e24cbf200bfd data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_sword.json +fe4dd01e7204deb70a789274b9b41f4a76dcbee1 data/janoeo_arsenal/recipes/aluminium_axe.json +51e5e565863e2db621e63af5425974dbfc4292ae data/janoeo_arsenal/recipes/aluminium_boots.json +d0110ec2a336e596c7e9c3d6db03e5b1d4787d2c data/janoeo_arsenal/recipes/aluminium_chestplate.json +1989ba0c502df51ff7198d354ac1dba5c0bf501a data/janoeo_arsenal/recipes/aluminium_helmet.json +7d6815b7fd9d5345b8eeb064446ddfeeae94ddc1 data/janoeo_arsenal/recipes/aluminium_hoe.json +b80e0590c36ab46f8df20a122bebdbcb793f4169 data/janoeo_arsenal/recipes/aluminium_leggings.json +15c5b2052cf420bd32a1008c57a842f204816a32 data/janoeo_arsenal/recipes/aluminium_pickaxe.json +03aacf95f7b0a911a87cb59fdb30ffbd015e48ca data/janoeo_arsenal/recipes/aluminium_shovel.json +e6cc39b1dda8a31b1fa269f920171e40baa16c5d data/janoeo_arsenal/recipes/aluminium_sword.json +5603c4e59d6433d58c422970e96b5877b47e4ef5 data/janoeo_arsenal/recipes/black_wool_boots.json +e61a82b034c376b0fd66069932fa6d0ffed8c735 data/janoeo_arsenal/recipes/black_wool_chestplate.json +3f3c5aafb52864b9060ee8df486a6efc62ee6737 data/janoeo_arsenal/recipes/black_wool_helmet.json +d97aec36b888398d27c144ff5fa38c068ddfeb03 data/janoeo_arsenal/recipes/black_wool_leggings.json +c3d0ed511d822e44f2134dca7657dd71476817fa data/janoeo_arsenal/recipes/blue_wool_boots.json +53fca5b232f3220077cd7d6b3e4cdc2374369ff0 data/janoeo_arsenal/recipes/blue_wool_chestplate.json +1a25a8254b2c42f6a5a42c4f13f4e22a1d3fb76d data/janoeo_arsenal/recipes/blue_wool_helmet.json +631d651f91ee2120a0fb291faf8cd0daa8063476 data/janoeo_arsenal/recipes/blue_wool_leggings.json +062f946b38ac2b0f251c34ee64926a3c01e3c648 data/janoeo_arsenal/recipes/brown_wool_boots.json +0a42e67fe06d3c78428c5990a2435a6ceb59595b data/janoeo_arsenal/recipes/brown_wool_chestplate.json +c090a6e9448943cf920102a5e3f5afd1be587051 data/janoeo_arsenal/recipes/brown_wool_helmet.json +1b5f914d6bf9e13299e19a041094956055d352a4 data/janoeo_arsenal/recipes/brown_wool_leggings.json +048a6df14d70c9513cbb7f2d58ed1ba029ce4fb0 data/janoeo_arsenal/recipes/copper_axe.json +85737ce4727614dde8c550d82b47e3e210c47e59 data/janoeo_arsenal/recipes/copper_boots.json +17abe297f9e519d5a9efd0806302c721735d483d data/janoeo_arsenal/recipes/copper_chestplate.json +f67e6f78841e20dcb92c4f44d5daf75ef65253a9 data/janoeo_arsenal/recipes/copper_helmet.json +9ffaad9d2b392fb3669c214545228676a78ea511 data/janoeo_arsenal/recipes/copper_hoe.json +19f789004691e32de409180d310a61651a56ffab data/janoeo_arsenal/recipes/copper_leggings.json +86c20b84765600012255afdb1e30c04975ea0b20 data/janoeo_arsenal/recipes/copper_pickaxe.json +1e6e56a1f798f38946196bfbf9f687d40b8f6daa data/janoeo_arsenal/recipes/copper_shovel.json +f9a1ad321c6a74097a62f46aed92e8b68ff700c2 data/janoeo_arsenal/recipes/copper_sword.json +8c4d956999dec990eddf4ebd1a99875a5ce364f4 data/janoeo_arsenal/recipes/cyan_wool_boots.json +1cbaf65a6ecca39dd4408ac93723a316f3f38817 data/janoeo_arsenal/recipes/cyan_wool_chestplate.json +f67c05706b17740ee0d14dc6988457b5b62b3125 data/janoeo_arsenal/recipes/cyan_wool_helmet.json +56a952bd5c5ddc23dc68e4c94c1f28d87a3078d1 data/janoeo_arsenal/recipes/cyan_wool_leggings.json +a4a23267a56596f360f4bc655d80d39abaccb485 data/janoeo_arsenal/recipes/gray_wool_boots.json +238e128b375c49126d6731dba8e8fb425e22d1fd data/janoeo_arsenal/recipes/gray_wool_chestplate.json +468918f2ca41e8e08b8e8b1970950175e328e32d data/janoeo_arsenal/recipes/gray_wool_helmet.json +9ab451c4cbcc5f82c39e3e121c40a67443580bc0 data/janoeo_arsenal/recipes/gray_wool_leggings.json +a3b9a0931186174f7c8e0b391f8e65000e742498 data/janoeo_arsenal/recipes/green_wool_boots.json +63906b26511b27673b51c86dbc6e7f493a6e66f5 data/janoeo_arsenal/recipes/green_wool_chestplate.json +613ba39b820f542ee66e19b114b2fcc0cbf704bf data/janoeo_arsenal/recipes/green_wool_helmet.json +a07d3a61c32c3a53161bfccb86102112d73b433d data/janoeo_arsenal/recipes/green_wool_leggings.json +a4be620987da5483fe6d334bc8de4f2b6b88c4f3 data/janoeo_arsenal/recipes/lead_boots.json +76f6bb28d30faa67a55631fbab9808a2c945eaa0 data/janoeo_arsenal/recipes/lead_chestplate.json +c52313a0026afe425f89e219f28168bac3528193 data/janoeo_arsenal/recipes/lead_helmet.json +909960f0eccf983dc3fc74bc31eb3de79eabc0e7 data/janoeo_arsenal/recipes/lead_leggings.json +0c38f4c7f101464cf14f0937172d4c9367ea2e43 data/janoeo_arsenal/recipes/light_blue_wool_boots.json +24ca5126bccfa33317874f73f22faf1a7d387db5 data/janoeo_arsenal/recipes/light_blue_wool_chestplate.json +735e33a68ea9dbba75392c272e90e0bb83a9bf5f data/janoeo_arsenal/recipes/light_blue_wool_helmet.json +14678a9da0995e6438c982be00613e6369fffb6f data/janoeo_arsenal/recipes/light_blue_wool_leggings.json +90a5bf4edc9a21c0d6f67e734d2ac1f5e088bc9f data/janoeo_arsenal/recipes/light_gray_wool_boots.json +b3ec9e8d3693732d45d00f83a5fe8528971af169 data/janoeo_arsenal/recipes/light_gray_wool_chestplate.json +de0d0fc0f3ec5255a1ba6e1e0b41d899e4e850a7 data/janoeo_arsenal/recipes/light_gray_wool_helmet.json +bbe48b95729eef5054af50f92cc4936983b1741a data/janoeo_arsenal/recipes/light_gray_wool_leggings.json +88abc86499b5473cf3d8bc0e2a3d144470771025 data/janoeo_arsenal/recipes/lime_wool_boots.json +4137df0198ff4746ae998dde0289e811b7f9470b data/janoeo_arsenal/recipes/lime_wool_chestplate.json +c6d161c2f02aa0ae2d5e20bbbc0f6834f63e41e5 data/janoeo_arsenal/recipes/lime_wool_helmet.json +f2cf265c6664dab54f588eb2a8114716e739cab6 data/janoeo_arsenal/recipes/lime_wool_leggings.json +5c6496a6266e8b1bb16e5425e3fae07334d9bbf1 data/janoeo_arsenal/recipes/magenta_wool_boots.json +3cceed489622bee38e0bc05d1a943e954404a390 data/janoeo_arsenal/recipes/magenta_wool_chestplate.json +4997a214d4a2cb1def783e8c51dd40ccbdb38a19 data/janoeo_arsenal/recipes/magenta_wool_helmet.json +015c06f8f0086c77cddd91c377be336d1b7ed3fe data/janoeo_arsenal/recipes/magenta_wool_leggings.json +6dee6a6a40921706817ae8cfb9d63aad29ce7730 data/janoeo_arsenal/recipes/orange_wool_boots.json +1acb39ae76befd917146aa3b0a56aa89ce4ab567 data/janoeo_arsenal/recipes/orange_wool_chestplate.json +d6830db47467a37e0520fa232b5dbd4c74e22d62 data/janoeo_arsenal/recipes/orange_wool_helmet.json +54d00dad4c6d3d5ac1b0d62a097fe3ce5b459ec1 data/janoeo_arsenal/recipes/orange_wool_leggings.json +46ba75a0867bc39f82433c30da30552fdad3fa10 data/janoeo_arsenal/recipes/pink_wool_boots.json +82e15bc492f9fec2cdcc211af58755b9b677ab4a data/janoeo_arsenal/recipes/pink_wool_chestplate.json +f62650b65c51268de16127deb89d05b3a049556b data/janoeo_arsenal/recipes/pink_wool_helmet.json +95e02111ac70098196f09ed17edf98daf4e16660 data/janoeo_arsenal/recipes/pink_wool_leggings.json +049940affcf48488497b185d0702050abd3be195 data/janoeo_arsenal/recipes/purple_wool_boots.json +63f4b77a5abb4f278337c1d18ca194c1abbea0e3 data/janoeo_arsenal/recipes/purple_wool_chestplate.json +9b4c3116d6572e1bbb4e45f8f5905595b912623e data/janoeo_arsenal/recipes/purple_wool_helmet.json +c14d2fa0f005528d4de73645b3ee827de5b39ad5 data/janoeo_arsenal/recipes/purple_wool_leggings.json +8d122f418442c7176754fcf2f0db98f5ddc2bf73 data/janoeo_arsenal/recipes/red_wool_boots.json +f0c451f11b76f7067ef2851a928fa5ab819b97be data/janoeo_arsenal/recipes/red_wool_chestplate.json +308d87f1816e772daa15d994828a57aa05844dc7 data/janoeo_arsenal/recipes/red_wool_helmet.json +e3bcfa84156990931d18c9cc6ac84900a506c244 data/janoeo_arsenal/recipes/red_wool_leggings.json +b588ca59242a963e4a6e7947e94f94fe55956aef data/janoeo_arsenal/recipes/silver_boots.json +08a5d1890fc080019c6841b8c9b35afc3bd6612f data/janoeo_arsenal/recipes/silver_chestplate.json +2a70519ea0424363a13cb44481b98f94c220df85 data/janoeo_arsenal/recipes/silver_helmet.json +7e208f2c9f23481eaeef444b30abbd831a3d1ae0 data/janoeo_arsenal/recipes/silver_leggings.json +9fc0884a6e1d28bdbe16890559e68528cf6fa3c4 data/janoeo_arsenal/recipes/tin_axe.json +d57dc5a2947e7d8ee7f8f48b619a1c424af744cd data/janoeo_arsenal/recipes/tin_boots.json +490fa8e1e51c6f208cc2ef3772649b2cae4b152a data/janoeo_arsenal/recipes/tin_chestplate.json +4bf5dcdcf8cbdafd4fe0b9d01b5e4dc6e321a407 data/janoeo_arsenal/recipes/tin_helmet.json +eeaf781036cfe0cea521e2bdc4981bbf4f5640c2 data/janoeo_arsenal/recipes/tin_hoe.json +0f8b765ed08676de22b5dfd24dd7c34bc986345c data/janoeo_arsenal/recipes/tin_leggings.json +308e9b7ea8da4aa37a8886332ba9a6d0854c451b data/janoeo_arsenal/recipes/tin_pickaxe.json +3dbd7a435ca5b7c56fe72dc010ccfb58e40c3226 data/janoeo_arsenal/recipes/tin_shovel.json +0f19b73abe0f02ca8a5d50891c1c00a8cf23ef47 data/janoeo_arsenal/recipes/tin_sword.json +63b1195881a3145257726f9730d46029e3309c9f data/janoeo_arsenal/recipes/uranium_boots.json +fa8c8682e181abe5329228bc0cc2a23f720f7fe5 data/janoeo_arsenal/recipes/uranium_chestplate.json +2dadc4ecc1eb6fdbc59f406ee5480380933794a1 data/janoeo_arsenal/recipes/uranium_helmet.json +f1b08bdab76cbcf1e3fd6c8e70045e78f84c9982 data/janoeo_arsenal/recipes/uranium_leggings.json +6804707ea3fbd055bf7aff27b76cddeb0ed08849 data/janoeo_arsenal/recipes/white_wool_boots.json +a2345f892f4d9de9f4ceffd92318e7b860b96bf4 data/janoeo_arsenal/recipes/white_wool_chestplate.json +f2d3c33587f9726bb99dc5d94671f182751107ef data/janoeo_arsenal/recipes/white_wool_helmet.json +6510e3c88d822bdafcedc75fd1b04c9608c517ae data/janoeo_arsenal/recipes/white_wool_leggings.json +3762efe75b893e9b4bf73e5e6e3907b0328a74c7 data/janoeo_arsenal/recipes/yellow_wool_boots.json +a9b62b031a1596458f54ff051a2cf256f1c1062e data/janoeo_arsenal/recipes/yellow_wool_chestplate.json +46bb465dbad9919fbe67ea756ca5a2a29ced0de6 data/janoeo_arsenal/recipes/yellow_wool_helmet.json +0a21048439ccb543f4aece0be6d8c838c39ddbca data/janoeo_arsenal/recipes/yellow_wool_leggings.json diff --git a/src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_axe.json b/src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_axe.json new file mode 100644 index 0000000..50e4d1a --- /dev/null +++ b/src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_axe.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo_arsenal:tin_axe" + ] + }, + "criteria": { + "has_tin": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, + "has_stick": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:rods/wooden" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo_arsenal:tin_axe" + } + } + }, + "requirements": [ + [ + "has_tin", + "has_stick", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_hoe.json b/src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_hoe.json new file mode 100644 index 0000000..d14626f --- /dev/null +++ b/src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_hoe.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo_arsenal:tin_hoe" + ] + }, + "criteria": { + "has_tin": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, + "has_stick": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:rods/wooden" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo_arsenal:tin_hoe" + } + } + }, + "requirements": [ + [ + "has_tin", + "has_stick", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_pickaxe.json b/src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_pickaxe.json new file mode 100644 index 0000000..a037e8f --- /dev/null +++ b/src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_pickaxe.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo_arsenal:tin_pickaxe" + ] + }, + "criteria": { + "has_tin": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, + "has_stick": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:rods/wooden" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo_arsenal:tin_pickaxe" + } + } + }, + "requirements": [ + [ + "has_tin", + "has_stick", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_shovel.json b/src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_shovel.json new file mode 100644 index 0000000..6650caa --- /dev/null +++ b/src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_shovel.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo_arsenal:tin_shovel" + ] + }, + "criteria": { + "has_tin": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, + "has_stick": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:rods/wooden" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo_arsenal:tin_shovel" + } + } + }, + "requirements": [ + [ + "has_tin", + "has_stick", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_sword.json b/src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_sword.json new file mode 100644 index 0000000..0b9c0b7 --- /dev/null +++ b/src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_sword.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo_arsenal:tin_sword" + ] + }, + "criteria": { + "has_tin": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, + "has_stick": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:rods/wooden" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo_arsenal:tin_sword" + } + } + }, + "requirements": [ + [ + "has_tin", + "has_stick", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo_arsenal/recipes/tin_axe.json b/src/generated/resources/data/janoeo_arsenal/recipes/tin_axe.json new file mode 100644 index 0000000..18503f5 --- /dev/null +++ b/src/generated/resources/data/janoeo_arsenal/recipes/tin_axe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AA", + "AS", + " S" + ], + "key": { + "A": { + "tag": "forge:ingots/tin" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "janoeo_arsenal:tin_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo_arsenal/recipes/tin_hoe.json b/src/generated/resources/data/janoeo_arsenal/recipes/tin_hoe.json new file mode 100644 index 0000000..d0c664d --- /dev/null +++ b/src/generated/resources/data/janoeo_arsenal/recipes/tin_hoe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AA", + " S", + " S" + ], + "key": { + "A": { + "tag": "forge:ingots/tin" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "janoeo_arsenal:tin_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo_arsenal/recipes/tin_pickaxe.json b/src/generated/resources/data/janoeo_arsenal/recipes/tin_pickaxe.json new file mode 100644 index 0000000..3400ade --- /dev/null +++ b/src/generated/resources/data/janoeo_arsenal/recipes/tin_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + " S ", + " S " + ], + "key": { + "A": { + "tag": "forge:ingots/tin" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "janoeo_arsenal:tin_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo_arsenal/recipes/tin_shovel.json b/src/generated/resources/data/janoeo_arsenal/recipes/tin_shovel.json new file mode 100644 index 0000000..309b104 --- /dev/null +++ b/src/generated/resources/data/janoeo_arsenal/recipes/tin_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "A", + "S", + "S" + ], + "key": { + "A": { + "tag": "forge:ingots/tin" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "janoeo_arsenal:tin_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/janoeo_arsenal/recipes/tin_sword.json b/src/generated/resources/data/janoeo_arsenal/recipes/tin_sword.json new file mode 100644 index 0000000..81672b2 --- /dev/null +++ b/src/generated/resources/data/janoeo_arsenal/recipes/tin_sword.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "C", + "C", + "S" + ], + "key": { + "C": { + "tag": "forge:ingots/tin" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "janoeo_arsenal:tin_sword" + } +} \ No newline at end of file diff --git a/src/main/java/fr/alasdiablo/janoeo/arsenal/Arsenal.java b/src/main/java/fr/alasdiablo/janoeo/arsenal/Arsenal.java index b95b37d..71a5334 100644 --- a/src/main/java/fr/alasdiablo/janoeo/arsenal/Arsenal.java +++ b/src/main/java/fr/alasdiablo/janoeo/arsenal/Arsenal.java @@ -1,7 +1,7 @@ package fr.alasdiablo.janoeo.arsenal; -import fr.alasdiablo.janoeo.arsenal.utils.Registries; -import fr.alasdiablo.janoeo.arsenal.utils.ModSetup; +import fr.alasdiablo.janoeo.arsenal.util.Registries; +import fr.alasdiablo.janoeo.arsenal.util.ModSetup; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; diff --git a/src/main/java/fr/alasdiablo/janoeo/arsenal/data/Recipes.java b/src/main/java/fr/alasdiablo/janoeo/arsenal/data/Recipes.java index acd7bc1..e86d0c3 100644 --- a/src/main/java/fr/alasdiablo/janoeo/arsenal/data/Recipes.java +++ b/src/main/java/fr/alasdiablo/janoeo/arsenal/data/Recipes.java @@ -1,8 +1,8 @@ package fr.alasdiablo.janoeo.arsenal.data; -import fr.alasdiablo.janoeo.arsenal.init.Armors; -import fr.alasdiablo.janoeo.arsenal.init.Tools; -import fr.alasdiablo.janoeo.arsenal.init.WoolsArmors; +import fr.alasdiablo.janoeo.arsenal.item.Armors; +import fr.alasdiablo.janoeo.arsenal.item.Tools; +import fr.alasdiablo.janoeo.arsenal.item.WoolsArmors; import fr.alasdiablo.janoeo.tags.ItemsTags; import javafx.util.Pair; import net.minecraft.block.Block; @@ -10,7 +10,6 @@ import net.minecraft.data.*; import net.minecraft.item.Item; import net.minecraft.tags.Tag; -import net.minecraft.util.IItemProvider; import net.minecraftforge.common.Tags; import java.util.Arrays; @@ -49,8 +48,8 @@ private void tools(Consumer consumer) { .patternLine("CC") .patternLine("CS") .patternLine(" S") - .addCriterion("has_copper", this.hasItem(ItemsTags.Ingots.COPPER)) - .addCriterion("has_stick", this.hasItem(Tags.Items.RODS_WOODEN)) + .addCriterion("has_copper", hasItem(ItemsTags.Ingots.COPPER)) + .addCriterion("has_stick", hasItem(Tags.Items.RODS_WOODEN)) .build(consumer); ShapedRecipeBuilder.shapedRecipe(Tools.COPPER_HOE) @@ -59,8 +58,8 @@ private void tools(Consumer consumer) { .patternLine("CC") .patternLine(" S") .patternLine(" S") - .addCriterion("has_copper", this.hasItem(ItemsTags.Ingots.COPPER)) - .addCriterion("has_stick", this.hasItem(Tags.Items.RODS_WOODEN)) + .addCriterion("has_copper", hasItem(ItemsTags.Ingots.COPPER)) + .addCriterion("has_stick", hasItem(Tags.Items.RODS_WOODEN)) .build(consumer); ShapedRecipeBuilder.shapedRecipe(Tools.COPPER_PICKAXE) @@ -69,8 +68,8 @@ private void tools(Consumer consumer) { .patternLine("CCC") .patternLine(" S ") .patternLine(" S ") - .addCriterion("has_copper", this.hasItem(ItemsTags.Ingots.COPPER)) - .addCriterion("has_stick", this.hasItem(Tags.Items.RODS_WOODEN)) + .addCriterion("has_copper", hasItem(ItemsTags.Ingots.COPPER)) + .addCriterion("has_stick", hasItem(Tags.Items.RODS_WOODEN)) .build(consumer); ShapedRecipeBuilder.shapedRecipe(Tools.COPPER_SHOVEL) @@ -79,8 +78,8 @@ private void tools(Consumer consumer) { .patternLine("C") .patternLine("S") .patternLine("S") - .addCriterion("has_copper", this.hasItem(ItemsTags.Ingots.COPPER)) - .addCriterion("has_stick", this.hasItem(Tags.Items.RODS_WOODEN)) + .addCriterion("has_copper", hasItem(ItemsTags.Ingots.COPPER)) + .addCriterion("has_stick", hasItem(Tags.Items.RODS_WOODEN)) .build(consumer); ShapedRecipeBuilder.shapedRecipe(Tools.COPPER_SWORD) @@ -89,8 +88,8 @@ private void tools(Consumer consumer) { .patternLine("C") .patternLine("C") .patternLine("S") - .addCriterion("has_copper", this.hasItem(ItemsTags.Ingots.COPPER)) - .addCriterion("has_stick", this.hasItem(Tags.Items.RODS_WOODEN)) + .addCriterion("has_copper", hasItem(ItemsTags.Ingots.COPPER)) + .addCriterion("has_stick", hasItem(Tags.Items.RODS_WOODEN)) .build(consumer); @@ -101,8 +100,8 @@ private void tools(Consumer consumer) { .patternLine("AA") .patternLine("AS") .patternLine(" S") - .addCriterion("has_aluminium", this.hasItem(ItemsTags.Ingots.ALUMINIUM)) - .addCriterion("has_stick", this.hasItem(Tags.Items.RODS_WOODEN)) + .addCriterion("has_aluminium", hasItem(ItemsTags.Ingots.ALUMINIUM)) + .addCriterion("has_stick", hasItem(Tags.Items.RODS_WOODEN)) .build(consumer); ShapedRecipeBuilder.shapedRecipe(Tools.ALUMINIUM_HOE) @@ -111,8 +110,8 @@ private void tools(Consumer consumer) { .patternLine("AA") .patternLine(" S") .patternLine(" S") - .addCriterion("has_aluminium", this.hasItem(ItemsTags.Ingots.ALUMINIUM)) - .addCriterion("has_stick", this.hasItem(Tags.Items.RODS_WOODEN)) + .addCriterion("has_aluminium", hasItem(ItemsTags.Ingots.ALUMINIUM)) + .addCriterion("has_stick", hasItem(Tags.Items.RODS_WOODEN)) .build(consumer); ShapedRecipeBuilder.shapedRecipe(Tools.ALUMINIUM_PICKAXE) @@ -121,8 +120,8 @@ private void tools(Consumer consumer) { .patternLine("AAA") .patternLine(" S ") .patternLine(" S ") - .addCriterion("has_aluminium", this.hasItem(ItemsTags.Ingots.ALUMINIUM)) - .addCriterion("has_stick", this.hasItem(Tags.Items.RODS_WOODEN)) + .addCriterion("has_aluminium", hasItem(ItemsTags.Ingots.ALUMINIUM)) + .addCriterion("has_stick", hasItem(Tags.Items.RODS_WOODEN)) .build(consumer); ShapedRecipeBuilder.shapedRecipe(Tools.ALUMINIUM_SHOVEL) @@ -131,8 +130,8 @@ private void tools(Consumer consumer) { .patternLine("A") .patternLine("S") .patternLine("S") - .addCriterion("has_aluminium", this.hasItem(ItemsTags.Ingots.ALUMINIUM)) - .addCriterion("has_stick", this.hasItem(Tags.Items.RODS_WOODEN)) + .addCriterion("has_aluminium", hasItem(ItemsTags.Ingots.ALUMINIUM)) + .addCriterion("has_stick", hasItem(Tags.Items.RODS_WOODEN)) .build(consumer); ShapedRecipeBuilder.shapedRecipe(Tools.ALUMINIUM_SWORD) @@ -141,8 +140,58 @@ private void tools(Consumer consumer) { .patternLine("C") .patternLine("C") .patternLine("S") - .addCriterion("has_aluminium", this.hasItem(ItemsTags.Ingots.ALUMINIUM)) - .addCriterion("has_stick", this.hasItem(Tags.Items.RODS_WOODEN)) + .addCriterion("has_aluminium", hasItem(ItemsTags.Ingots.ALUMINIUM)) + .addCriterion("has_stick", hasItem(Tags.Items.RODS_WOODEN)) + .build(consumer); + + ShapedRecipeBuilder.shapedRecipe(Tools.TIN_AXE) + .key('A', ItemsTags.Ingots.TIN) + .key('S', Tags.Items.RODS_WOODEN) + .patternLine("AA") + .patternLine("AS") + .patternLine(" S") + .addCriterion("has_tin", hasItem(ItemsTags.Ingots.TIN)) + .addCriterion("has_stick", hasItem(Tags.Items.RODS_WOODEN)) + .build(consumer); + + ShapedRecipeBuilder.shapedRecipe(Tools.TIN_HOE) + .key('A', ItemsTags.Ingots.TIN) + .key('S', Tags.Items.RODS_WOODEN) + .patternLine("AA") + .patternLine(" S") + .patternLine(" S") + .addCriterion("has_tin", hasItem(ItemsTags.Ingots.TIN)) + .addCriterion("has_stick", hasItem(Tags.Items.RODS_WOODEN)) + .build(consumer); + + ShapedRecipeBuilder.shapedRecipe(Tools.TIN_PICKAXE) + .key('A', ItemsTags.Ingots.TIN) + .key('S', Tags.Items.RODS_WOODEN) + .patternLine("AAA") + .patternLine(" S ") + .patternLine(" S ") + .addCriterion("has_tin", hasItem(ItemsTags.Ingots.TIN)) + .addCriterion("has_stick", hasItem(Tags.Items.RODS_WOODEN)) + .build(consumer); + + ShapedRecipeBuilder.shapedRecipe(Tools.TIN_SHOVEL) + .key('A', ItemsTags.Ingots.TIN) + .key('S', Tags.Items.RODS_WOODEN) + .patternLine("A") + .patternLine("S") + .patternLine("S") + .addCriterion("has_tin", hasItem(ItemsTags.Ingots.TIN)) + .addCriterion("has_stick", hasItem(Tags.Items.RODS_WOODEN)) + .build(consumer); + + ShapedRecipeBuilder.shapedRecipe(Tools.TIN_SWORD) + .key('C', ItemsTags.Ingots.TIN) + .key('S', Tags.Items.RODS_WOODEN) + .patternLine("C") + .patternLine("C") + .patternLine("S") + .addCriterion("has_tin", hasItem(ItemsTags.Ingots.TIN)) + .addCriterion("has_stick", hasItem(Tags.Items.RODS_WOODEN)) .build(consumer); } @@ -188,7 +237,7 @@ private void armors(Consumer consumer) { listOfArmor.forEach((key, values) -> values.forEach(element -> { ShapedRecipeBuilder recipe = ShapedRecipeBuilder.shapedRecipe(element.getKey()).key('I', key.getValue()); element.getValue().forEach(recipe::patternLine); - recipe.addCriterion(key.getKey(), this.hasItem(key.getValue())).build(consumer); + recipe.addCriterion(key.getKey(), hasItem(key.getValue())).build(consumer); })); } @@ -293,7 +342,7 @@ private void woolArmors(Consumer consumer) { listOfArmor.forEach((key, values) -> values.forEach(element -> { ShapedRecipeBuilder recipe = ShapedRecipeBuilder.shapedRecipe(element.getKey()).key('W', key.getValue()); element.getValue().forEach(recipe::patternLine); - recipe.addCriterion(key.getKey(), this.hasItem(key.getValue())).build(consumer); + recipe.addCriterion(key.getKey(), hasItem(key.getValue())).build(consumer); })); } } diff --git a/src/main/java/fr/alasdiablo/janoeo/arsenal/event/WoolArmorEvent.java b/src/main/java/fr/alasdiablo/janoeo/arsenal/event/WoolArmorEvent.java index 57a8c8e..dccdde8 100644 --- a/src/main/java/fr/alasdiablo/janoeo/arsenal/event/WoolArmorEvent.java +++ b/src/main/java/fr/alasdiablo/janoeo/arsenal/event/WoolArmorEvent.java @@ -1,10 +1,9 @@ package fr.alasdiablo.janoeo.arsenal.event; -import fr.alasdiablo.janoeo.arsenal.init.WoolsArmors; +import fr.alasdiablo.janoeo.arsenal.item.WoolsArmors; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingFallEvent; diff --git a/src/main/java/fr/alasdiablo/janoeo/arsenal/init/Armors.java b/src/main/java/fr/alasdiablo/janoeo/arsenal/item/Armors.java similarity index 98% rename from src/main/java/fr/alasdiablo/janoeo/arsenal/init/Armors.java rename to src/main/java/fr/alasdiablo/janoeo/arsenal/item/Armors.java index 4aa9832..4f494e2 100644 --- a/src/main/java/fr/alasdiablo/janoeo/arsenal/init/Armors.java +++ b/src/main/java/fr/alasdiablo/janoeo/arsenal/item/Armors.java @@ -1,8 +1,8 @@ -package fr.alasdiablo.janoeo.arsenal.init; +package fr.alasdiablo.janoeo.arsenal.item; import fr.alasdiablo.janoeo.arsenal.Arsenal; -import fr.alasdiablo.janoeo.arsenal.utils.ArmorsMaterials; -import fr.alasdiablo.janoeo.arsenal.utils.Registries; +import fr.alasdiablo.janoeo.arsenal.util.ArmorsMaterials; +import fr.alasdiablo.janoeo.arsenal.util.Registries; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ArmorItem; import net.minecraft.item.Item; diff --git a/src/main/java/fr/alasdiablo/janoeo/arsenal/init/Tools.java b/src/main/java/fr/alasdiablo/janoeo/arsenal/item/Tools.java similarity index 63% rename from src/main/java/fr/alasdiablo/janoeo/arsenal/init/Tools.java rename to src/main/java/fr/alasdiablo/janoeo/arsenal/item/Tools.java index 7cd1cbf..5e149e9 100644 --- a/src/main/java/fr/alasdiablo/janoeo/arsenal/init/Tools.java +++ b/src/main/java/fr/alasdiablo/janoeo/arsenal/item/Tools.java @@ -1,8 +1,8 @@ -package fr.alasdiablo.janoeo.arsenal.init; +package fr.alasdiablo.janoeo.arsenal.item; import fr.alasdiablo.janoeo.arsenal.Arsenal; -import fr.alasdiablo.janoeo.arsenal.utils.ItemsTiers; -import fr.alasdiablo.janoeo.arsenal.utils.Registries; +import fr.alasdiablo.janoeo.arsenal.util.ItemsTiers; +import fr.alasdiablo.janoeo.arsenal.util.Registries; import net.minecraft.item.*; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -35,23 +35,40 @@ public class Tools { @ObjectHolder(Registries.MOD_ID + ":" + Registries.ALUMINIUM_SWORD) public static Item ALUMINIUM_SWORD; + @ObjectHolder(Registries.MOD_ID + ":" + Registries.TIN_AXE) + public static Item TIN_AXE; + @ObjectHolder(Registries.MOD_ID + ":" + Registries.TIN_HOE) + public static Item TIN_HOE; + @ObjectHolder(Registries.MOD_ID + ":" + Registries.TIN_PICKAXE) + public static Item TIN_PICKAXE; + @ObjectHolder(Registries.MOD_ID + ":" + Registries.TIN_SHOVEL) + public static Item TIN_SHOVEL; + @ObjectHolder(Registries.MOD_ID + ":" + Registries.TIN_SWORD) + public static Item TIN_SWORD; + @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) public static class RegistryEvents { @SubscribeEvent public static void onItemsRegistry(final RegistryEvent.Register event) { IForgeRegistry e = event.getRegistry(); + e.register(new AxeItem(ItemsTiers.COPPER, 6.5f, -3.15f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.COPPER_AXE)); - e.register(new HoeItem(ItemsTiers.COPPER, -1.5f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.COPPER_HOE)); + e.register(new HoeItem(ItemsTiers.COPPER, -1.5f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.COPPER_HOE)); e.register(new PickaxeItem(ItemsTiers.COPPER, 1, -2.8f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.COPPER_PICKAXE)); e.register(new ShovelItem(ItemsTiers.COPPER, 1.5f, -3.0f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.COPPER_SHOVEL)); e.register(new SwordItem(ItemsTiers.COPPER, 3, -2.4f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.COPPER_SWORD)); e.register(new AxeItem(ItemsTiers.ALUMINIUM, 6.5f, -3.15f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.ALUMINIUM_AXE)); - e.register(new HoeItem(ItemsTiers.ALUMINIUM, -1.5f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.ALUMINIUM_HOE)); + e.register(new HoeItem(ItemsTiers.ALUMINIUM, -1.5f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.ALUMINIUM_HOE)); e.register(new PickaxeItem(ItemsTiers.ALUMINIUM, 1, -2.8f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.ALUMINIUM_PICKAXE)); e.register(new ShovelItem(ItemsTiers.ALUMINIUM, 1.5f, -3.0f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.ALUMINIUM_SHOVEL)); e.register(new SwordItem(ItemsTiers.ALUMINIUM, 3, -2.4f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.ALUMINIUM_SWORD)); + e.register(new AxeItem(ItemsTiers.TIN, 6.5f, -3.15f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.TIN_AXE)); + e.register(new HoeItem(ItemsTiers.TIN, -1.5f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.TIN_HOE)); + e.register(new PickaxeItem(ItemsTiers.TIN, 1, -2.8f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.TIN_PICKAXE)); + e.register(new ShovelItem(ItemsTiers.TIN, 1.5f, -3.0f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.TIN_SHOVEL)); + e.register(new SwordItem(ItemsTiers.TIN, 3, -2.4f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.TIN_SWORD)); } } } diff --git a/src/main/java/fr/alasdiablo/janoeo/arsenal/init/WoolsArmors.java b/src/main/java/fr/alasdiablo/janoeo/arsenal/item/WoolsArmors.java similarity index 99% rename from src/main/java/fr/alasdiablo/janoeo/arsenal/init/WoolsArmors.java rename to src/main/java/fr/alasdiablo/janoeo/arsenal/item/WoolsArmors.java index 9c34e1a..7754d19 100644 --- a/src/main/java/fr/alasdiablo/janoeo/arsenal/init/WoolsArmors.java +++ b/src/main/java/fr/alasdiablo/janoeo/arsenal/item/WoolsArmors.java @@ -1,8 +1,8 @@ -package fr.alasdiablo.janoeo.arsenal.init; +package fr.alasdiablo.janoeo.arsenal.item; import fr.alasdiablo.janoeo.arsenal.Arsenal; -import fr.alasdiablo.janoeo.arsenal.utils.ArmorsMaterials; -import fr.alasdiablo.janoeo.arsenal.utils.Registries; +import fr.alasdiablo.janoeo.arsenal.util.ArmorsMaterials; +import fr.alasdiablo.janoeo.arsenal.util.Registries; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ArmorItem; import net.minecraft.item.Item; diff --git a/src/main/java/fr/alasdiablo/janoeo/arsenal/utils/ArmorsMaterials.java b/src/main/java/fr/alasdiablo/janoeo/arsenal/util/ArmorsMaterials.java similarity index 89% rename from src/main/java/fr/alasdiablo/janoeo/arsenal/utils/ArmorsMaterials.java rename to src/main/java/fr/alasdiablo/janoeo/arsenal/util/ArmorsMaterials.java index 07ee2a7..daca36e 100644 --- a/src/main/java/fr/alasdiablo/janoeo/arsenal/utils/ArmorsMaterials.java +++ b/src/main/java/fr/alasdiablo/janoeo/arsenal/util/ArmorsMaterials.java @@ -1,8 +1,9 @@ -package fr.alasdiablo.janoeo.arsenal.utils; +package fr.alasdiablo.janoeo.arsenal.util; -import fr.alasdiablo.janoeo.tags.ItemsTags; +import fr.alasdiablo.janoeo.item.IngotsItems; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.IArmorMaterial; +import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.SoundEvent; import net.minecraft.util.SoundEvents; @@ -28,12 +29,12 @@ public enum ArmorsMaterials implements IArmorMaterial { RED_WOOL_ARMOR(Registries.RED_WOOL_ARMOR, 5, new int[] {1, 2, 3, 1} ,25, Ingredient.fromItems(Registries.WOOLS_LIST), SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, 0.2f), WHITE_WOOL_ARMOR(Registries.WHITE_WOOL_ARMOR, 5, new int[] {1, 2, 3, 1} ,25, Ingredient.fromItems(Registries.WOOLS_LIST), SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, 0.2f), YELLOW_WOOL_ARMOR(Registries.YELLOW_WOOL_ARMOR, 5, new int[] {1, 2, 3, 1} ,25, Ingredient.fromItems(Registries.WOOLS_LIST), SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, 0.2f), - COPPER_ARMOR(Registries.COPPER_ARMOR, 7, new int[]{1, 3, 5, 2}, 9, Ingredient.fromTag(ItemsTags.Ingots.COPPER), SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F), - ALUMINIUM_ARMOR(Registries.ALUMINIUM_ARMOR, 6, new int[]{1, 2, 4, 1}, 6, Ingredient.fromTag(ItemsTags.Ingots.ALUMINIUM), SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F), - LEAD_ARMOR(Registries.LEAD_ARMOR, 5, new int[]{1, 2, 4, 1}, 5, Ingredient.fromTag(ItemsTags.Ingots.LEAD), SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F), - SILVER_ARMOR(Registries.SILVER_ARMOR, 15, new int[]{2, 5, 6, 2}, 25, Ingredient.fromTag(ItemsTags.Ingots.SILVER), SoundEvents.ITEM_ARMOR_EQUIP_GOLD, 0.0F), - TIN_ARMOR(Registries.TIN_ARMOR, 6, new int[]{1, 2, 4, 1}, 7, Ingredient.fromTag(ItemsTags.Ingots.TIN), SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F), - URANIUM_ARMOR(Registries.URANIUM_ARMOR, 12, new int[]{2, 5, 6, 2}, 9, Ingredient.fromTag(ItemsTags.Ingots.URANIUM), SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F); + COPPER_ARMOR(Registries.COPPER_ARMOR, 7, new int[]{1, 3, 5, 2}, 9, Ingredient.fromStacks(new ItemStack(IngotsItems.COPPER_INGOT)), SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F), + ALUMINIUM_ARMOR(Registries.ALUMINIUM_ARMOR, 6, new int[]{1, 2, 4, 1}, 6, Ingredient.fromStacks(new ItemStack(IngotsItems.ALUMINIUM_INGOT)), SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F), + LEAD_ARMOR(Registries.LEAD_ARMOR, 5, new int[]{1, 2, 4, 1}, 5, Ingredient.fromStacks(new ItemStack(IngotsItems.LEAD_INGOT)), SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F), + SILVER_ARMOR(Registries.SILVER_ARMOR, 15, new int[]{2, 5, 6, 2}, 25, Ingredient.fromStacks(new ItemStack(IngotsItems.SILVER_INGOT)), SoundEvents.ITEM_ARMOR_EQUIP_GOLD, 0.0F), + TIN_ARMOR(Registries.TIN_ARMOR, 6, new int[]{1, 2, 4, 1}, 7, Ingredient.fromStacks(new ItemStack(IngotsItems.TIN_INGOT)), SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F), + URANIUM_ARMOR(Registries.URANIUM_ARMOR, 12, new int[]{2, 5, 6, 2}, 9, Ingredient.fromStacks(new ItemStack(IngotsItems.URANIUM_INGOT)), SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F); /** * name of the material diff --git a/src/main/java/fr/alasdiablo/janoeo/arsenal/utils/DataGenerators.java b/src/main/java/fr/alasdiablo/janoeo/arsenal/util/DataGenerators.java similarity index 92% rename from src/main/java/fr/alasdiablo/janoeo/arsenal/utils/DataGenerators.java rename to src/main/java/fr/alasdiablo/janoeo/arsenal/util/DataGenerators.java index 5e3b6e3..79e9656 100644 --- a/src/main/java/fr/alasdiablo/janoeo/arsenal/utils/DataGenerators.java +++ b/src/main/java/fr/alasdiablo/janoeo/arsenal/util/DataGenerators.java @@ -1,4 +1,4 @@ -package fr.alasdiablo.janoeo.arsenal.utils; +package fr.alasdiablo.janoeo.arsenal.util; import fr.alasdiablo.janoeo.arsenal.data.Recipes; import net.minecraft.data.DataGenerator; diff --git a/src/main/java/fr/alasdiablo/janoeo/arsenal/utils/ItemsTiers.java b/src/main/java/fr/alasdiablo/janoeo/arsenal/util/ItemsTiers.java similarity index 87% rename from src/main/java/fr/alasdiablo/janoeo/arsenal/utils/ItemsTiers.java rename to src/main/java/fr/alasdiablo/janoeo/arsenal/util/ItemsTiers.java index 196a376..418a0c0 100644 --- a/src/main/java/fr/alasdiablo/janoeo/arsenal/utils/ItemsTiers.java +++ b/src/main/java/fr/alasdiablo/janoeo/arsenal/util/ItemsTiers.java @@ -1,12 +1,15 @@ -package fr.alasdiablo.janoeo.arsenal.utils; +package fr.alasdiablo.janoeo.arsenal.util; +import fr.alasdiablo.janoeo.item.IngotsItems; import fr.alasdiablo.janoeo.tags.ItemsTags; import net.minecraft.item.IItemTier; +import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; public enum ItemsTiers implements IItemTier { COPPER(2, 32, 6.0f, 1.5f, 9, Ingredient.fromTag(ItemsTags.Ingots.COPPER)), - ALUMINIUM(2, 28, 5.0f, 1.0f, 6, Ingredient.fromTag(ItemsTags.Ingots.ALUMINIUM)); + ALUMINIUM(2, 28, 5.0f, 1.0f, 6, Ingredient.fromTag(ItemsTags.Ingots.ALUMINIUM)), + TIN(2, 30, 5.5f, 1.25f, 7, Ingredient.fromTag(ItemsTags.Ingots.TIN)); private final int harvestLevel; private final int maxUses; diff --git a/src/main/java/fr/alasdiablo/janoeo/arsenal/utils/ModSetup.java b/src/main/java/fr/alasdiablo/janoeo/arsenal/util/ModSetup.java similarity index 85% rename from src/main/java/fr/alasdiablo/janoeo/arsenal/utils/ModSetup.java rename to src/main/java/fr/alasdiablo/janoeo/arsenal/util/ModSetup.java index a43bbad..dd5df24 100644 --- a/src/main/java/fr/alasdiablo/janoeo/arsenal/utils/ModSetup.java +++ b/src/main/java/fr/alasdiablo/janoeo/arsenal/util/ModSetup.java @@ -1,9 +1,9 @@ -package fr.alasdiablo.janoeo.arsenal.utils; +package fr.alasdiablo.janoeo.arsenal.util; import fr.alasdiablo.janoeo.arsenal.event.IInitEvent; import fr.alasdiablo.janoeo.arsenal.event.WoolArmorEvent; -import fr.alasdiablo.janoeo.arsenal.init.Tools; -import fr.alasdiablo.janoeo.arsenal.init.WoolsArmors; +import fr.alasdiablo.janoeo.arsenal.item.Tools; +import fr.alasdiablo.janoeo.arsenal.item.WoolsArmors; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; diff --git a/src/main/java/fr/alasdiablo/janoeo/arsenal/utils/Registries.java b/src/main/java/fr/alasdiablo/janoeo/arsenal/util/Registries.java similarity index 96% rename from src/main/java/fr/alasdiablo/janoeo/arsenal/utils/Registries.java rename to src/main/java/fr/alasdiablo/janoeo/arsenal/util/Registries.java index a7fe794..859c4e3 100644 --- a/src/main/java/fr/alasdiablo/janoeo/arsenal/utils/Registries.java +++ b/src/main/java/fr/alasdiablo/janoeo/arsenal/util/Registries.java @@ -1,7 +1,6 @@ -package fr.alasdiablo.janoeo.arsenal.utils; +package fr.alasdiablo.janoeo.arsenal.util; import net.minecraft.block.Blocks; -import net.minecraft.item.ArmorMaterial; import net.minecraft.item.Item; /** @@ -157,6 +156,12 @@ public class Registries { public static final String ALUMINIUM_SHOVEL = "aluminium_shovel"; public static final String ALUMINIUM_SWORD = "aluminium_sword"; + public static final String TIN_AXE = "tin_axe"; + public static final String TIN_HOE = "tin_hoe"; + public static final String TIN_PICKAXE = "tin_pickaxe"; + public static final String TIN_SHOVEL = "tin_shovel"; + public static final String TIN_SWORD = "tin_sword"; + // List of all wool public static Item[] WOOLS_LIST = new Item[] { Blocks.BLACK_WOOL.asItem(), diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 3d208a4..725d353 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -23,6 +23,6 @@ Just Another Nether/Overworld/End Ores - Arsenal by AlasDiablo, lIotaMiu, Egame2 [[dependencies.janoeo_arsenal]] modId="janoeo" mandatory=true - versionRange="[3.6,)" - ordering="NONE" + versionRange="[4.4,)" + ordering="AFTER" side="BOTH" diff --git a/src/main/resources/assets/janoeo_arsenal/lang/en_us.json b/src/main/resources/assets/janoeo_arsenal/lang/en_us.json index 3cdf209..1407802 100644 --- a/src/main/resources/assets/janoeo_arsenal/lang/en_us.json +++ b/src/main/resources/assets/janoeo_arsenal/lang/en_us.json @@ -98,5 +98,10 @@ "item.janoeo_arsenal.copper_axe": "Copper Axe", "item.janoeo_arsenal.copper_shovel": "Copper Shovel", "item.janoeo_arsenal.copper_sword": "Copper Sword", - "item.janoeo_arsenal.copper_pickaxe": "Copper Pickaxe" + "item.janoeo_arsenal.copper_pickaxe": "Copper Pickaxe", + "item.janoeo_arsenal.tin_hoe": "Tin Hoe", + "item.janoeo_arsenal.tin_axe": "Tin Axe", + "item.janoeo_arsenal.tin_shovel": "Tin Shovel", + "item.janoeo_arsenal.tin_sword": "Tin Sword", + "item.janoeo_arsenal.tin_pickaxe": "Tin Pickaxe" } \ No newline at end of file diff --git a/src/main/resources/assets/janoeo_arsenal/models/item/tin_axe.json b/src/main/resources/assets/janoeo_arsenal/models/item/tin_axe.json new file mode 100644 index 0000000..e86892e --- /dev/null +++ b/src/main/resources/assets/janoeo_arsenal/models/item/tin_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "janoeo_arsenal:items/tin_axe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo_arsenal/models/item/tin_hoe.json b/src/main/resources/assets/janoeo_arsenal/models/item/tin_hoe.json new file mode 100644 index 0000000..a8a4f14 --- /dev/null +++ b/src/main/resources/assets/janoeo_arsenal/models/item/tin_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "janoeo_arsenal:items/tin_hoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo_arsenal/models/item/tin_pickaxe.json b/src/main/resources/assets/janoeo_arsenal/models/item/tin_pickaxe.json new file mode 100644 index 0000000..2470c4f --- /dev/null +++ b/src/main/resources/assets/janoeo_arsenal/models/item/tin_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "janoeo_arsenal:items/tin_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo_arsenal/models/item/tin_shovel.json b/src/main/resources/assets/janoeo_arsenal/models/item/tin_shovel.json new file mode 100644 index 0000000..58423dc --- /dev/null +++ b/src/main/resources/assets/janoeo_arsenal/models/item/tin_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "janoeo_arsenal:items/tin_shovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/janoeo_arsenal/models/item/tin_sword.json b/src/main/resources/assets/janoeo_arsenal/models/item/tin_sword.json new file mode 100644 index 0000000..9c3dae9 --- /dev/null +++ b/src/main/resources/assets/janoeo_arsenal/models/item/tin_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "janoeo_arsenal:items/tin_sword" + } +} \ No newline at end of file diff --git a/textures/items/tin_axe.png b/src/main/resources/assets/janoeo_arsenal/textures/items/tin_axe.png similarity index 100% rename from textures/items/tin_axe.png rename to src/main/resources/assets/janoeo_arsenal/textures/items/tin_axe.png diff --git a/textures/items/tin_hoe.png b/src/main/resources/assets/janoeo_arsenal/textures/items/tin_hoe.png similarity index 100% rename from textures/items/tin_hoe.png rename to src/main/resources/assets/janoeo_arsenal/textures/items/tin_hoe.png diff --git a/textures/items/tin_pickaxe.png b/src/main/resources/assets/janoeo_arsenal/textures/items/tin_pickaxe.png similarity index 100% rename from textures/items/tin_pickaxe.png rename to src/main/resources/assets/janoeo_arsenal/textures/items/tin_pickaxe.png diff --git a/textures/items/tin_shovel.png b/src/main/resources/assets/janoeo_arsenal/textures/items/tin_shovel.png similarity index 100% rename from textures/items/tin_shovel.png rename to src/main/resources/assets/janoeo_arsenal/textures/items/tin_shovel.png diff --git a/textures/items/tin_sword.png b/src/main/resources/assets/janoeo_arsenal/textures/items/tin_sword.png similarity index 100% rename from textures/items/tin_sword.png rename to src/main/resources/assets/janoeo_arsenal/textures/items/tin_sword.png diff --git a/src/main/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_axe.json b/src/main/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_axe.json new file mode 100644 index 0000000..50e4d1a --- /dev/null +++ b/src/main/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_axe.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo_arsenal:tin_axe" + ] + }, + "criteria": { + "has_tin": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, + "has_stick": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:rods/wooden" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo_arsenal:tin_axe" + } + } + }, + "requirements": [ + [ + "has_tin", + "has_stick", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_hoe.json b/src/main/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_hoe.json new file mode 100644 index 0000000..d14626f --- /dev/null +++ b/src/main/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_hoe.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo_arsenal:tin_hoe" + ] + }, + "criteria": { + "has_tin": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, + "has_stick": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:rods/wooden" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo_arsenal:tin_hoe" + } + } + }, + "requirements": [ + [ + "has_tin", + "has_stick", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_pickaxe.json b/src/main/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_pickaxe.json new file mode 100644 index 0000000..a037e8f --- /dev/null +++ b/src/main/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_pickaxe.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo_arsenal:tin_pickaxe" + ] + }, + "criteria": { + "has_tin": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, + "has_stick": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:rods/wooden" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo_arsenal:tin_pickaxe" + } + } + }, + "requirements": [ + [ + "has_tin", + "has_stick", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_shovel.json b/src/main/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_shovel.json new file mode 100644 index 0000000..6650caa --- /dev/null +++ b/src/main/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_shovel.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo_arsenal:tin_shovel" + ] + }, + "criteria": { + "has_tin": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, + "has_stick": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:rods/wooden" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo_arsenal:tin_shovel" + } + } + }, + "requirements": [ + [ + "has_tin", + "has_stick", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_sword.json b/src/main/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_sword.json new file mode 100644 index 0000000..0b9c0b7 --- /dev/null +++ b/src/main/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_sword.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "janoeo_arsenal:tin_sword" + ] + }, + "criteria": { + "has_tin": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, + "has_stick": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:rods/wooden" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "janoeo_arsenal:tin_sword" + } + } + }, + "requirements": [ + [ + "has_tin", + "has_stick", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo_arsenal/recipes/tin_axe.json b/src/main/resources/data/janoeo_arsenal/recipes/tin_axe.json new file mode 100644 index 0000000..18503f5 --- /dev/null +++ b/src/main/resources/data/janoeo_arsenal/recipes/tin_axe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AA", + "AS", + " S" + ], + "key": { + "A": { + "tag": "forge:ingots/tin" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "janoeo_arsenal:tin_axe" + } +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo_arsenal/recipes/tin_hoe.json b/src/main/resources/data/janoeo_arsenal/recipes/tin_hoe.json new file mode 100644 index 0000000..d0c664d --- /dev/null +++ b/src/main/resources/data/janoeo_arsenal/recipes/tin_hoe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AA", + " S", + " S" + ], + "key": { + "A": { + "tag": "forge:ingots/tin" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "janoeo_arsenal:tin_hoe" + } +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo_arsenal/recipes/tin_pickaxe.json b/src/main/resources/data/janoeo_arsenal/recipes/tin_pickaxe.json new file mode 100644 index 0000000..3400ade --- /dev/null +++ b/src/main/resources/data/janoeo_arsenal/recipes/tin_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + " S ", + " S " + ], + "key": { + "A": { + "tag": "forge:ingots/tin" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "janoeo_arsenal:tin_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo_arsenal/recipes/tin_shovel.json b/src/main/resources/data/janoeo_arsenal/recipes/tin_shovel.json new file mode 100644 index 0000000..309b104 --- /dev/null +++ b/src/main/resources/data/janoeo_arsenal/recipes/tin_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "A", + "S", + "S" + ], + "key": { + "A": { + "tag": "forge:ingots/tin" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "janoeo_arsenal:tin_shovel" + } +} \ No newline at end of file diff --git a/src/main/resources/data/janoeo_arsenal/recipes/tin_sword.json b/src/main/resources/data/janoeo_arsenal/recipes/tin_sword.json new file mode 100644 index 0000000..81672b2 --- /dev/null +++ b/src/main/resources/data/janoeo_arsenal/recipes/tin_sword.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "C", + "C", + "S" + ], + "key": { + "C": { + "tag": "forge:ingots/tin" + }, + "S": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "janoeo_arsenal:tin_sword" + } +} \ No newline at end of file diff --git a/textures/armor/aluminium_layer_1.png b/textures/armor/aluminium_layer_1.png deleted file mode 100644 index 379626f..0000000 Binary files a/textures/armor/aluminium_layer_1.png and /dev/null differ diff --git a/textures/armor/aluminium_layer_2.png b/textures/armor/aluminium_layer_2.png deleted file mode 100644 index d5b8a1a..0000000 Binary files a/textures/armor/aluminium_layer_2.png and /dev/null differ diff --git a/textures/armor/copper_2.png b/textures/armor/copper_2.png deleted file mode 100644 index 43b5929..0000000 Binary files a/textures/armor/copper_2.png and /dev/null differ diff --git a/textures/armor/copper_layer_1.png b/textures/armor/copper_layer_1.png deleted file mode 100644 index 16a6e4c..0000000 Binary files a/textures/armor/copper_layer_1.png and /dev/null differ diff --git a/textures/armor/lead_layer_1.png b/textures/armor/lead_layer_1.png deleted file mode 100644 index 68f4796..0000000 Binary files a/textures/armor/lead_layer_1.png and /dev/null differ diff --git a/textures/armor/lead_layer_2.png b/textures/armor/lead_layer_2.png deleted file mode 100644 index 8439aee..0000000 Binary files a/textures/armor/lead_layer_2.png and /dev/null differ diff --git a/textures/armor/silver_layer_1.png b/textures/armor/silver_layer_1.png deleted file mode 100644 index 9ce5620..0000000 Binary files a/textures/armor/silver_layer_1.png and /dev/null differ diff --git a/textures/armor/silver_layer_2.png b/textures/armor/silver_layer_2.png deleted file mode 100644 index fc69a50..0000000 Binary files a/textures/armor/silver_layer_2.png and /dev/null differ diff --git a/textures/armor/tin_layer_1.png b/textures/armor/tin_layer_1.png deleted file mode 100644 index 77bfeb3..0000000 Binary files a/textures/armor/tin_layer_1.png and /dev/null differ diff --git a/textures/armor/tin_layer_2.png b/textures/armor/tin_layer_2.png deleted file mode 100644 index 906e38c..0000000 Binary files a/textures/armor/tin_layer_2.png and /dev/null differ diff --git a/textures/armor/uranium_layer_1.png b/textures/armor/uranium_layer_1.png deleted file mode 100644 index 3ce2293..0000000 Binary files a/textures/armor/uranium_layer_1.png and /dev/null differ diff --git a/textures/armor/uranium_layer_2.png b/textures/armor/uranium_layer_2.png deleted file mode 100644 index 1276de6..0000000 Binary files a/textures/armor/uranium_layer_2.png and /dev/null differ diff --git a/textures/armor/wool armor/black_wool_layer_1.png b/textures/armor/wool armor/black_wool_layer_1.png deleted file mode 100644 index 571c1ab..0000000 Binary files a/textures/armor/wool armor/black_wool_layer_1.png and /dev/null differ diff --git a/textures/armor/wool armor/black_wool_layer_2.png b/textures/armor/wool armor/black_wool_layer_2.png deleted file mode 100644 index 034d85a..0000000 Binary files a/textures/armor/wool armor/black_wool_layer_2.png and /dev/null differ diff --git a/textures/armor/wool armor/blue_wool_layer_1.png b/textures/armor/wool armor/blue_wool_layer_1.png deleted file mode 100644 index a33e84a..0000000 Binary files a/textures/armor/wool armor/blue_wool_layer_1.png and /dev/null differ diff --git a/textures/armor/wool armor/blue_wool_layer_2.png b/textures/armor/wool armor/blue_wool_layer_2.png deleted file mode 100644 index fb43a2b..0000000 Binary files a/textures/armor/wool armor/blue_wool_layer_2.png and /dev/null differ diff --git a/textures/armor/wool armor/brown_wool_layer_1.png b/textures/armor/wool armor/brown_wool_layer_1.png deleted file mode 100644 index fe23a3e..0000000 Binary files a/textures/armor/wool armor/brown_wool_layer_1.png and /dev/null differ diff --git a/textures/armor/wool armor/brown_wool_layer_2.png b/textures/armor/wool armor/brown_wool_layer_2.png deleted file mode 100644 index 72ed757..0000000 Binary files a/textures/armor/wool armor/brown_wool_layer_2.png and /dev/null differ diff --git a/textures/armor/wool armor/cyan_wool_layer_1.png b/textures/armor/wool armor/cyan_wool_layer_1.png deleted file mode 100644 index 56f9d69..0000000 Binary files a/textures/armor/wool armor/cyan_wool_layer_1.png and /dev/null differ diff --git a/textures/armor/wool armor/cyan_wool_layer_2.png b/textures/armor/wool armor/cyan_wool_layer_2.png deleted file mode 100644 index df6ee70..0000000 Binary files a/textures/armor/wool armor/cyan_wool_layer_2.png and /dev/null differ diff --git a/textures/armor/wool armor/gray_wool_layer_1.png b/textures/armor/wool armor/gray_wool_layer_1.png deleted file mode 100644 index 69cf80f..0000000 Binary files a/textures/armor/wool armor/gray_wool_layer_1.png and /dev/null differ diff --git a/textures/armor/wool armor/gray_wool_layer_2.png b/textures/armor/wool armor/gray_wool_layer_2.png deleted file mode 100644 index f9cdbee..0000000 Binary files a/textures/armor/wool armor/gray_wool_layer_2.png and /dev/null differ diff --git a/textures/armor/wool armor/green_wool_layer_1.png b/textures/armor/wool armor/green_wool_layer_1.png deleted file mode 100644 index 31b3af4..0000000 Binary files a/textures/armor/wool armor/green_wool_layer_1.png and /dev/null differ diff --git a/textures/armor/wool armor/green_wool_layer_2.png b/textures/armor/wool armor/green_wool_layer_2.png deleted file mode 100644 index a3936e7..0000000 Binary files a/textures/armor/wool armor/green_wool_layer_2.png and /dev/null differ diff --git a/textures/armor/wool armor/light_blue_wool_layer_1.png b/textures/armor/wool armor/light_blue_wool_layer_1.png deleted file mode 100644 index 00f8ffc..0000000 Binary files a/textures/armor/wool armor/light_blue_wool_layer_1.png and /dev/null differ diff --git a/textures/armor/wool armor/light_blue_wool_layer_2.png b/textures/armor/wool armor/light_blue_wool_layer_2.png deleted file mode 100644 index ef40cbe..0000000 Binary files a/textures/armor/wool armor/light_blue_wool_layer_2.png and /dev/null differ diff --git a/textures/armor/wool armor/light_gray_wool_layer_1.png b/textures/armor/wool armor/light_gray_wool_layer_1.png deleted file mode 100644 index 355c316..0000000 Binary files a/textures/armor/wool armor/light_gray_wool_layer_1.png and /dev/null differ diff --git a/textures/armor/wool armor/light_gray_wool_layer_2.png b/textures/armor/wool armor/light_gray_wool_layer_2.png deleted file mode 100644 index 45abd41..0000000 Binary files a/textures/armor/wool armor/light_gray_wool_layer_2.png and /dev/null differ diff --git a/textures/armor/wool armor/lime_wool_layer_1.png b/textures/armor/wool armor/lime_wool_layer_1.png deleted file mode 100644 index df8a69e..0000000 Binary files a/textures/armor/wool armor/lime_wool_layer_1.png and /dev/null differ diff --git a/textures/armor/wool armor/lime_wool_layer_2.png b/textures/armor/wool armor/lime_wool_layer_2.png deleted file mode 100644 index b755586..0000000 Binary files a/textures/armor/wool armor/lime_wool_layer_2.png and /dev/null differ diff --git a/textures/armor/wool armor/magenta_wool_layer_1.png b/textures/armor/wool armor/magenta_wool_layer_1.png deleted file mode 100644 index a494aed..0000000 Binary files a/textures/armor/wool armor/magenta_wool_layer_1.png and /dev/null differ diff --git a/textures/armor/wool armor/magenta_wool_layer_2.png b/textures/armor/wool armor/magenta_wool_layer_2.png deleted file mode 100644 index 20b90e2..0000000 Binary files a/textures/armor/wool armor/magenta_wool_layer_2.png and /dev/null differ diff --git a/textures/armor/wool armor/orange_wool_layer_1.png b/textures/armor/wool armor/orange_wool_layer_1.png deleted file mode 100644 index a310af9..0000000 Binary files a/textures/armor/wool armor/orange_wool_layer_1.png and /dev/null differ diff --git a/textures/armor/wool armor/orange_wool_layer_2.png b/textures/armor/wool armor/orange_wool_layer_2.png deleted file mode 100644 index 9a2f2e9..0000000 Binary files a/textures/armor/wool armor/orange_wool_layer_2.png and /dev/null differ diff --git a/textures/armor/wool armor/pink_wool_layer_1.png b/textures/armor/wool armor/pink_wool_layer_1.png deleted file mode 100644 index 6be32b4..0000000 Binary files a/textures/armor/wool armor/pink_wool_layer_1.png and /dev/null differ diff --git a/textures/armor/wool armor/pink_wool_layer_2.png b/textures/armor/wool armor/pink_wool_layer_2.png deleted file mode 100644 index eb1546f..0000000 Binary files a/textures/armor/wool armor/pink_wool_layer_2.png and /dev/null differ diff --git a/textures/armor/wool armor/purple_wool_layer_1.png b/textures/armor/wool armor/purple_wool_layer_1.png deleted file mode 100644 index 00f4bc0..0000000 Binary files a/textures/armor/wool armor/purple_wool_layer_1.png and /dev/null differ diff --git a/textures/armor/wool armor/purple_wool_layer_2.png b/textures/armor/wool armor/purple_wool_layer_2.png deleted file mode 100644 index 4d05e22..0000000 Binary files a/textures/armor/wool armor/purple_wool_layer_2.png and /dev/null differ diff --git a/textures/armor/wool armor/red_wool_layer_1.png b/textures/armor/wool armor/red_wool_layer_1.png deleted file mode 100644 index 423ed5e..0000000 Binary files a/textures/armor/wool armor/red_wool_layer_1.png and /dev/null differ diff --git a/textures/armor/wool armor/red_wool_layer_2.png b/textures/armor/wool armor/red_wool_layer_2.png deleted file mode 100644 index d7f9253..0000000 Binary files a/textures/armor/wool armor/red_wool_layer_2.png and /dev/null differ diff --git a/textures/armor/wool armor/white_wool_layer_1.png b/textures/armor/wool armor/white_wool_layer_1.png deleted file mode 100644 index f370f2e..0000000 Binary files a/textures/armor/wool armor/white_wool_layer_1.png and /dev/null differ diff --git a/textures/armor/wool armor/white_wool_layer_2.png b/textures/armor/wool armor/white_wool_layer_2.png deleted file mode 100644 index b369050..0000000 Binary files a/textures/armor/wool armor/white_wool_layer_2.png and /dev/null differ diff --git a/textures/armor/wool armor/wool_layer_1.pdn b/textures/armor/wool armor/wool_layer_1.pdn deleted file mode 100644 index 57d9016..0000000 Binary files a/textures/armor/wool armor/wool_layer_1.pdn and /dev/null differ diff --git a/textures/armor/wool armor/wool_layer_2.pdn b/textures/armor/wool armor/wool_layer_2.pdn deleted file mode 100644 index 9245963..0000000 Binary files a/textures/armor/wool armor/wool_layer_2.pdn and /dev/null differ diff --git a/textures/armor/wool armor/yellow_wool_layer_1.png b/textures/armor/wool armor/yellow_wool_layer_1.png deleted file mode 100644 index 05b8eea..0000000 Binary files a/textures/armor/wool armor/yellow_wool_layer_1.png and /dev/null differ diff --git a/textures/armor/wool armor/yellow_wool_layer_2.png b/textures/armor/wool armor/yellow_wool_layer_2.png deleted file mode 100644 index 2323b65..0000000 Binary files a/textures/armor/wool armor/yellow_wool_layer_2.png and /dev/null differ diff --git a/textures/black_wool.png b/textures/black_wool.png deleted file mode 100644 index 0e486b0..0000000 Binary files a/textures/black_wool.png and /dev/null differ diff --git a/textures/blue_wool.png b/textures/blue_wool.png deleted file mode 100644 index 14c5d71..0000000 Binary files a/textures/blue_wool.png and /dev/null differ diff --git a/textures/brown_wool.png b/textures/brown_wool.png deleted file mode 100644 index ffaa750..0000000 Binary files a/textures/brown_wool.png and /dev/null differ diff --git a/textures/cyan_wool.png b/textures/cyan_wool.png deleted file mode 100644 index 6545f38..0000000 Binary files a/textures/cyan_wool.png and /dev/null differ diff --git a/textures/gray_wool.png b/textures/gray_wool.png deleted file mode 100644 index 1d12e2d..0000000 Binary files a/textures/gray_wool.png and /dev/null differ diff --git a/textures/green_wool.png b/textures/green_wool.png deleted file mode 100644 index f8bc1ef..0000000 Binary files a/textures/green_wool.png and /dev/null differ diff --git a/textures/iron_boots.png b/textures/iron_boots.png deleted file mode 100644 index e960924..0000000 Binary files a/textures/iron_boots.png and /dev/null differ diff --git a/textures/iron_chestplate.png b/textures/iron_chestplate.png deleted file mode 100644 index bab5613..0000000 Binary files a/textures/iron_chestplate.png and /dev/null differ diff --git a/textures/iron_helmet.png b/textures/iron_helmet.png deleted file mode 100644 index 085dd58..0000000 Binary files a/textures/iron_helmet.png and /dev/null differ diff --git a/textures/iron_layer_1.png b/textures/iron_layer_1.png deleted file mode 100644 index 1da5d26..0000000 Binary files a/textures/iron_layer_1.png and /dev/null differ diff --git a/textures/iron_layer_2.png b/textures/iron_layer_2.png deleted file mode 100644 index 3170869..0000000 Binary files a/textures/iron_layer_2.png and /dev/null differ diff --git a/textures/iron_leggings.png b/textures/iron_leggings.png deleted file mode 100644 index 5ea1672..0000000 Binary files a/textures/iron_leggings.png and /dev/null differ diff --git a/textures/items/aluminium_axe.png b/textures/items/aluminium_axe.png deleted file mode 100644 index f713eac..0000000 Binary files a/textures/items/aluminium_axe.png and /dev/null differ diff --git a/textures/items/aluminium_boots.png b/textures/items/aluminium_boots.png deleted file mode 100644 index 7938454..0000000 Binary files a/textures/items/aluminium_boots.png and /dev/null differ diff --git a/textures/items/aluminium_chestplate.png b/textures/items/aluminium_chestplate.png deleted file mode 100644 index a5dc1ce..0000000 Binary files a/textures/items/aluminium_chestplate.png and /dev/null differ diff --git a/textures/items/aluminium_helmet.png b/textures/items/aluminium_helmet.png deleted file mode 100644 index 04eeacd..0000000 Binary files a/textures/items/aluminium_helmet.png and /dev/null differ diff --git a/textures/items/aluminium_hoe.png b/textures/items/aluminium_hoe.png deleted file mode 100644 index ec53bca..0000000 Binary files a/textures/items/aluminium_hoe.png and /dev/null differ diff --git a/textures/items/aluminium_leggings.png b/textures/items/aluminium_leggings.png deleted file mode 100644 index 0389dc8..0000000 Binary files a/textures/items/aluminium_leggings.png and /dev/null differ diff --git a/textures/items/aluminium_pickaxe.png b/textures/items/aluminium_pickaxe.png deleted file mode 100644 index d8a1585..0000000 Binary files a/textures/items/aluminium_pickaxe.png and /dev/null differ diff --git a/textures/items/aluminium_shovel.png b/textures/items/aluminium_shovel.png deleted file mode 100644 index 250b5c3..0000000 Binary files a/textures/items/aluminium_shovel.png and /dev/null differ diff --git a/textures/items/aluminium_sword.png b/textures/items/aluminium_sword.png deleted file mode 100644 index be05037..0000000 Binary files a/textures/items/aluminium_sword.png and /dev/null differ diff --git a/textures/items/copper_axe.png b/textures/items/copper_axe.png deleted file mode 100644 index 9534ab1..0000000 Binary files a/textures/items/copper_axe.png and /dev/null differ diff --git a/textures/items/copper_boots.png b/textures/items/copper_boots.png deleted file mode 100644 index a3cf41d..0000000 Binary files a/textures/items/copper_boots.png and /dev/null differ diff --git a/textures/items/copper_chestplate.png b/textures/items/copper_chestplate.png deleted file mode 100644 index f2024fd..0000000 Binary files a/textures/items/copper_chestplate.png and /dev/null differ diff --git a/textures/items/copper_helmet.png b/textures/items/copper_helmet.png deleted file mode 100644 index f48ad1d..0000000 Binary files a/textures/items/copper_helmet.png and /dev/null differ diff --git a/textures/items/copper_hoe.png b/textures/items/copper_hoe.png deleted file mode 100644 index 4840bc8..0000000 Binary files a/textures/items/copper_hoe.png and /dev/null differ diff --git a/textures/items/copper_leggings.png b/textures/items/copper_leggings.png deleted file mode 100644 index 8a06101..0000000 Binary files a/textures/items/copper_leggings.png and /dev/null differ diff --git a/textures/items/copper_pickaxe.png b/textures/items/copper_pickaxe.png deleted file mode 100644 index 825cf5b..0000000 Binary files a/textures/items/copper_pickaxe.png and /dev/null differ diff --git a/textures/items/copper_shovel.png b/textures/items/copper_shovel.png deleted file mode 100644 index 60dff97..0000000 Binary files a/textures/items/copper_shovel.png and /dev/null differ diff --git a/textures/items/copper_sword.png b/textures/items/copper_sword.png deleted file mode 100644 index 586dd94..0000000 Binary files a/textures/items/copper_sword.png and /dev/null differ diff --git a/textures/items/lead_axe.png b/textures/items/lead_axe.png deleted file mode 100644 index 76fae08..0000000 Binary files a/textures/items/lead_axe.png and /dev/null differ diff --git a/textures/items/lead_boots.png b/textures/items/lead_boots.png deleted file mode 100644 index 68e1347..0000000 Binary files a/textures/items/lead_boots.png and /dev/null differ diff --git a/textures/items/lead_chestplate.png b/textures/items/lead_chestplate.png deleted file mode 100644 index a75fc43..0000000 Binary files a/textures/items/lead_chestplate.png and /dev/null differ diff --git a/textures/items/lead_helmet.png b/textures/items/lead_helmet.png deleted file mode 100644 index 5ccb3e6..0000000 Binary files a/textures/items/lead_helmet.png and /dev/null differ diff --git a/textures/items/lead_hoe.png b/textures/items/lead_hoe.png deleted file mode 100644 index 53e7d03..0000000 Binary files a/textures/items/lead_hoe.png and /dev/null differ diff --git a/textures/items/lead_leggings.png b/textures/items/lead_leggings.png deleted file mode 100644 index 81e977f..0000000 Binary files a/textures/items/lead_leggings.png and /dev/null differ diff --git a/textures/items/lead_pickaxe.png b/textures/items/lead_pickaxe.png deleted file mode 100644 index c17f183..0000000 Binary files a/textures/items/lead_pickaxe.png and /dev/null differ diff --git a/textures/items/lead_shovel.png b/textures/items/lead_shovel.png deleted file mode 100644 index 9d1d4de..0000000 Binary files a/textures/items/lead_shovel.png and /dev/null differ diff --git a/textures/items/lead_sword.png b/textures/items/lead_sword.png deleted file mode 100644 index 7e208d0..0000000 Binary files a/textures/items/lead_sword.png and /dev/null differ diff --git a/textures/items/silver_axe.png b/textures/items/silver_axe.png deleted file mode 100644 index 7b1810d..0000000 Binary files a/textures/items/silver_axe.png and /dev/null differ diff --git a/textures/items/silver_boots.png b/textures/items/silver_boots.png deleted file mode 100644 index b7ebb57..0000000 Binary files a/textures/items/silver_boots.png and /dev/null differ diff --git a/textures/items/silver_chestplate.png b/textures/items/silver_chestplate.png deleted file mode 100644 index 62f9ac2..0000000 Binary files a/textures/items/silver_chestplate.png and /dev/null differ diff --git a/textures/items/silver_helmet.png b/textures/items/silver_helmet.png deleted file mode 100644 index 8626600..0000000 Binary files a/textures/items/silver_helmet.png and /dev/null differ diff --git a/textures/items/silver_hoe.png b/textures/items/silver_hoe.png deleted file mode 100644 index 82c1a5c..0000000 Binary files a/textures/items/silver_hoe.png and /dev/null differ diff --git a/textures/items/silver_leggings.png b/textures/items/silver_leggings.png deleted file mode 100644 index 65cd8db..0000000 Binary files a/textures/items/silver_leggings.png and /dev/null differ diff --git a/textures/items/silver_pickaxe.png b/textures/items/silver_pickaxe.png deleted file mode 100644 index bd69bdf..0000000 Binary files a/textures/items/silver_pickaxe.png and /dev/null differ diff --git a/textures/items/silver_shovel.png b/textures/items/silver_shovel.png deleted file mode 100644 index 86e28a1..0000000 Binary files a/textures/items/silver_shovel.png and /dev/null differ diff --git a/textures/items/silver_sword.png b/textures/items/silver_sword.png deleted file mode 100644 index e09f8db..0000000 Binary files a/textures/items/silver_sword.png and /dev/null differ diff --git a/textures/items/tin_boots.png b/textures/items/tin_boots.png deleted file mode 100644 index a166259..0000000 Binary files a/textures/items/tin_boots.png and /dev/null differ diff --git a/textures/items/tin_chestplate.png b/textures/items/tin_chestplate.png deleted file mode 100644 index 904d12e..0000000 Binary files a/textures/items/tin_chestplate.png and /dev/null differ diff --git a/textures/items/tin_helmet.png b/textures/items/tin_helmet.png deleted file mode 100644 index 1f6e751..0000000 Binary files a/textures/items/tin_helmet.png and /dev/null differ diff --git a/textures/items/tin_leggings.png b/textures/items/tin_leggings.png deleted file mode 100644 index 4fecd79..0000000 Binary files a/textures/items/tin_leggings.png and /dev/null differ diff --git a/textures/items/uramium_sword.png b/textures/items/uramium_sword.png deleted file mode 100644 index 210531b..0000000 Binary files a/textures/items/uramium_sword.png and /dev/null differ diff --git a/textures/items/uranium_axe.png b/textures/items/uranium_axe.png deleted file mode 100644 index 48318e4..0000000 Binary files a/textures/items/uranium_axe.png and /dev/null differ diff --git a/textures/items/uranium_boots.png b/textures/items/uranium_boots.png deleted file mode 100644 index 9406fef..0000000 Binary files a/textures/items/uranium_boots.png and /dev/null differ diff --git a/textures/items/uranium_chestplate.png b/textures/items/uranium_chestplate.png deleted file mode 100644 index 0a784ba..0000000 Binary files a/textures/items/uranium_chestplate.png and /dev/null differ diff --git a/textures/items/uranium_helmet.png b/textures/items/uranium_helmet.png deleted file mode 100644 index ba0a0c3..0000000 Binary files a/textures/items/uranium_helmet.png and /dev/null differ diff --git a/textures/items/uranium_hoe.png b/textures/items/uranium_hoe.png deleted file mode 100644 index f872268..0000000 Binary files a/textures/items/uranium_hoe.png and /dev/null differ diff --git a/textures/items/uranium_leggings.png b/textures/items/uranium_leggings.png deleted file mode 100644 index 3e446c1..0000000 Binary files a/textures/items/uranium_leggings.png and /dev/null differ diff --git a/textures/items/uranium_pickaxe.png b/textures/items/uranium_pickaxe.png deleted file mode 100644 index bd77218..0000000 Binary files a/textures/items/uranium_pickaxe.png and /dev/null differ diff --git a/textures/items/uranium_shovel.png b/textures/items/uranium_shovel.png deleted file mode 100644 index 2297875..0000000 Binary files a/textures/items/uranium_shovel.png and /dev/null differ diff --git a/textures/items/wool armor/black_wool_boots.png b/textures/items/wool armor/black_wool_boots.png deleted file mode 100644 index 204d7f3..0000000 Binary files a/textures/items/wool armor/black_wool_boots.png and /dev/null differ diff --git a/textures/items/wool armor/black_wool_chestplate.png b/textures/items/wool armor/black_wool_chestplate.png deleted file mode 100644 index 3fc400d..0000000 Binary files a/textures/items/wool armor/black_wool_chestplate.png and /dev/null differ diff --git a/textures/items/wool armor/black_wool_helmet.png b/textures/items/wool armor/black_wool_helmet.png deleted file mode 100644 index 1d2b3a2..0000000 Binary files a/textures/items/wool armor/black_wool_helmet.png and /dev/null differ diff --git a/textures/items/wool armor/black_wool_leggings.png b/textures/items/wool armor/black_wool_leggings.png deleted file mode 100644 index 92731e6..0000000 Binary files a/textures/items/wool armor/black_wool_leggings.png and /dev/null differ diff --git a/textures/items/wool armor/blue_wool_boots.png b/textures/items/wool armor/blue_wool_boots.png deleted file mode 100644 index 4fb820a..0000000 Binary files a/textures/items/wool armor/blue_wool_boots.png and /dev/null differ diff --git a/textures/items/wool armor/blue_wool_chestplate.png b/textures/items/wool armor/blue_wool_chestplate.png deleted file mode 100644 index 9a0ce62..0000000 Binary files a/textures/items/wool armor/blue_wool_chestplate.png and /dev/null differ diff --git a/textures/items/wool armor/blue_wool_helmet.png b/textures/items/wool armor/blue_wool_helmet.png deleted file mode 100644 index 0ad2a45..0000000 Binary files a/textures/items/wool armor/blue_wool_helmet.png and /dev/null differ diff --git a/textures/items/wool armor/blue_wool_leggings.png b/textures/items/wool armor/blue_wool_leggings.png deleted file mode 100644 index 6ec114b..0000000 Binary files a/textures/items/wool armor/blue_wool_leggings.png and /dev/null differ diff --git a/textures/items/wool armor/brown_wool_boots.png b/textures/items/wool armor/brown_wool_boots.png deleted file mode 100644 index c7f0b61..0000000 Binary files a/textures/items/wool armor/brown_wool_boots.png and /dev/null differ diff --git a/textures/items/wool armor/brown_wool_chestplate.png b/textures/items/wool armor/brown_wool_chestplate.png deleted file mode 100644 index 67520b9..0000000 Binary files a/textures/items/wool armor/brown_wool_chestplate.png and /dev/null differ diff --git a/textures/items/wool armor/brown_wool_helmet.png b/textures/items/wool armor/brown_wool_helmet.png deleted file mode 100644 index 85de105..0000000 Binary files a/textures/items/wool armor/brown_wool_helmet.png and /dev/null differ diff --git a/textures/items/wool armor/brown_wool_leggings.png b/textures/items/wool armor/brown_wool_leggings.png deleted file mode 100644 index 16fcad7..0000000 Binary files a/textures/items/wool armor/brown_wool_leggings.png and /dev/null differ diff --git a/textures/items/wool armor/cyan_wool_boots.png b/textures/items/wool armor/cyan_wool_boots.png deleted file mode 100644 index cbdf30a..0000000 Binary files a/textures/items/wool armor/cyan_wool_boots.png and /dev/null differ diff --git a/textures/items/wool armor/cyan_wool_chestplate.png b/textures/items/wool armor/cyan_wool_chestplate.png deleted file mode 100644 index 5ed06d4..0000000 Binary files a/textures/items/wool armor/cyan_wool_chestplate.png and /dev/null differ diff --git a/textures/items/wool armor/cyan_wool_helmet.png b/textures/items/wool armor/cyan_wool_helmet.png deleted file mode 100644 index 4f4b6e8..0000000 Binary files a/textures/items/wool armor/cyan_wool_helmet.png and /dev/null differ diff --git a/textures/items/wool armor/cyan_wool_leggings.png b/textures/items/wool armor/cyan_wool_leggings.png deleted file mode 100644 index 90cb464..0000000 Binary files a/textures/items/wool armor/cyan_wool_leggings.png and /dev/null differ diff --git a/textures/items/wool armor/gray_wool_boots.png b/textures/items/wool armor/gray_wool_boots.png deleted file mode 100644 index 235956e..0000000 Binary files a/textures/items/wool armor/gray_wool_boots.png and /dev/null differ diff --git a/textures/items/wool armor/gray_wool_chestplate.png b/textures/items/wool armor/gray_wool_chestplate.png deleted file mode 100644 index 2226a9e..0000000 Binary files a/textures/items/wool armor/gray_wool_chestplate.png and /dev/null differ diff --git a/textures/items/wool armor/gray_wool_helmet.png b/textures/items/wool armor/gray_wool_helmet.png deleted file mode 100644 index ef466e7..0000000 Binary files a/textures/items/wool armor/gray_wool_helmet.png and /dev/null differ diff --git a/textures/items/wool armor/gray_wool_leggings.png b/textures/items/wool armor/gray_wool_leggings.png deleted file mode 100644 index 90adc53..0000000 Binary files a/textures/items/wool armor/gray_wool_leggings.png and /dev/null differ diff --git a/textures/items/wool armor/green_wool_boots.png b/textures/items/wool armor/green_wool_boots.png deleted file mode 100644 index a8ce13d..0000000 Binary files a/textures/items/wool armor/green_wool_boots.png and /dev/null differ diff --git a/textures/items/wool armor/green_wool_chestplate.png b/textures/items/wool armor/green_wool_chestplate.png deleted file mode 100644 index bf77b95..0000000 Binary files a/textures/items/wool armor/green_wool_chestplate.png and /dev/null differ diff --git a/textures/items/wool armor/green_wool_helmet.png b/textures/items/wool armor/green_wool_helmet.png deleted file mode 100644 index 58b9fa3..0000000 Binary files a/textures/items/wool armor/green_wool_helmet.png and /dev/null differ diff --git a/textures/items/wool armor/green_wool_leggings.png b/textures/items/wool armor/green_wool_leggings.png deleted file mode 100644 index 9e0dae4..0000000 Binary files a/textures/items/wool armor/green_wool_leggings.png and /dev/null differ diff --git a/textures/items/wool armor/light_blue_wool_boots.png b/textures/items/wool armor/light_blue_wool_boots.png deleted file mode 100644 index 723398e..0000000 Binary files a/textures/items/wool armor/light_blue_wool_boots.png and /dev/null differ diff --git a/textures/items/wool armor/light_blue_wool_chestplate.png b/textures/items/wool armor/light_blue_wool_chestplate.png deleted file mode 100644 index 6866f2b..0000000 Binary files a/textures/items/wool armor/light_blue_wool_chestplate.png and /dev/null differ diff --git a/textures/items/wool armor/light_blue_wool_helmet.png b/textures/items/wool armor/light_blue_wool_helmet.png deleted file mode 100644 index f60af30..0000000 Binary files a/textures/items/wool armor/light_blue_wool_helmet.png and /dev/null differ diff --git a/textures/items/wool armor/light_blue_wool_leggings.png b/textures/items/wool armor/light_blue_wool_leggings.png deleted file mode 100644 index 1b3186e..0000000 Binary files a/textures/items/wool armor/light_blue_wool_leggings.png and /dev/null differ diff --git a/textures/items/wool armor/light_gray_wool_boots.png b/textures/items/wool armor/light_gray_wool_boots.png deleted file mode 100644 index 683e28e..0000000 Binary files a/textures/items/wool armor/light_gray_wool_boots.png and /dev/null differ diff --git a/textures/items/wool armor/light_gray_wool_chestplate.png b/textures/items/wool armor/light_gray_wool_chestplate.png deleted file mode 100644 index c36192d..0000000 Binary files a/textures/items/wool armor/light_gray_wool_chestplate.png and /dev/null differ diff --git a/textures/items/wool armor/light_gray_wool_helmet.png b/textures/items/wool armor/light_gray_wool_helmet.png deleted file mode 100644 index bfacec6..0000000 Binary files a/textures/items/wool armor/light_gray_wool_helmet.png and /dev/null differ diff --git a/textures/items/wool armor/light_gray_wool_leggings.png b/textures/items/wool armor/light_gray_wool_leggings.png deleted file mode 100644 index 1d5117d..0000000 Binary files a/textures/items/wool armor/light_gray_wool_leggings.png and /dev/null differ diff --git a/textures/items/wool armor/lime_wool_boots.png b/textures/items/wool armor/lime_wool_boots.png deleted file mode 100644 index 0a2a0e9..0000000 Binary files a/textures/items/wool armor/lime_wool_boots.png and /dev/null differ diff --git a/textures/items/wool armor/lime_wool_chestplate.png b/textures/items/wool armor/lime_wool_chestplate.png deleted file mode 100644 index 6ae9916..0000000 Binary files a/textures/items/wool armor/lime_wool_chestplate.png and /dev/null differ diff --git a/textures/items/wool armor/lime_wool_helmet.png b/textures/items/wool armor/lime_wool_helmet.png deleted file mode 100644 index 4dfab70..0000000 Binary files a/textures/items/wool armor/lime_wool_helmet.png and /dev/null differ diff --git a/textures/items/wool armor/lime_wool_leggings.png b/textures/items/wool armor/lime_wool_leggings.png deleted file mode 100644 index a5f0818..0000000 Binary files a/textures/items/wool armor/lime_wool_leggings.png and /dev/null differ diff --git a/textures/items/wool armor/magenta_wool_boots.png b/textures/items/wool armor/magenta_wool_boots.png deleted file mode 100644 index 37e79f0..0000000 Binary files a/textures/items/wool armor/magenta_wool_boots.png and /dev/null differ diff --git a/textures/items/wool armor/magenta_wool_chestplate.png b/textures/items/wool armor/magenta_wool_chestplate.png deleted file mode 100644 index 6c73f35..0000000 Binary files a/textures/items/wool armor/magenta_wool_chestplate.png and /dev/null differ diff --git a/textures/items/wool armor/magenta_wool_helmet.png b/textures/items/wool armor/magenta_wool_helmet.png deleted file mode 100644 index b634d62..0000000 Binary files a/textures/items/wool armor/magenta_wool_helmet.png and /dev/null differ diff --git a/textures/items/wool armor/magenta_wool_leggings.png b/textures/items/wool armor/magenta_wool_leggings.png deleted file mode 100644 index 0d32396..0000000 Binary files a/textures/items/wool armor/magenta_wool_leggings.png and /dev/null differ diff --git a/textures/items/wool armor/orange_wool_boots.png b/textures/items/wool armor/orange_wool_boots.png deleted file mode 100644 index 70b93a0..0000000 Binary files a/textures/items/wool armor/orange_wool_boots.png and /dev/null differ diff --git a/textures/items/wool armor/orange_wool_chestplate.png b/textures/items/wool armor/orange_wool_chestplate.png deleted file mode 100644 index 76ed8bc..0000000 Binary files a/textures/items/wool armor/orange_wool_chestplate.png and /dev/null differ diff --git a/textures/items/wool armor/orange_wool_helmet.png b/textures/items/wool armor/orange_wool_helmet.png deleted file mode 100644 index 6844111..0000000 Binary files a/textures/items/wool armor/orange_wool_helmet.png and /dev/null differ diff --git a/textures/items/wool armor/orange_wool_leggings.png b/textures/items/wool armor/orange_wool_leggings.png deleted file mode 100644 index d6ae777..0000000 Binary files a/textures/items/wool armor/orange_wool_leggings.png and /dev/null differ diff --git a/textures/items/wool armor/pink_wool_boots.png b/textures/items/wool armor/pink_wool_boots.png deleted file mode 100644 index 9e7a6eb..0000000 Binary files a/textures/items/wool armor/pink_wool_boots.png and /dev/null differ diff --git a/textures/items/wool armor/pink_wool_chestplate.png b/textures/items/wool armor/pink_wool_chestplate.png deleted file mode 100644 index 4056ddd..0000000 Binary files a/textures/items/wool armor/pink_wool_chestplate.png and /dev/null differ diff --git a/textures/items/wool armor/pink_wool_helmet.png b/textures/items/wool armor/pink_wool_helmet.png deleted file mode 100644 index 45d9b83..0000000 Binary files a/textures/items/wool armor/pink_wool_helmet.png and /dev/null differ diff --git a/textures/items/wool armor/pink_wool_leggings.png b/textures/items/wool armor/pink_wool_leggings.png deleted file mode 100644 index ac56e73..0000000 Binary files a/textures/items/wool armor/pink_wool_leggings.png and /dev/null differ diff --git a/textures/items/wool armor/purple_wool_boots.png b/textures/items/wool armor/purple_wool_boots.png deleted file mode 100644 index f01dded..0000000 Binary files a/textures/items/wool armor/purple_wool_boots.png and /dev/null differ diff --git a/textures/items/wool armor/purple_wool_chestplate.png b/textures/items/wool armor/purple_wool_chestplate.png deleted file mode 100644 index 14472f7..0000000 Binary files a/textures/items/wool armor/purple_wool_chestplate.png and /dev/null differ diff --git a/textures/items/wool armor/purple_wool_helmet.png b/textures/items/wool armor/purple_wool_helmet.png deleted file mode 100644 index 5017960..0000000 Binary files a/textures/items/wool armor/purple_wool_helmet.png and /dev/null differ diff --git a/textures/items/wool armor/purple_wool_leggings.png b/textures/items/wool armor/purple_wool_leggings.png deleted file mode 100644 index 08282cd..0000000 Binary files a/textures/items/wool armor/purple_wool_leggings.png and /dev/null differ diff --git a/textures/items/wool armor/red_wool_boots.png b/textures/items/wool armor/red_wool_boots.png deleted file mode 100644 index 95295ad..0000000 Binary files a/textures/items/wool armor/red_wool_boots.png and /dev/null differ diff --git a/textures/items/wool armor/red_wool_chestplate.png b/textures/items/wool armor/red_wool_chestplate.png deleted file mode 100644 index b19332b..0000000 Binary files a/textures/items/wool armor/red_wool_chestplate.png and /dev/null differ diff --git a/textures/items/wool armor/red_wool_helmet.png b/textures/items/wool armor/red_wool_helmet.png deleted file mode 100644 index d8a206d..0000000 Binary files a/textures/items/wool armor/red_wool_helmet.png and /dev/null differ diff --git a/textures/items/wool armor/red_wool_leggings.png b/textures/items/wool armor/red_wool_leggings.png deleted file mode 100644 index ae553f8..0000000 Binary files a/textures/items/wool armor/red_wool_leggings.png and /dev/null differ diff --git a/textures/items/wool armor/white_wool_boots.png b/textures/items/wool armor/white_wool_boots.png deleted file mode 100644 index 9e3b50b..0000000 Binary files a/textures/items/wool armor/white_wool_boots.png and /dev/null differ diff --git a/textures/items/wool armor/white_wool_chestplate.png b/textures/items/wool armor/white_wool_chestplate.png deleted file mode 100644 index 6a52db1..0000000 Binary files a/textures/items/wool armor/white_wool_chestplate.png and /dev/null differ diff --git a/textures/items/wool armor/white_wool_helmet.png b/textures/items/wool armor/white_wool_helmet.png deleted file mode 100644 index efb187f..0000000 Binary files a/textures/items/wool armor/white_wool_helmet.png and /dev/null differ diff --git a/textures/items/wool armor/white_wool_leggings.png b/textures/items/wool armor/white_wool_leggings.png deleted file mode 100644 index dbd699d..0000000 Binary files a/textures/items/wool armor/white_wool_leggings.png and /dev/null differ diff --git a/textures/items/wool armor/wool_boots.pdn b/textures/items/wool armor/wool_boots.pdn deleted file mode 100644 index 039c685..0000000 Binary files a/textures/items/wool armor/wool_boots.pdn and /dev/null differ diff --git a/textures/items/wool armor/wool_chestplate.pdn b/textures/items/wool armor/wool_chestplate.pdn deleted file mode 100644 index 71f9002..0000000 Binary files a/textures/items/wool armor/wool_chestplate.pdn and /dev/null differ diff --git a/textures/items/wool armor/wool_helmet.pdn b/textures/items/wool armor/wool_helmet.pdn deleted file mode 100644 index 6f9edda..0000000 Binary files a/textures/items/wool armor/wool_helmet.pdn and /dev/null differ diff --git a/textures/items/wool armor/wool_leggings.pdn b/textures/items/wool armor/wool_leggings.pdn deleted file mode 100644 index 8457b17..0000000 Binary files a/textures/items/wool armor/wool_leggings.pdn and /dev/null differ diff --git a/textures/items/wool armor/yellow_wool_boots.png b/textures/items/wool armor/yellow_wool_boots.png deleted file mode 100644 index b83f01f..0000000 Binary files a/textures/items/wool armor/yellow_wool_boots.png and /dev/null differ diff --git a/textures/items/wool armor/yellow_wool_chestplate.png b/textures/items/wool armor/yellow_wool_chestplate.png deleted file mode 100644 index f1bbfff..0000000 Binary files a/textures/items/wool armor/yellow_wool_chestplate.png and /dev/null differ diff --git a/textures/items/wool armor/yellow_wool_helmet.png b/textures/items/wool armor/yellow_wool_helmet.png deleted file mode 100644 index 13a1dc1..0000000 Binary files a/textures/items/wool armor/yellow_wool_helmet.png and /dev/null differ diff --git a/textures/items/wool armor/yellow_wool_leggings.png b/textures/items/wool armor/yellow_wool_leggings.png deleted file mode 100644 index 102009d..0000000 Binary files a/textures/items/wool armor/yellow_wool_leggings.png and /dev/null differ diff --git a/textures/light_blue_wool.png b/textures/light_blue_wool.png deleted file mode 100644 index 529c92a..0000000 Binary files a/textures/light_blue_wool.png and /dev/null differ diff --git a/textures/light_gray_wool.png b/textures/light_gray_wool.png deleted file mode 100644 index f7f1353..0000000 Binary files a/textures/light_gray_wool.png and /dev/null differ diff --git a/textures/lime_wool.png b/textures/lime_wool.png deleted file mode 100644 index e106780..0000000 Binary files a/textures/lime_wool.png and /dev/null differ diff --git a/textures/magenta_wool.png b/textures/magenta_wool.png deleted file mode 100644 index b9700a8..0000000 Binary files a/textures/magenta_wool.png and /dev/null differ diff --git a/textures/orange_wool.png b/textures/orange_wool.png deleted file mode 100644 index 61c1e4b..0000000 Binary files a/textures/orange_wool.png and /dev/null differ diff --git a/textures/pink_wool.png b/textures/pink_wool.png deleted file mode 100644 index 17ef62b..0000000 Binary files a/textures/pink_wool.png and /dev/null differ diff --git a/textures/purple_wool.png b/textures/purple_wool.png deleted file mode 100644 index 08d4ee0..0000000 Binary files a/textures/purple_wool.png and /dev/null differ diff --git a/textures/red_wool.png b/textures/red_wool.png deleted file mode 100644 index f11cbcc..0000000 Binary files a/textures/red_wool.png and /dev/null differ diff --git a/textures/white_wool.png b/textures/white_wool.png deleted file mode 100644 index fa2c56e..0000000 Binary files a/textures/white_wool.png and /dev/null differ diff --git a/textures/yellow_wool.png b/textures/yellow_wool.png deleted file mode 100644 index fba2787..0000000 Binary files a/textures/yellow_wool.png and /dev/null differ