From 86f9a8923cfb12ab81e37c84a36643cd5020a2f8 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Sat, 2 Sep 2023 09:27:08 -0400 Subject: [PATCH 1/3] fix: vendor item model --- .../9a0caf301191a46050477dc8a9bfbf3be6c34032 | 2 +- .../c6e4c19894bc5aece2976a0277ba8e1dbf023865 | 2 +- .../d6a1ec2d08c6d6d7facbde77dda6f0158c00bbd6 | 6 +++--- .../assets/numismatics/models/item/vendor.json | 2 +- .../registry/NumismaticsBlocks.java | 3 +-- .../numismatics/textures/gui/vendor.aseprite | Bin 0 -> 1664 bytes .../assets/numismatics/textures/gui/vendor.png | Bin 0 -> 1383 bytes 7 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 common/src/main/resources/assets/numismatics/textures/gui/vendor.aseprite create mode 100644 common/src/main/resources/assets/numismatics/textures/gui/vendor.png diff --git a/common/src/generated/resources/.cache/9a0caf301191a46050477dc8a9bfbf3be6c34032 b/common/src/generated/resources/.cache/9a0caf301191a46050477dc8a9bfbf3be6c34032 index 24256b89..8bd6839f 100644 --- a/common/src/generated/resources/.cache/9a0caf301191a46050477dc8a9bfbf3be6c34032 +++ b/common/src/generated/resources/.cache/9a0caf301191a46050477dc8a9bfbf3be6c34032 @@ -1 +1 @@ -// 1.20.1 2023-08-04T15:07:32.93575349 Create: Numismatics/Numismatics's lang merger +// 1.20.1 2023-09-02T09:26:08.229913517 Create: Numismatics/Numismatics's lang merger diff --git a/common/src/generated/resources/.cache/c6e4c19894bc5aece2976a0277ba8e1dbf023865 b/common/src/generated/resources/.cache/c6e4c19894bc5aece2976a0277ba8e1dbf023865 index 236b1282..56de0b0c 100644 --- a/common/src/generated/resources/.cache/c6e4c19894bc5aece2976a0277ba8e1dbf023865 +++ b/common/src/generated/resources/.cache/c6e4c19894bc5aece2976a0277ba8e1dbf023865 @@ -1 +1 @@ -// 1.20.1 2023-08-04T15:07:32.935603901 Create: Numismatics/Numismatics' Sequenced Assembly Recipes +// 1.20.1 2023-09-02T09:26:08.229793765 Create: Numismatics/Numismatics' Sequenced Assembly Recipes diff --git a/common/src/generated/resources/.cache/d6a1ec2d08c6d6d7facbde77dda6f0158c00bbd6 b/common/src/generated/resources/.cache/d6a1ec2d08c6d6d7facbde77dda6f0158c00bbd6 index 77d4ea08..dec716ff 100644 --- a/common/src/generated/resources/.cache/d6a1ec2d08c6d6d7facbde77dda6f0158c00bbd6 +++ b/common/src/generated/resources/.cache/d6a1ec2d08c6d6d7facbde77dda6f0158c00bbd6 @@ -1,4 +1,4 @@ -// 1.20.1 2023-08-04T15:07:32.933344557 Create: Numismatics/Registrate Provider for numismatics [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] +// 1.20.1 2023-09-02T09:26:08.227639466 Create: Numismatics/Registrate Provider for numismatics [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] 5ec9eeaf96af5a8587ec71a9bcf3a5728f99c33d data/minecraft/tags/blocks/mineable/axe.json 74a4c7ca7a48382782e5dba33018dfc8255192c5 assets/numismatics/models/block/brass_depositor_locked.json d6f017479b3cc538f73d7fb0a1e65d1742bab266 assets/numismatics/models/item/light_blue_id_card.json @@ -40,9 +40,9 @@ ad693bfb3bb45d661f989071bd896e3020fcbe87 assets/numismatics/models/item/pink_car 3f0d912779200aaaf55bef102d9b96acead1a636 data/numismatics/tags/items/internal/dyes/purple_dyes.json 411b79f79547a0adcb665bf7440e8169f7dcb24e assets/numismatics/models/block/brass_depositor.json 27788e1854c12b323c1fe5945858fce4d1544e3c data/numismatics/tags/items/internal/dyes/white_dyes.json -88f8e0a11fb5b071eb90b7aaff49e133da6cbd64 assets/numismatics/models/item/vendor.json -c71ebb661adcdddcecd0f74c062718c3e55c1af4 data/create/tags/blocks/passive_boiler_heaters.json +6965cf99471bb8c63f5f8a94577e2cddc3b2bc33 assets/numismatics/models/item/vendor.json 3c36bec4bc30ac2bd5f0e0c881d6505b5cce35fe data/numismatics/loot_tables/blocks/vendor.json +c71ebb661adcdddcecd0f74c062718c3e55c1af4 data/create/tags/blocks/passive_boiler_heaters.json 36e1dad2803241c11c646b9737be8af6d67ef8fe data/forge/tags/items/string.json 7ebbfe751724c7a9b8b57cd9b4aae2a71a8da840 assets/numismatics/models/item/green_id_card.json 187e917e6a02d61b15493f292d7b1db2151ddfd0 assets/numismatics/models/item/crown.json diff --git a/common/src/generated/resources/assets/numismatics/models/item/vendor.json b/common/src/generated/resources/assets/numismatics/models/item/vendor.json index 4603079b..7b8c15f2 100644 --- a/common/src/generated/resources/assets/numismatics/models/item/vendor.json +++ b/common/src/generated/resources/assets/numismatics/models/item/vendor.json @@ -1,3 +1,3 @@ { - "parent": "numismatics:block/vendor" + "parent": "numismatics:block/display_case" } \ No newline at end of file diff --git a/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlocks.java b/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlocks.java index b4f9f820..5ce0571c 100644 --- a/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlocks.java +++ b/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlocks.java @@ -14,7 +14,6 @@ import dev.ithundxr.createnumismatics.content.vendor.VendorBlock; import dev.ithundxr.createnumismatics.multiloader.CommonTags; import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.material.MapColor; @@ -95,7 +94,7 @@ public class NumismaticsBlocks { .getExistingFile(Numismatics.asResource("block/display_case")) )) .item() - .model((c, p) -> p.blockItem(c)) + .model((c, p) -> p.withExistingParent("vendor", Numismatics.asResource("block/display_case"))) .build() .register(); diff --git a/common/src/main/resources/assets/numismatics/textures/gui/vendor.aseprite b/common/src/main/resources/assets/numismatics/textures/gui/vendor.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..15f02543e15424f25d3a2da7b20548fadca67d3b GIT binary patch literal 1664 zcmcIje@s(X6h5sKh!z%ku)gkrT~Pg+{as^nFZSu1l%7!0Osty=o;iC2Ds zT8ypY;noDPLZv~ThdioGqoBDSxv%)J5L?K)gnWkz4~X1G>mnDQqPdje%%yx)8G^k4 zY+uxQ(&xD7IW9h|lHr~R+{4e8$+15BfQ#qTyn^PkVlAGH3Hpt33*?#UIP&ocfFwwU zR7e9Jh(HU4Pz)Lf#!-%n8U(nW_=5b+Onw?>i7=}W#F+6Glz0QX?5^j0ki z-^EBQZXy8ZE=A33!}nSTuvkk`3tv;zViUlcI{-h+SMp050b-n}*RE*%vjE;z0LIQ0 zO;itHIu77Bq!6lvjL#ZGwnPH(0$YQY&smW@@hbA#% z7N3vk=H^E07yuTF1u-)-6Hy|OAVx<=BkFWI#Idn4M2$v+XtND5XhS4P60y0tnWFy^ zZuFfF1F`qIYsTIURZewu4ZK&i;hlt6eaMR!hn?jk@5lFytA>Iz8+sjmr?XEEh<>;c zw-`gsr5tipjGk>TzWHpQ{b-xd#=#Mj`djt!yGt{RU%YNVXtakAb5Xq)8Zt$9 z&FiO+g~UHF3r47=QsctJOuoT1)fb)Zey%yp>U>rav{v3Rx?QV|320TMrXMT%+|Q6K zGVdRhn{lwdg_6iPyV;@*Gn5z`Mgxq>n#m@@V;EPZWwQ1|TxDS17Sep?H!Y>EO(TbA$5sAU zYKn+HNBNDXe&ieD*;2ZaR4EJJZM}Lu%AnkRs;D8S{`Vx}J8}R0&14I);1ChsdWY82 zuw6S+79c9GF47ee56V^KUZXg^V^)v(b>`AG>(S1uT@eQ5S2vwMwwG{2(dCu#*xRV& zR!{m|c>9`lzbMJD&=cHHG`%aTVG;(Li1c9r<;^8eY;|?KXGEJz<~kNqn}~JV)Qr4a LkG-ys+r$3?Qr7cn literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/numismatics/textures/gui/vendor.png b/common/src/main/resources/assets/numismatics/textures/gui/vendor.png new file mode 100644 index 0000000000000000000000000000000000000000..a11201c0d8aa04e2969cb753be1681a3e5960213 GIT binary patch literal 1383 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$5xX)7d$|)7e>}peR2rGbfdS zL1SX=L|c!;4l+mMgO|Fl;wuX%JP|Ngr$empik8Sirxl`6r3O2{aL+PP(bVf}%076o z|LCgb?#=7?)-@^oV0`rI(UKQRs{iygw{(1cutWa+JKJ~n7@hW>FbfM(7kLsf& zwcT25ae@v4wGvJ~Y10hVJv~cg;=h0R_*L)JW~=$Xi@&V0>}Ir^STRjWx2J#HK0oMpkEk0d5-yl~7*dh?={g2y|QS1k+P zH{oN%(>+HcwZkJn&->H5aL&F>XG&)&dn5>YPf&1j6jhy)sO+`cud7w$?Q!cL?Xmk^ z^jc$74T^LYF!64B&Hlgn{@tjbD?Rl!Mc8-6%REmO;dsN;JL_?cytUtBmJjyK;Z>*O zS27#VUvfPv>Iuh-`)qpaqGxSlk9o(??BAAiYTc9Nnom9-_$^r*EGDsowd&fQd$WF9 z)G}PU68eeF!h+=(*Oa~Y9^O6p?cP7z%WvMZS9uhzIus%S41DH!o-U3d6?5L+vG;qN zA;JFOdf*Ahw5_s#pKz_dqtvCb>=BbRr{?9NCXb0Rxt`9L8d;Q5>t19QG2nLGO>+W91ylvXwJslNy z%2sC1Nd5m;_Wz%<%ZZvFlH=?D?tLxv&ClxhSBJ+e3}0q2G{^}vTu5eOsPbWO=;vg3 zVaUi}tH!Y4INLidh2Xk2%=B_gPU%gHy#QDLqXKGFy zdpa2w7?;l8Us7HD+eDY;-mz2%yO5ht&P(rE`AmQAym{B++~sdFFA%-jmcQ#~`0A^d zzdU`K+EUHDO^xA4z*V;Tx@Ga7%l#QXJluEv#jJXB4u+_}+={dNt>>^TG4(a6Yk8JG z$(CW#qMx%>89dsa<==~wWda6DgpOFXb)42GoBpRoKNDYH|8w@{Y6f6Pt*zVXcKh+t zB&)f<%;vjTu)w1?M?$c$u1-!+Fg!ebu9$OGUtixYy+)}`A1-=cdZGm^VTK!c(@@Wl X+A}qFi+tTukl#FA{an^LB{Ts5YHcFC literal 0 HcmV?d00001 From 8bcf27aea822c84cda79fb86e9569ec77c982cfe Mon Sep 17 00:00:00 2001 From: IThundxr Date: Sat, 2 Sep 2023 09:41:32 -0400 Subject: [PATCH 2/3] feat: creative vendor block --- .../6ba62358bf8e130d42215f5f9edbedd611809677 | 2 +- .../9a0caf301191a46050477dc8a9bfbf3be6c34032 | 2 +- .../c6e4c19894bc5aece2976a0277ba8e1dbf023865 | 2 +- .../d6a1ec2d08c6d6d7facbde77dda6f0158c00bbd6 | 91 ++++++++++--------- .../blockstates/creative_vendor.json | 19 ++++ .../assets/numismatics/lang/en_ud.json | 1 + .../assets/numismatics/lang/en_us.json | 39 ++++++++ .../models/item/creative_vendor.json | 3 + .../tags/blocks/mineable/pickaxe.json | 4 +- .../loot_tables/blocks/creative_vendor.json | 21 +++++ .../internal/relocation_not_supported.json | 3 +- .../registry/NumismaticsBlockEntities.java | 3 +- .../registry/NumismaticsBlocks.java | 31 +++++-- .../models/block/creative_display_case.json | 8 +- 14 files changed, 165 insertions(+), 64 deletions(-) create mode 100644 common/src/generated/resources/assets/numismatics/blockstates/creative_vendor.json create mode 100644 common/src/generated/resources/assets/numismatics/models/item/creative_vendor.json create mode 100644 common/src/generated/resources/data/numismatics/loot_tables/blocks/creative_vendor.json diff --git a/common/src/generated/resources/.cache/6ba62358bf8e130d42215f5f9edbedd611809677 b/common/src/generated/resources/.cache/6ba62358bf8e130d42215f5f9edbedd611809677 index 6f423b12..5914d834 100644 --- a/common/src/generated/resources/.cache/6ba62358bf8e130d42215f5f9edbedd611809677 +++ b/common/src/generated/resources/.cache/6ba62358bf8e130d42215f5f9edbedd611809677 @@ -1,4 +1,4 @@ -// 1.20.1 2023-08-04T15:07:32.935355558 Create: Numismatics/Numismatics Standard Recipes +// 1.20.1 2023-09-02T09:38:50.268718823 Create: Numismatics/Numismatics Standard Recipes ba04c62863e2c847ad7ac240e282c3f6ecd85d62 data/numismatics/recipes/crafting/banking_guide.json 11be645cfbf1ee8721ffceb2b47d30e2923e9323 data/numismatics/advancements/recipes/misc/crafting/andesite_depositor.json 360f03b664bac1cf6fde98e1ec77ca6e93933c4a data/numismatics/advancements/recipes/misc/crafting/banking_guide.json diff --git a/common/src/generated/resources/.cache/9a0caf301191a46050477dc8a9bfbf3be6c34032 b/common/src/generated/resources/.cache/9a0caf301191a46050477dc8a9bfbf3be6c34032 index 8bd6839f..0deb74ba 100644 --- a/common/src/generated/resources/.cache/9a0caf301191a46050477dc8a9bfbf3be6c34032 +++ b/common/src/generated/resources/.cache/9a0caf301191a46050477dc8a9bfbf3be6c34032 @@ -1 +1 @@ -// 1.20.1 2023-09-02T09:26:08.229913517 Create: Numismatics/Numismatics's lang merger +// 1.20.1 2023-09-02T09:38:50.268969181 Create: Numismatics/Numismatics's lang merger diff --git a/common/src/generated/resources/.cache/c6e4c19894bc5aece2976a0277ba8e1dbf023865 b/common/src/generated/resources/.cache/c6e4c19894bc5aece2976a0277ba8e1dbf023865 index 56de0b0c..1415d254 100644 --- a/common/src/generated/resources/.cache/c6e4c19894bc5aece2976a0277ba8e1dbf023865 +++ b/common/src/generated/resources/.cache/c6e4c19894bc5aece2976a0277ba8e1dbf023865 @@ -1 +1 @@ -// 1.20.1 2023-09-02T09:26:08.229793765 Create: Numismatics/Numismatics' Sequenced Assembly Recipes +// 1.20.1 2023-09-02T09:38:50.268878579 Create: Numismatics/Numismatics' Sequenced Assembly Recipes diff --git a/common/src/generated/resources/.cache/d6a1ec2d08c6d6d7facbde77dda6f0158c00bbd6 b/common/src/generated/resources/.cache/d6a1ec2d08c6d6d7facbde77dda6f0158c00bbd6 index dec716ff..10fa3cc0 100644 --- a/common/src/generated/resources/.cache/d6a1ec2d08c6d6d7facbde77dda6f0158c00bbd6 +++ b/common/src/generated/resources/.cache/d6a1ec2d08c6d6d7facbde77dda6f0158c00bbd6 @@ -1,97 +1,100 @@ -// 1.20.1 2023-09-02T09:26:08.227639466 Create: Numismatics/Registrate Provider for numismatics [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] +// 1.20.1 2023-09-02T09:38:50.267349549 Create: Numismatics/Registrate Provider for numismatics [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] 5ec9eeaf96af5a8587ec71a9bcf3a5728f99c33d data/minecraft/tags/blocks/mineable/axe.json -74a4c7ca7a48382782e5dba33018dfc8255192c5 assets/numismatics/models/block/brass_depositor_locked.json -d6f017479b3cc538f73d7fb0a1e65d1742bab266 assets/numismatics/models/item/light_blue_id_card.json f7f43dd6d567ec8303c73b79409bc92d8b56574a assets/numismatics/blockstates/andesite_depositor.json -b5533a44ad137e21ee8aab5c200f673d1e8a235f assets/numismatics/models/item/pink_id_card.json c05836600bd1689f598515841869634b1d709cca assets/numismatics/models/item/yellow_id_card.json -4458283178334ae169a7cbbd1aa09067cbb99ee7 data/numismatics/tags/items/internal/dyes/green_dyes.json -182450e6ad4229f2959e6c50e38ef6e2ff5259d0 data/numismatics/tags/items/internal/dyes/orange_dyes.json 921085f1caf23e8fd003fc38c439270950a306c3 assets/numismatics/models/item/gray_card.json -c1878dd808cf36e400e13885adfab22b60ac291e assets/numismatics/models/item/purple_id_card.json +182450e6ad4229f2959e6c50e38ef6e2ff5259d0 data/numismatics/tags/items/internal/dyes/orange_dyes.json +4458283178334ae169a7cbbd1aa09067cbb99ee7 data/numismatics/tags/items/internal/dyes/green_dyes.json facbd710d107ebc9b2c6ddfa3b59a16d5f85c992 assets/numismatics/models/item/spur.json 99e3dd233c66e14a6e572e332ac8b7af1f8ed94e assets/numismatics/models/item/orange_card.json c1863c2bd08a5910a534aee0dcbc61a352fb9577 assets/numismatics/models/item/white_card.json -224bcb5095af5ab25eb16ab0d9c1993323734cf9 data/numismatics/tags/items/internal/nuggets/zinc_nuggets.json -a28cf7778f3cf79ca94ac5196ce4aee934961519 assets/numismatics/models/item/cyan_card.json -a73343c9e46c851778f3f091fe523894712ec74d data/minecraft/tags/blocks/mineable/pickaxe.json -56973a6ce09377c8f235f46aa4d71a2a9fabf587 assets/numismatics/models/item/red_card.json 52b48750de8a5a571a08bce3f2f025474153d50b assets/numismatics/models/item/bevel.json ac8c537dfc0e6704a0abe4f47130c41b19cde231 data/numismatics/tags/items/internal/dyes/magenta_dyes.json c5958ebbc2782c2611690c642713cadc59656814 assets/numismatics/models/item/light_blue_card.json 77de205f7ee2b6736ece646c399aaa194def42f0 assets/numismatics/models/item/brown_card.json -1e78f650091a4a2c43e36fb815f23d0591e058a6 assets/numismatics/models/item/magenta_card.json 9c20dd40c03605721d0231ffde829d55e36b1c05 assets/numismatics/models/item/yellow_card.json 790ff3c5da6a67a5de1ceb7138fa3e1c0fe97f80 data/numismatics/tags/items/internal/dyes/lime_dyes.json -265ef24d62bc7580e763e1fb6802bf4e58dc0194 assets/numismatics/models/block/andesite_depositor.json 2f1dad2a2e0086d54cf4b88378feacc04341d87f data/numismatics/tags/items/internal/ingots/iron_ingots.json -ac27ad7e34b80e814bda1942dec179814f896df2 data/numismatics/tags/blocks/internal/relocation_not_supported.json +d4b100dee3fb5ad235f06a247a4c2c0ed04d1e0d data/numismatics/tags/blocks/internal/relocation_not_supported.json d38d7d40599c66ac84ef7dd2c1635d3ba7794871 data/numismatics/tags/items/internal/nuggets/brass_nuggets.json d36f0cc1a6b0873730d353bd84dda701d169265b data/numismatics/tags/items/internal/plates/iron_plates.json -84ab8c91452f94501b3acc31ec1e0bc64417f839 assets/numismatics/models/item/black_card.json -4e3215ab9d54a9e751caa9a946ad54da40586789 assets/numismatics/models/item/purple_card.json 70c481f36a9718ac48632e6939ac6ba785be4c9e assets/numismatics/models/item/black_id_card.json 17b5bc6d0bfd98157c3d2ed8ee6ebc81fd6d7599 data/numismatics/tags/items/internal/nuggets/iron_nuggets.json d2b105f0657bad99b8efed45dc0a8df8ff775c10 assets/numismatics/blockstates/vendor.json -fd289500be71ae25ed8c08b5f9fea41054cf6a61 assets/numismatics/models/item/brown_id_card.json -dcf8ea4cef1226fb52d84359d1d2ff403ddb556a assets/numismatics/models/item/orange_id_card.json 266d9b0eb6fdecc4bcf6da465078d059009a3b54 data/numismatics/loot_tables/blocks/blaze_banker.json -ad693bfb3bb45d661f989071bd896e3020fcbe87 assets/numismatics/models/item/pink_card.json -3f0d912779200aaaf55bef102d9b96acead1a636 data/numismatics/tags/items/internal/dyes/purple_dyes.json -411b79f79547a0adcb665bf7440e8169f7dcb24e assets/numismatics/models/block/brass_depositor.json +95ef415a564eba1d212053195d25b199427b94e3 assets/numismatics/blockstates/creative_vendor.json 27788e1854c12b323c1fe5945858fce4d1544e3c data/numismatics/tags/items/internal/dyes/white_dyes.json -6965cf99471bb8c63f5f8a94577e2cddc3b2bc33 assets/numismatics/models/item/vendor.json -3c36bec4bc30ac2bd5f0e0c881d6505b5cce35fe data/numismatics/loot_tables/blocks/vendor.json c71ebb661adcdddcecd0f74c062718c3e55c1af4 data/create/tags/blocks/passive_boiler_heaters.json 36e1dad2803241c11c646b9737be8af6d67ef8fe data/forge/tags/items/string.json 7ebbfe751724c7a9b8b57cd9b4aae2a71a8da840 assets/numismatics/models/item/green_id_card.json -187e917e6a02d61b15493f292d7b1db2151ddfd0 assets/numismatics/models/item/crown.json 4d944b6e0e93a3444591a2e540530da0b2a0ff08 data/numismatics/tags/items/internal/dyes/light_blue_dyes.json -95b492bd9230dc90fca9395c823cef39e644d8f2 assets/numismatics/models/item/sprocket.json 9fdcd12c871f136e66973a8c02be94a675a4b727 data/numismatics/tags/items/internal/dyes/yellow_dyes.json d048d04208faa63f0014d614d6026a66fe118c11 data/numismatics/loot_tables/blocks/brass_depositor.json 160d556c6bfdb651082b39784258f6d06c21ca8f assets/numismatics/blockstates/brass_depositor.json b6efde0135fab023b1b51f219254e5e9d7439f6a assets/numismatics/models/item/cog.json -3961fdf3030140fc32e0e8c1d440ac395e62f5b6 assets/numismatics/blockstates/bank_terminal.json a96d3d02794064cd9be1bca25a9ba6217675e6c5 assets/numismatics/models/item/white_id_card.json c71ebb661adcdddcecd0f74c062718c3e55c1af4 data/create/tags/blocks/fan_transparent.json -41b79e319044d6179f7757f73ef67c9acdbfe87d assets/numismatics/models/item/lime_id_card.json 5b0244502972f49d063d98fa0cb3f6fc65af82b2 data/numismatics/tags/items/internal/string.json -83ce6c9d27970b4c643f0f9f3dfeb58668fca3d4 assets/numismatics/models/item/banking_guide.json 7b126eb3ff0b2e9af171e5464fc9ff9f7fcfd653 assets/numismatics/models/item/lime_card.json bde18ccd9c21484154597c6271750c0406082f61 data/forge/tags/blocks/relocation_not_supported.json -a8cb82f19034a0e724e12df45c883e9cd469c210 assets/numismatics/models/item/green_card.json bde18ccd9c21484154597c6271750c0406082f61 data/c/tags/blocks/relocation_not_supported.json 2a6aaab63efb82be5fee5de0f9d96824d520b25e data/numismatics/tags/items/internal/dyes/blue_dyes.json -542c57a9ddbcaea138bb217a5b9aa657299ff29c assets/numismatics/lang/en_us.json -2449b7346e1657ef1c6ab4c134aab55b216ec783 assets/numismatics/models/item/andesite_depositor.json -06ecd28cd97f4e8200dc396858695cad57b871c8 assets/numismatics/blockstates/blaze_banker.json -dc5c60bbbaf3a5d7bc1f9bc0c9377757dbd8de49 data/numismatics/loot_tables/blocks/bank_terminal.json +6cb764824a2190dab6219b7502ec77f14c1a90e0 data/numismatics/loot_tables/blocks/creative_vendor.json 4f78ca868db20495aa20be7c6a14e2678fb16f9f assets/numismatics/models/block/andesite_depositor_locked.json 62ab2750314492e8da73768bd891faee34cfdcd6 data/numismatics/tags/items/internal/dyes/red_dyes.json -6987a368b36811a263f65dd71b74f9f1fb828ae1 assets/numismatics/models/block/bank_terminal.json -fa326874015c5f24f6a65390c31f96324eecc96d assets/numismatics/models/item/blue_card.json 36e1dad2803241c11c646b9737be8af6d67ef8fe data/c/tags/items/string.json a7e754dd80af7eff6447f4376b98ebe4eb54e7d6 data/numismatics/tags/items/internal/dyes/black_dyes.json a2dec3b886deae84d88babd6fb1ce2997d193533 data/numismatics/tags/items/coins.json -8fd12493390894fa5b3988f499f758c17137af16 assets/numismatics/models/item/sun.json ad712dd2a2a7268dfa773f38a50d526952758d5c data/numismatics/tags/items/internal/dyes/cyan_dyes.json e62db1a880d468865769307ad19f16d9b7dac7c1 data/numismatics/tags/items/internal/dyes/light_gray_dyes.json -ce821bcccb920fd51237904e253fb29100882648 data/numismatics/tags/items/internal/dyes/brown_dyes.json a2ff135c1fea203b49dbbf4cae010664aa1cf909 assets/numismatics/models/item/magenta_id_card.json ee60b7c614946045f0671976ef12e43151c33ce1 assets/numismatics/models/item/blue_id_card.json -4a6ca666740b098929798ad132260f288cc228c0 data/numismatics/tags/items/internal/ingots/copper_ingots.json 82bc77ac080aa62bc6cdf0a932f4e80de50412dc data/numismatics/tags/items/internal/dyes/pink_dyes.json +b3293e39ea5d4a1fdf65d014ec370b328ae36949 assets/numismatics/models/item/light_gray_id_card.json +a6a8db1faafaf7833406120a76fe5c21eb21d2e6 data/numismatics/tags/items/id_cards.json +8550097149cebbfd50bdeac2003327b60a4aee9a assets/numismatics/models/item/light_gray_card.json +b1f339ffecbae2c812e18a1286162d31429ce356 data/numismatics/tags/items/internal/dyes/gray_dyes.json +890e519d407cab18c04ee439e7d5f67eb4f76ab3 assets/numismatics/models/item/blaze_banker.json +74a4c7ca7a48382782e5dba33018dfc8255192c5 assets/numismatics/models/block/brass_depositor_locked.json +d6f017479b3cc538f73d7fb0a1e65d1742bab266 assets/numismatics/models/item/light_blue_id_card.json +b5533a44ad137e21ee8aab5c200f673d1e8a235f assets/numismatics/models/item/pink_id_card.json +c1878dd808cf36e400e13885adfab22b60ac291e assets/numismatics/models/item/purple_id_card.json +224bcb5095af5ab25eb16ab0d9c1993323734cf9 data/numismatics/tags/items/internal/nuggets/zinc_nuggets.json +a28cf7778f3cf79ca94ac5196ce4aee934961519 assets/numismatics/models/item/cyan_card.json +edd6109002439af0f15959debe4cb9cca254add8 data/minecraft/tags/blocks/mineable/pickaxe.json +56973a6ce09377c8f235f46aa4d71a2a9fabf587 assets/numismatics/models/item/red_card.json +1e78f650091a4a2c43e36fb815f23d0591e058a6 assets/numismatics/models/item/magenta_card.json +265ef24d62bc7580e763e1fb6802bf4e58dc0194 assets/numismatics/models/block/andesite_depositor.json +84ab8c91452f94501b3acc31ec1e0bc64417f839 assets/numismatics/models/item/black_card.json +4e3215ab9d54a9e751caa9a946ad54da40586789 assets/numismatics/models/item/purple_card.json +fd289500be71ae25ed8c08b5f9fea41054cf6a61 assets/numismatics/models/item/brown_id_card.json +dcf8ea4cef1226fb52d84359d1d2ff403ddb556a assets/numismatics/models/item/orange_id_card.json +ad693bfb3bb45d661f989071bd896e3020fcbe87 assets/numismatics/models/item/pink_card.json +3f0d912779200aaaf55bef102d9b96acead1a636 data/numismatics/tags/items/internal/dyes/purple_dyes.json +411b79f79547a0adcb665bf7440e8169f7dcb24e assets/numismatics/models/block/brass_depositor.json +6965cf99471bb8c63f5f8a94577e2cddc3b2bc33 assets/numismatics/models/item/vendor.json +3c36bec4bc30ac2bd5f0e0c881d6505b5cce35fe data/numismatics/loot_tables/blocks/vendor.json +187e917e6a02d61b15493f292d7b1db2151ddfd0 assets/numismatics/models/item/crown.json +95b492bd9230dc90fca9395c823cef39e644d8f2 assets/numismatics/models/item/sprocket.json +3961fdf3030140fc32e0e8c1d440ac395e62f5b6 assets/numismatics/blockstates/bank_terminal.json +41b79e319044d6179f7757f73ef67c9acdbfe87d assets/numismatics/models/item/lime_id_card.json +83ce6c9d27970b4c643f0f9f3dfeb58668fca3d4 assets/numismatics/models/item/banking_guide.json +a8cb82f19034a0e724e12df45c883e9cd469c210 assets/numismatics/models/item/green_card.json +f25e7fdaec79f1bae98b56c2870e760dd3c1a4d7 assets/numismatics/lang/en_us.json +2449b7346e1657ef1c6ab4c134aab55b216ec783 assets/numismatics/models/item/andesite_depositor.json +cca7e7be961c6ed6272f19211bb17707b7934155 assets/numismatics/models/item/creative_vendor.json +06ecd28cd97f4e8200dc396858695cad57b871c8 assets/numismatics/blockstates/blaze_banker.json +dc5c60bbbaf3a5d7bc1f9bc0c9377757dbd8de49 data/numismatics/loot_tables/blocks/bank_terminal.json +6987a368b36811a263f65dd71b74f9f1fb828ae1 assets/numismatics/models/block/bank_terminal.json +fa326874015c5f24f6a65390c31f96324eecc96d assets/numismatics/models/item/blue_card.json +8fd12493390894fa5b3988f499f758c17137af16 assets/numismatics/models/item/sun.json +ce821bcccb920fd51237904e253fb29100882648 data/numismatics/tags/items/internal/dyes/brown_dyes.json +4a6ca666740b098929798ad132260f288cc228c0 data/numismatics/tags/items/internal/ingots/copper_ingots.json 5f6e841fc0eae95df179de8d4b2eae325a19e015 data/numismatics/tags/items/cards.json 9e6e50d40e3688ae681107e60ac5ff5fc22585f9 data/numismatics/loot_tables/blocks/andesite_depositor.json 99bfe9fe8c163701a2a9784d29f26fa2b67d54d3 assets/numismatics/models/item/gray_id_card.json -b3293e39ea5d4a1fdf65d014ec370b328ae36949 assets/numismatics/models/item/light_gray_id_card.json -a6a8db1faafaf7833406120a76fe5c21eb21d2e6 data/numismatics/tags/items/id_cards.json 9ac23febc1b0d808cb545b3cdda93fae40081b3d assets/numismatics/models/item/brass_depositor.json 0d06a3a44565e63cf98c451e7a4a6c28681d49be assets/numismatics/models/item/red_id_card.json -0b93fe0243f6e90bdfeb9e67101ec2006e9b7040 assets/numismatics/lang/en_ud.json -8550097149cebbfd50bdeac2003327b60a4aee9a assets/numismatics/models/item/light_gray_card.json +9b874041e62f0236c80a82d0b82fa97a212f9dcc assets/numismatics/lang/en_ud.json 5849c2cae2ca479893e1e4063d2efb75eada281a assets/numismatics/models/item/cyan_id_card.json 228b67a48aa045bfe809c54c756df80eb0765aad assets/numismatics/models/item/bank_terminal.json -b1f339ffecbae2c812e18a1286162d31429ce356 data/numismatics/tags/items/internal/dyes/gray_dyes.json -890e519d407cab18c04ee439e7d5f67eb4f76ab3 assets/numismatics/models/item/blaze_banker.json diff --git a/common/src/generated/resources/assets/numismatics/blockstates/creative_vendor.json b/common/src/generated/resources/assets/numismatics/blockstates/creative_vendor.json new file mode 100644 index 00000000..9fe6a27e --- /dev/null +++ b/common/src/generated/resources/assets/numismatics/blockstates/creative_vendor.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "numismatics:block/creative_display_case", + "y": 90 + }, + "facing=north": { + "model": "numismatics:block/creative_display_case" + }, + "facing=south": { + "model": "numismatics:block/creative_display_case", + "y": 180 + }, + "facing=west": { + "model": "numismatics:block/creative_display_case", + "y": 270 + } + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/numismatics/lang/en_ud.json b/common/src/generated/resources/assets/numismatics/lang/en_ud.json index 3d32c1dd..6e8508cd 100644 --- a/common/src/generated/resources/assets/numismatics/lang/en_ud.json +++ b/common/src/generated/resources/assets/numismatics/lang/en_ud.json @@ -3,6 +3,7 @@ "block.numismatics.bank_terminal": "ןɐuıɯɹǝ⟘ ʞuɐᗺ", "block.numismatics.blaze_banker": "ɹǝʞuɐᗺ ǝzɐןᗺ", "block.numismatics.brass_depositor": "ɹoʇısodǝᗡ ssɐɹᗺ", + "block.numismatics.creative_vendor": "ɹopuǝΛ ǝʌıʇɐǝɹƆ", "block.numismatics.vendor": "ɹopuǝΛ", "item.numismatics.banking_guide": "ǝpın⅁ buıʞuɐᗺ", "item.numismatics.bevel": "ןǝʌǝᗺ", diff --git a/common/src/generated/resources/assets/numismatics/lang/en_us.json b/common/src/generated/resources/assets/numismatics/lang/en_us.json index a052102d..44366551 100644 --- a/common/src/generated/resources/assets/numismatics/lang/en_us.json +++ b/common/src/generated/resources/assets/numismatics/lang/en_us.json @@ -6,6 +6,7 @@ "block.numismatics.bank_terminal": "Bank Terminal", "block.numismatics.blaze_banker": "Blaze Banker", "block.numismatics.brass_depositor": "Brass Depositor", + "block.numismatics.creative_vendor": "Creative Vendor", "block.numismatics.vendor": "Vendor", "item.numismatics.banking_guide": "Banking Guide", @@ -48,6 +49,44 @@ "item.numismatics.yellow_card": "Yellow Card", "item.numismatics.yellow_id_card": "Yellow ID Card", + "create.numismatics.andesite_depositor.price": "Price", + + "create.item.numismatics.spur": "Spur", + "create.item.numismatics.bevel": "Bevel", + "create.item.numismatics.sprocket": "Sprocket", + "create.item.numismatics.cog": "Cog", + "create.item.numismatics.crown": "Crown", + "create.item.numismatics.sun": "Sun", + + "gui.numismatics.bank_terminal.balance": "Balance: %s %s, %s¤", + + "command.numismatics.arguments.enum.invalid": "Error: Invalid enum value '%s'. Valid values are: %s", + + "itemGroup.numismatics": "Create: Numismatics", + + "gui.numismatics.trust_list": "Trust List", + + "create.numismatics.trust_list.configure": "Configure Trust List", + + "item.numismatics.coin.tooltip.value": "Value: %s %s (%s¤)", + "item.numismatics.coin.tooltip.value.basic": "Value: %s¤", + + "block.numismatics.andesite_depositor.tooltip.price": "Price: %s %s (%s¤)", + + "item.numismatics.coin.tooltip.count": "Count: %s %s", + "item.numismatics.card.tooltip.bound": "Bound", + "item.numismatics.card.tooltip.bound.to": "Bound to: %s", + "item.numismatics.card.tooltip.blank": "Blank", + + "block.numismatics.brass_depositor.tooltip.price": "Price: %s %s, %s¤", + + "item.numismatics.id_card.tooltip.already_bound": "Already bound, Sneak + Use to Unbind", + "item.numismatics.id_card.tooltip.cleared": "Cleared", + "item.numismatics.id_card.tooltip.bound": "Bound to self", + + "item.numismatics.banking_guide.tooltip": "BANKING GUIDE", + "item.numismatics.banking_guide.tooltip.summary": "Use on a _Blaze Burner_ to convert it into a _Blaze Banker_.", + "_": "->------------------------] UI & Messages [------------------------<-", diff --git a/common/src/generated/resources/assets/numismatics/models/item/creative_vendor.json b/common/src/generated/resources/assets/numismatics/models/item/creative_vendor.json new file mode 100644 index 00000000..6e6f5759 --- /dev/null +++ b/common/src/generated/resources/assets/numismatics/models/item/creative_vendor.json @@ -0,0 +1,3 @@ +{ + "parent": "numismatics:block/creative_display_case" +} \ No newline at end of file diff --git a/common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 1aecce35..bae65181 100644 --- a/common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -4,6 +4,8 @@ "numismatics:andesite_depositor", "numismatics:brass_depositor", "numismatics:bank_terminal", - "numismatics:blaze_banker" + "numismatics:blaze_banker", + "numismatics:vendor", + "numismatics:creative_vendor" ] } \ No newline at end of file diff --git a/common/src/generated/resources/data/numismatics/loot_tables/blocks/creative_vendor.json b/common/src/generated/resources/data/numismatics/loot_tables/blocks/creative_vendor.json new file mode 100644 index 00000000..0397684b --- /dev/null +++ b/common/src/generated/resources/data/numismatics/loot_tables/blocks/creative_vendor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "numismatics:creative_vendor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "numismatics:blocks/creative_vendor" +} \ No newline at end of file diff --git a/common/src/generated/resources/data/numismatics/tags/blocks/internal/relocation_not_supported.json b/common/src/generated/resources/data/numismatics/tags/blocks/internal/relocation_not_supported.json index 26b07ee1..ba902183 100644 --- a/common/src/generated/resources/data/numismatics/tags/blocks/internal/relocation_not_supported.json +++ b/common/src/generated/resources/data/numismatics/tags/blocks/internal/relocation_not_supported.json @@ -3,7 +3,6 @@ "values": [ "numismatics:andesite_depositor", "numismatics:brass_depositor", - "numismatics:blaze_banker", - "numismatics:vendor" + "numismatics:blaze_banker" ] } \ No newline at end of file diff --git a/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlockEntities.java b/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlockEntities.java index edc470cf..33ba2df3 100644 --- a/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlockEntities.java +++ b/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlockEntities.java @@ -32,11 +32,10 @@ public class NumismaticsBlockEntities { .register(); public static final BlockEntityEntry VENDOR = REGISTRATE.blockEntity("vendor", VendorBlockEntity::new) - .validBlocks(NumismaticsBlocks.VENDOR) + .validBlocks(NumismaticsBlocks.VENDOR, NumismaticsBlocks.CREATIVE_VENDOR) .renderer(() -> VendorRenderer::new) .register(); - @SuppressWarnings("EmptyMethod") public static void register() {} } diff --git a/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlocks.java b/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlocks.java index 5ce0571c..078415a9 100644 --- a/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlocks.java +++ b/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlocks.java @@ -80,21 +80,36 @@ public class NumismaticsBlocks { .register(); public static final BlockEntry VENDOR = REGISTRATE.block("vendor", p -> new VendorBlock(p, false)) -// .initialProperties(SharedProperties::softMetal) + .initialProperties(SharedProperties::softMetal) .properties(BlockBehaviour.Properties::noOcclusion) -// .properties(p -> p.mapColor(MapColor.COLOR_LIGHT_GRAY)) -// .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) -// .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) -// .transform(pickaxeOnly()) + .properties(p -> p.mapColor(MapColor.TERRACOTTA_WHITE)) + .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) + .transform(pickaxeOnly()) .addLayer(() -> RenderType::cutout) - .tag(CommonTags.RELOCATION_NOT_SUPPORTED.tag) -// .tag(AllTags.AllBlockTags.FAN_TRANSPARENT.tag, AllTags.AllBlockTags.PASSIVE_BOILER_HEATERS.tag) .lang("Vendor") .blockstate((c, p) -> p.horizontalBlock(c.getEntry(), p.models() .getExistingFile(Numismatics.asResource("block/display_case")) )) .item() - .model((c, p) -> p.withExistingParent("vendor", Numismatics.asResource("block/display_case"))) + .model((c, p) -> p.withExistingParent(c.getName(), Numismatics.asResource("block/display_case"))) + .build() + .register(); + + public static final BlockEntry CREATIVE_VENDOR = REGISTRATE.block("creative_vendor", p -> new VendorBlock(p, true)) + .initialProperties(SharedProperties::softMetal) + .properties(BlockBehaviour.Properties::noOcclusion) + .properties(p -> p.mapColor(MapColor.TERRACOTTA_WHITE)) + .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) + .transform(pickaxeOnly()) + .addLayer(() -> RenderType::cutout) + .lang("Creative Vendor") + .blockstate((c, p) -> p.horizontalBlock(c.getEntry(), p.models() + .getExistingFile(Numismatics.asResource("block/creative_display_case")) + )) + .item() + .model((c, p) -> p.withExistingParent(c.getName(), Numismatics.asResource("block/creative_display_case"))) .build() .register(); diff --git a/common/src/main/resources/assets/numismatics/models/block/creative_display_case.json b/common/src/main/resources/assets/numismatics/models/block/creative_display_case.json index e7e4fdf9..8c4fe9c2 100644 --- a/common/src/main/resources/assets/numismatics/models/block/creative_display_case.json +++ b/common/src/main/resources/assets/numismatics/models/block/creative_display_case.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "1": "numismatics:block/shop/display_case/creative_casing_short", - "2": "numismatics:block/shop/display_case/creative_display_case_front", - "3": "numismatics:block/shop/display_case/framed_glass_small", - "4": "numismatics:block/shop/display_case/creative_display_case_plate", + "1": "numismatics:block/shop/vendor/creative_casing_short", + "2": "numismatics:block/shop/vendor/creative_display_case_front", + "3": "numismatics:block/shop/vendor/framed_glass_small", + "4": "numismatics:block/shop/vendor/creative_display_case_plate", "5": "create:block/creative_casing", "particle": "create:block/creative_casing" }, From 9d8661133509e32bb71a193fc301952989b6db25 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Sat, 2 Sep 2023 09:57:55 -0400 Subject: [PATCH 3/3] mixin extras time lets go!!! --- common/build.gradle | 3 +++ .../mixin/MixinGoogleOverlayRenderer.java | 9 +++++++++ common/src/main/resources/numismatics-common.mixins.json | 3 ++- fabric/build.gradle | 3 +++ forge/build.gradle | 4 ++++ 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/dev/ithundxr/createnumismatics/mixin/MixinGoogleOverlayRenderer.java diff --git a/common/build.gradle b/common/build.gradle index cf0e85ba..43b8c3bc 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -30,6 +30,9 @@ dependencies { // required for proper remapping and compiling modCompileOnly("net.fabricmc.fabric-api:fabric-api:${fabric_api_version}") + + implementation(annotationProcessor("com.github.LlamaLad7:MixinExtras:0.1.1")) + implementation(include("com.github.LlamaLad7:MixinExtras:0.1.1")) } sourceSets.main { diff --git a/common/src/main/java/dev/ithundxr/createnumismatics/mixin/MixinGoogleOverlayRenderer.java b/common/src/main/java/dev/ithundxr/createnumismatics/mixin/MixinGoogleOverlayRenderer.java new file mode 100644 index 00000000..841dfc22 --- /dev/null +++ b/common/src/main/java/dev/ithundxr/createnumismatics/mixin/MixinGoogleOverlayRenderer.java @@ -0,0 +1,9 @@ +package dev.ithundxr.createnumismatics.mixin; + +import com.simibubi.create.content.equipment.goggles.GoggleOverlayRenderer; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(GoggleOverlayRenderer.class) +public class MixinGoogleOverlayRenderer { + // Hello Mixins :3 +} diff --git a/common/src/main/resources/numismatics-common.mixins.json b/common/src/main/resources/numismatics-common.mixins.json index e4e0998c..7c95244f 100644 --- a/common/src/main/resources/numismatics-common.mixins.json +++ b/common/src/main/resources/numismatics-common.mixins.json @@ -7,7 +7,8 @@ "client.MixinModelBakery" ], "mixins": [ - "AccessorLangMerger" + "AccessorLangMerger", + "MixinGoogleOverlayRenderer" ], "injectors": { "defaultRequire": 1 diff --git a/fabric/build.gradle b/fabric/build.gradle index 9998ceeb..4debacbd 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -99,6 +99,9 @@ dependencies { // modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-fabric:${rei_version}") // modCompileOnly("me.shedaniel:RoughlyEnoughItems-default-plugin-fabric:${rei_version}") // modCompileOnly("dev.emi:emi:${emi_version}") + + implementation(annotationProcessor("com.github.LlamaLad7:MixinExtras:0.1.1")) + implementation(include("com.github.LlamaLad7:MixinExtras:0.1.1")) } processResources { diff --git a/forge/build.gradle b/forge/build.gradle index f7e3bdc9..59f880bf 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -28,6 +28,7 @@ repositories { // mavens for Forge-exclusives maven { url = "https://maven.theillusivec4.top/" } // Curios maven { url = "https://maven.terraformersmc.com/releases/" } // EMI + maven { url = "https://jitpack.io/" } // Mixin Extras, Fabric ASM maven { // Create Forge and Registrate Forge url = "https://maven.tterrag.com/" content { @@ -60,6 +61,9 @@ dependencies { // if you would like to add integration with JEI, uncomment this line. // modCompileOnly("mezz.jei:jei-${minecraft_version}:${jei_version}:api") + + implementation(annotationProcessor("com.github.LlamaLad7:MixinExtras:0.1.1")) + implementation(include("com.github.LlamaLad7:MixinExtras:0.1.1")) } processResources {