Officially depend on Barch-Lib...

... let's hope i get this working right. 😄
BarchamMal · Aug 2, 2024 · bd7e778 · bd7e778
1 parent fc11ad7
commit bd7e778
Show file tree

Hide file tree

Showing 39 changed files with 226 additions and 235 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,11 +11,13 @@ base {
 }
 
 repositories {
-	// Add repositories to retrieve artifacts from in here.
-	// You should only use this when depending on other mods because
-	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
-	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
-	// for more information about repositories.
+	maven {
+		name = "CurseForge"
+		url = "https://www.cursemaven.com"
+		content {
+			includeGroup "curse.maven"
+		}
+	}
 }
 
 loom {
@@ -38,7 +40,10 @@ dependencies {
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-
+
+	// Barch-lib, a required library.
+	modImplementation "curse.maven:barch-lib-1071113:${project.barch_version}"
+
 }
 
 processResources {

diff --git a/gradle.properties b/gradle.properties
@@ -14,4 +14,5 @@ maven_group=barch.mc_extended
 archives_base_name=mc-extended
 
 # Dependencies
-fabric_version=0.100.7+1.21
+fabric_version=0.100.7+1.21
+barch_version=5565253
diff --git a/src/main/java/barch/mc_extended/Armor/BronzeArmorData.java b/src/main/java/barch/mc_extended/Armor/BronzeArmorData.java
@@ -1,7 +1,7 @@
 package barch.mc_extended.Armor;
 
-import barch.mc_extended.Glue.ItemGrouped;
-import barch.mc_extended.Glue.ItemGrouper;
+import net.barch.barch_lib.Items.ItemGroupItem;
+import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
 import barch.mc_extended.Minerals.Bronze;
 import net.minecraft.item.*;
 import net.minecraft.recipe.Ingredient;
@@ -58,11 +58,11 @@ public static void RegisterArmor() {
 
     public static void GroupArmor() {
 
-        ItemGrouper.GroupItem(BRONZE_HELMET, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, Items.IRON_BOOTS)});
-        ItemGrouper.GroupItem(BRONZE_CHESTPLATE, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, BRONZE_HELMET)});
-        ItemGrouper.GroupItem(BRONZE_LEGGINGS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, BRONZE_CHESTPLATE)});
-        ItemGrouper.GroupItem(BRONZE_BOOTS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, BRONZE_LEGGINGS)});
-        ItemGrouper.GroupItem(BRONZE_HORSE_ARMOR, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, Items.IRON_HORSE_ARMOR)});
+        MCE_ITEM_GROUPER.GroupItem(BRONZE_HELMET, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, Items.IRON_BOOTS)});
+        MCE_ITEM_GROUPER.GroupItem(BRONZE_CHESTPLATE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, BRONZE_HELMET)});
+        MCE_ITEM_GROUPER.GroupItem(BRONZE_LEGGINGS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, BRONZE_CHESTPLATE)});
+        MCE_ITEM_GROUPER.GroupItem(BRONZE_BOOTS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, BRONZE_LEGGINGS)});
+        MCE_ITEM_GROUPER.GroupItem(BRONZE_HORSE_ARMOR, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, Items.IRON_HORSE_ARMOR)});
 
     }
 }
diff --git a/src/main/java/barch/mc_extended/Armor/CopperArmorData.java b/src/main/java/barch/mc_extended/Armor/CopperArmorData.java
@@ -1,7 +1,7 @@
 package barch.mc_extended.Armor;
 
-import barch.mc_extended.Glue.ItemGrouped;
-import barch.mc_extended.Glue.ItemGrouper;
+import net.barch.barch_lib.Items.ItemGroupItem;
+import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
 import net.minecraft.item.*;
 import net.minecraft.recipe.Ingredient;
 import net.minecraft.registry.Registries;
@@ -58,11 +58,11 @@ public static void RegisterArmor() {
 
     public static void GroupArmor() {
 
-        ItemGrouper.GroupItem(COPPER_HELMET, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SILVER_BOOTS)});
-        ItemGrouper.GroupItem(COPPER_CHESTPLATE, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, COPPER_HELMET)});
-        ItemGrouper.GroupItem(COPPER_LEGGINGS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, COPPER_CHESTPLATE)});
-        ItemGrouper.GroupItem(COPPER_BOOTS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, COPPER_LEGGINGS)});
-        ItemGrouper.GroupItem(COPPER_HORSE_ARMOR, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SILVER_HORSE_ARMOR)});
+        MCE_ITEM_GROUPER.GroupItem(COPPER_HELMET, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SILVER_BOOTS)});
+        MCE_ITEM_GROUPER.GroupItem(COPPER_CHESTPLATE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, COPPER_HELMET)});
+        MCE_ITEM_GROUPER.GroupItem(COPPER_LEGGINGS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, COPPER_CHESTPLATE)});
+        MCE_ITEM_GROUPER.GroupItem(COPPER_BOOTS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, COPPER_LEGGINGS)});
+        MCE_ITEM_GROUPER.GroupItem(COPPER_HORSE_ARMOR, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SILVER_HORSE_ARMOR)});
 
     }
 }
