diff --git a/src/client/java/gay/pridecraft/mixin/client/ProudClientMixin.java b/src/client/java/gay/pridecraft/pridemod/mixin/client/ProudClientMixin.java similarity index 89% rename from src/client/java/gay/pridecraft/mixin/client/ProudClientMixin.java rename to src/client/java/gay/pridecraft/pridemod/mixin/client/ProudClientMixin.java index 80f1b06..71eb918 100644 --- a/src/client/java/gay/pridecraft/mixin/client/ProudClientMixin.java +++ b/src/client/java/gay/pridecraft/pridemod/mixin/client/ProudClientMixin.java @@ -1,4 +1,4 @@ -package gay.pridecraft.mixin.client; +package gay.pridecraft.pridemod.mixin.client; import net.minecraft.client.MinecraftClient; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/client/resources/pridemod.client.mixins.json b/src/client/resources/pridemod.client.mixins.json index 5cf42ef..114c705 100644 --- a/src/client/resources/pridemod.client.mixins.json +++ b/src/client/resources/pridemod.client.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "gay.pridecraft.mixin.client", + "package": "gay.pridecraft.pridemod.mixin.client", "compatibilityLevel": "JAVA_17", "client": [ "ProudClientMixin" diff --git a/src/main/java/gay/pridecraft/PrideMod.java b/src/main/java/gay/pridecraft/PrideMod.java deleted file mode 100644 index 762edc5..0000000 --- a/src/main/java/gay/pridecraft/PrideMod.java +++ /dev/null @@ -1,17 +0,0 @@ -package gay.pridecraft; - -import net.fabricmc.api.ModInitializer; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class PrideMod implements ModInitializer { - - public static final Logger LOGGER = LoggerFactory.getLogger("pridemod"); - - @Override - public void onInitialize() { - - LOGGER.info("Hello Gay world!"); - } -} \ No newline at end of file diff --git a/src/main/java/gay/pridecraft/pridemod/PrideMod.java b/src/main/java/gay/pridecraft/pridemod/PrideMod.java new file mode 100644 index 0000000..aa4219a --- /dev/null +++ b/src/main/java/gay/pridecraft/pridemod/PrideMod.java @@ -0,0 +1,23 @@ +package gay.pridecraft.pridemod; + +import gay.pridecraft.pridemod.item.ModItemGroups; +import net.fabricmc.api.ModInitializer; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import gay.pridecraft.pridemod.item.ModItems; + +public class PrideMod implements ModInitializer { + + public static final String MOD_ID = "pridemod"; + public static final Logger LOGGER = LoggerFactory.getLogger("MOD_ID"); + + @Override + public void onInitialize() { + LOGGER.info("Thanks for using PrideMod! Gaying your minecraft..."); + ModItemGroups.registerItemGroups(); + ModItems.registerModItems(); + + + } +} \ No newline at end of file diff --git a/src/main/java/gay/pridecraft/PrideModDataGenerator.java b/src/main/java/gay/pridecraft/pridemod/PrideModDataGenerator.java similarity index 90% rename from src/main/java/gay/pridecraft/PrideModDataGenerator.java rename to src/main/java/gay/pridecraft/pridemod/PrideModDataGenerator.java index d724c14..1b4bbc3 100644 --- a/src/main/java/gay/pridecraft/PrideModDataGenerator.java +++ b/src/main/java/gay/pridecraft/pridemod/PrideModDataGenerator.java @@ -1,4 +1,4 @@ -package gay.pridecraft; +package gay.pridecraft.pridemod; import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; diff --git a/src/main/java/gay/pridecraft/pridemod/item/ModItemGroups.java b/src/main/java/gay/pridecraft/pridemod/item/ModItemGroups.java new file mode 100644 index 0000000..5e323d2 --- /dev/null +++ b/src/main/java/gay/pridecraft/pridemod/item/ModItemGroups.java @@ -0,0 +1,50 @@ +package gay.pridecraft.pridemod.item; + +import gay.pridecraft.pridemod.PrideMod; +import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +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 BEDS_GROUP = Registry.register(Registries.ITEM_GROUP, + new Identifier(PrideMod.MOD_ID, "test"), + FabricItemGroup.builder().displayName(Text.translatable("pridebeds.pridemod")) + .icon(() -> new ItemStack(Items.WHITE_BED)).entries((displayContext, entries) -> { + + entries.add(Items.DIRT); + + }).build()); + + public static final ItemGroup FLAGS_GROUP = Registry.register(Registries.ITEM_GROUP, + new Identifier(PrideMod.MOD_ID, "test2"), + FabricItemGroup.builder().displayName(Text.translatable("prideflags.pridemod")) + .icon(() -> new ItemStack(Items.WHITE_BANNER)).entries((displayContext, entries) -> { + + entries.add(Items.DIRT); + + }).build()); + + public static final ItemGroup ENTITIES_GROUP = Registry.register(Registries.ITEM_GROUP, + new Identifier(PrideMod.MOD_ID, "test3"), + FabricItemGroup.builder().displayName(Text.translatable("pridemobs.pridemod")) + .icon(() -> new ItemStack(Items.BEE_SPAWN_EGG)).entries((displayContext, entries) -> { + + entries.add(Items.DIRT); + + }).build()); + + public static void registerItemGroups() { + PrideMod.LOGGER.info("Making the gay items in" + PrideMod.MOD_ID, "have a group..."); + } + + + + + + +} diff --git a/src/main/java/gay/pridecraft/pridemod/item/ModItems.java b/src/main/java/gay/pridecraft/pridemod/item/ModItems.java new file mode 100644 index 0000000..bfea525 --- /dev/null +++ b/src/main/java/gay/pridecraft/pridemod/item/ModItems.java @@ -0,0 +1,44 @@ +package gay.pridecraft.pridemod.item; + + +import gay.pridecraft.pridemod.PrideMod; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroupEntries; +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; +import net.minecraft.item.Item; +import net.minecraft.item.ItemConvertible; +import net.minecraft.item.ItemGroups; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; + +public class ModItems { + + public static final Item TEST = registerItem("test", new Item(new FabricItemSettings())); + public static final Item TEST2 = registerItem("test2", new Item(new FabricItemSettings())); + public static final Item TEST3 = registerItem("test3", new Item(new FabricItemSettings())); + public static final Item TEST4 = registerItem("test4", new Item(new FabricItemSettings())); + public static final Item TEST5 = registerItem("test5", new Item(new FabricItemSettings())); + + + private static void addToIgredientGroup(FabricItemGroupEntries entries) { + entries.add(TEST); + entries.add(TEST2); + entries.add(TEST3); + entries.add(TEST4); + entries.add(TEST5); + } + + private static Item registerItem(String name, Item item) { + return Registry.register(Registries.ITEM, new Identifier(PrideMod.MOD_ID, name), item); + } + + + public static void registerModItems() { + + PrideMod.LOGGER.info("Making the gay items from" + PrideMod.MOD_ID); + + //ItemGroupEvents.modifyEntriesEvent(ItemGroups.INGREDIENTS).register(ModItems::addToIgredientGroup); + + } +} diff --git a/src/main/java/gay/pridecraft/mixin/ProudMixin.java b/src/main/java/gay/pridecraft/pridemod/mixin/ProudMixin.java similarity index 91% rename from src/main/java/gay/pridecraft/mixin/ProudMixin.java rename to src/main/java/gay/pridecraft/pridemod/mixin/ProudMixin.java index 714b84f..8a6a2d6 100644 --- a/src/main/java/gay/pridecraft/mixin/ProudMixin.java +++ b/src/main/java/gay/pridecraft/pridemod/mixin/ProudMixin.java @@ -1,4 +1,4 @@ -package gay.pridecraft.mixin; +package gay.pridecraft.pridemod.mixin; import net.minecraft.server.MinecraftServer; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 1dd48b7..e6cd538 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -17,13 +17,13 @@ "environment": "*", "entrypoints": { "main": [ - "gay.pridecraft.PrideMod" + "gay.pridecraft.pridemod.PrideMod" ], "client": [ "gay.pridecraft.PrideModClient" ], "fabric-datagen": [ - "gay.pridecraft.PrideModDataGenerator" + "gay.pridecraft.pridemod.PrideModDataGenerator" ] }, "mixins": [ diff --git a/src/main/resources/pridemod.mixins.json b/src/main/resources/pridemod.mixins.json index d6c7f76..7bbb0eb 100644 --- a/src/main/resources/pridemod.mixins.json +++ b/src/main/resources/pridemod.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "gay.pridecraft.mixin", + "package": "gay.pridecraft.pridemod.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ "ProudMixin"