From 2a54a4e8ec8ec4a977eee4f06d6ac14cd7bbbdca Mon Sep 17 00:00:00 2001 From: NormalFery <132052650+NormalFery@users.noreply.github.com> Date: Mon, 21 Oct 2024 18:07:00 +0100 Subject: [PATCH] Made item groups, forced candels to exist --- .../pridecraft/joy/item/ModItemGroups.java | 47 +++++++++++++++--- src/main/resources/assets/joy/lang/en_us.json | 7 ++- .../assets/joy/textures/item/ace_candle.png | Bin 0 -> 235 bytes .../joy/textures/item/agender_candle.png | Bin 0 -> 254 bytes .../joy/textures/item/aplatonic_candle.png | Bin 0 -> 241 bytes .../assets/joy/textures/item/aro_candle.png | Bin 0 -> 253 bytes .../joy/textures/item/aroace_candle.png | Bin 0 -> 253 bytes .../joy/textures/item/bigender_candle.png | Bin 0 -> 264 bytes .../joy/textures/item/bisexual_candle.png | Bin 0 -> 216 bytes .../assets/joy/textures/item/elytra.png | Bin 0 -> 463 bytes .../assets/joy/textures/item/enby_candle.png | Bin 0 -> 230 bytes .../assets/joy/textures/item/gay_candle.png | Bin 0 -> 263 bytes .../joy/textures/item/gender_fluid_candle.png | Bin 0 -> 249 bytes .../joy/textures/item/intersex_candle.png | Bin 0 -> 205 bytes .../joy/textures/item/lesbian_candle.png | Bin 0 -> 253 bytes .../assets/joy/textures/item/mlm_candle.png | Bin 0 -> 245 bytes .../assets/joy/textures/item/pan_candle.png | Bin 0 -> 220 bytes .../assets/joy/textures/item/pride_elytra.png | Bin 0 -> 488 bytes .../joy/textures/item/progress_candle.png | Bin 0 -> 315 bytes .../assets/joy/textures/item/queer_candle.png | Bin 0 -> 223 bytes .../assets/joy/textures/item/trans_candle.png | Bin 0 -> 231 bytes 21 files changed, 44 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/assets/joy/textures/item/ace_candle.png create mode 100644 src/main/resources/assets/joy/textures/item/agender_candle.png create mode 100644 src/main/resources/assets/joy/textures/item/aplatonic_candle.png create mode 100644 src/main/resources/assets/joy/textures/item/aro_candle.png create mode 100644 src/main/resources/assets/joy/textures/item/aroace_candle.png create mode 100644 src/main/resources/assets/joy/textures/item/bigender_candle.png create mode 100644 src/main/resources/assets/joy/textures/item/bisexual_candle.png create mode 100644 src/main/resources/assets/joy/textures/item/elytra.png create mode 100644 src/main/resources/assets/joy/textures/item/enby_candle.png create mode 100644 src/main/resources/assets/joy/textures/item/gay_candle.png create mode 100644 src/main/resources/assets/joy/textures/item/gender_fluid_candle.png create mode 100644 src/main/resources/assets/joy/textures/item/intersex_candle.png create mode 100644 src/main/resources/assets/joy/textures/item/lesbian_candle.png create mode 100644 src/main/resources/assets/joy/textures/item/mlm_candle.png create mode 100644 src/main/resources/assets/joy/textures/item/pan_candle.png create mode 100644 src/main/resources/assets/joy/textures/item/pride_elytra.png create mode 100644 src/main/resources/assets/joy/textures/item/progress_candle.png create mode 100644 src/main/resources/assets/joy/textures/item/queer_candle.png create mode 100644 src/main/resources/assets/joy/textures/item/trans_candle.png diff --git a/src/main/java/gay/pridecraft/joy/item/ModItemGroups.java b/src/main/java/gay/pridecraft/joy/item/ModItemGroups.java index 03ef8a1..cc071d2 100644 --- a/src/main/java/gay/pridecraft/joy/item/ModItemGroups.java +++ b/src/main/java/gay/pridecraft/joy/item/ModItemGroups.java @@ -1,21 +1,20 @@ package gay.pridecraft.joy.item; - import gay.pridecraft.joy.Joy; import gay.pridecraft.joy.block.ModBlocks; import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; +import net.minecraft.item.MinecartItem; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.text.Text; import net.minecraft.util.Identifier; public class ModItemGroups { - public static final ItemGroup JOY_GROUP = Registry.register(Registries.ITEM_GROUP, - Identifier.of(Joy.MOD_ID, "joy"), - FabricItemGroup.builder().displayName(Text.translatable("itemgroup.joy_group")) - .icon(() -> new ItemStack(ModItems.PRIDE_BRUSH)).entries((displayContext, entries) -> { + public static final ItemGroup JOY_GROUP = Registry.register(Registries.ITEM_GROUP, + Identifier.of(Joy.MOD_ID, "joy"),FabricItemGroup.builder().displayName(Text.translatable("itemgroup.joy_group_beds")) + .icon(() -> new ItemStack(ModBlocks.GAY_BED)).entries((displayContext, entries) -> { entries.add(ModBlocks.GAY_BED); entries.add(ModBlocks.ENBY_BED); @@ -34,6 +33,16 @@ public class ModItemGroups { entries.add(ModBlocks.LESBIAN_BED); entries.add(ModBlocks.PROGRESS_BED); + + + + + }).build()); + + public static final ItemGroup JOY_GROUP2 = Registry.register(Registries.ITEM_GROUP, + Identifier.of(Joy.MOD_ID, "joy_candles"),FabricItemGroup.builder().displayName(Text.translatable("itemgroup.joy_group_candles")) + .icon(() -> new ItemStack(ModBlocks.GAY_CANDLE)).entries((displayContext, entries) -> { + entries.add(ModBlocks.QUEER_CANDLE); entries.add(ModBlocks.GAY_CANDLE); entries.add(ModBlocks.ENBY_CANDLE); @@ -52,9 +61,11 @@ public class ModItemGroups { entries.add(ModBlocks.LESBIAN_CANDLE); entries.add(ModBlocks.PROGRESS_CANDLE); - entries.add(ModItems.TOTEM_OF_PRIDE); - entries.add(ModItems.PRIDE_BRUSH); - entries.add(ModItems.PRIDE_ELYTRA); + }).build()); + public static final ItemGroup JOY_GROUP3 = Registry.register(Registries.ITEM_GROUP, + Identifier.of(Joy.MOD_ID, "joy_entities"),FabricItemGroup.builder().displayName(Text.translatable("itemgroup.joy_group_entities")) + .icon(() -> new ItemStack(ModItems.BII_SPAWN_EGG)).entries((displayContext, entries) -> { + entries.add(ModItems.SOCK_FOX_SPAWN_EGG); entries.add(ModItems.BII_SPAWN_EGG); entries.add(ModItems.ENBEE_SPAWN_EGG); @@ -63,7 +74,27 @@ public class ModItemGroups { entries.add(ModItems.AXOLOTL_SPAWN_EGG); entries.add(ModItems.FROG_SPAWN_EGG); entries.add(ModItems.SNIFFER_SPAWN_EGG); + }).build()); + public static final ItemGroup JOY_GROUP4 = Registry.register(Registries.ITEM_GROUP, + Identifier.of(Joy.MOD_ID, "joy_blocks"),FabricItemGroup.builder().displayName(Text.translatable("itemgroup.joy_group_blocks")) + .icon(() -> new ItemStack(ModBlocks.MLM_CANDLE)).entries((displayContext, entries) -> { + + + + }).build()); + public static final ItemGroup JOY_GROUP5 = Registry.register(Registries.ITEM_GROUP, + Identifier.of(Joy.MOD_ID, "joy_misc"),FabricItemGroup.builder().displayName(Text.translatable("itemgroup.joy_group_misc")) + .icon(() -> new ItemStack(ModItems.PRIDE_BRUSH)).entries((displayContext, entries) -> { + + entries.add(ModItems.TOTEM_OF_PRIDE); + entries.add(ModItems.PRIDE_BRUSH); + entries.add(ModItems.PRIDE_ELYTRA); + + }).build()); + + + public static void registerItemGroups() { // Joy.LOGGER.info("Making the gay items in" + Joy.MOD_ID, "have a group..."); diff --git a/src/main/resources/assets/joy/lang/en_us.json b/src/main/resources/assets/joy/lang/en_us.json index ac8d523..c969782 100644 --- a/src/main/resources/assets/joy/lang/en_us.json +++ b/src/main/resources/assets/joy/lang/en_us.json @@ -1,6 +1,9 @@ { - "itemgroup.joy_group": "Joy", - + "itemgroup.joy_group_beds": "Joy Beds", + "itemgroup.joy_group_candles": "Joy Candles", + "itemgroup.joy_group_entities": "Joy Entities", + "itemgroup.joy_group_blocks": "Joy Blocks", + "itemgroup.joy_group_misc": "Joy Misc", "block.joy.gay_bed": "Gay Bed", "block.joy.enby_bed": "Enby Bed", "block.joy.intersex_bed": "Intersex Bed", diff --git a/src/main/resources/assets/joy/textures/item/ace_candle.png b/src/main/resources/assets/joy/textures/item/ace_candle.png new file mode 100644 index 0000000000000000000000000000000000000000..c5c79222311462445de77c6a28d5baa9bd440a51 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Q-Dv1>;M1%jSW(zB-GW_Y%R5;gdZJmB!H|Jwcg7SH?md(MTa zJ;CQLIB97n%$VZj#iQGAR3EW&>jS<+?DEQPT$!D7{s^)zx^_#-#ZuY%OIY?f*`za; gZtAD!9DCVcUh#=V#m%Gt9MB2|Pgg&ebxsLQ0OaRa1poj5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/joy/textures/item/agender_candle.png b/src/main/resources/assets/joy/textures/item/agender_candle.png new file mode 100644 index 0000000000000000000000000000000000000000..aa8be2b00a6df5965b3d8a131b9f5d6ffe31f6e8 GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!cYsfb>;M1%{k=-0B-DTW_;LL5 zRxA{_4A>1MJhAf$}1cXfR-_My85}Sb4q9e09R#Y A^#A|> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/joy/textures/item/aplatonic_candle.png b/src/main/resources/assets/joy/textures/item/aplatonic_candle.png new file mode 100644 index 0000000000000000000000000000000000000000..a1b76ad811fedd8f3a45d22b145a3a04b92c5014 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!cYsfbE08ueNOjk6&DD)1wqP#kpix($sr_O($(~H|5Ub@ULa)+N&`4qQT|-q-pR+JrfH&mpu?50Vz;M1%jSW)mgN3}3g%cXZ z$`?v1Dws5F5;Jn*>)xJFzbIz={ko&iCr><-cKq_?1!vP|u3!J-#}A;c2Tz}74TCZ>0PRx>beTGP;=qRz>pF`tQXk&p9%^V83;m|ZY^+uE=>SBh!LWnQLR y4-T-Et`KKg^Jr@Vvt}|w!TkHrnHs9~Kd`f0FC)YB}T)+Ouk01a4|9|lGsqge7rnM`Q*4<%X zQFQ9w!K><|U=b#+@53N$a5i=N7oeexB|(0{3=Yq3qyafmo-U3d6^yYbSQ!s9@GucEF}?M%mSJ}6SLdHU^VC4>7zfrR$HeMUfA7(8A5T-G@yGywpGyInQ_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/joy/textures/item/bigender_candle.png b/src/main/resources/assets/joy/textures/item/bigender_candle.png new file mode 100644 index 0000000000000000000000000000000000000000..a8b8dafc8aef334f02f966625571748244592628 GIT binary patch literal 264 zcmV+j0r&oiP)D6W;M1%jSW&Ks75T&$=GXC zea5pvQNiR+^3+-dpCp+%0b;eyI$Ne_oyt;KqGeHS<-621YM-h5EQP(7w16fsmIV0) zGdMiEkp|=hc)B=-R4^tT;A99r(JJU_$iuuLTX=fm|3rJ6l0Mb+mq$C(wV9?IW9BMw z`J)x6;3g_9(6=VgmCH4EYq{{%V?W&GM2gq$wfr_G{lbKP$?5wgg_y

^*r5Xf}hV LtDnm{r-UW|PMb(h literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/joy/textures/item/elytra.png b/src/main/resources/assets/joy/textures/item/elytra.png new file mode 100644 index 0000000000000000000000000000000000000000..2f1549240c4d23208f13271abf326465dde7210a GIT binary patch literal 463 zcmV;=0WkiFP)rl21zlQ5400Q)AL2^4}(-Ke`B|HtqyhZG!fFfj)!~ zxD6t~?@-%X)GmU+Rs}A!FjF@r6@(bgj1?o3!fP=&HJWSB>T&M5=iK|=gKq?I6j|`LZRR?P9~GI+imLgy30rf$fl6-8N2Z-*5r#0 zM-`2OnjMf$A=hF}CV`~SHp(ts%bjZ!wV&{@@=8w_V1d``{dZr>valjgn5IcRZ*wX@ zDGXae0B|v11>hm@+gJ+2Z0H7njn`F#5Ki5h;8;`%`0cZ%52tH71Os+}Zv65pz-1KH z{h%9gnD8K%C2y6UBf5-2DWRe$3fs3`0)8mZ4NR~f0&m2Fl#)@9QgWE^U|e+_ZUUf{ zL+O;k`s^}YDI@OhF!WtV)GF>G?(dkcl(9a$d_RJ5V!zPDU(r;p2!LstL+O2Ps#bKF zyRb)E)}nd2M|xMnD(Jz%Q^r6002ovPDHLk FV1kcE$_xMi literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/joy/textures/item/enby_candle.png b/src/main/resources/assets/joy/textures/item/enby_candle.png new file mode 100644 index 0000000000000000000000000000000000000000..99b64ca69f181e1d5abbae1d23d2938651b4d688 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!eSlAh>;M1%jSW(d&QQIz+T{Nk z@BgukwVSt2MPCMBV+u4daZ zv9AJX6k|z{UoeBivm0qZPN=7gV@Sm<)`JHb4=FG(Y%K8j8~pwLmZK~T3=NDN8M7K4 zwrX)m$T731Ja0PieQj|Qf5FB*0uvY-S;bh+m|kaUWaQ^Kb1?Z3dxixc!?(Y?%^7Y~ aGuLw{aPwZboWCDv0fVQjpUXO@geCy|2UH0F literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/joy/textures/item/gay_candle.png b/src/main/resources/assets/joy/textures/item/gay_candle.png new file mode 100644 index 0000000000000000000000000000000000000000..8f65e96debc667b14f230308a9d60852298f97d8 GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}Y=BRQ>;M1%jSW&KC@L&cSK4Z* zdC5XgQNiSDB*Ps~hgI$j|7U9c*`EEsQQ}!D!_gV4^Qz?jpYi_ldcm#LCQ(ZT{@=3n zXyL6sCXuvFLd&As%6F-2)IL-9Spj0TNiuV?RF+Iy;d%#X5o1Y^UoeBivm0qZPK2k6 zV@L&K?5UH2OpZK911fV**t@15Ov?K+>*B|$bE4}vXjcgI9k_e?E~`X5k0a|bImUan z^Emj{Tx8m{o6AwK!1hla!+QaNnLiyS?BmvyI9(*oxcR;;LtU0VZ>hj(5ow?u44$rj JF6*2UngF9BU$g)K literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/joy/textures/item/gender_fluid_candle.png b/src/main/resources/assets/joy/textures/item/gender_fluid_candle.png new file mode 100644 index 0000000000000000000000000000000000000000..18ee4977c1982a7fe501f630cf3159829d2c0f0f GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Uw}`D>;M1%jSW(dMmFC|o${@7 z&5vb!6%|Z=?>)D{yWsfc%QM%n2P$~*^l6gJoF6}a1c=o(>ui~#bt+3`iIjx8pn#Z# zd7!$Qt(HZ#srxJ|-=(5eZIgi}GnNGT1v5B2yO9RuM0&b7hEyP`U3sBg1o<2kb=#Jf8C>FU$v8!rc^kHr)b7F;mn~}{z z9=Y?8QUYx!_lOI$ZMrMn5!>Fw=OAH|-oV1JO;M1%jSW&KC@L&cSK4Z* zdC5XgQNiSnr$e!n)YV9aRqhP`XKMc0p8YJ9;rQjt{~IM{u3!J-#}A;c2Tz}_vagwD zntd~A*+GxKS}~6~GBHb3QWDSHGyodTSQ6wH%;50sMjDV4<>}%WQo&eykkRpg0T0W8 z)7yE)tp41-)5P@d&uRw7O=}t&RMa_HH0CogF7k0caDMt37PAYcZ(AES=Sndxxy;LS z>%jrG(iP$?YaVS)VAf1#D42i$Ia5Qm{s(rJtGuBHgST@7ZDH_q^>bP0l+XkK4Fq84 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/joy/textures/item/mlm_candle.png b/src/main/resources/assets/joy/textures/item/mlm_candle.png new file mode 100644 index 0000000000000000000000000000000000000000..9b79290eb0c100861aba334630eb4674050d16cc GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!M}SX=>;M1%jSW(HLPEG>WB4;O z1UlLk6-+oRErsUI<*Tk1*|J6a(xu~P6WK*bN9J~efprDaj=8nw^Lcd4{W zfU;hSno+jheYP^7nT#bte!&b5&u*jvInkajjv*C{u_szZnH+gsFN!<=USDMGaBM^U zjf!=fyX9}#R|x1GxSPF=VR53Wf`Jv&_Kth+m~@sYT9``3u*!TY*sG-RYZlY$RVFNn pA5>T>(nOoqmcN*t;8p#f=c$o!LS*s66+mkkJYD@<);T3K0RZ+ySWEx_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/joy/textures/item/pan_candle.png b/src/main/resources/assets/joy/textures/item/pan_candle.png new file mode 100644 index 0000000000000000000000000000000000000000..7796f3fd9c76aefdf282c589d0d1f896b8087b2d GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Wq?nJ>;M1%Z^dul;lAi>$d>1& z#}!(S-db%Un?CdC4AuW=wC@anuOxv6$de_k(8R51B}%krc8enX%k zj3q&S!3+-1ZlnP@fu1goAr*0@C*1iO3b3sl R6bm$*!PC{xWt~$(69ChURCxdZ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/joy/textures/item/pride_elytra.png b/src/main/resources/assets/joy/textures/item/pride_elytra.png new file mode 100644 index 0000000000000000000000000000000000000000..591ed44dcc0149b29b385068e9211a9adc84a2cf GIT binary patch literal 488 zcmVP)rl08c!VHAa*Nyf=&$cK&=f~+DbVyQ*gVt4zk{09~* z{(^M*0o&Pbk%(H``vGDj77`EWTV=iJME z;iF3#2DXqCT*vmDQ0l&OxGmcIo+&4XFB90TAyS^?l+=tWpC;B+Df6Y#nIiC}Qd<=qL6lmgL+4nVEe8%eL# zdQ49GIFDASH##n^0$k3**N9HN(cv)WM;aQHs~7R*EZoHWC_cgW>;FU}I;E+GcY@vV z7J(TJ+0)+KA3*jr4r79cY}Lhl0Ht45#roZ)YYPJ99dt8|-CTE@?sIGCW|}~GhpsJX zn+|vT{R{bCH>u_p0PS{rBz=IX=9b6YQ_0YVJXzV3$;M1%jSW&KC@L&cS9G8{#w;F0*vd~jhFab*a`0+z?;ng3@_Fj!-xZ~;Ixc&LJ&NVaFum3+&^UwC|Q_TVQ zQm1V2E;u?v)xtcm$X!FB_pEIC%>QS+|GZwHu4WrxC>6C-;QuYlTdPe31;nb4NhEEP z@Mz)HvZ%K5UFsUO&(wWZfLLvk%$zKhC2yWyP6N7%u_VYZn8D%M4G<^Z)5S5Qf-&~Q zNzp?F49*AhqfgEIa(~9`MB_OZnl1gFo;N?0f2GZ5k=N$8EUnkrI&0m|xHHMhl_fF9 za@uV^>D(!*sGgANJv%yyZO3$$O?xK>$TClP;ks_A`isY=Rt))#mb{D91zGulRxx(~GP|9|k{!HX9!K7INWU8;Bf%9XmA0h89I6!*EE z;a9y0G=i}t$S;_|;n|HeAji+s#WAFUvGqi=s6!ynfeY!o@77<rkvSoIpk3gs(}Pgg&ebxsLQ0HSGJ7XSbN literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/joy/textures/item/trans_candle.png b/src/main/resources/assets/joy/textures/item/trans_candle.png new file mode 100644 index 0000000000000000000000000000000000000000..cfa6a4cd906ca99834c7f459a5e7a3bae710ffea GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!O@L2`>whr#@#DvXr%!+HJ$L-_ z=v`U=nad=rGV6 z#*!evU