From b8714f552cea1d9c53a47a608f2a0f4cebc3193c Mon Sep 17 00:00:00 2001 From: Traister101 <66151907+Traister101@users.noreply.github.com> Date: Mon, 26 Aug 2024 01:44:30 -0700 Subject: [PATCH 1/4] Don't commit datagen cache --- .gitignore | 3 + .../82f68ffb8e45957cc828f8c7056c33cb8d025fa1 | 547 ------------------ 2 files changed, 3 insertions(+), 547 deletions(-) delete mode 100644 src/generated/resources/.cache/82f68ffb8e45957cc828f8c7056c33cb8d025fa1 diff --git a/.gitignore b/.gitignore index 0829b11..a38041e 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,6 @@ forge*changelog.txt /src/recipes.txt /src/stamp_holder_hires.png /resources/ + +# Java datagen cache +/src/generated/resources/.cache diff --git a/src/generated/resources/.cache/82f68ffb8e45957cc828f8c7056c33cb8d025fa1 b/src/generated/resources/.cache/82f68ffb8e45957cc828f8c7056c33cb8d025fa1 deleted file mode 100644 index c3d5fb7..0000000 --- a/src/generated/resources/.cache/82f68ffb8e45957cc828f8c7056c33cb8d025fa1 +++ /dev/null @@ -1,547 +0,0 @@ -// 1.20.1 2024-02-07T20:24:03.1587398 Item Models: lithiccoins -1de06058306c99ed798170b13c832a212384c0f3 assets/lithiccoins/models/coin/angler/aluminum.json -20e0567990afce45d67b3744f0a5732ea481b61f assets/lithiccoins/models/coin/angler/bismuth.json -090dc90143d534daae46bcb2c9014686aeb83765 assets/lithiccoins/models/coin/angler/bismuth_bronze.json -0a6f2b4e4e17c200818fe8c4550ccf5e90dd8839 assets/lithiccoins/models/coin/angler/black_bronze.json -c24d735293d08df440704b89b8eef35c735f0635 assets/lithiccoins/models/coin/angler/black_steel.json -260c5c6f4602b16df773586f2a525e28cfe1da5c assets/lithiccoins/models/coin/angler/blue_steel.json -05a11cda1ef9b9adc6e117e6f448d01f631385cc assets/lithiccoins/models/coin/angler/brass.json -69a8657a5ab36cebc21eae544413e5cfb79aa064 assets/lithiccoins/models/coin/angler/bronze.json -4dbc8c82cc9af1ba6b58775ee252a7bde4b34011 assets/lithiccoins/models/coin/angler/cast_iron.json -ab4feab1aa6c760da754ebfc94a27df0196b1caf assets/lithiccoins/models/coin/angler/chromium.json -6b63f4319330085f6c63575157d485d090dfcd37 assets/lithiccoins/models/coin/angler/constantan.json -0b9820ce8beb1bd6a7d55e411e5558465d5b1085 assets/lithiccoins/models/coin/angler/copper.json -b7fdc04ec92d7833cfab15a958e821040bc79873 assets/lithiccoins/models/coin/angler/electrum.json -7583044670c0e04697532afc5af35f31336d6920 assets/lithiccoins/models/coin/angler/gold.json -1f5e78609ced940287326bd829fcb2f7025b6a9c assets/lithiccoins/models/coin/angler/lead.json -ef9af6f995a26caab9b6a1181d78a8e0f405d4b1 assets/lithiccoins/models/coin/angler/nickel.json -6181b86c684799211663a3d709c055d179a6dd04 assets/lithiccoins/models/coin/angler/red_steel.json -78f405d9f0b0e8dfca640a5f90ecf3a08e72fd45 assets/lithiccoins/models/coin/angler/rose_gold.json -efe85321b97e3fc3ddc5518c7bbfc35e9adcbdb8 assets/lithiccoins/models/coin/angler/silver.json -9a28ba5902c9def7b74967f827e66bea7eec2e2b assets/lithiccoins/models/coin/angler/stainless_steel.json -b962cd6d324ddc2aac6c402f0a0a53890c45b059 assets/lithiccoins/models/coin/angler/steel.json -2d8656bc6339b857a95a569cd69a5ef166b13944 assets/lithiccoins/models/coin/angler/sterling_silver.json -0fe75d8ff65b8bd4c9f099b4ac656f4f154d645d assets/lithiccoins/models/coin/angler/tin.json -35b2408804cf5fe32141fef2d303d5762ba6c9ef assets/lithiccoins/models/coin/angler/uranium.json -70379245ee1e35febf67900e90b79558504450ee assets/lithiccoins/models/coin/angler/wrought_iron.json -00eaec2b5444999724e69d3c5fea00582460ec3c assets/lithiccoins/models/coin/angler/zinc.json -a74700e200cbb47a0952c7c2665d7180f6f6de9a assets/lithiccoins/models/coin/archer/aluminum.json -7b27cffa89a44f8295f40a46c16184e1dbd0da9b assets/lithiccoins/models/coin/archer/bismuth.json -0ffd68b8d15f4e6e897216458bbc6e2098364f5d assets/lithiccoins/models/coin/archer/bismuth_bronze.json -b085954013a6ed4a2d6809b15c39ab0633fc9e74 assets/lithiccoins/models/coin/archer/black_bronze.json -5caa3bc30ec64f995f3ea65ce4871f61b11431b0 assets/lithiccoins/models/coin/archer/black_steel.json -30cb05bf8642c49002202f0476bfa02a554d7dad assets/lithiccoins/models/coin/archer/blue_steel.json -7adb5cae2e28a70507d04171481998f53853e0e0 assets/lithiccoins/models/coin/archer/brass.json -5c72c1f4a8e4d921c6f25c9222e76a5da06fcaa7 assets/lithiccoins/models/coin/archer/bronze.json -414d5b988fbda84e4c51f232424f0ceeba46852f assets/lithiccoins/models/coin/archer/cast_iron.json -c8cc3f96dd4ecd8f27f0c0e6633565e52433ac4f assets/lithiccoins/models/coin/archer/chromium.json -45f276bbd7ccac91d73749e7d2f2a02a85604072 assets/lithiccoins/models/coin/archer/constantan.json -12890fd38f9cc2e28d533d265f08b01181b037f4 assets/lithiccoins/models/coin/archer/copper.json -ed1eb190686b528f4a2df5cfce535ee4e8748236 assets/lithiccoins/models/coin/archer/electrum.json -6420a6bf84476bd8f0280afbce72f41eee8fcdf9 assets/lithiccoins/models/coin/archer/gold.json -321ebfe0a397e7ba925cb4023253a9ce4251bc58 assets/lithiccoins/models/coin/archer/lead.json -e4bd14e81b2b2ebc148b088709b2c53df70432cb assets/lithiccoins/models/coin/archer/nickel.json -8113d71b8194694ea112f8c955961f2e57496b7a assets/lithiccoins/models/coin/archer/red_steel.json -8bf6a58721bdfc23964f8ee460873ac83daeb9dc assets/lithiccoins/models/coin/archer/rose_gold.json -3083cba02aecbd9067f18245f8822385cf5e9732 assets/lithiccoins/models/coin/archer/silver.json -e12a2b52768242c3465e48ac9f8298268ec06801 assets/lithiccoins/models/coin/archer/stainless_steel.json -fd9db7ac8baa38fe7352a4e7bfb8f20d78435c69 assets/lithiccoins/models/coin/archer/steel.json -1ddac46cee6d008734873a5ce4fd5f76dce40feb assets/lithiccoins/models/coin/archer/sterling_silver.json -a73d45444b96d74038f20ea4170d7b31d87721b1 assets/lithiccoins/models/coin/archer/tin.json -761c32b8a084dbc0f403513a177ec1d215cf5b7c assets/lithiccoins/models/coin/archer/uranium.json -bbf173b8fac22b1172cc1c32a7e1f5aea98a60af assets/lithiccoins/models/coin/archer/wrought_iron.json -6c0c006242c6dee760175bbb3df42739ce946202 assets/lithiccoins/models/coin/archer/zinc.json -4b5543d64d7d46df056f23ab23e291635b74d665 assets/lithiccoins/models/coin/arms_up/aluminum.json -49f1ee9e4b562786b35dd940c9e5b9582219eddf assets/lithiccoins/models/coin/arms_up/bismuth.json -d3146b9fec51cf48fe69fb495db27e5e7eca6298 assets/lithiccoins/models/coin/arms_up/bismuth_bronze.json -25fdb1d6331f25478e9b954d371d6e94a1df837a assets/lithiccoins/models/coin/arms_up/black_bronze.json -ef9c120003f4a11503de9ab1d03031801a977e97 assets/lithiccoins/models/coin/arms_up/black_steel.json -36bdbe2287ab778cef74d81669036f0fe8ebb820 assets/lithiccoins/models/coin/arms_up/blue_steel.json -25f3956b515009cf35edd5a596abe9410698f7ce assets/lithiccoins/models/coin/arms_up/brass.json -54b3add81cbc2d4ac1c79394d84f61cde2bad780 assets/lithiccoins/models/coin/arms_up/bronze.json -34f17af8221f85dcf9b879c20498a41932316d2b assets/lithiccoins/models/coin/arms_up/cast_iron.json -6ed16d23d501a54d588875b843ca340cd4746079 assets/lithiccoins/models/coin/arms_up/chromium.json -29da1ab33589b1964584baab7141f3b28f06f7b2 assets/lithiccoins/models/coin/arms_up/constantan.json -eda036375a0f2d658e25d75261218888e68502a3 assets/lithiccoins/models/coin/arms_up/copper.json -06df86a0d40bf31476213f1c884891d53f4b73a1 assets/lithiccoins/models/coin/arms_up/electrum.json -a6fe13d873c75aa026da0bddd95d5f80f2aac27a assets/lithiccoins/models/coin/arms_up/gold.json -b02a5c36dc88cc23e4909dd55101cc56f0c89e80 assets/lithiccoins/models/coin/arms_up/lead.json -60032df72fe319c8b421c6b65040e1494dd0511b assets/lithiccoins/models/coin/arms_up/nickel.json -7f68de5d57c1012eb363c289411d12a8a1b6c9cc assets/lithiccoins/models/coin/arms_up/red_steel.json -b5f7e9632450e9bf303a5abce2d4663a268a8078 assets/lithiccoins/models/coin/arms_up/rose_gold.json -82dca1104f702a5e4844d15786c85b23a6d3665a assets/lithiccoins/models/coin/arms_up/silver.json -b2d7bd32f73647bf6e20d84d9bfde0d690033a83 assets/lithiccoins/models/coin/arms_up/stainless_steel.json -004c29d982c393fab76458e23798edd8a0cc4897 assets/lithiccoins/models/coin/arms_up/steel.json -becc35c987a9b803d354c70dd3ab2497dfbe29ec assets/lithiccoins/models/coin/arms_up/sterling_silver.json -08c777aedf4c255823c8fa4461bb54e5e6c78655 assets/lithiccoins/models/coin/arms_up/tin.json -c36187aadf334e1720996b7c398d4b7102c1035f assets/lithiccoins/models/coin/arms_up/uranium.json -753c8619d05a6a09bf8a049269cb48d02b64bb66 assets/lithiccoins/models/coin/arms_up/wrought_iron.json -c775f51e8613a247de512d15bd1e293ae3f13f76 assets/lithiccoins/models/coin/arms_up/zinc.json -041a48de95acaec846cd5289460db5855b457370 assets/lithiccoins/models/coin/blade/aluminum.json -a6336603a9512ab68a03308a91489e4d8b4cd4db assets/lithiccoins/models/coin/blade/bismuth.json -c7f6e575e4899cb3e89546ff3f892c4477138bf7 assets/lithiccoins/models/coin/blade/bismuth_bronze.json -ad0a24f8f68e9f34acac6fb14db3b0c91f9d3f27 assets/lithiccoins/models/coin/blade/black_bronze.json -f88dc52032cab826964a4b99d2ce412394a50276 assets/lithiccoins/models/coin/blade/black_steel.json -e5e7d99b1e6aa3d1f7f727f3f50c35e10c82e46a assets/lithiccoins/models/coin/blade/blue_steel.json -e499c47ef73cc278984d27f3e04b0eb3dffb5d52 assets/lithiccoins/models/coin/blade/brass.json -02fecfa49bd5d1a439e1351827a6eafb56306f7c assets/lithiccoins/models/coin/blade/bronze.json -9590aba9a05a10cd79b500fa2377eb460c57ad80 assets/lithiccoins/models/coin/blade/cast_iron.json -46c16b8e6828df68769354978ac7665a8590eec1 assets/lithiccoins/models/coin/blade/chromium.json -c4c8e4b592a63e5b7963bdd4e1c43233ebc82869 assets/lithiccoins/models/coin/blade/constantan.json -7b0c15354141779b3fbbfb36ccd630611b36c29b assets/lithiccoins/models/coin/blade/copper.json -0b778564f7ef613c2874d863ffe9101c0b00855c assets/lithiccoins/models/coin/blade/electrum.json -d4ba8bc61f2fcd88c3fe9f2a44ca32e99794ffb4 assets/lithiccoins/models/coin/blade/gold.json -0520f3fec12a36b43cac85915d80fe314704d447 assets/lithiccoins/models/coin/blade/lead.json -46c8133d64053e6102e1a7f36ac6c9401ee924fb assets/lithiccoins/models/coin/blade/nickel.json -121e057f68e11e68fb35c6278545d5ea001ab3d4 assets/lithiccoins/models/coin/blade/red_steel.json -b3f59e47b2319bcbbc2869fe624e7d80dcb25be0 assets/lithiccoins/models/coin/blade/rose_gold.json -cbed684b49420a4362d8ba725ebbe6ebb9d64d78 assets/lithiccoins/models/coin/blade/silver.json -9aa1979e1dadbb8739a3d15771af8c6a0fe9d4dd assets/lithiccoins/models/coin/blade/stainless_steel.json -1067c674546be09b3065e8ddd179428e93d90f95 assets/lithiccoins/models/coin/blade/steel.json -d83cf705db320a6a794e836d540d0ac3faec709a assets/lithiccoins/models/coin/blade/sterling_silver.json -cb304fcaac0c0de4db5478e083688eb1ffa44f3c assets/lithiccoins/models/coin/blade/tin.json -cc578dd2f112aa54cc95f4ee0961cc684d655933 assets/lithiccoins/models/coin/blade/uranium.json -f4cab2439596d8e8f80483198541a4f5d9f23ad0 assets/lithiccoins/models/coin/blade/wrought_iron.json -2bc0efdecfa323628a8547c72e03dc9330a32565 assets/lithiccoins/models/coin/blade/zinc.json -be4c3a344f1b3218b16118281da9fe1db957f1fd assets/lithiccoins/models/coin/brewer/aluminum.json -d61a17a140a8ed39b930a70ce77b59b09b7a570b assets/lithiccoins/models/coin/brewer/bismuth.json -367bc098c9b74e4abd821124c482752d859f95c0 assets/lithiccoins/models/coin/brewer/bismuth_bronze.json -a95a178bda4d23d13c845720be827dc3efdb03fc assets/lithiccoins/models/coin/brewer/black_bronze.json -19b926096a30e5bde274f2c7143e90c32f26132c assets/lithiccoins/models/coin/brewer/black_steel.json -bb33f63ce02b185b09c564eb77d1fcfd466bb211 assets/lithiccoins/models/coin/brewer/blue_steel.json -be9df4650f1267c02b9d1108f52e71a287f9a214 assets/lithiccoins/models/coin/brewer/brass.json -fc15c7bf84ee7c6bcf94bd0d7a6446aa1c027534 assets/lithiccoins/models/coin/brewer/bronze.json -9f37a8521e700fe0591a7b0052ea44638dc0f5b8 assets/lithiccoins/models/coin/brewer/cast_iron.json -d482f822749841ba6c0136f84ae9e10495291ed6 assets/lithiccoins/models/coin/brewer/chromium.json -5d768c0e000a611418008c0773cabee51499980a assets/lithiccoins/models/coin/brewer/constantan.json -d53d098b60ae05453c2e1968b6c434865e6b5bbb assets/lithiccoins/models/coin/brewer/copper.json -26a12ce3494bc50a8b3a31f7f78ddc5efca676bf assets/lithiccoins/models/coin/brewer/electrum.json -9d37e66070f4e1934713d9eb12d7500bbdb45e80 assets/lithiccoins/models/coin/brewer/gold.json -065b449fbdbaf9842663e68a3c78e1faa9600df2 assets/lithiccoins/models/coin/brewer/lead.json -b673dcdf77173c344f9e48bbd8c5fbe2bfb20d41 assets/lithiccoins/models/coin/brewer/nickel.json -0f18d72e315299ae542434f10afbdbb6bef1546e assets/lithiccoins/models/coin/brewer/red_steel.json -b17a39786df2a42dfccdb8aaf3f5ba393f1b758c assets/lithiccoins/models/coin/brewer/rose_gold.json -dd72d29e94ecb7f22a495df240dfdb6231519c68 assets/lithiccoins/models/coin/brewer/silver.json -7857a5ff8b422b1c632f3ae8340f204a9e3fe5a2 assets/lithiccoins/models/coin/brewer/stainless_steel.json -7d20ce35a5305f85beba2e3b848fba07e9161433 assets/lithiccoins/models/coin/brewer/steel.json -9edff1794e6cbafeef4d333861966cfa23238ed7 assets/lithiccoins/models/coin/brewer/sterling_silver.json -2607fe39fb471f457e69c1ac5efd96f5650a2aeb assets/lithiccoins/models/coin/brewer/tin.json -d6ac0fd7a3b4cd18b3dd235fb891440459754c15 assets/lithiccoins/models/coin/brewer/uranium.json -e59e80c0de0001f667503d3203b486ad0530395e assets/lithiccoins/models/coin/brewer/wrought_iron.json -4ced54e5517650c0e6b1501d02342d18d16cc13a assets/lithiccoins/models/coin/brewer/zinc.json -df302b032cfcf261587186e0ca4aa6f307662ad9 assets/lithiccoins/models/coin/burn/aluminum.json -ff41cdb60cca0ba05621c73dd113225916fee890 assets/lithiccoins/models/coin/burn/bismuth.json -e474801c1d2675942676843862831780cab4dd36 assets/lithiccoins/models/coin/burn/bismuth_bronze.json -7ae23ab964042e93d723e13f490664301b5e4d01 assets/lithiccoins/models/coin/burn/black_bronze.json -7b28fa3df4323dbfe0b3e5db6d353cb6a5c591f7 assets/lithiccoins/models/coin/burn/black_steel.json -6961a9e5262e68792bc22f359e0bcb5376aa732c assets/lithiccoins/models/coin/burn/blue_steel.json -5e88fc19f57886ae23b35a20d124dd54534341fe assets/lithiccoins/models/coin/burn/brass.json -897c768e65504fdb0c8e4bd1fd3391ee6e787742 assets/lithiccoins/models/coin/burn/bronze.json -23ca340895eb9fde160e5b542ef5684da0ce83c0 assets/lithiccoins/models/coin/burn/cast_iron.json -4f1b7bdc7d970ba9bc3ee5c439be268590b88e1a assets/lithiccoins/models/coin/burn/chromium.json -8f7fe7b427bb343bb0a72e4a9af12cc4887107ce assets/lithiccoins/models/coin/burn/constantan.json -f0d63c30811c39573a657526638da043a91213bc assets/lithiccoins/models/coin/burn/copper.json -c15f3ed063650dd7a3723986216168e1782b6fee assets/lithiccoins/models/coin/burn/electrum.json -667577e0301c4271513a352029771ccd94a66cd3 assets/lithiccoins/models/coin/burn/gold.json -09ad906eeae5d946bcf3a13af2536d61369cc5ee assets/lithiccoins/models/coin/burn/lead.json -5c4027ecb54864b8d056c59f8b4e4e6911f4ca89 assets/lithiccoins/models/coin/burn/nickel.json -ad179837740b468ba7581b837b12fcba8671fe95 assets/lithiccoins/models/coin/burn/red_steel.json -00b5d9c2273f357652690dd2075342e927627a35 assets/lithiccoins/models/coin/burn/rose_gold.json -1d664cf675342897d62989abe547df82e8813a85 assets/lithiccoins/models/coin/burn/silver.json -3c896dcec9535623642db64fe2a6b2e98a5c528a assets/lithiccoins/models/coin/burn/stainless_steel.json -af85066a2058170c358d520ab3bb60c6f28d91aa assets/lithiccoins/models/coin/burn/steel.json -7896976d9ed42397d177ff1ee3cfaa25979a1739 assets/lithiccoins/models/coin/burn/sterling_silver.json -20fd3c31c2e1254f9a0b22afca2cc2b6ee17acb7 assets/lithiccoins/models/coin/burn/tin.json -302e1b52682e7a78cb50ec7d18a19c104e3ae7e6 assets/lithiccoins/models/coin/burn/uranium.json -90a559d5250f93d3d671a8f94c9e86b9b7dc4d6c assets/lithiccoins/models/coin/burn/wrought_iron.json -77c96b78d4d4d95625fab29df4d828b8c1d3f9ad assets/lithiccoins/models/coin/burn/zinc.json -3ffca7aa1a03650a78dec0e68a54185b42bcd599 assets/lithiccoins/models/coin/danger/aluminum.json -016b21c282f3bbe166192ad38da89182b1d95e27 assets/lithiccoins/models/coin/danger/bismuth.json -87de1a70092a2b9b87d30544a13c68fc7bdf8603 assets/lithiccoins/models/coin/danger/bismuth_bronze.json -5dfec3a20cc8c94cf4649f0decf0adc2b41d74e6 assets/lithiccoins/models/coin/danger/black_bronze.json -1f152511144a2b3e2e35c3e1e779234a09d369c5 assets/lithiccoins/models/coin/danger/black_steel.json -02937e9dc2bd7f919024f4f1a2ca9f321adede62 assets/lithiccoins/models/coin/danger/blue_steel.json -914888faaae5f30b0952ee0d7547680fccdedbba assets/lithiccoins/models/coin/danger/brass.json -c18ef56525b75f2f3c495c6fb1f31b3fc612db55 assets/lithiccoins/models/coin/danger/bronze.json -b4a062d2d593f0e07946f1702761f25e99194ee5 assets/lithiccoins/models/coin/danger/cast_iron.json -96b0c43eb8421b74c0324f769a34ca46631b9255 assets/lithiccoins/models/coin/danger/chromium.json -138080a9c3a06b0050ba6e0b8d459cd890c42df7 assets/lithiccoins/models/coin/danger/constantan.json -cba48ad4725fb2f36ec65807b10c0b9b6dacf2e8 assets/lithiccoins/models/coin/danger/copper.json -999bf3526dc6d1ff7d9e5ec34b23144c24b24c68 assets/lithiccoins/models/coin/danger/electrum.json -fd6c9be865ca83724418a1fa6530492ad85112d2 assets/lithiccoins/models/coin/danger/gold.json -31a9827785468279f66ae97ac8bddd6900674ca2 assets/lithiccoins/models/coin/danger/lead.json -2325710c888d1eee5960e3bb870282faa773b2ea assets/lithiccoins/models/coin/danger/nickel.json -302c1be36df224f8f662fa863065c7d677d3105d assets/lithiccoins/models/coin/danger/red_steel.json -ce8228cdead20f003fa9f4f747a982e6cbb569ea assets/lithiccoins/models/coin/danger/rose_gold.json -d489fe54aed58a3a9b6d295234a23db6859b43a3 assets/lithiccoins/models/coin/danger/silver.json -8570d2009ad8c65911454e4c28717d83cff3b91f assets/lithiccoins/models/coin/danger/stainless_steel.json -19b63bbde7ecf4314e86af318af74b486cd10b8b assets/lithiccoins/models/coin/danger/steel.json -6a0e965c64e0a27ee76755c2579a05bef453ef69 assets/lithiccoins/models/coin/danger/sterling_silver.json -879f24901face2b868201045726ae923de3e3a86 assets/lithiccoins/models/coin/danger/tin.json -97d43e20ebba3c84a8af8b388e4bf9ec8cea7fbd assets/lithiccoins/models/coin/danger/uranium.json -4d8bff0f8ea529292a3d40208d8a4d47051242ab assets/lithiccoins/models/coin/danger/wrought_iron.json -db39877ec1078124bc043b4e1a3d29d6dd434bb8 assets/lithiccoins/models/coin/danger/zinc.json -6dc8e300250910c1b68464d202e502064acb9a1a assets/lithiccoins/models/coin/eagle/aluminum.json -8b2ac34ac31282063dfd9aa32839b549906f8fd1 assets/lithiccoins/models/coin/eagle/bismuth.json -14eb66fc7f2a72908fa7f888f31a1c325f23f375 assets/lithiccoins/models/coin/eagle/bismuth_bronze.json -973decc5e3b18f7828befc691ec1fda84d195e5e assets/lithiccoins/models/coin/eagle/black_bronze.json -0b0cb6fd25fa744255244b15554e1cb3ed427b3d assets/lithiccoins/models/coin/eagle/black_steel.json -9569fc2bdb298f7be0623b793e562fe6fbb0040a assets/lithiccoins/models/coin/eagle/blue_steel.json -723528704ed9827a0d1c6d108e947b9d625d75e2 assets/lithiccoins/models/coin/eagle/brass.json -e2d32d03659fcc3bfcbc46af4da03f7caad28fa2 assets/lithiccoins/models/coin/eagle/bronze.json -496c008ee7718bef07860c1a577efd8aa545f27f assets/lithiccoins/models/coin/eagle/cast_iron.json -0810a7eac08a9e3d883490c4afd27f612bc50114 assets/lithiccoins/models/coin/eagle/chromium.json -5edc0b5fb9de23caa0d2415bdce590192b344290 assets/lithiccoins/models/coin/eagle/constantan.json -e9d7e0d9d25c66d16d37cbba83160367b278cb83 assets/lithiccoins/models/coin/eagle/copper.json -d964c3c6d138142a8e56a3c728e7330d4f6d4643 assets/lithiccoins/models/coin/eagle/electrum.json -db566e359eb83f1cd336a7aedfccbded731aebd5 assets/lithiccoins/models/coin/eagle/gold.json -52986731384b4fbe0ac2c3786f7dedc879c69043 assets/lithiccoins/models/coin/eagle/lead.json -27c11ddf88ccbaa29cd1136ae77d226bd46553f7 assets/lithiccoins/models/coin/eagle/nickel.json -8ca464088ee2526f0ffd93b64788dc85b815577e assets/lithiccoins/models/coin/eagle/red_steel.json -5d172a39e3d314c08bcaf624d73bc15e6f5fbf78 assets/lithiccoins/models/coin/eagle/rose_gold.json -ac87de6f8ee11c87a5c32a99e41d0cda3d6c9a6d assets/lithiccoins/models/coin/eagle/silver.json -4bbb4824263612fd12e4264cb608d1ee4bc5bbed assets/lithiccoins/models/coin/eagle/stainless_steel.json -700cde514e1ada6b76a2f1828b12c832ea6566f6 assets/lithiccoins/models/coin/eagle/steel.json -56053e94fc2264b624fdb6edce5c9aebd0d51ed7 assets/lithiccoins/models/coin/eagle/sterling_silver.json -8e7a0af3af05a9d76c46bbd017948458dd7ea2cd assets/lithiccoins/models/coin/eagle/tin.json -3155b9d9423c9126c34097ca3656b495124b75b4 assets/lithiccoins/models/coin/eagle/uranium.json -8fd1ca62732e444fb2eda0e42a279f2e1d182fd8 assets/lithiccoins/models/coin/eagle/wrought_iron.json -94fe10e3e79d3fb8e74a1461033565c654fb416e assets/lithiccoins/models/coin/eagle/zinc.json -f6abce89f2d3b9fa81919d59a9f5a61d2262cd26 assets/lithiccoins/models/coin/explorer/aluminum.json -5c0400615523670a150990c604f2d7c4a9cb6529 assets/lithiccoins/models/coin/explorer/bismuth.json -303b82abae369e456b3bcbade3dc5ef5709d01e0 assets/lithiccoins/models/coin/explorer/bismuth_bronze.json -a1bb2419269e5332a37d6038e4b1d2ed275226fa assets/lithiccoins/models/coin/explorer/black_bronze.json -52471380754f5d44c87f0676a4056bd5e593cb31 assets/lithiccoins/models/coin/explorer/black_steel.json -3a5710f5be6a6f9aef05d42745be6f49e79d4c38 assets/lithiccoins/models/coin/explorer/blue_steel.json -888e3e931da51626cacdd3417e4959e8b7e522a3 assets/lithiccoins/models/coin/explorer/brass.json -234b7b4e813f09b0ec232563ec42346f5390a144 assets/lithiccoins/models/coin/explorer/bronze.json -a82610ca7addc33a1dab084016bd5bd2317f372c assets/lithiccoins/models/coin/explorer/cast_iron.json -5010e78db86fd6c9a78db5e2883e0a0f662f4bfc assets/lithiccoins/models/coin/explorer/chromium.json -5bdb2d5c7a131ab121a694442ced2906c3804d71 assets/lithiccoins/models/coin/explorer/constantan.json -350ded2f08b479a867d2468da24c374a30a8623e assets/lithiccoins/models/coin/explorer/copper.json -e1c071870b973370029ceba5435918083c7d9f80 assets/lithiccoins/models/coin/explorer/electrum.json -4e5b2089eb05a51422829b0121c86d8342d24cbb assets/lithiccoins/models/coin/explorer/gold.json -f80712bc7f8512468ceae1807403fd50ec1db5d6 assets/lithiccoins/models/coin/explorer/lead.json -78f94e5579e461b6dbfa9ef30a7f4efd990f9a7b assets/lithiccoins/models/coin/explorer/nickel.json -8b13d59c0a18193c944e0300d72de9f93ca92e11 assets/lithiccoins/models/coin/explorer/red_steel.json -99037f8b6c228b6f2033529436ec3dc1167a1e69 assets/lithiccoins/models/coin/explorer/rose_gold.json -1e4173af4622f82ae9d234b152b4d0e7295f5f4d assets/lithiccoins/models/coin/explorer/silver.json -6dcea5d125c5207bc5729c268f25bc2dc823720e assets/lithiccoins/models/coin/explorer/stainless_steel.json -faa9d3bb5373950c7b9efb6a6e9b03bb0008c635 assets/lithiccoins/models/coin/explorer/steel.json -c140094ac09e9b8bcb3734e60df811b945458b53 assets/lithiccoins/models/coin/explorer/sterling_silver.json -09cd80ed5f4d48131bc6f0d47ddab2a4e1ab174b assets/lithiccoins/models/coin/explorer/tin.json -16a860835d6c207c11d4adfb9fc98a8e632960af assets/lithiccoins/models/coin/explorer/uranium.json -b225df3b3936cb915a446a9b4c092a640ea61961 assets/lithiccoins/models/coin/explorer/wrought_iron.json -560e9fd798f4187fa6a739b8f397ff0cfef39f36 assets/lithiccoins/models/coin/explorer/zinc.json -2431abd492efa585252b0155465a251b6932f8fe assets/lithiccoins/models/coin/friend/aluminum.json -7bbb7a1bda067da87ee343012b6201e527abd201 assets/lithiccoins/models/coin/friend/bismuth.json -fd3599cf6846614b41e568b50c7e1404d2d35c17 assets/lithiccoins/models/coin/friend/bismuth_bronze.json -063edb8592e553c6e9e0784a07aea44f64863407 assets/lithiccoins/models/coin/friend/black_bronze.json -dbc83cd1803050e3187bb41ebced7272cbb3e549 assets/lithiccoins/models/coin/friend/black_steel.json -23abad84e8d4a62884f84ac3a2e54b66b72328c8 assets/lithiccoins/models/coin/friend/blue_steel.json -2c21fc85e43e808faf5eb580c2b23b600d088d09 assets/lithiccoins/models/coin/friend/brass.json -d4c1edf1a1b6d6232998906b5844d8063fa7e482 assets/lithiccoins/models/coin/friend/bronze.json -a03eec5c2c0170c45940b1fc9e5afb01f78920c8 assets/lithiccoins/models/coin/friend/cast_iron.json -29001646abb4fc8050af10e0a1bf91c20948b5c1 assets/lithiccoins/models/coin/friend/chromium.json -67bd7e9240c283106308b4e73973383dfc20c105 assets/lithiccoins/models/coin/friend/constantan.json -a294b68093a3f05119cc6c6da8c5fd7968f36ee6 assets/lithiccoins/models/coin/friend/copper.json -1f6778376ce7119639a5bc2cf5e49ff6808f951b assets/lithiccoins/models/coin/friend/electrum.json -edc1e875da20025719b25c6b26655ccc6eeff095 assets/lithiccoins/models/coin/friend/gold.json -ebb85b837ca21d624b1de9560a74a6bd94c62897 assets/lithiccoins/models/coin/friend/lead.json -c7ed84dd8a7c99c8ec8bd498493d9884e4058ca8 assets/lithiccoins/models/coin/friend/nickel.json -f40a498c915490b388ef93c66d0d270629ffa083 assets/lithiccoins/models/coin/friend/red_steel.json -9630f9e370cec4459d761835c8556348f6f541fa assets/lithiccoins/models/coin/friend/rose_gold.json -2d517361fcd9ee86eb82b98d16f9133415b27c59 assets/lithiccoins/models/coin/friend/silver.json -7c13bd3cd9518cc938b15912e313738d2b9497f8 assets/lithiccoins/models/coin/friend/stainless_steel.json -6e2a98aa6142cc54ce4df60787d83ee37c65530f assets/lithiccoins/models/coin/friend/steel.json -eb5cd8e70f11788a72b800608ccb06251eb7db2b assets/lithiccoins/models/coin/friend/sterling_silver.json -b73c29448b8efc2105e5bdcb9427861efd452774 assets/lithiccoins/models/coin/friend/tin.json -896196dbfe97cdc8c8d5d68ceb21308e9ba0f4a2 assets/lithiccoins/models/coin/friend/uranium.json -c143b1128139924cdee57ce4697541360fc7110f assets/lithiccoins/models/coin/friend/wrought_iron.json -54ce1687627491ea195829c234ba11d7769c11e4 assets/lithiccoins/models/coin/friend/zinc.json -7227e521867e21f4e95f200cea942570247f5757 assets/lithiccoins/models/coin/heartbreak/aluminum.json -9bc69f4f93fe03bdff56f4de5997353b2b862e86 assets/lithiccoins/models/coin/heartbreak/bismuth.json -ddbbab97be3a1e54d04e19de9c294d31ebd20491 assets/lithiccoins/models/coin/heartbreak/bismuth_bronze.json -6b92ccc8a79b76346ff12554d0ba65a0ef45a1fa assets/lithiccoins/models/coin/heartbreak/black_bronze.json -3013f1f49ddfbc02e002cbb101a215e59ac44ecc assets/lithiccoins/models/coin/heartbreak/black_steel.json -bd68ee49173c2db44943a4d2d41392c2ce060f3a assets/lithiccoins/models/coin/heartbreak/blue_steel.json -5a2e586a3555b0e7408f4861a049f3831d2ab915 assets/lithiccoins/models/coin/heartbreak/brass.json -112948f0930d1a2e662482cbc62ac723002d38b9 assets/lithiccoins/models/coin/heartbreak/bronze.json -cbc03c5eb105835d61b072b4fb857c97f0f34fb1 assets/lithiccoins/models/coin/heartbreak/cast_iron.json -ad8a347d1ff2936089aa7560522a7da073d545ad assets/lithiccoins/models/coin/heartbreak/chromium.json -a6d503e98c46f1eec876909e991db02281b00b26 assets/lithiccoins/models/coin/heartbreak/constantan.json -8c7a4230cfb0b87952834ed9cb9b652b2f7da152 assets/lithiccoins/models/coin/heartbreak/copper.json -5c93b6f0e47d0ed2be699470bf9ad4c28ab96ca8 assets/lithiccoins/models/coin/heartbreak/electrum.json -f06098db59bcb932d93d320d0b9ba8531564c2a5 assets/lithiccoins/models/coin/heartbreak/gold.json -319cce842165d95815c4760c0387abfb02c003a1 assets/lithiccoins/models/coin/heartbreak/lead.json -09417b6cbeefe3f8cf948b521d5454ae97273bac assets/lithiccoins/models/coin/heartbreak/nickel.json -2261315f8868e701961a7f33dcdb4dd514feea0c assets/lithiccoins/models/coin/heartbreak/red_steel.json -0fa72030a024c64b462403393904eebba73afe26 assets/lithiccoins/models/coin/heartbreak/rose_gold.json -87fb36529653715279ba650a97a7f4c03dacc43b assets/lithiccoins/models/coin/heartbreak/silver.json -26b5d4dc64c089f0ee5106a8dd9d572a110ceb69 assets/lithiccoins/models/coin/heartbreak/stainless_steel.json -39332ac859a1a3a55409c49a1238991d26bda10d assets/lithiccoins/models/coin/heartbreak/steel.json -0e689192bab7f42208021edf8827b7c609f01313 assets/lithiccoins/models/coin/heartbreak/sterling_silver.json -d3909e9544e9e85ed6d9d00dc2b85860488f87b3 assets/lithiccoins/models/coin/heartbreak/tin.json -7c787b67a21a6391296632893b598e1496f57019 assets/lithiccoins/models/coin/heartbreak/uranium.json -2d47f40fe29f776b717fa717281f11c3b20c3e8f assets/lithiccoins/models/coin/heartbreak/wrought_iron.json -799181a1135a99d7e4197f753d0246b94f1c38a7 assets/lithiccoins/models/coin/heartbreak/zinc.json -239c750612144be7109193df2d8b32ca2c641dfd assets/lithiccoins/models/coin/heart/aluminum.json -f9cfa0de102a97e568e4aedf797f7e3aa75b5c53 assets/lithiccoins/models/coin/heart/bismuth.json -e196ca69b85161cc72872d87689ad2fc4be66aed assets/lithiccoins/models/coin/heart/bismuth_bronze.json -11cddbd17bef69ad25b3b2b62860c1fb68a3785b assets/lithiccoins/models/coin/heart/black_bronze.json -70433ee6814ea69e0351f84b3cd1669dcb3f106f assets/lithiccoins/models/coin/heart/black_steel.json -2aa0e6201d9242b527dfa775de44c4c324d808e1 assets/lithiccoins/models/coin/heart/blue_steel.json -947846e86fad23e00b65ea6e943330782c51d443 assets/lithiccoins/models/coin/heart/brass.json -a8793c413ac2eaf3ec5ba11344aa27ce62a8ac11 assets/lithiccoins/models/coin/heart/bronze.json -43613275be9a281a399c51c10b168d172df6a854 assets/lithiccoins/models/coin/heart/cast_iron.json -07d56f8c57c4e1987e2b59c701a1a790993c8ce0 assets/lithiccoins/models/coin/heart/chromium.json -2231bbb9a25a7ae733432c36c305ea4e83dd0a8a assets/lithiccoins/models/coin/heart/constantan.json -f112a165d3ea1695574f9d5e978f414bc816c0d4 assets/lithiccoins/models/coin/heart/copper.json -89fa3af5b598cadb02755457c27b90ccce44cb87 assets/lithiccoins/models/coin/heart/electrum.json -36e2134b31e7a2a78142d709479c8bcadee7b508 assets/lithiccoins/models/coin/heart/gold.json -7e27ce3bf25cefd2334a747b3280d3097bf8e8a8 assets/lithiccoins/models/coin/heart/lead.json -305a9276259ac3f6a30c0cab79f6a3aa3bb6fdeb assets/lithiccoins/models/coin/heart/nickel.json -d0ee284ec68482bcd2496eabf71bd1b4678a088e assets/lithiccoins/models/coin/heart/red_steel.json -15a510f5024a8817d51caa7b6015c4aa4a24f765 assets/lithiccoins/models/coin/heart/rose_gold.json -f138b8e401274e0212efd7d8e8e876dc27ae0cd3 assets/lithiccoins/models/coin/heart/silver.json -88a78a6397ea2398fb475462746af726a5080e3f assets/lithiccoins/models/coin/heart/stainless_steel.json -d3d1c87d22933c556c1d510d6545cb8d0716b25c assets/lithiccoins/models/coin/heart/steel.json -afdb246e3e8576a5273c67036d0c2e80d5f65756 assets/lithiccoins/models/coin/heart/sterling_silver.json -f0eb37d25227aa79c5d2d2acfc59e6796fa9605e assets/lithiccoins/models/coin/heart/tin.json -0857b0323fc8b820ff1e86296decc64121b11b2f assets/lithiccoins/models/coin/heart/uranium.json -8ed1404b35af396b2202bf1e4492714b132c7b24 assets/lithiccoins/models/coin/heart/wrought_iron.json -8effc9e7f51e34a6dcb9ec35ac84cbc64c250df8 assets/lithiccoins/models/coin/heart/zinc.json -421b55a5ba421446faca9dda7cedebe4bdde1df5 assets/lithiccoins/models/coin/howl/aluminum.json -dd9eab403082068486a5f9b662e33a48df578efd assets/lithiccoins/models/coin/howl/bismuth.json -8768efa41a07359ad4085cdf8a6063ebbe6a4236 assets/lithiccoins/models/coin/howl/bismuth_bronze.json -fcf213b8e121546baf1b725fd1e5943610a970e8 assets/lithiccoins/models/coin/howl/black_bronze.json -4b98ee54d33fa01dbc74be066eead0947fa9d316 assets/lithiccoins/models/coin/howl/black_steel.json -252b06ed4fe761790970e773f049063c329e5f9c assets/lithiccoins/models/coin/howl/blue_steel.json -71399eb00e1f9f707b9f44c326f70e6ac3115caf assets/lithiccoins/models/coin/howl/brass.json -74893994b075305ccd732000cc5e0f2f20cc6838 assets/lithiccoins/models/coin/howl/bronze.json -4a2c754910fe5bca269a81818140480f22ee2209 assets/lithiccoins/models/coin/howl/cast_iron.json -25354bc894bbbd5887d790fc3af2fc5459bfa1fa assets/lithiccoins/models/coin/howl/chromium.json -b38b8305a35bfe223f853b7f87f32c990096a0cb assets/lithiccoins/models/coin/howl/constantan.json -570056e3e4e31395d89d777fc2706df4fd04a6ae assets/lithiccoins/models/coin/howl/copper.json -a01c033b12200fcb927960b7e7da2772cadb3252 assets/lithiccoins/models/coin/howl/electrum.json -420e5d022941f4d1d01983483d2315fa5b23cb47 assets/lithiccoins/models/coin/howl/gold.json -cf29d123c0fa0796a53b6fcfe905d6c06b23fc07 assets/lithiccoins/models/coin/howl/lead.json -b57d7c4191f9be43359babbefcb7586bc9439b7b assets/lithiccoins/models/coin/howl/nickel.json -9fd9ab6fadddfb974e0abffe23ad159b7c6ffa7c assets/lithiccoins/models/coin/howl/red_steel.json -473d4eec612cb6248a43d82170b052b1d013614c assets/lithiccoins/models/coin/howl/rose_gold.json -41e5b6741d6377d5493a54dd1f957d401e1a1460 assets/lithiccoins/models/coin/howl/silver.json -fd8271d273b506ebbfe9b46411de7c2e0fb010bf assets/lithiccoins/models/coin/howl/stainless_steel.json -383406489a9744040b97f82d7fa1b35bb11861b2 assets/lithiccoins/models/coin/howl/steel.json -dc565f5572905a3872687cc0770255d25d0cda2d assets/lithiccoins/models/coin/howl/sterling_silver.json -3562f7124b957aed509d56db7b9bff7d77b2c064 assets/lithiccoins/models/coin/howl/tin.json -0421a2325becaaff25dec77e986056b863bd5b91 assets/lithiccoins/models/coin/howl/uranium.json -c7d89943b5109be8c71cd8f26e1c9abe4011facc assets/lithiccoins/models/coin/howl/wrought_iron.json -e2e32de6c4bde8a9550bef5817988fb13759b680 assets/lithiccoins/models/coin/howl/zinc.json -031adc2ed3dff7bcc569e0b942244bc5a4cbe63e assets/lithiccoins/models/coin/miner/aluminum.json -ad051723be54d4a04274e509f29e4cbb9a175044 assets/lithiccoins/models/coin/miner/bismuth.json -a216f3de1bfe613071b27e81ed33ce4c1b9e84b0 assets/lithiccoins/models/coin/miner/bismuth_bronze.json -8eeec7e4d90602e97765c842c38b33332b799e25 assets/lithiccoins/models/coin/miner/black_bronze.json -d3ab9bce7b12db013afcb6b49523f14e9ff34ec3 assets/lithiccoins/models/coin/miner/black_steel.json -d557a11289b3d747f349a72eccbb775e69041ffd assets/lithiccoins/models/coin/miner/blue_steel.json -61d6f71e80957e6581f9c897ee334447ee9dccb1 assets/lithiccoins/models/coin/miner/brass.json -5e6e92cde2daffd8a1b5ef0f438ffe132fb5b397 assets/lithiccoins/models/coin/miner/bronze.json -cb04047437bd770cae6dc7cd393a359b9725f27d assets/lithiccoins/models/coin/miner/cast_iron.json -44f334ca0014ccd129cc29031bfe6af8da867110 assets/lithiccoins/models/coin/miner/chromium.json -2fa774df2b0a91571fd600f05752f37854a935f9 assets/lithiccoins/models/coin/miner/constantan.json -0f858f5b095448d7fa4aba9a1f25609b29e926bd assets/lithiccoins/models/coin/miner/copper.json -29533361393ae4f0d897bb5969782179c0c6ec94 assets/lithiccoins/models/coin/miner/electrum.json -f49c61cd85b2deb33303b47111b65f7bbb28410b assets/lithiccoins/models/coin/miner/gold.json -3ff8008408900787f6d8b65edf42708c2feba1bd assets/lithiccoins/models/coin/miner/lead.json -4e87e4c2f806a59ba9361569e6ac71e2b7306071 assets/lithiccoins/models/coin/miner/nickel.json -a9f21997c41b72ac054c733425eb43f0684dc650 assets/lithiccoins/models/coin/miner/red_steel.json -81b71de2026d3e5c0875bf4b442a57efca6ff779 assets/lithiccoins/models/coin/miner/rose_gold.json -6fcf3007e89877b106372c50b6da00d5050bb4d5 assets/lithiccoins/models/coin/miner/silver.json -742ec5bca3a89464d2c0af5e90633a92bce3785d assets/lithiccoins/models/coin/miner/stainless_steel.json -ceb4a17b9a6c82e96c789c71e1c3cbcfc2810047 assets/lithiccoins/models/coin/miner/steel.json -02ff4d3e3db37e4700dc199321fa2e978887fee3 assets/lithiccoins/models/coin/miner/sterling_silver.json -6c0c64f84d6832cd9f0996f900574338e5e99618 assets/lithiccoins/models/coin/miner/tin.json -683a1c684fc4088b194a234cde048bb70821308e assets/lithiccoins/models/coin/miner/uranium.json -18c6d1b7e455869155d88a2b5ebd0ba5aa9b7552 assets/lithiccoins/models/coin/miner/wrought_iron.json -64704d61d31cf1011fe7c824734ddd57fce2c8da assets/lithiccoins/models/coin/miner/zinc.json -db2c59151957940ad882d04aac303376a77aa13d assets/lithiccoins/models/coin/mourner/aluminum.json -8e3e410a8fe96435c7e5cabcac838a99747442cc assets/lithiccoins/models/coin/mourner/bismuth.json -f91a5ef4df1c856558ff2cb809ea8118bac59c35 assets/lithiccoins/models/coin/mourner/bismuth_bronze.json -ee46307fa57b31a1ef5a9ec059bc43ebf2f020a0 assets/lithiccoins/models/coin/mourner/black_bronze.json -1a93cc8654ef8886235451cc537d8e08e816b8a5 assets/lithiccoins/models/coin/mourner/black_steel.json -1710da257d4683d7c3c088c85ec8afeb2d7a0e8d assets/lithiccoins/models/coin/mourner/blue_steel.json -3a8d93f801d9c0a44ad490db71e534410e99a341 assets/lithiccoins/models/coin/mourner/brass.json -3fc5d16b766f1b9981b4e1438a9dbec01ab58c17 assets/lithiccoins/models/coin/mourner/bronze.json -bced7bbd33f3efc7c204345b618dce529208d308 assets/lithiccoins/models/coin/mourner/cast_iron.json -c1a0ae92c1129e61cb3fa770348b7576e65ed10b assets/lithiccoins/models/coin/mourner/chromium.json -f9a5c97408ca7083c79189a342240654db856596 assets/lithiccoins/models/coin/mourner/constantan.json -27f4cd1509de4e1bbb394c63350a6dd0ecc2c598 assets/lithiccoins/models/coin/mourner/copper.json -c119e9e145dbbe8116b47e0258051b9aabf9b2fc assets/lithiccoins/models/coin/mourner/electrum.json -6f641f595a2a24ec730f59300e509a4c732d872a assets/lithiccoins/models/coin/mourner/gold.json -feff05ccd129a429e295448f160a7f489ab2dfe6 assets/lithiccoins/models/coin/mourner/lead.json -ecb7a7cc87879c664d75484448b4bc283a4114b5 assets/lithiccoins/models/coin/mourner/nickel.json -fc5c9b4bbf805ca35dbdd717b6f861c75beb0e8a assets/lithiccoins/models/coin/mourner/red_steel.json -6594fe5e00ce257aeb22069cd1546f1afc6dc29e assets/lithiccoins/models/coin/mourner/rose_gold.json -581669e76afb01f030c0ac356f0b0ce0f1cea09f assets/lithiccoins/models/coin/mourner/silver.json -15f481cc791e402aa9f5a2a800cac3a8553b9cf2 assets/lithiccoins/models/coin/mourner/stainless_steel.json -20863f033ee3f273a4a5b6105d23ec395ffedcac assets/lithiccoins/models/coin/mourner/steel.json -74100890d104c2c8e2bacbdefded06f2bf005c7e assets/lithiccoins/models/coin/mourner/sterling_silver.json -5e5e3254eb55eba7edd90f812f27c2692d69b7b1 assets/lithiccoins/models/coin/mourner/tin.json -cefbd851ec129ef740e0bb6a9e4cf3a0b4b9fedb assets/lithiccoins/models/coin/mourner/uranium.json -326209e713108f448881ea3ba35d36fd7d112856 assets/lithiccoins/models/coin/mourner/wrought_iron.json -504a5b1c173228716c81b865fc8311ecce587cc6 assets/lithiccoins/models/coin/mourner/zinc.json -ab1d13682a1603db26bc2fa72aa670007869fc9d assets/lithiccoins/models/coin/plenty/aluminum.json -e974b6cab6bca2f421e69acab866851202ce464a assets/lithiccoins/models/coin/plenty/bismuth.json -5ce34e7a6587bc70c7d0686413202bb54ce3b7c5 assets/lithiccoins/models/coin/plenty/bismuth_bronze.json -7bc5ef0d06bb35f442b8237b96a73f4b229ef629 assets/lithiccoins/models/coin/plenty/black_bronze.json -9a5854807e336ef9834443bcf0fb6d2058a98504 assets/lithiccoins/models/coin/plenty/black_steel.json -cee31f6d822828dd989c27c87962b56265274b54 assets/lithiccoins/models/coin/plenty/blue_steel.json -de0c11bb6e9ec09b8fe63f124407e198b2abb8af assets/lithiccoins/models/coin/plenty/brass.json -e85c975e0279beb7d99c1d7df75739ba222bdfb4 assets/lithiccoins/models/coin/plenty/bronze.json -c7d302d4c2a88ced25b24d1bcb31da9e7dbcbb20 assets/lithiccoins/models/coin/plenty/cast_iron.json -f8b59df19a5ad0ab6a931efe348d5ab9a72b7c54 assets/lithiccoins/models/coin/plenty/chromium.json -5658ae5afe2544a28c6edcb6bda84cf0696c5a7e assets/lithiccoins/models/coin/plenty/constantan.json -f5e360139b450d78231326429aadd4551b707025 assets/lithiccoins/models/coin/plenty/copper.json -ec469ab195b0a2eaded0aa60aae4fc06474de265 assets/lithiccoins/models/coin/plenty/electrum.json -54283064c555eac83edc3dc2499f28a56a6e5c9a assets/lithiccoins/models/coin/plenty/gold.json -4a15828a8f38115884a49777bbff791cccb54641 assets/lithiccoins/models/coin/plenty/lead.json -a2913af55da2d209b459e58959b39cfa59358303 assets/lithiccoins/models/coin/plenty/nickel.json -12c02a32820531ae773917c6ede5702f8a17aa57 assets/lithiccoins/models/coin/plenty/red_steel.json -03b8053d68cef95cd419b9695064cc693d1d4831 assets/lithiccoins/models/coin/plenty/rose_gold.json -e87f66799be04910ed959a132508c5fa1b9a0d38 assets/lithiccoins/models/coin/plenty/silver.json -a4cbbd6eb9be4f8d7a0ae44b9741e7d74b62278b assets/lithiccoins/models/coin/plenty/stainless_steel.json -6f29f51c77269530340f0b8345748e95c380fa11 assets/lithiccoins/models/coin/plenty/steel.json -878ea07e1a50eac6dc68f8c653c44e877268f1a0 assets/lithiccoins/models/coin/plenty/sterling_silver.json -1ad25a964be7a0b144d62dec471ee6f1885d4701 assets/lithiccoins/models/coin/plenty/tin.json -cec1e9803e298e0d26766df17afbf69a34afe974 assets/lithiccoins/models/coin/plenty/uranium.json -80444737d97a4cfbbf3794061e6a7fe605f5e767 assets/lithiccoins/models/coin/plenty/wrought_iron.json -12197408db645cad32becfff3e159bccccf000f6 assets/lithiccoins/models/coin/plenty/zinc.json -5e28e47426f46e06d9531e630d5c290a19f1c98c assets/lithiccoins/models/coin/prize/aluminum.json -4179f0b4e880be192959f6ff23631567110c54e9 assets/lithiccoins/models/coin/prize/bismuth.json -570583dea398dcb5ecd3f66e8a705bfab0776c91 assets/lithiccoins/models/coin/prize/bismuth_bronze.json -cf015e5af704dd414872fe5f61312558121058a4 assets/lithiccoins/models/coin/prize/black_bronze.json -b20c55319a1931e1f768d0ff3357b08bc295af63 assets/lithiccoins/models/coin/prize/black_steel.json -e82062f303a8e8ba6606ee5595b8c9b0912b506d assets/lithiccoins/models/coin/prize/blue_steel.json -adc6bb30f3d25b0f866464a0bc14fb58a1e2b220 assets/lithiccoins/models/coin/prize/brass.json -2d6be4597638e83934c39b4fbba92c8891fec7b7 assets/lithiccoins/models/coin/prize/bronze.json -5862ebcacd27f50f19c38f9bf4015c1069d1118f assets/lithiccoins/models/coin/prize/cast_iron.json -300f7caf08547a5c5ce7db36430a119cd2cf65b6 assets/lithiccoins/models/coin/prize/chromium.json -36d39dc9e09394b0492216dbfeb032897d887b4f assets/lithiccoins/models/coin/prize/constantan.json -c7ea4722751031a32afb6bbbf6203ea4d16143c6 assets/lithiccoins/models/coin/prize/copper.json -97e41488a767f70df90162767ab21424733a2b14 assets/lithiccoins/models/coin/prize/electrum.json -db6a427f8e923b0c317b626478868b3076533f87 assets/lithiccoins/models/coin/prize/gold.json -20d056f1d0fe5448fd4dc1f128b5520b5d542fa3 assets/lithiccoins/models/coin/prize/lead.json -8224155664f1f01af981ecf40b2baa88d7c1c463 assets/lithiccoins/models/coin/prize/nickel.json -1bbe791b98a82fa7ba46356b582fab31441e65e0 assets/lithiccoins/models/coin/prize/red_steel.json -48730b65a75f5f291e70430d2d733a6dc0cd739f assets/lithiccoins/models/coin/prize/rose_gold.json -ff5d07439d3d477b148d49e7c0437fffa997f5ec assets/lithiccoins/models/coin/prize/silver.json -2877362f7f462841678e285aabc25022049f3781 assets/lithiccoins/models/coin/prize/stainless_steel.json -aef1d9d1f75caf16afa6cfd699da66f8d1a4271b assets/lithiccoins/models/coin/prize/steel.json -c49a19aa6229ed1549a2521d70353d14998ccd89 assets/lithiccoins/models/coin/prize/sterling_silver.json -78c9b299b83334656727e723b528202dede89d80 assets/lithiccoins/models/coin/prize/tin.json -94ae57ea4d02d739a60a940a1d74f2b49333da4c assets/lithiccoins/models/coin/prize/uranium.json -9072a518198314ffc7c210d87ca0571f24aa3852 assets/lithiccoins/models/coin/prize/wrought_iron.json -2859a7b54d81b02a443b4458a4f2418db1eb08b7 assets/lithiccoins/models/coin/prize/zinc.json -af7866e7fd75993456e991d2b90529dd62fb65cb assets/lithiccoins/models/coin/sheaf/aluminum.json -410870b21fd1941cd987f3c4665ed34680c8336e assets/lithiccoins/models/coin/sheaf/bismuth.json -3ea3d8ce81180970e4cd396e6ac33054888e323b assets/lithiccoins/models/coin/sheaf/bismuth_bronze.json -558981e0bb5bb772fb7347890cf036c73004a396 assets/lithiccoins/models/coin/sheaf/black_bronze.json -e698f904ff71d043e29c3bc6c5ef04c4d1ac179c assets/lithiccoins/models/coin/sheaf/black_steel.json -e5ccd37509caa22474be3b7fbd31bf3542ffff78 assets/lithiccoins/models/coin/sheaf/blue_steel.json -293309ef913de97109aafc1229ddef0f31928f94 assets/lithiccoins/models/coin/sheaf/brass.json -890247c8e8ea33eb00c240b0bb26fb4fa50fca60 assets/lithiccoins/models/coin/sheaf/bronze.json -6aecec82302ecdc58a36caaad2b5de06753a9b2e assets/lithiccoins/models/coin/sheaf/cast_iron.json -a00c0501bc32d5c4f5442bb7eef6579a1c4dca3d assets/lithiccoins/models/coin/sheaf/chromium.json -c42b922e4f0d7de083976d72b4db283815638833 assets/lithiccoins/models/coin/sheaf/constantan.json -8de5b56986d1089cf9e2a3a03bd79fd01d3f2f13 assets/lithiccoins/models/coin/sheaf/copper.json -144c125e19c36fecba59c0c7db9da598407293c6 assets/lithiccoins/models/coin/sheaf/electrum.json -244a73d4dd7770af908171fe715feaa1fa7892fc assets/lithiccoins/models/coin/sheaf/gold.json -7115e69fed27ffebf26d3bf3d79551eb8c4d7b08 assets/lithiccoins/models/coin/sheaf/lead.json -9ba394bb02cc75b9a4a3a7f355d35598703bc420 assets/lithiccoins/models/coin/sheaf/nickel.json -39becdeff50142675dc4683c8a4a8aa75af2c310 assets/lithiccoins/models/coin/sheaf/red_steel.json -df9556d9a4cc8e453a02d85010bb8395403ce3c7 assets/lithiccoins/models/coin/sheaf/rose_gold.json -9710563bf5f443a93cff6efdd4fb83b288b3dd02 assets/lithiccoins/models/coin/sheaf/silver.json -fd35b64876a1bcd3d159008fa103afc006e5eed3 assets/lithiccoins/models/coin/sheaf/stainless_steel.json -71d29c9167bbacab0e9895d11323982f8c259d99 assets/lithiccoins/models/coin/sheaf/steel.json -fb2f064d9a9a36ffdf7da7d3035d72577e616f78 assets/lithiccoins/models/coin/sheaf/sterling_silver.json -a4f93a18bf283a1bd5c0fa3cfc1a1e2f67a94c8b assets/lithiccoins/models/coin/sheaf/tin.json -21d6e1e3fe2aac3e9d0714aec52cbd317a4ec2d1 assets/lithiccoins/models/coin/sheaf/uranium.json -ae8abbb3529be3dbc2d7a1b955002398219894e4 assets/lithiccoins/models/coin/sheaf/wrought_iron.json -6a829cb98a0b45567fce108a5a52d95dda8f9825 assets/lithiccoins/models/coin/sheaf/zinc.json -53ebdc83de82900908a70af8c4847de09545d200 assets/lithiccoins/models/coin/shelter/aluminum.json -9952555dedec245d7ed4d9c3c6b06d99d1399436 assets/lithiccoins/models/coin/shelter/bismuth.json -6b1fc2032fbfc255229d0efe22b0b0d7ab2c60da assets/lithiccoins/models/coin/shelter/bismuth_bronze.json -d5eb209cabcf0d1f3cef123a6aee4f4e92f9d99a assets/lithiccoins/models/coin/shelter/black_bronze.json -0570e5312f88b6a3c17cf363eabd7979933ee281 assets/lithiccoins/models/coin/shelter/black_steel.json -421c88a09440e9e9401bdf7246608fa392f7815b assets/lithiccoins/models/coin/shelter/blue_steel.json -10ef5cbc50b9e1651193adf3f0ae958df128e9a4 assets/lithiccoins/models/coin/shelter/brass.json -044a47abe387e73a4bb61ca1c0eb0ec427efaced assets/lithiccoins/models/coin/shelter/bronze.json -8eb595da2ce17dbf110498470fda922411eb6fd0 assets/lithiccoins/models/coin/shelter/cast_iron.json -06aa13f73b06dbfcfec75865a1f0366a564a7848 assets/lithiccoins/models/coin/shelter/chromium.json -bade0c226fb28e29438e1feb3501e2f3c8ad8cb1 assets/lithiccoins/models/coin/shelter/constantan.json -278a283310c14e5f24713b856fe7683ad5880b40 assets/lithiccoins/models/coin/shelter/copper.json -2f1b2faaa8a5718474150f44eed36143744842da assets/lithiccoins/models/coin/shelter/electrum.json -9f1e4113d1d9ed9d16f58784f7d4cf7bea42c879 assets/lithiccoins/models/coin/shelter/gold.json -6ae95cfd240974b031fd7e2838430a9fcfc88a25 assets/lithiccoins/models/coin/shelter/lead.json -7f86dcc571c11d77bbfc15d39647e45ff938d315 assets/lithiccoins/models/coin/shelter/nickel.json -23573a8c9a6622ec2a89717ff0a028176dc91e29 assets/lithiccoins/models/coin/shelter/red_steel.json -d7bb0c02d34abab2cf4e213cf8cea352069b337d assets/lithiccoins/models/coin/shelter/rose_gold.json -209a9db7061189d0bb87258cf626bc807f0c062b assets/lithiccoins/models/coin/shelter/silver.json -2b71a47e7f3cd9e98de8daaa18e04f020a5a1bfd assets/lithiccoins/models/coin/shelter/stainless_steel.json -75a3318e4fb5cad5b6a491c2922ad6b79a8ca432 assets/lithiccoins/models/coin/shelter/steel.json -ae0d9a9054048c6d23ab190febd54472dace37a7 assets/lithiccoins/models/coin/shelter/sterling_silver.json -90c8aa107b1d3a23aeeb89807077d17cb3471d8d assets/lithiccoins/models/coin/shelter/tin.json -05aa67687650c80222841987090575dc32308fc5 assets/lithiccoins/models/coin/shelter/uranium.json -a6515b2ab7ffd328937c18354c7b33bbe2d2c00f assets/lithiccoins/models/coin/shelter/wrought_iron.json -36c035b6e82dd1b37ad038fad03fe3b21b7e1412 assets/lithiccoins/models/coin/shelter/zinc.json -9201ad4185ea0a2a792deb5ef82b1e75a192632c assets/lithiccoins/models/coin/skull/aluminum.json -f572185e7fe5defa3176332ee2dbb21ec7cf5390 assets/lithiccoins/models/coin/skull/bismuth.json -f4817127e3bf7d2f76199c80e2ae7b2152d1a6c7 assets/lithiccoins/models/coin/skull/bismuth_bronze.json -2b38a5881c233ed67dcd2d28438db4ffc8d81458 assets/lithiccoins/models/coin/skull/black_bronze.json -8aa5ace22f4fe564f379a388140fdcf1c4051730 assets/lithiccoins/models/coin/skull/black_steel.json -ff183793fba7091d914628ed3b44679f41c131f5 assets/lithiccoins/models/coin/skull/blue_steel.json -ac361a8ea45626dd278dfdebbad10569449205ec assets/lithiccoins/models/coin/skull/brass.json -6383230b6757d57da9379a36bedc0c21c9748e1b assets/lithiccoins/models/coin/skull/bronze.json -67085bdae27c95f82b3cdf8674372737f398f293 assets/lithiccoins/models/coin/skull/cast_iron.json -f44247d4f42a245a0c93331aa743b64172d245f3 assets/lithiccoins/models/coin/skull/chromium.json -a99d45f5bb23a6ae3eb017bf59f2107ba2329089 assets/lithiccoins/models/coin/skull/constantan.json -1668aa45f5d686c6a05faba5c8c680b034f2e6cf assets/lithiccoins/models/coin/skull/copper.json -1dd2a0e1c67a25bb0bf2104a0e8fe55f5478a883 assets/lithiccoins/models/coin/skull/electrum.json -718db90c278780704c944dc595548dcbf7eff6c6 assets/lithiccoins/models/coin/skull/gold.json -78babcac996d0ad0ba5b5da1046cfbbf940a4233 assets/lithiccoins/models/coin/skull/lead.json -9623bca384af00c9767bb49b607d5f9f43bd3c96 assets/lithiccoins/models/coin/skull/nickel.json -95bc560494332c6eece9576e2958703afd1b5caf assets/lithiccoins/models/coin/skull/red_steel.json -6056eeff3cd5ff02edd00e3074d08bfe52afd57a assets/lithiccoins/models/coin/skull/rose_gold.json -8556ea6c0c29dc4bc24ebe41ad2ebbf00ff4a8a6 assets/lithiccoins/models/coin/skull/silver.json -dd14a9b828d222192f95a9da31e6da7b4b793990 assets/lithiccoins/models/coin/skull/stainless_steel.json -62a7d711c4158b18227d9ee1a5aedce4b3bbd85f assets/lithiccoins/models/coin/skull/steel.json -1922c653eef941b6216566fd5a0884b74afce90e assets/lithiccoins/models/coin/skull/sterling_silver.json -8cdb8200943be41c4c0430f79fd49070e721ca7a assets/lithiccoins/models/coin/skull/tin.json -0d5d4627435e6eb24ef8c07b6503d5a40d23661d assets/lithiccoins/models/coin/skull/uranium.json -673d3dbc41f45aae9925055fe9261756f38f5e98 assets/lithiccoins/models/coin/skull/wrought_iron.json -dd3c4d3974801483c27508a187ceeaf0054fea37 assets/lithiccoins/models/coin/skull/zinc.json -59b0083b3c909fbdfd9c6e297e1d53b368ade0f1 assets/lithiccoins/models/coin/trifoil/aluminum.json -564fd81543680c3bd9a16e996cb5e3645e9b87c5 assets/lithiccoins/models/coin/trifoil/bismuth.json -d3db9007c5628c08fae1eb543c89c0b84ce7a74e assets/lithiccoins/models/coin/trifoil/bismuth_bronze.json -aef37ad3e07cdec42104d5cc84b1bce22085400b assets/lithiccoins/models/coin/trifoil/black_bronze.json -511bc3cd62c1aab8ae325a925d15bac2e0b4b498 assets/lithiccoins/models/coin/trifoil/black_steel.json -a0cb80d700f341cf8e56163b8b370cb04ffa9bc3 assets/lithiccoins/models/coin/trifoil/blue_steel.json -d499bd5f406e4022b97149d55fe9a0842e876ea5 assets/lithiccoins/models/coin/trifoil/brass.json -d9857613553332a812e60eae67ab8932b86329e6 assets/lithiccoins/models/coin/trifoil/bronze.json -e738147a0aa32ec1b7ee8248fb38e5da1c4056f2 assets/lithiccoins/models/coin/trifoil/cast_iron.json -bdc94d39e0f52047470e33538eb2aa8c5c4985ed assets/lithiccoins/models/coin/trifoil/chromium.json -83a72b8cee993973f7e28ddd34372844e12b7bea assets/lithiccoins/models/coin/trifoil/constantan.json -fa1769eb9178e4c1886018419616356f7832da22 assets/lithiccoins/models/coin/trifoil/copper.json -696df0ecf83e2544c2bb9808ef745c59a8681ae1 assets/lithiccoins/models/coin/trifoil/electrum.json -cef29ac27081d92526c55cc35a89e159bec1ea47 assets/lithiccoins/models/coin/trifoil/gold.json -1b1ea7ce06b67430bd0bf01ef23407663e4104df assets/lithiccoins/models/coin/trifoil/lead.json -7b834ffdda64d38a18dfa47bdd201af1a2f47c72 assets/lithiccoins/models/coin/trifoil/nickel.json -0a38ff9d0f86029ed3fba83fbf8cd86fbbee8511 assets/lithiccoins/models/coin/trifoil/red_steel.json -e47fcfc60a0f3b60ccb39ecac11874e0fa7e6651 assets/lithiccoins/models/coin/trifoil/rose_gold.json -d10facd4d73db2862b346ca3e33747b3ccdac5b7 assets/lithiccoins/models/coin/trifoil/silver.json -4a1ce5cc2ebbcab0cbc0729f5c93a071c01f2d20 assets/lithiccoins/models/coin/trifoil/stainless_steel.json -d4c0d316337ff59b91674d6ef797c6eb59cf7649 assets/lithiccoins/models/coin/trifoil/steel.json -5edc0576508016086b8435e18b1a02529aa0234f assets/lithiccoins/models/coin/trifoil/sterling_silver.json -1e54332d958e4e6b15a94414660e3b80879df7e9 assets/lithiccoins/models/coin/trifoil/tin.json -13d6cd3ba3c3cea9f2805b3ded636547e9c51e43 assets/lithiccoins/models/coin/trifoil/uranium.json -6411c3480c2b1da3bf50bc926984bb702fd157c4 assets/lithiccoins/models/coin/trifoil/wrought_iron.json -0a0ddae83c5b86ac2914e67f4e8cc7e129d77795 assets/lithiccoins/models/coin/trifoil/zinc.json From 24f7ff1d713930f92dc9596c44d624203097abde Mon Sep 17 00:00:00 2001 From: Traister101 <66151907+Traister101@users.noreply.github.com> Date: Mon, 26 Aug 2024 01:52:49 -0700 Subject: [PATCH 2/4] Remove crazy mixin --- .../lithiccoins/LithicCoins.java | 3 ++ .../mixin/InteractionManagerMixin.java | 49 ------------------- .../util/LithicCoinsInteractionManager.java | 34 +++++++++++++ src/main/resources/lithiccoins.mixins.json | 3 +- 4 files changed, 38 insertions(+), 51 deletions(-) delete mode 100644 src/main/java/com/redstoneguy10ls/lithiccoins/mixin/InteractionManagerMixin.java create mode 100644 src/main/java/com/redstoneguy10ls/lithiccoins/util/LithicCoinsInteractionManager.java diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/LithicCoins.java b/src/main/java/com/redstoneguy10ls/lithiccoins/LithicCoins.java index 0376e48..cd70359 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/LithicCoins.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/LithicCoins.java @@ -24,6 +24,8 @@ import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.fml.loading.FMLEnvironment; + +import com.redstoneguy10ls.lithiccoins.util.LithicCoinsInteractionManager; import org.slf4j.Logger; // The value here should match an entry in the META-INF/mods.toml file @@ -65,6 +67,7 @@ public LithicCoins() private void commonSetup(final FMLCommonSetupEvent event) { + event.enqueueWork(LithicCoinsInteractionManager::init); } private void addCreative(BuildCreativeModeTabContentsEvent event) diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/mixin/InteractionManagerMixin.java b/src/main/java/com/redstoneguy10ls/lithiccoins/mixin/InteractionManagerMixin.java deleted file mode 100644 index 208cbd0..0000000 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/mixin/InteractionManagerMixin.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.redstoneguy10ls.lithiccoins.mixin; - -import com.redstoneguy10ls.lithiccoins.common.container.WaxKnappingContainer; -import com.redstoneguy10ls.lithiccoins.util.LCTags; -import net.dries007.tfc.common.TFCTags; -import net.dries007.tfc.common.container.ItemStackContainerProvider; -import net.dries007.tfc.common.container.KnappingContainer; -import net.dries007.tfc.util.InteractionManager; -import net.dries007.tfc.util.KnappingType; -import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.crafting.Ingredient; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import static net.dries007.tfc.util.InteractionManager.register; - -@Mixin(InteractionManager.class) -public abstract class InteractionManagerMixin { - - - @Inject(method= "registerDefaultInteractions", at = @At("HEAD"), remap = false) - private static void registerDefaultInteractions(CallbackInfo ci) - { - register(Ingredient.of(LCTags.Items.ANY_KNAPPING), false, true, (stack, context) -> { - final Player player = context.getPlayer(); - if (player != null && context.getClickedPos().equals(BlockPos.ZERO)) - { - final KnappingType type = KnappingType.get(player); - if (type != null) - { - if (player instanceof ServerPlayer serverPlayer) - { - final ItemStackContainerProvider provider = new ItemStackContainerProvider((stack1, hand, slot, playerInventory, windowId) -> WaxKnappingContainer.create(stack1, type, hand, slot, playerInventory, windowId), Component.translatable("tfc.screen.knapping")); - provider.openScreen(serverPlayer, context.getHand(), buffer -> buffer.writeResourceLocation(type.getId())); - } - } - return InteractionResult.SUCCESS; - } - return InteractionResult.PASS; - }); - } -} diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/util/LithicCoinsInteractionManager.java b/src/main/java/com/redstoneguy10ls/lithiccoins/util/LithicCoinsInteractionManager.java new file mode 100644 index 0000000..f06d686 --- /dev/null +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/util/LithicCoinsInteractionManager.java @@ -0,0 +1,34 @@ +package com.redstoneguy10ls.lithiccoins.util; + +import com.redstoneguy10ls.lithiccoins.common.container.WaxKnappingContainer; +import net.dries007.tfc.common.container.ItemStackContainerProvider; +import net.dries007.tfc.util.*; + +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.crafting.Ingredient; + +public final class LithicCoinsInteractionManager { + + public static void init() { + InteractionManager.register(Ingredient.of(LCTags.Items.ANY_KNAPPING), false, true, (stack, context) -> { + final Player player = context.getPlayer(); + if (player != null && context.getClickedPos().equals(BlockPos.ZERO)) { + final KnappingType type = KnappingType.get(player); + if (type != null) { + if (player instanceof ServerPlayer serverPlayer) { + final ItemStackContainerProvider provider = new ItemStackContainerProvider( + (stack1, hand, slot, playerInventory, windowId) -> WaxKnappingContainer.create(stack1, type, hand, slot, + playerInventory, windowId), Component.translatable("tfc.screen.knapping")); + provider.openScreen(serverPlayer, context.getHand(), buffer -> buffer.writeResourceLocation(type.getId())); + } + } + return InteractionResult.SUCCESS; + } + return InteractionResult.PASS; + }); + } +} \ No newline at end of file diff --git a/src/main/resources/lithiccoins.mixins.json b/src/main/resources/lithiccoins.mixins.json index ca03142..44cb962 100644 --- a/src/main/resources/lithiccoins.mixins.json +++ b/src/main/resources/lithiccoins.mixins.json @@ -7,8 +7,7 @@ "defaultRequire": 1 }, "mixins": [ - "FriendlyByteBufMixin", - "InteractionManagerMixin" + "FriendlyByteBufMixin" ], "refmap": "lithiccoins.refmap.json" From 7728a2087d326c7d9debb9411dc5684b2db8443b Mon Sep 17 00:00:00 2001 From: Traister101 <66151907+Traister101@users.noreply.github.com> Date: Mon, 26 Aug 2024 02:04:01 -0700 Subject: [PATCH 3/4] Rename classes to be a consistent casing. In this case matching the Java style of PascalCase --- .../lithiccoins/ClientEventHandler.java | 24 +++---- .../lithiccoins/ForgeEventHandlers.java | 4 +- ...erer.java => MintBlockEntityRenderer.java} | 23 +++---- .../common/blockentities/LCBlockEntities.java | 4 +- ...tBlockEntity.java => MintBlockEntity.java} | 24 ++++--- .../lithiccoins/common/blocks/LCBlocks.java | 6 +- .../blocks/{mintBlock.java => MintBlock.java} | 20 +++--- .../CoinHelpers.java | 2 +- .../{Capability => capability}/ILocation.java | 2 +- .../INetworkLocation.java | 2 +- .../{Capability => capability}/IPurse.java | 2 +- .../ItemStackCapabilitySync.java | 2 +- .../LocationCapability.java | 2 +- .../LocationDefinition.java | 0 .../LocationHandler.java | 2 +- .../PurseCapability.java | 2 +- .../PurseHandler.java | 2 +- .../items/{coinItem.java => CoinItem.java} | 7 +-- .../{coinMaterial.java => CoinMaterial.java} | 4 +- .../{coinPatterns.java => CoinPatterns.java} | 6 -- ...{coinPurseItem.java => CoinPurseItem.java} | 11 +--- .../lithiccoins/common/items/LCItems.java | 28 ++++----- .../lithiccoins/common/items/LCTabs.java | 6 +- ...{moldedWaxItem.java => MoldedWaxItem.java} | 8 +-- .../items/{stampItem.java => StampItem.java} | 10 ++- ...tampMaterials.java => StampMaterials.java} | 4 +- .../{stampTypes.java => StampTypes.java} | 4 +- ...inDieMold.java => UnfiredCoinDieMold.java} | 8 +-- .../common/items/firedCoinDieMold.java | 4 +- .../common/recipes/MintingRecipe.java | 1 - .../jei/category/MintingRecipeCategory.java | 5 -- .../mixin/FriendlyByteBufMixin.java | 2 +- .../{coinTooltip.java => CoinTooltip.java} | 13 ++-- .../lithiccoins/util/LCHelpers.java | 62 +++++++++---------- .../util/{registries.java => Registries.java} | 2 +- .../util/{tooltips.java => Tooltips.java} | 9 +-- 36 files changed, 138 insertions(+), 179 deletions(-) rename src/main/java/com/redstoneguy10ls/lithiccoins/client/render/{mintBlockEntityRenderer.java => MintBlockEntityRenderer.java} (89%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/blockentities/{mintBlockEntity.java => MintBlockEntity.java} (92%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/blocks/{mintBlock.java => MintBlock.java} (95%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/{Capability => capability}/CoinHelpers.java (93%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/{Capability => capability}/ILocation.java (93%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/{Capability => capability}/INetworkLocation.java (74%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/{Capability => capability}/IPurse.java (60%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/{Capability => capability}/ItemStackCapabilitySync.java (96%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/{Capability => capability}/LocationCapability.java (96%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/{Capability => capability}/LocationDefinition.java (100%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/{Capability => capability}/LocationHandler.java (98%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/{Capability => capability}/PurseCapability.java (90%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/{Capability => capability}/PurseHandler.java (95%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/items/{coinItem.java => CoinItem.java} (89%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/items/{coinMaterial.java => CoinMaterial.java} (85%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/items/{coinPatterns.java => CoinPatterns.java} (87%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/items/{coinPurseItem.java => CoinPurseItem.java} (96%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/items/{moldedWaxItem.java => MoldedWaxItem.java} (68%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/items/{stampItem.java => StampItem.java} (61%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/items/{stampMaterials.java => StampMaterials.java} (68%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/items/{stampTypes.java => StampTypes.java} (81%) rename src/main/java/com/redstoneguy10ls/lithiccoins/common/items/{unfiredCoinDieMold.java => UnfiredCoinDieMold.java} (67%) rename src/main/java/com/redstoneguy10ls/lithiccoins/util/{coinTooltip.java => CoinTooltip.java} (90%) rename src/main/java/com/redstoneguy10ls/lithiccoins/util/{registries.java => Registries.java} (94%) rename src/main/java/com/redstoneguy10ls/lithiccoins/util/{tooltips.java => Tooltips.java} (60%) diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/ClientEventHandler.java b/src/main/java/com/redstoneguy10ls/lithiccoins/ClientEventHandler.java index 4d4bb7c..c49de9b 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/ClientEventHandler.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/ClientEventHandler.java @@ -1,32 +1,26 @@ package com.redstoneguy10ls.lithiccoins; -import com.mojang.datafixers.util.Either; -import com.redstoneguy10ls.lithiccoins.client.render.mintBlockEntityRenderer; +import com.redstoneguy10ls.lithiccoins.client.render.MintBlockEntityRenderer; import com.redstoneguy10ls.lithiccoins.client.screen.WaxKanppingScreen; -import com.redstoneguy10ls.lithiccoins.common.Capability.IPurse; -import com.redstoneguy10ls.lithiccoins.common.Capability.LocationCapability; -import com.redstoneguy10ls.lithiccoins.common.Capability.PurseCapability; +import com.redstoneguy10ls.lithiccoins.common.capability.IPurse; +import com.redstoneguy10ls.lithiccoins.common.capability.LocationCapability; +import com.redstoneguy10ls.lithiccoins.common.capability.PurseCapability; import com.redstoneguy10ls.lithiccoins.common.blockentities.LCBlockEntities; import com.redstoneguy10ls.lithiccoins.common.container.LCContainerTypes; import com.redstoneguy10ls.lithiccoins.common.items.LCItems; -import com.redstoneguy10ls.lithiccoins.common.items.stampTypes; -import com.redstoneguy10ls.lithiccoins.util.LCHelpers; -import com.redstoneguy10ls.lithiccoins.util.coinTooltip; -import com.redstoneguy10ls.lithiccoins.util.tooltips; +import com.redstoneguy10ls.lithiccoins.util.CoinTooltip; +import com.redstoneguy10ls.lithiccoins.util.Tooltips; import net.dries007.tfc.client.model.ContainedFluidModel; -import net.dries007.tfc.util.Metal; + import net.minecraft.client.gui.screens.MenuScreens; import net.minecraft.client.renderer.item.ItemProperties; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.inventory.tooltip.TooltipComponent; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraftforge.client.event.EntityRenderersEvent; import net.minecraftforge.client.event.RegisterClientTooltipComponentFactoriesEvent; import net.minecraftforge.client.event.RegisterColorHandlersEvent; -import net.minecraftforge.client.event.RenderTooltipEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.eventbus.api.IEventBus; @@ -56,12 +50,12 @@ public static void init() public static void regusterEntityRenderers(EntityRenderersEvent.RegisterRenderers event) { - event.registerBlockEntityRenderer(LCBlockEntities.MINT.get(), ctx -> new mintBlockEntityRenderer()); + event.registerBlockEntityRenderer(LCBlockEntities.MINT.get(), ctx -> new MintBlockEntityRenderer()); } public static void onTooltipFactoryRegistry(RegisterClientTooltipComponentFactoriesEvent event) { - event.register(tooltips.CoinImageTooltip.class, coinTooltip::new); + event.register(Tooltips.CoinImageTooltip.class, CoinTooltip::new); } diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/ForgeEventHandlers.java b/src/main/java/com/redstoneguy10ls/lithiccoins/ForgeEventHandlers.java index bb67b67..9a1a6b9 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/ForgeEventHandlers.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/ForgeEventHandlers.java @@ -1,8 +1,8 @@ package com.redstoneguy10ls.lithiccoins; -import com.redstoneguy10ls.lithiccoins.common.Capability.LocationCapability; -import com.redstoneguy10ls.lithiccoins.common.Capability.LocationHandler; +import com.redstoneguy10ls.lithiccoins.common.capability.LocationCapability; +import com.redstoneguy10ls.lithiccoins.common.capability.LocationHandler; import com.redstoneguy10ls.lithiccoins.util.LCTags; import net.dries007.tfc.util.Helpers; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/client/render/mintBlockEntityRenderer.java b/src/main/java/com/redstoneguy10ls/lithiccoins/client/render/MintBlockEntityRenderer.java similarity index 89% rename from src/main/java/com/redstoneguy10ls/lithiccoins/client/render/mintBlockEntityRenderer.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/client/render/MintBlockEntityRenderer.java index 8f15b3f..50ebf65 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/client/render/mintBlockEntityRenderer.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/client/render/MintBlockEntityRenderer.java @@ -2,32 +2,25 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; -import com.redstoneguy10ls.lithiccoins.common.blockentities.mintBlockEntity; +import com.redstoneguy10ls.lithiccoins.common.blockentities.MintBlockEntity; import com.redstoneguy10ls.lithiccoins.common.blocks.LCStateProperties; -import com.redstoneguy10ls.lithiccoins.common.blocks.mintBlock; import net.dries007.tfc.common.capabilities.Capabilities; import net.dries007.tfc.util.Helpers; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; -import net.minecraft.core.Direction; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraft.world.level.block.state.properties.DirectionProperty; -import net.minecraftforge.items.IItemHandler; -import static com.redstoneguy10ls.lithiccoins.common.blocks.mintBlock.FACING; -import static net.minecraft.core.Direction.NORTH; -import static net.minecraft.core.Direction.SOUTH; +import net.minecraftforge.items.IItemHandler; -public class mintBlockEntityRenderer implements BlockEntityRenderer { +public class MintBlockEntityRenderer implements BlockEntityRenderer { @Override - public void render(mintBlockEntity mint, float partialTicks, PoseStack stack, MultiBufferSource bufferSource, int packedLight, int packedOverlay) + public void render(MintBlockEntity mint, float partialTicks, PoseStack stack, MultiBufferSource bufferSource, int packedLight, int packedOverlay) { final Level level = mint.getLevel(); final IItemHandler inventory = Helpers.getCapability(mint, Capabilities.ITEM); @@ -37,10 +30,10 @@ public void render(mintBlockEntity mint, float partialTicks, PoseStack stack, Mu return; } - final ItemStack topdie = inventory.getStackInSlot(mintBlockEntity.SLOT_TOPDIE); - final ItemStack coin = inventory.getStackInSlot(mintBlockEntity.SLOT_COIN); - final ItemStack bottom = inventory.getStackInSlot(mintBlockEntity.SLOT_BOTTOMDIE); - final ItemStack output = inventory.getStackInSlot(mintBlockEntity.SLOT_OUTPUT); + final ItemStack topdie = inventory.getStackInSlot(MintBlockEntity.SLOT_TOPDIE); + final ItemStack coin = inventory.getStackInSlot(MintBlockEntity.SLOT_COIN); + final ItemStack bottom = inventory.getStackInSlot(MintBlockEntity.SLOT_BOTTOMDIE); + final ItemStack output = inventory.getStackInSlot(MintBlockEntity.SLOT_OUTPUT); final BlockState blockState = mint.getLevel().getBlockState(mint.getBlockPos()); diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/blockentities/LCBlockEntities.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/blockentities/LCBlockEntities.java index 8ace177..7225e77 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/blockentities/LCBlockEntities.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/blockentities/LCBlockEntities.java @@ -16,8 +16,8 @@ public class LCBlockEntities { public static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(Registries.BLOCK_ENTITY_TYPE, MOD_ID); - public static final RegistryObject> MINT = - register("mint", mintBlockEntity::new, LCBlocks.MINT); + public static final RegistryObject> MINT = + register("mint", MintBlockEntity::new, LCBlocks.MINT); private static RegistryObject> register(String name, BlockEntityType.BlockEntitySupplier factory, Supplier block) { diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/blockentities/mintBlockEntity.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/blockentities/MintBlockEntity.java similarity index 92% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/blockentities/mintBlockEntity.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/blockentities/MintBlockEntity.java index 9921114..693434c 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/blockentities/mintBlockEntity.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/blockentities/MintBlockEntity.java @@ -1,9 +1,7 @@ package com.redstoneguy10ls.lithiccoins.common.blockentities; -import com.redstoneguy10ls.lithiccoins.common.Capability.LocationCapability; -import com.redstoneguy10ls.lithiccoins.common.blocks.mintBlock; -import com.redstoneguy10ls.lithiccoins.common.items.TopDies; -import com.redstoneguy10ls.lithiccoins.common.recipes.LCRecipeTypes; +import com.redstoneguy10ls.lithiccoins.common.capability.LocationCapability; +import com.redstoneguy10ls.lithiccoins.common.blocks.MintBlock; import com.redstoneguy10ls.lithiccoins.common.recipes.MintingRecipe; import com.redstoneguy10ls.lithiccoins.util.LCHelpers; import com.redstoneguy10ls.lithiccoins.util.LCTags; @@ -27,7 +25,7 @@ import static com.redstoneguy10ls.lithiccoins.LithicCoins.MOD_ID; -public class mintBlockEntity extends InventoryBlockEntity implements ISlotCallback { +public class MintBlockEntity extends InventoryBlockEntity implements ISlotCallback { public static final int SLOT_TOPDIE = 0; public static final int SLOT_BOTTOMDIE = 1; @@ -43,18 +41,18 @@ public class mintBlockEntity extends InventoryBlockEntity type, BlockPos pos, BlockState state, InventoryFactory inventoryFactory, Component defaultName) + public MintBlockEntity(BlockEntityType type, BlockPos pos, BlockState state, InventoryFactory inventoryFactory, Component defaultName) { super(type,pos,state,inventoryFactory, defaultName); } - public static void serverTick(Level level, BlockPos pos, BlockState state, mintBlockEntity mint) + public static void serverTick(Level level, BlockPos pos, BlockState state, MintBlockEntity mint) { final ServerLevel serverLevel = (ServerLevel) level; @@ -71,7 +69,7 @@ public static void serverTick(Level level, BlockPos pos, BlockState state, mintB clientTick(level, pos, state, mint); } - public static void clientTick(Level level, BlockPos pos, BlockState state, mintBlockEntity mint) + public static void clientTick(Level level, BlockPos pos, BlockState state, MintBlockEntity mint) { if(mint.hittimer > 0) { @@ -127,8 +125,8 @@ public void updateHit() { assert level != null; BlockState state = level.getBlockState(worldPosition); - BlockState newState = Helpers.setProperty(state, mintBlock.HIT, hasHit()); - if(hasHit() != state.getValue(mintBlock.HIT)) + BlockState newState = Helpers.setProperty(state, MintBlock.HIT, hasHit()); + if(hasHit() != state.getValue(MintBlock.HIT)) { level.setBlockAndUpdate(worldPosition, newState); } @@ -288,11 +286,11 @@ else if(getBottomDieTier() < recipe.getTier()) public static class mintInventory extends InventoryItemHandler implements MintingRecipe.Inventory{ - private final mintBlockEntity mint; + private final MintBlockEntity mint; public mintInventory(InventoryBlockEntity mint) { super(mint, 4); - this.mint = (mintBlockEntity) mint; + this.mint = (MintBlockEntity) mint; } @Override diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/blocks/LCBlocks.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/blocks/LCBlocks.java index db24491..9822a60 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/blocks/LCBlocks.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/blocks/LCBlocks.java @@ -1,7 +1,7 @@ package com.redstoneguy10ls.lithiccoins.common.blocks; import com.redstoneguy10ls.lithiccoins.common.blockentities.LCBlockEntities; -import com.redstoneguy10ls.lithiccoins.common.blockentities.mintBlockEntity; +import com.redstoneguy10ls.lithiccoins.common.blockentities.MintBlockEntity; import com.redstoneguy10ls.lithiccoins.common.items.LCItems; import net.dries007.tfc.common.blocks.ExtendedProperties; import net.dries007.tfc.util.registry.RegistrationHelpers; @@ -26,13 +26,13 @@ public class LCBlocks { public static final RegistryObject MINT = register("mint", - () -> new mintBlock(ExtendedProperties.of() + () -> new MintBlock(ExtendedProperties.of() .mapColor(MapColor.STONE) .strength(2.0F, 2.0F) .sound(SoundType.BASALT) .noOcclusion() .blockEntity(LCBlockEntities.MINT) - .serverTicks(mintBlockEntity::serverTick))); + .serverTicks(MintBlockEntity::serverTick))); private static RegistryObject register(String name, Supplier blockSupplier) { diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/blocks/mintBlock.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/blocks/MintBlock.java similarity index 95% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/blocks/mintBlock.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/blocks/MintBlock.java index daeb92a..5d24cc1 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/blocks/mintBlock.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/blocks/MintBlock.java @@ -2,9 +2,8 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.redstoneguy10ls.lithiccoins.common.blockentities.LCBlockEntities; -import com.redstoneguy10ls.lithiccoins.common.blockentities.mintBlockEntity; +import com.redstoneguy10ls.lithiccoins.common.blockentities.MintBlockEntity; import com.redstoneguy10ls.lithiccoins.common.misc.LCSounds; -import com.redstoneguy10ls.lithiccoins.util.LCHelpers; import com.redstoneguy10ls.lithiccoins.util.LCTags; import net.dries007.tfc.client.IHighlightHandler; import net.dries007.tfc.client.particle.TFCParticles; @@ -32,7 +31,6 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.DirectionProperty; -import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; @@ -43,10 +41,10 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; -import static com.redstoneguy10ls.lithiccoins.common.blockentities.mintBlockEntity.*; +import static com.redstoneguy10ls.lithiccoins.common.blockentities.MintBlockEntity.*; -public class mintBlock extends DeviceBlock implements IHighlightHandler { +public class MintBlock extends DeviceBlock implements IHighlightHandler { public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; //public static final IntegerProperty HAS_TOP_DIE = LCStateProperties.HAS_TOP_DIE; @@ -84,7 +82,7 @@ public class mintBlock extends DeviceBlock implements IHighlightHandler { - public mintBlock(ExtendedProperties properties) { + public MintBlock(ExtendedProperties properties) { super(properties, InventoryRemoveBehavior.DROP); //registerDefaultState(getStateDefinition().any().setValue(HAS_BOTTOM_DIE, 0)); //registerDefaultState(getStateDefinition().any().setValue(HAS_TOP_DIE, 0)); @@ -152,7 +150,7 @@ else if (BOTTOM_DIE_W_AABB.move(pos).contains(hit)) { @Override public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - if(level.getBlockEntity(pos) instanceof final mintBlockEntity mint) + if(level.getBlockEntity(pos) instanceof final MintBlockEntity mint) { final ItemStack heldStack = player.getItemInHand(hand); final SelectionPlace selection = getPlayerSelection(level,pos,player,hit); @@ -182,7 +180,7 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player return InteractionResult.PASS; } - private static InteractionResult attemptMint(Level level, mintBlockEntity mint, Player player,BlockPos pos) + private static InteractionResult attemptMint(Level level, MintBlockEntity mint, Player player,BlockPos pos) { final InteractionResult mintResult = mint.minting(player); if(mintResult == InteractionResult.SUCCESS) @@ -203,7 +201,7 @@ private static InteractionResult attemptMint(Level level, mintBlockEntity mint, return InteractionResult.FAIL; } - private static InteractionResult coinstuff(BlockState state, Level level, mintBlockEntity mint, IItemHandler inventory, Player player, ItemStack stack, int slot) + private static InteractionResult coinstuff(BlockState state, Level level, MintBlockEntity mint, IItemHandler inventory, Player player, ItemStack stack, int slot) { if ((player.isShiftKeyDown() || Helpers.isItem(stack, LCTags.Items.BLANK_COIN))) { if(mint.hasBottomDie() > 0) @@ -221,7 +219,7 @@ private static InteractionResult coinstuff(BlockState state, Level level, mintBl return InteractionResult.PASS; } - private static InteractionResult lookTest(BlockState state,Level level, mintBlockEntity mint, IItemHandler inventory, Player player, ItemStack stack, int slot){ + private static InteractionResult lookTest(BlockState state,Level level, MintBlockEntity mint, IItemHandler inventory, Player player, ItemStack stack, int slot){ if(slot == SLOT_BOTTOMDIE) { if ((player.isShiftKeyDown() || Helpers.isItem(stack, LCTags.Items.BOTTOM_DIE))) { @@ -240,7 +238,7 @@ private static InteractionResult lookTest(BlockState state,Level level, mintBloc return InteractionResult.PASS; } - private static InteractionResult insertOrExtract(Level level, mintBlockEntity mint, IItemHandler inventory, Player player, ItemStack stack, int slot) + private static InteractionResult insertOrExtract(Level level, MintBlockEntity mint, IItemHandler inventory, Player player, ItemStack stack, int slot) { if(!stack.isEmpty()) { diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/CoinHelpers.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/CoinHelpers.java similarity index 93% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/CoinHelpers.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/CoinHelpers.java index 5f08dd6..f5ac9ef 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/CoinHelpers.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/CoinHelpers.java @@ -1,5 +1,5 @@ - package com.redstoneguy10ls.lithiccoins.common.Capability; + package com.redstoneguy10ls.lithiccoins.common.capability; /* import net.minecraft.world.Container; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/ILocation.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/ILocation.java similarity index 93% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/ILocation.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/ILocation.java index e79ff3c..ace3490 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/ILocation.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/ILocation.java @@ -1,4 +1,4 @@ -package com.redstoneguy10ls.lithiccoins.common.Capability; +package com.redstoneguy10ls.lithiccoins.common.capability; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/INetworkLocation.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/INetworkLocation.java similarity index 74% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/INetworkLocation.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/INetworkLocation.java index 1f4e39d..db6bf4b 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/INetworkLocation.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/INetworkLocation.java @@ -1,4 +1,4 @@ -package com.redstoneguy10ls.lithiccoins.common.Capability; +package com.redstoneguy10ls.lithiccoins.common.capability; import net.minecraft.nbt.CompoundTag; import net.minecraftforge.common.util.INBTSerializable; diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/IPurse.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/IPurse.java similarity index 60% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/IPurse.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/IPurse.java index cac8c99..6e69de0 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/IPurse.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/IPurse.java @@ -1,4 +1,4 @@ -package com.redstoneguy10ls.lithiccoins.common.Capability; +package com.redstoneguy10ls.lithiccoins.common.capability; public interface IPurse { diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/ItemStackCapabilitySync.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/ItemStackCapabilitySync.java similarity index 96% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/ItemStackCapabilitySync.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/ItemStackCapabilitySync.java index 1cf2d0b..5640c6b 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/ItemStackCapabilitySync.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/ItemStackCapabilitySync.java @@ -1,4 +1,4 @@ -package com.redstoneguy10ls.lithiccoins.common.Capability; +package com.redstoneguy10ls.lithiccoins.common.capability; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/LocationCapability.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/LocationCapability.java similarity index 96% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/LocationCapability.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/LocationCapability.java index 1dac11c..bc154a1 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/LocationCapability.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/LocationCapability.java @@ -1,4 +1,4 @@ -package com.redstoneguy10ls.lithiccoins.common.Capability; +package com.redstoneguy10ls.lithiccoins.common.capability; import com.redstoneguy10ls.lithiccoins.util.LCHelpers; diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/LocationDefinition.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/LocationDefinition.java similarity index 100% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/LocationDefinition.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/LocationDefinition.java diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/LocationHandler.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/LocationHandler.java similarity index 98% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/LocationHandler.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/LocationHandler.java index 95529f5..7da1b03 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/LocationHandler.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/LocationHandler.java @@ -1,4 +1,4 @@ -package com.redstoneguy10ls.lithiccoins.common.Capability; +package com.redstoneguy10ls.lithiccoins.common.capability; import net.minecraft.ChatFormatting; import net.minecraft.core.Direction; diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/PurseCapability.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/PurseCapability.java similarity index 90% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/PurseCapability.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/PurseCapability.java index e5b5c2c..44a63e0 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/PurseCapability.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/PurseCapability.java @@ -1,4 +1,4 @@ -package com.redstoneguy10ls.lithiccoins.common.Capability; +package com.redstoneguy10ls.lithiccoins.common.capability; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/PurseHandler.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/PurseHandler.java similarity index 95% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/PurseHandler.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/PurseHandler.java index ffd91df..eb7a7d1 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/Capability/PurseHandler.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/capability/PurseHandler.java @@ -1,4 +1,4 @@ -package com.redstoneguy10ls.lithiccoins.common.Capability; +package com.redstoneguy10ls.lithiccoins.common.capability; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/coinItem.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/CoinItem.java similarity index 89% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/items/coinItem.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/items/CoinItem.java index 6ffd8d9..02bda06 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/coinItem.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/CoinItem.java @@ -1,6 +1,6 @@ package com.redstoneguy10ls.lithiccoins.common.items; -import com.redstoneguy10ls.lithiccoins.common.Capability.LocationHandler; +import com.redstoneguy10ls.lithiccoins.common.capability.LocationHandler; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -14,10 +14,9 @@ import org.jetbrains.annotations.NotNull; import javax.annotation.Nullable; -import java.util.Objects; -public class coinItem extends Item { - public coinItem(Properties pProperties) { +public class CoinItem extends Item { + public CoinItem(Properties pProperties) { super(pProperties); } diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/coinMaterial.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/CoinMaterial.java similarity index 85% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/items/coinMaterial.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/items/CoinMaterial.java index 153aa8e..3b99d96 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/coinMaterial.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/CoinMaterial.java @@ -1,6 +1,6 @@ package com.redstoneguy10ls.lithiccoins.common.items; -public enum coinMaterial { +public enum CoinMaterial { ALUMINUM, BISMUTH, BISMUTH_BRONZE, @@ -27,6 +27,6 @@ public enum coinMaterial { URANIUM, WROUGHT_IRON, ZINC; - public static final coinMaterial[] VALUES = values(); + public static final CoinMaterial[] VALUES = values(); } diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/coinPatterns.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/CoinPatterns.java similarity index 87% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/items/coinPatterns.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/items/CoinPatterns.java index cc9a51b..efc2a75 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/coinPatterns.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/CoinPatterns.java @@ -1,11 +1,5 @@ package com.redstoneguy10ls.lithiccoins.common.items; -import com.redstoneguy10ls.lithiccoins.util.registries; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Item; -import org.jetbrains.annotations.Nullable; /* import static com.redstoneguy10ls.lithiccoins.LithicCoins.MOD_ID; diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/coinPurseItem.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/CoinPurseItem.java similarity index 96% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/items/coinPurseItem.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/items/CoinPurseItem.java index 002d9bc..8d0d876 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/coinPurseItem.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/CoinPurseItem.java @@ -1,9 +1,6 @@ package com.redstoneguy10ls.lithiccoins.common.items; -import com.redstoneguy10ls.lithiccoins.common.Capability.IPurse; -import com.redstoneguy10ls.lithiccoins.common.Capability.LocationCapability; -import com.redstoneguy10ls.lithiccoins.common.Capability.PurseCapability; -import com.redstoneguy10ls.lithiccoins.common.Capability.PurseHandler; +import com.redstoneguy10ls.lithiccoins.common.capability.LocationCapability; import com.redstoneguy10ls.lithiccoins.common.misc.LCSounds; import com.redstoneguy10ls.lithiccoins.config.LithicConfig; import com.redstoneguy10ls.lithiccoins.util.LCTags; @@ -30,8 +27,6 @@ import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.*; import net.minecraft.world.level.Level; -import net.minecraftforge.common.capabilities.ICapabilityProvider; -import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.Optional; @@ -39,13 +34,13 @@ import static org.openjdk.nashorn.internal.objects.NativeMath.floor; -public class coinPurseItem extends Item { +public class CoinPurseItem extends Item { private static final String TAG_ITEMS = "Items"; public static final int MAX_WEIGHT = 64 * Helpers.getValueOrDefault(LithicConfig.SERVER.numberOfStacksInCoinPurse); private static final int BAR_COLOR = Mth.color(0.4F, 0.4F, 1.0F); - public coinPurseItem(Properties pProperties) { + public CoinPurseItem(Properties pProperties) { super(pProperties); } diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/LCItems.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/LCItems.java index a1ffd06..14c2a65 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/LCItems.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/LCItems.java @@ -21,25 +21,25 @@ public class LCItems { public static final DeferredRegister ITEMS = DeferredRegister.create(Registries.ITEM, MOD_ID); - public static final Map> BLANK_COINS = Helpers.mapOfKeys(coinMaterial.class, type -> + public static final Map> BLANK_COINS = Helpers.mapOfKeys(CoinMaterial.class, type -> register("blank_coin/" + type.name()) ); - public static final Map> DISPLAY_COINS = Helpers.mapOfKeys(coinMaterial.class, type -> + public static final Map> DISPLAY_COINS = Helpers.mapOfKeys(CoinMaterial.class, type -> register("blank_coin/display/" + type.name()) ); - public static final Map>> STAMPED_COINS = - Helpers.mapOfKeys(coinMaterial.class, coins -> - Helpers.mapOfKeys(stampTypes.class, stamps -> register("coin/"+stamps.name()+"/"+coins.name(), - () -> new coinItem(new Item.Properties()))) + public static final Map>> STAMPED_COINS = + Helpers.mapOfKeys(CoinMaterial.class, coins -> + Helpers.mapOfKeys(StampTypes.class, stamps -> register("coin/"+stamps.name()+"/"+coins.name(), + () -> new CoinItem(new Item.Properties()))) ); //DIES public static final Map>> TOP_DIE = Helpers.mapOfKeys(TopDies.class, stamps -> Helpers.mapOfKeys(Metal.Default.class, Metal.Default::hasTools, metals -> register("top_die/"+stamps.name()+"/"+metals.name(), - () -> new stampItem(metals.toolTier(), new Item.Properties().rarity(metals.getRarity())))) + () -> new StampItem(metals.toolTier(), new Item.Properties().rarity(metals.getRarity())))) ); public static final Map> BOTTOM_DIE = Helpers.mapOfKeys(Metal.Default.class, Metal.Default::hasTools, metal -> register("bottom_die/" + metal.name(), () -> new TieredItem(metal.toolTier(), new Item.Properties().rarity(metal.getRarity()))) @@ -51,21 +51,21 @@ public class LCItems { //WAX STUFF public static final RegistryObject WAX_DIE = register("wax/wax_die"); - public static final Map> MOLDED_WAX = Helpers.mapOfKeys(stampTypes.class, stamps -> - register("wax/"+stamps.name(), () -> new moldedWaxItem(new Item.Properties()))); + public static final Map> MOLDED_WAX = Helpers.mapOfKeys(StampTypes.class, stamps -> + register("wax/"+stamps.name(), () -> new MoldedWaxItem(new Item.Properties()))); - public static final Map> UNFIRED_DIE_MOLD = Helpers.mapOfKeys(stampTypes.class, stamps -> - register("ceramic/die_mold/unfired/"+stamps.name(), () -> new unfiredCoinDieMold(new Item.Properties()))); + public static final Map> UNFIRED_DIE_MOLD = Helpers.mapOfKeys(StampTypes.class, stamps -> + register("ceramic/die_mold/unfired/"+stamps.name(), () -> new UnfiredCoinDieMold(new Item.Properties()))); - public static final Map> FIRED_DIE_MOLD = - Helpers.mapOfKeys(stampTypes.class, stamps -> + public static final Map> FIRED_DIE_MOLD = + Helpers.mapOfKeys(StampTypes.class, stamps -> register("ceramic/die_mold/fired/"+stamps.name(), () -> new firedCoinDieMold(TFCConfig.SERVER.moldIngotCapacity, TFCTags.Fluids.USABLE_IN_INGOT_MOLD, new Item.Properties()))); - public static final RegistryObject COIN_PURSE = register("coin_purse", () -> new coinPurseItem(new Item.Properties().stacksTo(1))); + public static final RegistryObject COIN_PURSE = register("coin_purse", () -> new CoinPurseItem(new Item.Properties().stacksTo(1))); public static final RegistryObject STAMP_HOLDER = register("stamp_holder"); public static final RegistryObject DIE_HOLDER = register("die_holder"); diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/LCTabs.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/LCTabs.java index f8edb41..94bd39b 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/LCTabs.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/LCTabs.java @@ -30,16 +30,16 @@ public final class LCTabs { register("everything_else", () -> new ItemStack(LCBlocks.MINT.get()), LCTabs::fillTab); public static final LCTabs.CreativeTabHolder COINS = - register("coins", () -> new ItemStack(LCItems.BLANK_COINS.get(coinMaterial.GOLD).get()), LCTabs::fillCoinTab); + register("coins", () -> new ItemStack(LCItems.BLANK_COINS.get(CoinMaterial.GOLD).get()), LCTabs::fillCoinTab); private static void fillCoinTab(CreativeModeTab.ItemDisplayParameters parameters, CreativeModeTab.Output out) { LCItems.BLANK_COINS.values().forEach(reg -> accept(out, reg)); - for(stampTypes stamps : stampTypes.VALUES) + for(StampTypes stamps : StampTypes.VALUES) { - for(coinMaterial mats : coinMaterial.values()) + for(CoinMaterial mats : CoinMaterial.values()) { accept(out,LCItems.STAMPED_COINS.get(mats), stamps); } diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/moldedWaxItem.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/MoldedWaxItem.java similarity index 68% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/items/moldedWaxItem.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/items/MoldedWaxItem.java index c0a8e96..e4ef4d3 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/moldedWaxItem.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/MoldedWaxItem.java @@ -1,22 +1,22 @@ package com.redstoneguy10ls.lithiccoins.common.items; import com.redstoneguy10ls.lithiccoins.util.LCHelpers; -import com.redstoneguy10ls.lithiccoins.util.tooltips; +import com.redstoneguy10ls.lithiccoins.util.Tooltips; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import java.util.Optional; -public class moldedWaxItem extends Item { +public class MoldedWaxItem extends Item { - public moldedWaxItem(Properties pProperties) { + public MoldedWaxItem(Properties pProperties) { super(pProperties); } @Override public Optional getTooltipImage(ItemStack stack) { - return Optional.of(new tooltips.CoinImageTooltip(1,1, LCHelpers.getStamptype(stack.getItem()))); + return Optional.of(new Tooltips.CoinImageTooltip(1,1, LCHelpers.getStamptype(stack.getItem()))); } } diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/stampItem.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/StampItem.java similarity index 61% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/items/stampItem.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/items/StampItem.java index 974695c..e6c4261 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/stampItem.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/StampItem.java @@ -1,7 +1,7 @@ package com.redstoneguy10ls.lithiccoins.common.items; import com.redstoneguy10ls.lithiccoins.util.LCHelpers; -import com.redstoneguy10ls.lithiccoins.util.tooltips; +import com.redstoneguy10ls.lithiccoins.util.Tooltips; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tier; @@ -9,16 +9,14 @@ import java.util.Optional; -import static com.redstoneguy10ls.lithiccoins.common.items.stampTypes.ANGLER; - -public class stampItem extends TieredItem { - public stampItem(Tier tier , Properties properties){super(tier, properties);} +public class StampItem extends TieredItem { + public StampItem(Tier tier , Properties properties){super(tier, properties);} @Override public Optional getTooltipImage(ItemStack stack) { - return Optional.of(new tooltips.CoinImageTooltip(1,1,LCHelpers.getStamptype(stack.getItem()))); + return Optional.of(new Tooltips.CoinImageTooltip(1,1,LCHelpers.getStamptype(stack.getItem()))); } } diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/stampMaterials.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/StampMaterials.java similarity index 68% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/items/stampMaterials.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/items/StampMaterials.java index 4c10cea..d319623 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/stampMaterials.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/StampMaterials.java @@ -1,6 +1,6 @@ package com.redstoneguy10ls.lithiccoins.common.items; -public enum stampMaterials { +public enum StampMaterials { BISMUTH_BRONZE, BLACK_BRONZE, BLACK_STEEL, @@ -10,5 +10,5 @@ public enum stampMaterials { RED_STEEL, STEEL, WROUGHT_IRON; - public static final stampMaterials[] VALUES = values(); + public static final StampMaterials[] VALUES = values(); } \ No newline at end of file diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/stampTypes.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/StampTypes.java similarity index 81% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/items/stampTypes.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/items/StampTypes.java index 7c40222..a20d7b6 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/stampTypes.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/StampTypes.java @@ -1,6 +1,6 @@ package com.redstoneguy10ls.lithiccoins.common.items; -public enum stampTypes { +public enum StampTypes { ANGLER, ARCHER, ARMS_UP, @@ -26,5 +26,5 @@ public enum stampTypes { SYMBOL, TRIFOIL, FACE; - public static final stampTypes[] VALUES = values(); + public static final StampTypes[] VALUES = values(); } diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/unfiredCoinDieMold.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/UnfiredCoinDieMold.java similarity index 67% rename from src/main/java/com/redstoneguy10ls/lithiccoins/common/items/unfiredCoinDieMold.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/common/items/UnfiredCoinDieMold.java index 3c75006..f65ffd7 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/unfiredCoinDieMold.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/UnfiredCoinDieMold.java @@ -1,20 +1,20 @@ package com.redstoneguy10ls.lithiccoins.common.items; import com.redstoneguy10ls.lithiccoins.util.LCHelpers; -import com.redstoneguy10ls.lithiccoins.util.tooltips; +import com.redstoneguy10ls.lithiccoins.util.Tooltips; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import java.util.Optional; -public class unfiredCoinDieMold extends Item { - public unfiredCoinDieMold(Properties pProperties) { +public class UnfiredCoinDieMold extends Item { + public UnfiredCoinDieMold(Properties pProperties) { super(pProperties); } @Override public Optional getTooltipImage(ItemStack stack) { - return Optional.of(new tooltips.CoinImageTooltip(1,1, LCHelpers.getStamptype(stack.getItem()))); + return Optional.of(new Tooltips.CoinImageTooltip(1,1, LCHelpers.getStamptype(stack.getItem()))); } } diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/firedCoinDieMold.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/firedCoinDieMold.java index 44bf69c..8630478 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/firedCoinDieMold.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/items/firedCoinDieMold.java @@ -1,7 +1,7 @@ package com.redstoneguy10ls.lithiccoins.common.items; import com.redstoneguy10ls.lithiccoins.util.LCHelpers; -import com.redstoneguy10ls.lithiccoins.util.tooltips; +import com.redstoneguy10ls.lithiccoins.util.Tooltips; import net.dries007.tfc.common.items.MoldItem; import net.dries007.tfc.util.Metal; import net.minecraft.tags.TagKey; @@ -29,6 +29,6 @@ public firedCoinDieMold(IntSupplier capacity, TagKey fluidTag, Properties @Override public Optional getTooltipImage(ItemStack stack) { - return Optional.of(new tooltips.CoinImageTooltip(1,1, LCHelpers.getStamptype(stack.getItem()))); + return Optional.of(new Tooltips.CoinImageTooltip(1,1, LCHelpers.getStamptype(stack.getItem()))); } } diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/recipes/MintingRecipe.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/recipes/MintingRecipe.java index 4a7373e..9fa4a3b 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/recipes/MintingRecipe.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/recipes/MintingRecipe.java @@ -3,7 +3,6 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.redstoneguy10ls.lithiccoins.common.items.TopDies; -import com.redstoneguy10ls.lithiccoins.common.items.stampTypes; import net.dries007.tfc.common.recipes.ISimpleRecipe; import net.dries007.tfc.common.recipes.RecipeSerializerImpl; import net.dries007.tfc.common.recipes.inventory.EmptyInventory; diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/compat/jei/category/MintingRecipeCategory.java b/src/main/java/com/redstoneguy10ls/lithiccoins/compat/jei/category/MintingRecipeCategory.java index a6674d2..a3ca97e 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/compat/jei/category/MintingRecipeCategory.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/compat/jei/category/MintingRecipeCategory.java @@ -2,13 +2,10 @@ import com.redstoneguy10ls.lithiccoins.common.items.LCItems; import com.redstoneguy10ls.lithiccoins.common.items.TopDies; -import com.redstoneguy10ls.lithiccoins.common.items.stampTypes; import com.redstoneguy10ls.lithiccoins.common.recipes.MintingRecipe; import com.redstoneguy10ls.lithiccoins.util.LCTags; -import com.redstoneguy10ls.lithiccoins.util.tooltips; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; -import mezz.jei.api.gui.builder.IRecipeSlotBuilder; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.helpers.IGuiHelper; import mezz.jei.api.recipe.IFocusGroup; @@ -16,14 +13,12 @@ import mezz.jei.api.recipe.RecipeType; import net.dries007.tfc.util.Metal; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; -import java.util.Optional; public class MintingRecipeCategory extends BaseRecipeCategory { diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/mixin/FriendlyByteBufMixin.java b/src/main/java/com/redstoneguy10ls/lithiccoins/mixin/FriendlyByteBufMixin.java index ed76e60..3af36de 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/mixin/FriendlyByteBufMixin.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/mixin/FriendlyByteBufMixin.java @@ -1,7 +1,7 @@ package com.redstoneguy10ls.lithiccoins.mixin; -import com.redstoneguy10ls.lithiccoins.common.Capability.ItemStackCapabilitySync; +import com.redstoneguy10ls.lithiccoins.common.capability.ItemStackCapabilitySync; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/util/coinTooltip.java b/src/main/java/com/redstoneguy10ls/lithiccoins/util/CoinTooltip.java similarity index 90% rename from src/main/java/com/redstoneguy10ls/lithiccoins/util/coinTooltip.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/util/CoinTooltip.java index e90e275..7a93ab0 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/util/coinTooltip.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/util/CoinTooltip.java @@ -1,7 +1,6 @@ package com.redstoneguy10ls.lithiccoins.util; -import com.redstoneguy10ls.lithiccoins.common.items.stampTypes; -import net.dries007.tfc.client.ClientDeviceImageTooltip; +import com.redstoneguy10ls.lithiccoins.common.items.StampTypes; import net.dries007.tfc.util.Helpers; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; @@ -10,9 +9,9 @@ import java.util.Map; -public class coinTooltip implements ClientTooltipComponent { +public class CoinTooltip implements ClientTooltipComponent { - public static final Map TEXTURE_LOCATION = Helpers.mapOfKeys(stampTypes.class, type -> + public static final Map TEXTURE_LOCATION = Helpers.mapOfKeys(StampTypes.class, type -> LCHelpers.identifier("textures/coin_preview/coin_"+type.name().toLowerCase()+"_preview.png")); /* @@ -40,9 +39,9 @@ public class coinTooltip implements ClientTooltipComponent { */ //public static final ResourceLocation TEXTURE_LOCATION = LCHelpers.identifier("textures/entity/coin_angler_preview.png"); - private final tooltips.CoinImageTooltip tooltip; + private final Tooltips.CoinImageTooltip tooltip; - public coinTooltip(tooltips.CoinImageTooltip tooltips) { + public CoinTooltip(Tooltips.CoinImageTooltip tooltips) { this.tooltip = tooltips; } @@ -58,7 +57,7 @@ public int getWidth(Font font) { return this.gridSizeX() * 18 + 2; } - private stampTypes getType() + private StampTypes getType() { return tooltip.stamp(); } diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/util/LCHelpers.java b/src/main/java/com/redstoneguy10ls/lithiccoins/util/LCHelpers.java index e377139..1d8792c 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/util/LCHelpers.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/util/LCHelpers.java @@ -2,11 +2,11 @@ import com.redstoneguy10ls.lithiccoins.common.items.LCItems; import com.redstoneguy10ls.lithiccoins.common.items.TopDies; -import com.redstoneguy10ls.lithiccoins.common.items.coinMaterial; -import com.redstoneguy10ls.lithiccoins.common.items.stampTypes; +import com.redstoneguy10ls.lithiccoins.common.items.CoinMaterial; +import com.redstoneguy10ls.lithiccoins.common.items.StampTypes; import net.dries007.tfc.util.Helpers; import net.dries007.tfc.util.Metal; -import net.minecraft.client.Minecraft; + import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -19,11 +19,11 @@ public static ResourceLocation identifier(String name) { return new ResourceLocation(MOD_ID, name); } - public static stampTypes getStamptype(Item item) + public static StampTypes getStamptype(Item item) { String x = item.getName(new ItemStack(item)).toString(); - for(stampTypes stamps : stampTypes.VALUES) + for(StampTypes stamps : StampTypes.VALUES) { String str1 = stamps.name(); if(!(x.toUpperCase().contains(str1.toUpperCase())) ) @@ -143,32 +143,32 @@ public static int getMetalInInt(Item item) public static int getCoinInInt(ItemStack stack) { - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.ALUMINUM).orElse(null))){return 1;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.BISMUTH).orElse(null))){return 2;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.BISMUTH_BRONZE).orElse(null))){return 3;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.BLACK_BRONZE).orElse(null))){return 4;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.BLACK_STEEL).orElse(null))){return 5;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.BLUE_STEEL).orElse(null))){return 6;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.BRASS).orElse(null))){return 7;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.BRONZE).orElse(null))){return 8;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.CAST_IRON).orElse(null))){return 9;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.CHROMIUM).orElse(null))){return 10;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.CONSTANTAN).orElse(null))){return 11;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.COPPER).orElse(null))){return 12;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.ELECTRUM).orElse(null))){return 13;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.GOLD).orElse(null))){return 14;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.LEAD).orElse(null))){return 15;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.NICKEL).orElse(null))){return 16;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.RED_STEEL).orElse(null))){return 17;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.ROSE_GOLD).orElse(null))){return 18;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.SILVER).orElse(null))){return 19;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.STAINLESS_STEEL).orElse(null))){return 20;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.STEEL).orElse(null))){return 21;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.STERLING_SILVER).orElse(null))){return 22;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.TIN).orElse(null))){return 23;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.URANIUM).orElse(null))){return 24;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.WROUGHT_IRON).orElse(null))){return 25;} - if(stack.is(LCItems.BLANK_COINS.get(coinMaterial.ZINC).orElse(null))){return 26;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.ALUMINUM).orElse(null))){return 1;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.BISMUTH).orElse(null))){return 2;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.BISMUTH_BRONZE).orElse(null))){return 3;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.BLACK_BRONZE).orElse(null))){return 4;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.BLACK_STEEL).orElse(null))){return 5;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.BLUE_STEEL).orElse(null))){return 6;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.BRASS).orElse(null))){return 7;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.BRONZE).orElse(null))){return 8;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.CAST_IRON).orElse(null))){return 9;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.CHROMIUM).orElse(null))){return 10;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.CONSTANTAN).orElse(null))){return 11;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.COPPER).orElse(null))){return 12;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.ELECTRUM).orElse(null))){return 13;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.GOLD).orElse(null))){return 14;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.LEAD).orElse(null))){return 15;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.NICKEL).orElse(null))){return 16;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.RED_STEEL).orElse(null))){return 17;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.ROSE_GOLD).orElse(null))){return 18;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.SILVER).orElse(null))){return 19;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.STAINLESS_STEEL).orElse(null))){return 20;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.STEEL).orElse(null))){return 21;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.STERLING_SILVER).orElse(null))){return 22;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.TIN).orElse(null))){return 23;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.URANIUM).orElse(null))){return 24;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.WROUGHT_IRON).orElse(null))){return 25;} + if(stack.is(LCItems.BLANK_COINS.get(CoinMaterial.ZINC).orElse(null))){return 26;} return 0; } diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/util/registries.java b/src/main/java/com/redstoneguy10ls/lithiccoins/util/Registries.java similarity index 94% rename from src/main/java/com/redstoneguy10ls/lithiccoins/util/registries.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/util/Registries.java index 5a43826..36369f5 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/util/registries.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/util/Registries.java @@ -4,7 +4,7 @@ import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; -public class registries { +public class Registries { public static final ResourceKey> COIN_TIPS = createRegistryKey("coin_tips"); diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/util/tooltips.java b/src/main/java/com/redstoneguy10ls/lithiccoins/util/Tooltips.java similarity index 60% rename from src/main/java/com/redstoneguy10ls/lithiccoins/util/tooltips.java rename to src/main/java/com/redstoneguy10ls/lithiccoins/util/Tooltips.java index 8ad5944..717a8ef 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/util/tooltips.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/util/Tooltips.java @@ -1,18 +1,15 @@ package com.redstoneguy10ls.lithiccoins.util; -import com.redstoneguy10ls.lithiccoins.common.items.stampTypes; +import com.redstoneguy10ls.lithiccoins.common.items.StampTypes; import mezz.jei.api.gui.ingredient.IRecipeSlotTooltipCallback; import mezz.jei.api.gui.ingredient.IRecipeSlotView; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.tooltip.TooltipComponent; -import net.minecraft.world.level.block.entity.DecoratedPotPatterns; import java.util.List; -public final class tooltips { - public record CoinImageTooltip(int width, int height, stampTypes stamp) implements TooltipComponent, IRecipeSlotTooltipCallback { +public final class Tooltips { + public record CoinImageTooltip(int width, int height, StampTypes stamp) implements TooltipComponent, IRecipeSlotTooltipCallback { @Override public void onTooltip(IRecipeSlotView recipeSlotView, List tooltip) { From 1489eaa2647cff208f29d9a194d2539e3b3e7558 Mon Sep 17 00:00:00 2001 From: Traister101 <66151907+Traister101@users.noreply.github.com> Date: Mon, 26 Aug 2024 02:09:49 -0700 Subject: [PATCH 4/4] Get the MintInventory inner class as well --- .../common/blockentities/MintBlockEntity.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/redstoneguy10ls/lithiccoins/common/blockentities/MintBlockEntity.java b/src/main/java/com/redstoneguy10ls/lithiccoins/common/blockentities/MintBlockEntity.java index 693434c..3332863 100644 --- a/src/main/java/com/redstoneguy10ls/lithiccoins/common/blockentities/MintBlockEntity.java +++ b/src/main/java/com/redstoneguy10ls/lithiccoins/common/blockentities/MintBlockEntity.java @@ -1,5 +1,6 @@ package com.redstoneguy10ls.lithiccoins.common.blockentities; +import com.redstoneguy10ls.lithiccoins.common.blockentities.MintBlockEntity.MintInventory; import com.redstoneguy10ls.lithiccoins.common.capability.LocationCapability; import com.redstoneguy10ls.lithiccoins.common.blocks.MintBlock; import com.redstoneguy10ls.lithiccoins.common.recipes.MintingRecipe; @@ -25,7 +26,7 @@ import static com.redstoneguy10ls.lithiccoins.LithicCoins.MOD_ID; -public class MintBlockEntity extends InventoryBlockEntity implements ISlotCallback { +public class MintBlockEntity extends InventoryBlockEntity implements ISlotCallback { public static final int SLOT_TOPDIE = 0; public static final int SLOT_BOTTOMDIE = 1; @@ -43,10 +44,10 @@ public class MintBlockEntity extends InventoryBlockEntity type, BlockPos pos, BlockState state, InventoryFactory inventoryFactory, Component defaultName) + public MintBlockEntity(BlockEntityType type, BlockPos pos, BlockState state, InventoryFactory inventoryFactory, Component defaultName) { super(type,pos,state,inventoryFactory, defaultName); @@ -284,11 +285,11 @@ else if(getBottomDieTier() < recipe.getTier()) return InteractionResult.PASS; } - public static class mintInventory extends InventoryItemHandler implements MintingRecipe.Inventory{ + public static class MintInventory extends InventoryItemHandler implements MintingRecipe.Inventory{ private final MintBlockEntity mint; - public mintInventory(InventoryBlockEntity mint) { + public MintInventory(InventoryBlockEntity mint) { super(mint, 4); this.mint = (MintBlockEntity) mint; }