From cd8de6dffb6b7245589cdb295ca3895ebb1215dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ampflower=20=F0=9F=8C=BA?= Date: Wed, 12 Mar 2025 22:06:02 -0700 Subject: [PATCH] feat: Add branding rosettes Co-authored-by: WorldWidePixel --- .../pridecraft/joy/data/JoyModelProvider.java | 4 +++ .../joy/registry/JoyItemGroups.java | 4 +++ .../gay/pridecraft/joy/registry/JoyItems.java | 32 ++++++++++++++++++ .../main/resources/assets/joy/lang/en_us.json | 12 +++++++ .../assets/joy/textures/item/ace_rosette.png | Bin 0 -> 388 bytes .../assets/joy/textures/item/aro_rosette.png | Bin 0 -> 386 bytes .../joy/textures/item/bisexual_rosette.png | Bin 0 -> 391 bytes .../assets/joy/textures/item/enby_rosette.png | Bin 0 -> 388 bytes .../assets/joy/textures/item/gay_rosette.png | Bin 0 -> 396 bytes .../joy/textures/item/lesbian_rosette.png | Bin 0 -> 388 bytes .../assets/joy/textures/item/mlm_rosette.png | Bin 0 -> 396 bytes .../assets/joy/textures/item/pan_rosette.png | Bin 0 -> 391 bytes .../joy/textures/item/plural_rosette.png | Bin 0 -> 416 bytes .../joy/textures/item/trans_rosette.png | Bin 0 -> 391 bytes 14 files changed, 52 insertions(+) create mode 100644 xplat/src/main/resources/assets/joy/textures/item/ace_rosette.png create mode 100644 xplat/src/main/resources/assets/joy/textures/item/aro_rosette.png create mode 100644 xplat/src/main/resources/assets/joy/textures/item/bisexual_rosette.png create mode 100644 xplat/src/main/resources/assets/joy/textures/item/enby_rosette.png create mode 100644 xplat/src/main/resources/assets/joy/textures/item/gay_rosette.png create mode 100644 xplat/src/main/resources/assets/joy/textures/item/lesbian_rosette.png create mode 100644 xplat/src/main/resources/assets/joy/textures/item/mlm_rosette.png create mode 100644 xplat/src/main/resources/assets/joy/textures/item/pan_rosette.png create mode 100644 xplat/src/main/resources/assets/joy/textures/item/plural_rosette.png create mode 100644 xplat/src/main/resources/assets/joy/textures/item/trans_rosette.png diff --git a/xplat/src/datagen/java/gay/pridecraft/joy/data/JoyModelProvider.java b/xplat/src/datagen/java/gay/pridecraft/joy/data/JoyModelProvider.java index a562a84..e47f465 100644 --- a/xplat/src/datagen/java/gay/pridecraft/joy/data/JoyModelProvider.java +++ b/xplat/src/datagen/java/gay/pridecraft/joy/data/JoyModelProvider.java @@ -128,6 +128,10 @@ public class JoyModelProvider extends FabricModelProvider { gen.register(bundle, Models.GENERATED); } + for (final var rosette : JoyItems.ROSETTES) { + gen.register(rosette, Models.GENERATED); + } + gen.register(JoyItems.TOTEM_OF_PRIDE, Models.GENERATED); gen.register(JoyItems.PRIDE_ELYTRA, Models.GENERATED); gen.register(JoyItems.PRIDE_BRUSH, Models.GENERATED); diff --git a/xplat/src/main/java/gay/pridecraft/joy/registry/JoyItemGroups.java b/xplat/src/main/java/gay/pridecraft/joy/registry/JoyItemGroups.java index a9eadd1..7f59761 100644 --- a/xplat/src/main/java/gay/pridecraft/joy/registry/JoyItemGroups.java +++ b/xplat/src/main/java/gay/pridecraft/joy/registry/JoyItemGroups.java @@ -114,6 +114,10 @@ public final class JoyItemGroups { } ); + public static final ItemGroup ROSETTES = register("rosettes", + JoyItems.PLURAL_ROSETTE::getDefaultStack, + (ctx, entries) -> JoyItems.ROSETTES.forEach(entries::add)); + private static ItemGroup register(String name, Supplier icon, ItemGroup.EntryCollector collector) { return Pivot.INSTANCE.register(RegistryKeys.ITEM_GROUP, name, Pivot.itemGroupBuilder() .displayName(Text.translatable("itemgroup.joy." + name)) diff --git a/xplat/src/main/java/gay/pridecraft/joy/registry/JoyItems.java b/xplat/src/main/java/gay/pridecraft/joy/registry/JoyItems.java index a201947..e877a6a 100644 --- a/xplat/src/main/java/gay/pridecraft/joy/registry/JoyItems.java +++ b/xplat/src/main/java/gay/pridecraft/joy/registry/JoyItems.java @@ -125,6 +125,34 @@ public final class JoyItems { // endregion + // region rosette + + public static final Item + GAY_ROSETTE = registerDummy("gay_rosette"), + ENBY_ROSETTE = registerDummy("enby_rosette"), + BISEXUAL_ROSETTE = registerDummy("bisexual_rosette"), + MLM_ROSETTE = registerDummy("mlm_rosette"), + ACE_ROSETTE = registerDummy("ace_rosette"), + ARO_ROSETTE = registerDummy("aro_rosette"), + PAN_ROSETTE = registerDummy("pan_rosette"), + TRANS_ROSETTE = registerDummy("trans_rosette"), + LESBIAN_ROSETTE = registerDummy("lesbian_rosette"), + PLURAL_ROSETTE = registerDummy("plural_rosette"); + + public static final List ROSETTES = List.of( + GAY_ROSETTE, + ENBY_ROSETTE, + BISEXUAL_ROSETTE, + MLM_ROSETTE, + ACE_ROSETTE, + ARO_ROSETTE, + PAN_ROSETTE, + TRANS_ROSETTE, + LESBIAN_ROSETTE, + PLURAL_ROSETTE + ); + // endregion + // Currently inaccessible, only exists to serve as an example. public static final Item DOUGLAS_DISC = registerDisc("douglas"), @@ -138,6 +166,10 @@ public final class JoyItems { )); } + private static Item registerDummy(String name) { + return registerItem(name, new Item(new Item.Settings())); + } + private static Item registerItem(String name, Item item) { return Pivot.INSTANCE.register(RegistryKeys.ITEM, name, item); } diff --git a/xplat/src/main/resources/assets/joy/lang/en_us.json b/xplat/src/main/resources/assets/joy/lang/en_us.json index 2638269..70607e0 100644 --- a/xplat/src/main/resources/assets/joy/lang/en_us.json +++ b/xplat/src/main/resources/assets/joy/lang/en_us.json @@ -9,6 +9,7 @@ "itemgroup.joy.misc": "Joy Misc", "itemgroup.joy.food": "Joy Food", "itemgroup.joy.flowers": "Joy Flowers", + "itemgroup.joy.rosettes": "Pridecraft Rosettes", "block.joy.gay_bed": "Gay Bed", "block.joy.enby_bed": "Enby Bed", @@ -78,6 +79,17 @@ "item.joy.lesbian_bundle": "Lesbian Bundle", "item.joy.progress_bundle": "Progress Bundle", + "item.joy.gay_rosette": "Gay Rosette", + "item.joy.enby_rosette": "Enby Rosette", + "item.joy.bisexual_rosette": "Bisexual Rosette", + "item.joy.mlm_rosette": "MLM Rosette", + "item.joy.ace_rosette": "Ace Rosette", + "item.joy.aro_rosette": "Aro Rosette", + "item.joy.pan_rosette": "Pan Rosette", + "item.joy.trans_rosette": "Trans Rosette", + "item.joy.lesbian_rosette": "Lesbian Rosette", + "item.joy.plural_rosette": "Plural Rosette", + "item.joy.sock_fox_spawn_egg": "Thigh-High Fox Spawn Egg", "item.joy.bii_spawn_egg": "Bii Spawn Egg", "item.joy.enbee_spawn_egg": "Enbee Spawn Egg", diff --git a/xplat/src/main/resources/assets/joy/textures/item/ace_rosette.png b/xplat/src/main/resources/assets/joy/textures/item/ace_rosette.png new file mode 100644 index 0000000000000000000000000000000000000000..614562d73fbd189093a5ce2b40f6630113d2dc57 GIT binary patch literal 388 zcmV-~0ek+5P)3Q0skRCwBb(+RS~AP5A|7I8q~{^$KzKbSo|8&&;g3kgagVip1N6%^APCCY+A zzxN;jejhRX1AB`q0f$~hOaYvL>_BD^>5o8lt0TSuCtzlgF@WAdGc^HkptUiEd++YG z)&PD2%FQEY^I#3qVGIJkmK2oX4#qm00002uVaiRCwBb(FLO0Fbn|DC)-V(_5LRv6xLef>GKPtC_-ww?(+BOLZj2K2*>x$ z2=n-X(~JSbJ67bV=iJy<(v|k0o^wm2G5{>-V2uQ518}AbH0uK6_##C7WE)KzKOs;d z7CTatj=>i|9{^J->;M1& literal 0 HcmV?d00001 diff --git a/xplat/src/main/resources/assets/joy/textures/item/bisexual_rosette.png b/xplat/src/main/resources/assets/joy/textures/item/bisexual_rosette.png new file mode 100644 index 0000000000000000000000000000000000000000..00c2b6547a227a8cc833f3d127bf1bd8a426f0e4 GIT binary patch literal 391 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyoCO|{#S9F5he4R}c>anMprB%a zPl)R^rUD>yw*Rzj+fp&tLtR2421enAMlPbd^>T80e1f7qi?=!hRWOwV`33)Hc)H!d z3&{KD>EaktajW)hVAdBao`#Fcv6jxe{%^hKC++?(o;R^duE!xFzU6{fcGosuN0%x6 zbtZOg3Qx(6yAs`g zFIL*VcZu7aRNtU&GVWq<|G=G)z&Q0r*FBzV%8c%lU3c!Y-Rx(0)m$Ffvy$GDIgQCmtRy4iObYC`ADP0007XQchF<0OhwZ zN&o->3Q0skRCwBb(+RS~AP5A|78D2J{^$KzKbSo|8&&;g3kgaQAz}vd6%x}NIm&_} zzxRXyejhRX1AB|A0EeELO#z$$?|^3z8IM49t0TSuB_JZ^)_^e}Gd%%qpw`x!`xx%M z_W*tZO4TD~^Id;}U`?IOX9DUqp& z;09W20cb{~_c1nr1m^BU2|QvOK!C%3sz@HyJMdbodtd$iy4X&-Lm!~9=|=(-{^+To igdidj0l<8jOZfwd>mQ}vlTX$F00003iQrLjoOAoalWM}q%bm99v&_+GDMLdkq!|RHesc@D=2osZt{5m<-9l9ug&KG z0004WQchCGvFX>cC(}F+&VB1 zz{P{H46$tdWJ)jtK_X33PA4}!lWAY1C)rk zSBM46gtFsEdV?75p8TvT{-GzO4sF2r4oU!3g?U2h;SSn@_3p{#uGi>~GblmtSs^kj z2?$6qj{y9}7OBO-05Ah?{N#bhuxU>l)hCw@U?fRxR7KR;NEM?Y44iOcED`qwT0007XQchF<0OhwZ zN&o->3Q0skRCwBb(+8sDAPfUgQ4IdJ?|M@mdIwQTiRi1puZwNc9eRQ!ZXY2?^3msn iMDaUy1t4GvFX>cC(}F+&VB1 zz{P{H46$tdWJ)jtK_X33PA4}!lWAY1C)rk zSBM46gtFsEdV?75p8TvT{-GzO4sF2r4oU!3g?U2h;SSn@_3p{#uGi>~GblmtSs^kj z2?$6qj{y9}7OBO-05Ah?{N#bhuxU>l)hCw@U?fRxR7KR;NEManMprB%a zPl)S(#U3E@{|$y4+hr9u{&$&tYP)rgfl;`jk&B$19-p9S)W@C2fhw3vg8YL2Gd$gH z;05IU^K@|xskl{piG3QgA`f%GO%A4g{~NETwSQZtVf!yw&?SV?=$>QHcYP(Mi}$M^ zH0kYY!|qfgm@XAzNxeH z$pO9q)0xY+R{WgJ+rYcU_5cHq!#&0g3@5)ZbTRWySUZ<9;j!Hr@A#D|kq;8ZOA5CUJKVf)gDQ)`R*X_*$|Mv%qMAohOnRDet=q^)!g`BU-d@b_D hUCfFNb-h48)d${`(!6PJXABGp22WQ%mvv4FO#rqMmkj^_ literal 0 HcmV?d00001 diff --git a/xplat/src/main/resources/assets/joy/textures/item/plural_rosette.png b/xplat/src/main/resources/assets/joy/textures/item/plural_rosette.png new file mode 100644 index 0000000000000000000000000000000000000000..3a1fb737a4a75de631ede9b077114b4b26e760d2 GIT binary patch literal 416 zcmV;R0bl-!P)CP_p=RCwBb(+7e>AqWIeM08Q+{^wo%A2fZ^GcUzPr4WfQtLCFWAz4pZi?@aT zzQ+aW-;bEyz`kV+a&UTPwxOy|fDhmm^~{f8jHo@>KoVTzs#SGPrInsQ0<>0Z1?B{L z?+)+;hBSE0*3AGU-~(VQWOqao&;mpO1QNh=01>qW4I4BEnxMm0#)2st7SJ0IuAXc3 zgSj2Bzk_kQ7jRJ#q9VbWevugO2p}6wmOfY=CuPn6n!o^vB!I^PXn>f6 zMijI90id-8bnm~Ni`aChU!bs!A8}ClM=ynn3lX`-uFNmbOZf+2#~&aOi;#i<0000< KMNUMnLSTaTd7{n$ literal 0 HcmV?d00001 diff --git a/xplat/src/main/resources/assets/joy/textures/item/trans_rosette.png b/xplat/src/main/resources/assets/joy/textures/item/trans_rosette.png new file mode 100644 index 0000000000000000000000000000000000000000..9379dfeff5d0568cfe3cb4fcc5b08c8b11927324 GIT binary patch literal 391 zcmV;20eJq2P)pFAy7V(DkXf&VrgwtIsepS1~d~9v&_Z5fy23 zHLw5x00MMUPE-E?<+m_O0002~Nkl*P$j4zoSLW zL?S@G3jo@`a7>wg?+HQpeWb}hXm2qCVVjFcGXMvW1tfz=c?4#C+~X6_0R8Gzfl@%3 zIsjduR#kN`#l6-Vzz<+lJ`z;4YWNX10Vr#1Ca#))CZseFhH5}CDg}#n3uj{ zfG+T`3k2|aqfAil06y=7$o(ApPA7=m&!GdEKuX9yuE|?@f{1L7(1%mn@vF`E1n4Rk}4#z-ac7 l0E~}0H~^zxI05%B%zwlw8cs^$J2n6S002ovPDHLkV1msfoDBc~ literal 0 HcmV?d00001