diff --git a/src/main/java/barch/mc_extended/Armor/CorundumArmorData.java b/src/main/java/barch/mc_extended/Armor/CorundumArmorData.java
@@ -1,7 +1,7 @@
 package barch.mc_extended.Armor;
 
-import barch.mc_extended.Glue.ItemGrouped;
-import barch.mc_extended.Glue.ItemGrouper;
+import net.barch.barch_lib.Items.ItemGroupItem;
+import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
 import barch.mc_extended.Minerals.Corundum;
 import net.minecraft.item.*;
 import net.minecraft.recipe.Ingredient;
@@ -55,10 +55,10 @@ public static void RegisterArmor() {
     }
 
     public static void GroupArmor() {
-        ItemGrouper.GroupItem(CORUNDUM_HELMET, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, Items.NETHERITE_BOOTS)});
-        ItemGrouper.GroupItem(CORUNDUM_CHESTPLATE, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, CORUNDUM_HELMET)});
-        ItemGrouper.GroupItem(CORUNDUM_LEGGINGS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, CORUNDUM_CHESTPLATE)});
-        ItemGrouper.GroupItem(CORUNDUM_BOOTS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, CORUNDUM_LEGGINGS)});
-        ItemGrouper.GroupItem(CORUNDUM_HORSE_ARMOR, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SAPPHIRE_HORSE_ARMOR)});
+        MCE_ITEM_GROUPER.GroupItem(CORUNDUM_HELMET, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, Items.NETHERITE_BOOTS)});
+        MCE_ITEM_GROUPER.GroupItem(CORUNDUM_CHESTPLATE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, CORUNDUM_HELMET)});
+        MCE_ITEM_GROUPER.GroupItem(CORUNDUM_LEGGINGS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, CORUNDUM_CHESTPLATE)});
+        MCE_ITEM_GROUPER.GroupItem(CORUNDUM_BOOTS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, CORUNDUM_LEGGINGS)});
+        MCE_ITEM_GROUPER.GroupItem(CORUNDUM_HORSE_ARMOR, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SAPPHIRE_HORSE_ARMOR)});
     }
 }
diff --git a/src/main/java/barch/mc_extended/Armor/RubyArmorData.java b/src/main/java/barch/mc_extended/Armor/RubyArmorData.java
@@ -1,7 +1,7 @@
 package barch.mc_extended.Armor;
 
-import barch.mc_extended.Glue.ItemGrouped;
-import barch.mc_extended.Glue.ItemGrouper;
+import net.barch.barch_lib.Items.ItemGroupItem;
+import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
 import net.minecraft.item.*;
 import net.minecraft.recipe.Ingredient;
 import net.minecraft.registry.Registries;
@@ -57,11 +57,11 @@ public static void RegisterArmor() {
 
     public static void GroupArmor() {
 
-        ItemGrouper.GroupItem(RUBY_HELMET, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, Items.DIAMOND_BOOTS)});
-        ItemGrouper.GroupItem(RUBY_CHESTPLATE, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, RUBY_HELMET)});
-        ItemGrouper.GroupItem(RUBY_LEGGINGS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, RUBY_CHESTPLATE)});
-        ItemGrouper.GroupItem(RUBY_BOOTS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, RUBY_LEGGINGS)});
-        ItemGrouper.GroupItem(RUBY_HORSE_ARMOR, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, Items.DIAMOND_HORSE_ARMOR)});
+        MCE_ITEM_GROUPER.GroupItem(RUBY_HELMET, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, Items.DIAMOND_BOOTS)});
+        MCE_ITEM_GROUPER.GroupItem(RUBY_CHESTPLATE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, RUBY_HELMET)});
+        MCE_ITEM_GROUPER.GroupItem(RUBY_LEGGINGS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, RUBY_CHESTPLATE)});
+        MCE_ITEM_GROUPER.GroupItem(RUBY_BOOTS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, RUBY_LEGGINGS)});
+        MCE_ITEM_GROUPER.GroupItem(RUBY_HORSE_ARMOR, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, Items.DIAMOND_HORSE_ARMOR)});
 
     }
 }
