Update item groups

Add Caffeinated item group and update sorting in vanilla item groups
Chikorita-Lover · Dec 24, 2023 · f9d13b4 · f9d13b4
1 parent 0215056
commit f9d13b4
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 17 deletions.
diff --git a/src/main/java/com/chikoritalover/caffeinated/Caffeinated.java b/src/main/java/com/chikoritalover/caffeinated/Caffeinated.java
@@ -27,6 +27,7 @@ public void onInitialize() {
  CaffeinatedBannerPatterns.initAndGetDefault(Registries.BANNER_PATTERN);
  CaffeinatedBlocks.register();
  CaffeinatedCauldronBehavior.register();
+ CaffeinatedItemGroups.register();
  CaffeinatedItems.register();
  CaffeinatedParticleTypes.register();
  CaffeinatedPlacedFeatures.register();

diff --git a/src/main/java/com/chikoritalover/caffeinated/registry/CaffeinatedItemGroups.java b/src/main/java/com/chikoritalover/caffeinated/registry/CaffeinatedItemGroups.java
@@ -0,0 +1,45 @@
+package com.chikoritalover.caffeinated.registry;
+
+import com.chikoritalover.caffeinated.Caffeinated;
+import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
+import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
+import net.minecraft.block.Blocks;
+import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ItemGroups;
+import net.minecraft.item.Items;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+
+public class CaffeinatedItemGroups {
+ private static final RegistryKey<ItemGroup> CAFFEINATED = RegistryKey.of(RegistryKeys.ITEM_GROUP, new Identifier(Caffeinated.MODID, "caffeinated"));
+
+ public static void register() {
+ Registry.register(Registries.ITEM_GROUP, CAFFEINATED, FabricItemGroup.builder()
+ .displayName(Text.translatable("itemGroup.caffeinated.caffeinated"))
+ .icon(CaffeinatedItems.COFFEE_BOTTLE::getDefaultStack)
+ .build()
+ );
+
+ ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(entries -> {
+ entries.addBefore(Items.NETHER_WART, CaffeinatedItems.COFFEE_BERRIES);
+ entries.addBefore(Blocks.SCULK, CaffeinatedBlocks.COFFEE_BEAN_BLOCK, CaffeinatedBlocks.GROUND_COFFEE_BLOCK);
+ });
+ ItemGroupEvents.modifyEntriesEvent(ItemGroups.FOOD_AND_DRINK).register(entries -> {
+ entries.addBefore(Items.CHORUS_FRUIT, CaffeinatedItems.COFFEE_BERRIES);
+ entries.addBefore(Items.PUMPKIN_PIE, CaffeinatedBlocks.TIRAMISU, CaffeinatedItems.TIRAMISU_SLICE);
+ entries.add(CaffeinatedItems.COFFEE_BOTTLE);
+ });
+ ItemGroupEvents.modifyEntriesEvent(ItemGroups.INGREDIENTS).register(entries -> {
+ entries.addAfter(Items.GLASS_BOTTLE, CaffeinatedItems.COFFEE_BEANS, CaffeinatedItems.GROUND_COFFEE);
+ entries.addAfter(Items.PIGLIN_BANNER_PATTERN, CaffeinatedItems.JAVA_BANNER_PATTERN);
+ });
+ ItemGroupEvents.modifyEntriesEvent(CAFFEINATED).register(entries -> {
+ entries.add(CaffeinatedItems.COFFEE_BERRIES);
+ entries.addAfter(CaffeinatedItems.COFFEE_BERRIES, CaffeinatedItems.COFFEE_BEANS, CaffeinatedItems.GROUND_COFFEE, CaffeinatedBlocks.COFFEE_BEAN_BLOCK, CaffeinatedBlocks.GROUND_COFFEE_BLOCK, CaffeinatedItems.COFFEE_BOTTLE, CaffeinatedBlocks.TIRAMISU, CaffeinatedItems.TIRAMISU_SLICE, CaffeinatedItems.JAVA_BANNER_PATTERN);
+ });
+ }
+}
diff --git a/src/main/java/com/chikoritalover/caffeinated/registry/CaffeinatedItems.java b/src/main/java/com/chikoritalover/caffeinated/registry/CaffeinatedItems.java
@@ -44,7 +44,6 @@ private static Item register(Identifier id, Item item) {
 
  public static void register() {
  registerCompostingChances();
- registerItemGroups();
  }
 
  public static void registerCompostingChances() {
@@ -56,20 +55,4 @@ public static void registerCompostingChances() {
  CompostingChanceRegistry.INSTANCE.add(CaffeinatedBlocks.TIRAMISU, 1.0F);
  CompostingChanceRegistry.INSTANCE.add(TIRAMISU_SLICE, 0.85F);
  }
-
- public static void registerItemGroups() {
- ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(entries -> {
- entries.addAfter(Blocks.HONEYCOMB_BLOCK, CaffeinatedBlocks.COFFEE_BEAN_BLOCK, CaffeinatedBlocks.GROUND_COFFEE_BLOCK);
- entries.addAfter(Items.SWEET_BERRIES, COFFEE_BERRIES);
- });
- ItemGroupEvents.modifyEntriesEvent(ItemGroups.FOOD_AND_DRINK).register(entries -> {
- entries.addAfter(Items.GLOW_BERRIES, COFFEE_BERRIES);
- entries.addAfter(Items.CAKE, CaffeinatedBlocks.TIRAMISU, TIRAMISU_SLICE);
- entries.addAfter(Items.HONEY_BOTTLE, COFFEE_BOTTLE);
- });
- ItemGroupEvents.modifyEntriesEvent(ItemGroups.INGREDIENTS).register(entries -> {
- entries.addAfter(Items.WHEAT, COFFEE_BEANS, GROUND_COFFEE);
- entries.addAfter(Items.PIGLIN_BANNER_PATTERN, JAVA_BANNER_PATTERN);
- });
- }
 }
diff --git a/src/main/resources/assets/caffeinated/lang/en_us.json b/src/main/resources/assets/caffeinated/lang/en_us.json
@@ -41,6 +41,8 @@
  "item.caffeinated.java_banner_pattern.desc": "Java Emblem",
  "item.caffeinated.tiramisu_slice": "Tiramisu Slice",
 
+ "itemGroup.caffeinated.caffeinated": "Caffeinated",
+
  "subtitles.block.cauldron.brew": "Cauldron brews",
  "subtitles.block.cauldron.bubble": "Cauldron bubbles",
  "subtitles.item.coffee_bottle.drink": "Slurping",