Add item groups

Author: Ampflower

fabric/src/main/java/gay/ampflower/mod/pet/fabric/FabricPivot.java

@@ -0,0 +1,16 @@
+package gay.ampflower.mod.pet.fabric;
+
+import gay.ampflower.mod.pet.util.VanillaPivot;
+import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
+import net.minecraft.item.ItemGroup;
+
+/**
+ * @author Ampflower
+ * @since 0.2.0
+ **/
+public class FabricPivot extends VanillaPivot {
+	@Override
+	public ItemGroup.Builder createItemGroupBuilder() {
+		return FabricItemGroup.builder();
+	}
+}

fabric/src/main/resources/META-INF/services/gay.ampflower.mod.pet.util.Pivot

@@ -1 +1 @@
-gay.ampflower.mod.pet.util.VanillaPivot
+gay.ampflower.mod.pet.fabric.FabricPivot

xplat/src/main/java/gay/ampflower/mod/pet/registry/PetworksItemGroups.java

@@ -0,0 +1,31 @@
+package gay.ampflower.mod.pet.registry;
+
+import gay.ampflower.mod.pet.util.Pivot;
+import net.minecraft.item.ItemGroup;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.text.Text;
+
+/**
+ * @author Ampflower
+ * @since 0.2.0
+ **/
+public final class PetworksItemGroups {
+	public static final ItemGroup COLLAR_GROUP = register("collars", Pivot.INSTANCE.createItemGroupBuilder()
+		.icon(PetworksItems.PRIDE_COLLAR::getDefaultStack)
+		.displayName(Text.translatable("itemGroup.petworks.collars"))
+		.entries((context, entries) -> Pivot.registerCollars(entries::add))
+		.build());
+
+	public static final ItemGroup GUISE_GROUP = register("guises", Pivot.INSTANCE.createItemGroupBuilder()
+		.icon(PetworksItems.TAMED_CAT_GUISE::getDefaultStack)
+		.displayName(Text.translatable("itemGroup.petworks.guises"))
+		.entries((context, entries) -> Pivot.registerGuises(entries::add))
+		.build());
+
+	private static ItemGroup register(final String id, final ItemGroup itemGroup) {
+		return Pivot.INSTANCE.register(RegistryKeys.ITEM_GROUP, id, itemGroup);
+	}
+
+	public static void init() {
+	}
+}

xplat/src/main/java/gay/ampflower/mod/pet/util/Pivot.java

@@ -60,6 +60,8 @@ public interface Pivot {
 
 	<V, T extends V> T register(RegistryKey<Registry<V>> key, String id, T t);
 
+	ItemGroup.Builder createItemGroupBuilder();
+
 	static <A> void registerCollars(BiConsumer<Item, A> collarConsumer, A cosmetic, A armor, A gimick) {
 		collarConsumer.accept(MAID_COLLAR, cosmetic);
 		collarConsumer.accept(COLLAR, cosmetic);
@@ -90,12 +92,52 @@ static <A> void registerCollars(BiConsumer<Item, A> collarConsumer, A cosmetic,
 		collarConsumer.accept(BEDROCK_COLLAR, gimick);
 	}
 
+	static void registerCollars(Consumer<ItemConvertible> collarConsumer) {
+		collarConsumer.accept(MAID_COLLAR);
+		collarConsumer.accept(COLLAR);
+		collarConsumer.accept(MISSING_COLLAR);
+		collarConsumer.accept(PRIDE_COLLAR);
+		collarConsumer.accept(TRANS_COLLAR);
+		collarConsumer.accept(LESBIAN_COLLAR);
+		collarConsumer.accept(GAY_COLLAR);
+		collarConsumer.accept(GENDERQUEER_COLLAR);
+		collarConsumer.accept(GENDERFLUID_COLLAR);
+		collarConsumer.accept(AGENDER_COLLAR);
+		collarConsumer.accept(ARO_COLLAR);
+		collarConsumer.accept(ACE_COLLAR);
+		collarConsumer.accept(AROACE_COLLAR);
+		collarConsumer.accept(CLOTH_COLLAR);
+		collarConsumer.accept(HIDE_COLLAR);
+		collarConsumer.accept(LEATHER_COLLAR);
+		collarConsumer.accept(CHAIN_COLLAR);
+		collarConsumer.accept(IRON_COLLAR);
+		collarConsumer.accept(GOLD_COLLAR);
+		collarConsumer.accept(COPPER_COLLAR);
+		collarConsumer.accept(QUARTZ_COLLAR);
+		collarConsumer.accept(AMETHYST_COLLAR);
+		collarConsumer.accept(EMERALD_COLLAR);
+		collarConsumer.accept(DIAMOND_COLLAR);
+		collarConsumer.accept(NETHERITE_COLLAR);
+		collarConsumer.accept(OBSIDIAN_COLLAR);
+		collarConsumer.accept(BEDROCK_COLLAR);
+	}
+
+	static void registerGuises(Consumer<ItemConvertible> guiseConsumer) {
+		guiseConsumer.accept(WOLF_GUISE);
+		guiseConsumer.accept(TAMED_CAT_GUISE);
+		guiseConsumer.accept(STRAY_CAT_GUISE);
+		guiseConsumer.accept(OCELOT_GUISE);
+		guiseConsumer.accept(FOX_GUISE);
+		guiseConsumer.accept(RABBIT_GUISE);
+	}
+
 	static void init() {
 		PetworksBlocks.init();
 		PetworksBlockTypes.init();
 		PetworksBlockEntities.init();
 		PetworksDataComponentTypes.init();
 		PetworksItems.init();
 		PetworksRecipeSerializers.init();
+		PetworksItemGroups.init();
 	}
 }

xplat/src/main/java/gay/ampflower/mod/pet/util/VanillaPivot.java

@@ -1,17 +1,28 @@
 package gay.ampflower.mod.pet.util;
 
+import com.mojang.logging.LogUtils;
+import net.minecraft.item.ItemGroup;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
+import org.slf4j.Logger;
 
 /**
  * @author Ampflower
  * @since 0.1.0
  **/
 public class VanillaPivot implements Pivot {
+	private static final Logger logger = LogUtils.getLogger();
+
 	@Override
 	public <V, T extends V> T register(final RegistryKey<Registry<V>> key, final String id, final T t) {
 		@SuppressWarnings("unchecked") final var registry = (Registry<V>) Registries.REGISTRIES.getOrEmpty(key.getValue()).orElseThrow();
 		return Registry.register(registry, Util.id(id), t);
 	}
+
+	@Override
+	public ItemGroup.Builder createItemGroupBuilder() {
+		logger.error("Stray call to VanillaPivot#createItemGroupBuilder(), providing dummy.", new Throwable());
+		return ItemGroup.create(null, -1);
+	}
 }

xplat/src/main/resources/assets/petworks/lang/en_us.json

@@ -36,6 +36,9 @@
 	"item.petworks.glowing.advanced": "Glowing (%d, %d)",
 	"item.petworks.glowing": "Glowing",
 
+	"itemGroup.petworks.guises": "Caricatures",
+	"itemGroup.petworks.collars": "Collars",
+
 	"trinkets.slot.chest.guise": "Caricature",
 	"trinkets.slot.chest.collar": "Collar",