diff --git a/src/main/java/barch/mc_extended/Armor/SapphireArmorData.java b/src/main/java/barch/mc_extended/Armor/SapphireArmorData.java
@@ -1,7 +1,7 @@
 package barch.mc_extended.Armor;
 
-import barch.mc_extended.Glue.ItemGrouped;
-import barch.mc_extended.Glue.ItemGrouper;
+import net.barch.barch_lib.Items.ItemGroupItem;
+import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
 import barch.mc_extended.Minerals.Sapphire;
 import net.minecraft.item.*;
 import net.minecraft.recipe.Ingredient;
@@ -59,11 +59,11 @@ public static void RegisterArmor() {
 
     public static void GroupArmor() {
 
-        ItemGrouper.GroupItem(SAPPHIRE_HELMET, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, RUBY_BOOTS)});
-        ItemGrouper.GroupItem(SAPPHIRE_CHESTPLATE, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SAPPHIRE_HELMET)});
-        ItemGrouper.GroupItem(SAPPHIRE_LEGGINGS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SAPPHIRE_CHESTPLATE)});
-        ItemGrouper.GroupItem(SAPPHIRE_BOOTS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SAPPHIRE_LEGGINGS)});
-        ItemGrouper.GroupItem(SAPPHIRE_HORSE_ARMOR, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, RUBY_HORSE_ARMOR)});
+        MCE_ITEM_GROUPER.GroupItem(SAPPHIRE_HELMET, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, RUBY_BOOTS)});
+        MCE_ITEM_GROUPER.GroupItem(SAPPHIRE_CHESTPLATE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SAPPHIRE_HELMET)});
+        MCE_ITEM_GROUPER.GroupItem(SAPPHIRE_LEGGINGS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SAPPHIRE_CHESTPLATE)});
+        MCE_ITEM_GROUPER.GroupItem(SAPPHIRE_BOOTS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SAPPHIRE_LEGGINGS)});
+        MCE_ITEM_GROUPER.GroupItem(SAPPHIRE_HORSE_ARMOR, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, RUBY_HORSE_ARMOR)});
 
     }
 }
diff --git a/src/main/java/barch/mc_extended/Armor/SilverArmorData.java b/src/main/java/barch/mc_extended/Armor/SilverArmorData.java
@@ -1,7 +1,7 @@
 package barch.mc_extended.Armor;
 
-import barch.mc_extended.Glue.ItemGrouped;
-import barch.mc_extended.Glue.ItemGrouper;
+import net.barch.barch_lib.Items.ItemGroupItem;
+import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
 import barch.mc_extended.Minerals.Silver;
 import net.minecraft.item.*;
 import net.minecraft.recipe.Ingredient;
@@ -56,11 +56,11 @@ public static void RegisterArmor() {
 
     public static void GroupArmor() {
 
-        ItemGrouper.GroupItem(SILVER_HELMET, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, Items.GOLDEN_BOOTS)});
-        ItemGrouper.GroupItem(SILVER_CHESTPLATE, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SILVER_HELMET)});
-        ItemGrouper.GroupItem(SILVER_LEGGINGS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SILVER_CHESTPLATE)});
-        ItemGrouper.GroupItem(SILVER_BOOTS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SILVER_LEGGINGS)});
-        ItemGrouper.GroupItem(SILVER_HORSE_ARMOR, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, Items.GOLDEN_HORSE_ARMOR)});
+        MCE_ITEM_GROUPER.GroupItem(SILVER_HELMET, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, Items.GOLDEN_BOOTS)});
+        MCE_ITEM_GROUPER.GroupItem(SILVER_CHESTPLATE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SILVER_HELMET)});
+        MCE_ITEM_GROUPER.GroupItem(SILVER_LEGGINGS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SILVER_CHESTPLATE)});
+        MCE_ITEM_GROUPER.GroupItem(SILVER_BOOTS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SILVER_LEGGINGS)});
+        MCE_ITEM_GROUPER.GroupItem(SILVER_HORSE_ARMOR, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, Items.GOLDEN_HORSE_ARMOR)});
 
     }
 

diff --git a/src/main/java/barch/mc_extended/Armor/TinArmorData.java b/src/main/java/barch/mc_extended/Armor/TinArmorData.java
@@ -1,7 +1,7 @@
 package barch.mc_extended.Armor;
 
