diff --git a/src/main/java/gay/pridecraft/joy/datagen/ModModelProvider.java b/src/main/java/gay/pridecraft/joy/datagen/ModModelProvider.java index 256f19b..89afec0 100644 --- a/src/main/java/gay/pridecraft/joy/datagen/ModModelProvider.java +++ b/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.BII_SPAWN_EGG, Models.GENERATED); -// itemModelGenerator.register(ModItems.ENBEE_SPAWN_EGG, Models.GENERATED); -// itemModelGenerator.register(ModItems.TRANS_BEE_SPAWN_EGG, Models.GENERATED); -// itemModelGenerator.register(ModItems.AXOLOTL_SPAWN_EGG, Models.GENERATED); -// itemModelGenerator.register(ModItems.SNIFFER_SPAWN_EGG, Models.GENERATED); + itemModelGenerator.register(ModItems.SOCK_FOX_SPAWN_EGG, Models.GENERATED); + itemModelGenerator.register(ModItems.BII_SPAWN_EGG, Models.GENERATED); + itemModelGenerator.register(ModItems.ENBEE_SPAWN_EGG, Models.GENERATED); + itemModelGenerator.register(ModItems.TRANS_BEE_SPAWN_EGG, Models.GENERATED); + itemModelGenerator.register(ModItems.AXOLOTL_SPAWN_EGG, Models.GENERATED); + itemModelGenerator.register(ModItems.FROG_SPAWN_EGG, Models.GENERATED); + itemModelGenerator.register(ModItems.SNIFFER_SPAWN_EGG, Models.GENERATED); } } \ No newline at end of file diff --git a/src/main/java/gay/pridecraft/joy/item/ModItemGroups.java b/src/main/java/gay/pridecraft/joy/item/ModItemGroups.java index 03ef8a1..37a8dfe 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_BEDS = Registry.register(Registries.ITEM_GROUP, + Identifier.of(Joy.MOD_ID, "joy"),FabricItemGroup.builder().displayName(Text.translatable("itemgroup.joy_beds_group")) + .icon(() -> new ItemStack(ModBlocks.GAY_BED)).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); - entries.add(ModItems.PRIDE_BRUSH); - entries.add(ModItems.PRIDE_ELYTRA); + }).build()); + public static final ItemGroup JOY_ENTITIES = Registry.register(Registries.ITEM_GROUP, + 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..."); diff --git a/src/main/resources/assets/joy/lang/en_us.json b/src/main/resources/assets/joy/lang/en_us.json index ac8d523..95b61b5 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_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", 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 0000000..c5c7922 Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/ace_candle.png differ 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 0000000..aa8be2b Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/agender_candle.png differ 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 0000000..a1b76ad Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/aplatonic_candle.png differ diff --git a/src/main/resources/assets/joy/textures/item/aro_candle.png b/src/main/resources/assets/joy/textures/item/aro_candle.png new file mode 100644 index 0000000..46a84c3 Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/aro_candle.png differ diff --git a/src/main/resources/assets/joy/textures/item/aroace_candle.png b/src/main/resources/assets/joy/textures/item/aroace_candle.png new file mode 100644 index 0000000..c1bbdf4 Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/aroace_candle.png differ 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 0000000..a8b8daf Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/bigender_candle.png differ diff --git a/src/main/resources/assets/joy/textures/item/bisexual_candle.png b/src/main/resources/assets/joy/textures/item/bisexual_candle.png new file mode 100644 index 0000000..6899d19 Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/bisexual_candle.png differ 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 0000000..2f15492 Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/elytra.png differ 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 0000000..99b64ca Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/enby_candle.png differ 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 0000000..8f65e96 Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/gay_candle.png differ 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 0000000..18ee497 Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/gender_fluid_candle.png differ diff --git a/src/main/resources/assets/joy/textures/item/intersex_candle.png b/src/main/resources/assets/joy/textures/item/intersex_candle.png new file mode 100644 index 0000000..b24f85a Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/intersex_candle.png differ diff --git a/src/main/resources/assets/joy/textures/item/lesbian_candle.png b/src/main/resources/assets/joy/textures/item/lesbian_candle.png new file mode 100644 index 0000000..fca90fd Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/lesbian_candle.png differ 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 0000000..9b79290 Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/mlm_candle.png differ 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 0000000..7796f3f Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/pan_candle.png differ 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 0000000..591ed44 Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/pride_elytra.png differ diff --git a/src/main/resources/assets/joy/textures/item/progress_candle.png b/src/main/resources/assets/joy/textures/item/progress_candle.png new file mode 100644 index 0000000..03326f6 Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/progress_candle.png differ diff --git a/src/main/resources/assets/joy/textures/item/queer_candle.png b/src/main/resources/assets/joy/textures/item/queer_candle.png new file mode 100644 index 0000000..89b8982 Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/queer_candle.png differ 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 0000000..cfa6a4c Binary files /dev/null and b/src/main/resources/assets/joy/textures/item/trans_candle.png differ