Add the candle textures & Different Item groups (#12)

* Made item groups, forced candels to exist

* Added requested changes

src/main/java/gay/pridecraft/joy/datagen/ModModelProvider.java

@@ -39,11 +39,12 @@ public class ModModelProvider extends FabricModelProvider {
         itemModelGenerator.register(ModItems.TOTEM_OF_PRIDE, Models.GENERATED);
         itemModelGenerator.register(ModItems.PRIDE_ELYTRA, Models.GENERATED);
         itemModelGenerator.register(ModItems.PRIDE_BRUSH, Models.GENERATED);
-//      itemModelGenerator.register(ModItems.SOCK_FOX_SPAWN_EGG, Models.GENERATED);
+        itemModelGenerator.register(ModItems.SOCK_FOX_SPAWN_EGG, Models.GENERATED);
-//      itemModelGenerator.register(ModItems.BII_SPAWN_EGG, Models.GENERATED);
+        itemModelGenerator.register(ModItems.BII_SPAWN_EGG, Models.GENERATED);
-//      itemModelGenerator.register(ModItems.ENBEE_SPAWN_EGG, Models.GENERATED);
+        itemModelGenerator.register(ModItems.ENBEE_SPAWN_EGG, Models.GENERATED);
-//      itemModelGenerator.register(ModItems.TRANS_BEE_SPAWN_EGG, Models.GENERATED);
+        itemModelGenerator.register(ModItems.TRANS_BEE_SPAWN_EGG, Models.GENERATED);
-//      itemModelGenerator.register(ModItems.AXOLOTL_SPAWN_EGG, Models.GENERATED);
+        itemModelGenerator.register(ModItems.AXOLOTL_SPAWN_EGG, Models.GENERATED);
-//      itemModelGenerator.register(ModItems.SNIFFER_SPAWN_EGG, Models.GENERATED);
+        itemModelGenerator.register(ModItems.FROG_SPAWN_EGG, Models.GENERATED);
+        itemModelGenerator.register(ModItems.SNIFFER_SPAWN_EGG, Models.GENERATED);
     }
 }

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,
+    public static final ItemGroup JOY_BEDS =  Registry.register(Registries.ITEM_GROUP,
-            Identifier.of(Joy.MOD_ID, "joy"),
+            Identifier.of(Joy.MOD_ID, "joy"),FabricItemGroup.builder().displayName(Text.translatable("itemgroup.joy_beds_group"))
-            FabricItemGroup.builder().displayName(Text.translatable("itemgroup.joy_group"))
+                    .icon(() -> new ItemStack(ModBlocks.GAY_BED)).entries((displayContext, entries) -> {
-                    .icon(() -> new ItemStack(ModItems.PRIDE_BRUSH)).entries((displayContext, entries) -> {
 
                         entries.add(ModBlocks.GAY_BED);
                         entries.add(ModBlocks.ENBY_BED);
@@ -34,6 +33,12 @@ public class ModItemGroups {
                         entries.add(ModBlocks.LESBIAN_BED);
                         entries.add(ModBlocks.PROGRESS_BED);
 
+                    }).build());
+
+    public static final ItemGroup JOY_CANDLES =  Registry.register(Registries.ITEM_GROUP,
+            Identifier.of(Joy.MOD_ID, "joy_candles"),FabricItemGroup.builder().displayName(Text.translatable("itemgroup.joy_candles_group"))
+                    .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 +57,11 @@ public class ModItemGroups {
                         entries.add(ModBlocks.LESBIAN_CANDLE);
                         entries.add(ModBlocks.PROGRESS_CANDLE);
 
-                        entries.add(ModItems.TOTEM_OF_PRIDE);
+                    }).build());
-                        entries.add(ModItems.PRIDE_BRUSH);
+    public static final ItemGroup JOY_ENTITIES =  Registry.register(Registries.ITEM_GROUP,
-                        entries.add(ModItems.PRIDE_ELYTRA);
+            Identifier.of(Joy.MOD_ID, "joy_entities"),FabricItemGroup.builder().displayName(Text.translatable("itemgroup.joy_entities_group"))
+                    .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 +70,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_BLOCKS =  Registry.register(Registries.ITEM_GROUP,
+            Identifier.of(Joy.MOD_ID, "joy_blocks"),FabricItemGroup.builder().displayName(Text.translatable("itemgroup.joy_blocks_group"))
+                    .icon(() -> new ItemStack(ModBlocks.MLM_CANDLE)).entries((displayContext, entries) -> {
+                       // Using Gay Bed since I don't know how to do vanilla items & it's a block.
+                        entries.add(ModBlocks.GAY_BED);
+
+                    }).build());
+    public static final ItemGroup JOY_MISC =  Registry.register(Registries.ITEM_GROUP,
+            Identifier.of(Joy.MOD_ID, "joy_misc"),FabricItemGroup.builder().displayName(Text.translatable("itemgroup.joy_misc_group"))
+                    .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...");

src/main/resources/assets/joy/lang/en_us.json

@@ -1,6 +1,9 @@
 {
-  "itemgroup.joy_group": "Joy",
+  "itemgroup.joy_beds_group": "Joy Beds",
-
+  "itemgroup.joy_candles_group": "Joy Candles",
+  "itemgroup.joy_entities_group": "Joy Entities",
+  "itemgroup.joy_blocks_group": "Joy Blocks",
+  "itemgroup.joy_misc_group": "Joy Misc",
   "block.joy.gay_bed": "Gay Bed",
   "block.joy.enby_bed": "Enby Bed",
   "block.joy.intersex_bed": "Intersex Bed",