-import barch.mc_extended.Glue.ItemGrouped;
-import barch.mc_extended.Glue.ItemGrouper;
+import net.barch.barch_lib.Items.ItemGroupItem;
+import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
 import barch.mc_extended.Minerals.Tin;
 import net.minecraft.item.*;
 import net.minecraft.recipe.Ingredient;
@@ -59,11 +59,11 @@ public static void RegisterArmor() {
 
     public static void GroupArmor() {
 
-        ItemGrouper.GroupItem(TIN_HELMET, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, BRONZE_BOOTS)});
-        ItemGrouper.GroupItem(TIN_CHESTPLATE, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, TIN_HELMET)});
-        ItemGrouper.GroupItem(TIN_LEGGINGS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, TIN_CHESTPLATE)});
-        ItemGrouper.GroupItem(TIN_BOOTS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, TIN_LEGGINGS)});
-        ItemGrouper.GroupItem(TIN_HORSE_ARMOR, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, BRONZE_HORSE_ARMOR)});
+        MCE_ITEM_GROUPER.GroupItem(TIN_HELMET, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, BRONZE_BOOTS)});
+        MCE_ITEM_GROUPER.GroupItem(TIN_CHESTPLATE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, TIN_HELMET)});
+        MCE_ITEM_GROUPER.GroupItem(TIN_LEGGINGS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, TIN_CHESTPLATE)});
+        MCE_ITEM_GROUPER.GroupItem(TIN_BOOTS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, TIN_LEGGINGS)});
+        MCE_ITEM_GROUPER.GroupItem(TIN_HORSE_ARMOR, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, BRONZE_HORSE_ARMOR)});
 
     }
 }
diff --git a/src/main/java/barch/mc_extended/Entities/Entities.java b/src/main/java/barch/mc_extended/Entities/Entities.java
@@ -1,7 +1,7 @@
 package barch.mc_extended.Entities;
 
-import barch.mc_extended.Glue.ItemGrouper;
-import barch.mc_extended.Glue.ItemGrouped;
+import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
+import net.barch.barch_lib.Items.ItemGroupItem;
 import barch.mc_extended.Tags;
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
 import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
@@ -72,10 +72,10 @@ public static void RegisterAll() {
 
     public static void GroupAll() {
 
-        ItemGrouper.GroupItem(ENDER_CUBE_SPAWN_EGG, new ItemGrouped[]{new ItemGrouped(ItemGroups.SPAWN_EGGS, Items.ELDER_GUARDIAN_SPAWN_EGG)});
-        ItemGrouper.GroupItem(LOST_SPAWN_EGG, new ItemGrouped[]{new ItemGrouped(ItemGroups.SPAWN_EGGS, Items.LLAMA_SPAWN_EGG)});
-        ItemGrouper.GroupItem(SILVER_GOLEM_SPAWN_EGG, new ItemGrouped[]{new ItemGrouped(ItemGroups.SPAWN_EGGS, Items.SILVERFISH_SPAWN_EGG)});
-        ItemGrouper.GroupItem(TROUT_FISH_SPAWN_EGG, new ItemGrouped[]{new ItemGrouped(ItemGroups.SPAWN_EGGS, Items.TROPICAL_FISH_SPAWN_EGG)});
+        MCE_ITEM_GROUPER.GroupItem(ENDER_CUBE_SPAWN_EGG, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.SPAWN_EGGS, Items.ELDER_GUARDIAN_SPAWN_EGG)});
+        MCE_ITEM_GROUPER.GroupItem(LOST_SPAWN_EGG, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.SPAWN_EGGS, Items.LLAMA_SPAWN_EGG)});
+        MCE_ITEM_GROUPER.GroupItem(SILVER_GOLEM_SPAWN_EGG, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.SPAWN_EGGS, Items.SILVERFISH_SPAWN_EGG)});
+        MCE_ITEM_GROUPER.GroupItem(TROUT_FISH_SPAWN_EGG, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.SPAWN_EGGS, Items.TROPICAL_FISH_SPAWN_EGG)});
 
     }
 }
diff --git a/src/main/java/barch/mc_extended/Foods/Cheese.java b/src/main/java/barch/mc_extended/Foods/Cheese.java
@@ -1,8 +1,8 @@
 package barch.mc_extended.Foods;
 
-import barch.mc_extended.Glue.BlockBuilder;
-import barch.mc_extended.Glue.ItemGrouper;
-import barch.mc_extended.Glue.ItemGrouped;
+import net.barch.barch_lib.Blocks.BlockBuilder;
+import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
+import net.barch.barch_lib.Items.ItemGroupItem;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.CakeBlock;
@@ -27,7 +27,7 @@ public static void RegisterAll() {
 
     public static void GroupItems() {
 
-        ItemGrouper.GroupItem(CHEESE.asItem(), new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, Items.CAKE)});
+        MCE_ITEM_GROUPER.GroupItem(CHEESE.asItem(), new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, Items.CAKE)});
 
 
     }

diff --git a/src/main/java/barch/mc_extended/Foods/Meats.java b/src/main/java/barch/mc_extended/Foods/Meats.java
@@ -1,7 +1,7 @@
 package barch.mc_extended.Foods;
 
-import barch.mc_extended.Glue.ItemGrouper;
-import barch.mc_extended.Glue.ItemGrouped;
+import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
+import net.barch.barch_lib.Items.ItemGroupItem;
 import net.minecraft.component.type.FoodComponents;
 import net.minecraft.item.*;
 import net.minecraft.registry.Registries;
@@ -24,8 +24,8 @@ public static void RegisterAll() {
     }
     public static void GroupItems() {
 
-        ItemGrouper.GroupItem(TROUT, new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, Items.COOKED_SALMON)});
-        ItemGrouper.GroupItem(COOKED_TROUT, new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, TROUT)});
+        MCE_ITEM_GROUPER.GroupItem(TROUT, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, Items.COOKED_SALMON)});
+        MCE_ITEM_GROUPER.GroupItem(COOKED_TROUT, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, TROUT)});
 
     }
 

diff --git a/src/main/java/barch/mc_extended/Foods/Mushrooms.java b/src/main/java/barch/mc_extended/Foods/Mushrooms.java
@@ -1,8 +1,8 @@
 package barch.mc_extended.Foods;
 
-import barch.mc_extended.Glue.BlockBuilder;
-import barch.mc_extended.Glue.ItemGrouper;
-import barch.mc_extended.Glue.ItemGrouped;
+import net.barch.barch_lib.Blocks.BlockBuilder;
+import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
+import net.barch.barch_lib.Items.ItemGroupItem;
 import net.minecraft.block.*;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
@@ -38,8 +38,8 @@ public static void RegisterItems() {
 
     public static void GroupItems() {
 
-        ItemGrouper.GroupItem(WHITE_MUSHROOM.asItem(), new ItemGrouped[]{new ItemGrouped(ItemGroups.NATURAL, Blocks.RED_MUSHROOM)});
-        ItemGrouper.GroupItem(WHITE_MUSHROOM_BLOCK.asItem(), new ItemGrouped[]{new ItemGrouped(ItemGroups.NATURAL, Blocks.RED_MUSHROOM_BLOCK)});
+        MCE_ITEM_GROUPER.GroupItem(WHITE_MUSHROOM.asItem(), new ItemGroupItem[]{new ItemGroupItem(ItemGroups.NATURAL, Blocks.RED_MUSHROOM)});
+        MCE_ITEM_GROUPER.GroupItem(WHITE_MUSHROOM_BLOCK.asItem(), new ItemGroupItem[]{new ItemGroupItem(ItemGroups.NATURAL, Blocks.RED_MUSHROOM_BLOCK)});
 
     }
 

diff --git a/src/main/java/barch/mc_extended/Foods/Onion.java b/src/main/java/barch/mc_extended/Foods/Onion.java
@@ -1,8 +1,8 @@
 package barch.mc_extended.Foods;
 
-import barch.mc_extended.Glue.BlockBuilder;
-import barch.mc_extended.Glue.ItemGrouper;
-import barch.mc_extended.Glue.ItemGrouped;
+import net.barch.barch_lib.Blocks.BlockBuilder;
+import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
+import net.barch.barch_lib.Items.ItemGroupItem;
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
 import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
 import net.fabricmc.fabric.api.registry.CompostingChanceRegistry;
@@ -55,8 +55,8 @@ public static void RegisterAll() {
 
     public static void GroupItems() {
 
-        ItemGrouper.GroupItem(ONION, new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, Items.BAKED_POTATO)});
-        ItemGrouper.GroupItem(FRIED_ONION, new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, ONION)});
+        MCE_ITEM_GROUPER.GroupItem(ONION, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, Items.BAKED_POTATO)});
+        MCE_ITEM_GROUPER.GroupItem(FRIED_ONION, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, ONION)});
 
     }