Skip to content

Commit bd7e778

Browse files
BarchamMalBarchamMal
committed
Officially depend on Barch-Lib...
... let's hope i get this working right. 😄
1 parent fc11ad7 commit bd7e778

39 files changed

+226
-235
lines changed

‎build.gradle

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ base {
1111
}
1212

1313
repositories {
14-
// Add repositories to retrieve artifacts from in here.
15-
// You should only use this when depending on other mods because
16-
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
17-
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
18-
// for more information about repositories.
14+
maven {
15+
name = "CurseForge"
16+
url = "https://www.cursemaven.com"
17+
content {
18+
includeGroup "curse.maven"
19+
}
20+
}
1921
}
2022

2123
loom {
@@ -38,7 +40,10 @@ dependencies {
3840

3941
// Fabric API. This is technically optional, but you probably want it anyway.
4042
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
41-
43+
44+
// Barch-lib, a required library.
45+
modImplementation "curse.maven:barch-lib-1071113:${project.barch_version}"
46+
4247
}
4348

4449
processResources {

‎gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ maven_group=barch.mc_extended
1414
archives_base_name=mc-extended
1515

1616
# Dependencies
17-
fabric_version=0.100.7+1.21
17+
fabric_version=0.100.7+1.21
18+
barch_version=5565253

‎src/main/java/barch/mc_extended/Armor/BronzeArmorData.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package barch.mc_extended.Armor;
22

3-
import barch.mc_extended.Glue.ItemGrouped;
4-
import barch.mc_extended.Glue.ItemGrouper;
3+
import net.barch.barch_lib.Items.ItemGroupItem;
4+
import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
55
import barch.mc_extended.Minerals.Bronze;
66
import net.minecraft.item.*;
77
import net.minecraft.recipe.Ingredient;
@@ -58,11 +58,11 @@ public static void RegisterArmor() {
5858

5959
public static void GroupArmor() {
6060

61-
ItemGrouper.GroupItem(BRONZE_HELMET, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, Items.IRON_BOOTS)});
62-
ItemGrouper.GroupItem(BRONZE_CHESTPLATE, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, BRONZE_HELMET)});
63-
ItemGrouper.GroupItem(BRONZE_LEGGINGS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, BRONZE_CHESTPLATE)});
64-
ItemGrouper.GroupItem(BRONZE_BOOTS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, BRONZE_LEGGINGS)});
65-
ItemGrouper.GroupItem(BRONZE_HORSE_ARMOR, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, Items.IRON_HORSE_ARMOR)});
61+
MCE_ITEM_GROUPER.GroupItem(BRONZE_HELMET, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, Items.IRON_BOOTS)});
62+
MCE_ITEM_GROUPER.GroupItem(BRONZE_CHESTPLATE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, BRONZE_HELMET)});
63+
MCE_ITEM_GROUPER.GroupItem(BRONZE_LEGGINGS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, BRONZE_CHESTPLATE)});
64+
MCE_ITEM_GROUPER.GroupItem(BRONZE_BOOTS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, BRONZE_LEGGINGS)});
65+
MCE_ITEM_GROUPER.GroupItem(BRONZE_HORSE_ARMOR, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, Items.IRON_HORSE_ARMOR)});
6666

6767
}
6868
}

‎src/main/java/barch/mc_extended/Armor/CopperArmorData.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package barch.mc_extended.Armor;
22

3-
import barch.mc_extended.Glue.ItemGrouped;
4-
import barch.mc_extended.Glue.ItemGrouper;
3+
import net.barch.barch_lib.Items.ItemGroupItem;
4+
import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
55
import net.minecraft.item.*;
66
import net.minecraft.recipe.Ingredient;
77
import net.minecraft.registry.Registries;
@@ -58,11 +58,11 @@ public static void RegisterArmor() {
5858

5959
public static void GroupArmor() {
6060

61-
ItemGrouper.GroupItem(COPPER_HELMET, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SILVER_BOOTS)});
62-
ItemGrouper.GroupItem(COPPER_CHESTPLATE, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, COPPER_HELMET)});
63-
ItemGrouper.GroupItem(COPPER_LEGGINGS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, COPPER_CHESTPLATE)});
64-
ItemGrouper.GroupItem(COPPER_BOOTS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, COPPER_LEGGINGS)});
65-
ItemGrouper.GroupItem(COPPER_HORSE_ARMOR, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SILVER_HORSE_ARMOR)});
61+
MCE_ITEM_GROUPER.GroupItem(COPPER_HELMET, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SILVER_BOOTS)});
62+
MCE_ITEM_GROUPER.GroupItem(COPPER_CHESTPLATE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, COPPER_HELMET)});
63+
MCE_ITEM_GROUPER.GroupItem(COPPER_LEGGINGS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, COPPER_CHESTPLATE)});
64+
MCE_ITEM_GROUPER.GroupItem(COPPER_BOOTS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, COPPER_LEGGINGS)});
65+
MCE_ITEM_GROUPER.GroupItem(COPPER_HORSE_ARMOR, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SILVER_HORSE_ARMOR)});
6666

6767
}
6868
}

‎src/main/java/barch/mc_extended/Armor/CorundumArmorData.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package barch.mc_extended.Armor;
22

3-
import barch.mc_extended.Glue.ItemGrouped;
4-
import barch.mc_extended.Glue.ItemGrouper;
3+
import net.barch.barch_lib.Items.ItemGroupItem;
4+
import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
55
import barch.mc_extended.Minerals.Corundum;
66
import net.minecraft.item.*;
77
import net.minecraft.recipe.Ingredient;
@@ -55,10 +55,10 @@ public static void RegisterArmor() {
5555
}
5656

5757
public static void GroupArmor() {
58-
ItemGrouper.GroupItem(CORUNDUM_HELMET, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, Items.NETHERITE_BOOTS)});
59-
ItemGrouper.GroupItem(CORUNDUM_CHESTPLATE, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, CORUNDUM_HELMET)});
60-
ItemGrouper.GroupItem(CORUNDUM_LEGGINGS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, CORUNDUM_CHESTPLATE)});
61-
ItemGrouper.GroupItem(CORUNDUM_BOOTS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, CORUNDUM_LEGGINGS)});
62-
ItemGrouper.GroupItem(CORUNDUM_HORSE_ARMOR, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SAPPHIRE_HORSE_ARMOR)});
58+
MCE_ITEM_GROUPER.GroupItem(CORUNDUM_HELMET, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, Items.NETHERITE_BOOTS)});
59+
MCE_ITEM_GROUPER.GroupItem(CORUNDUM_CHESTPLATE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, CORUNDUM_HELMET)});
60+
MCE_ITEM_GROUPER.GroupItem(CORUNDUM_LEGGINGS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, CORUNDUM_CHESTPLATE)});
61+
MCE_ITEM_GROUPER.GroupItem(CORUNDUM_BOOTS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, CORUNDUM_LEGGINGS)});
62+
MCE_ITEM_GROUPER.GroupItem(CORUNDUM_HORSE_ARMOR, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SAPPHIRE_HORSE_ARMOR)});
6363
}
6464
}

‎src/main/java/barch/mc_extended/Armor/RubyArmorData.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package barch.mc_extended.Armor;
22

3-
import barch.mc_extended.Glue.ItemGrouped;
4-
import barch.mc_extended.Glue.ItemGrouper;
3+
import net.barch.barch_lib.Items.ItemGroupItem;
4+
import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
55
import net.minecraft.item.*;
66
import net.minecraft.recipe.Ingredient;
77
import net.minecraft.registry.Registries;
@@ -57,11 +57,11 @@ public static void RegisterArmor() {
5757

5858
public static void GroupArmor() {
5959

60-
ItemGrouper.GroupItem(RUBY_HELMET, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, Items.DIAMOND_BOOTS)});
61-
ItemGrouper.GroupItem(RUBY_CHESTPLATE, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, RUBY_HELMET)});
62-
ItemGrouper.GroupItem(RUBY_LEGGINGS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, RUBY_CHESTPLATE)});
63-
ItemGrouper.GroupItem(RUBY_BOOTS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, RUBY_LEGGINGS)});
64-
ItemGrouper.GroupItem(RUBY_HORSE_ARMOR, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, Items.DIAMOND_HORSE_ARMOR)});
60+
MCE_ITEM_GROUPER.GroupItem(RUBY_HELMET, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, Items.DIAMOND_BOOTS)});
61+
MCE_ITEM_GROUPER.GroupItem(RUBY_CHESTPLATE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, RUBY_HELMET)});
62+
MCE_ITEM_GROUPER.GroupItem(RUBY_LEGGINGS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, RUBY_CHESTPLATE)});
63+
MCE_ITEM_GROUPER.GroupItem(RUBY_BOOTS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, RUBY_LEGGINGS)});
64+
MCE_ITEM_GROUPER.GroupItem(RUBY_HORSE_ARMOR, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, Items.DIAMOND_HORSE_ARMOR)});
6565

6666
}
6767
}

‎src/main/java/barch/mc_extended/Armor/SapphireArmorData.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package barch.mc_extended.Armor;
22

3-
import barch.mc_extended.Glue.ItemGrouped;
4-
import barch.mc_extended.Glue.ItemGrouper;
3+
import net.barch.barch_lib.Items.ItemGroupItem;
4+
import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
55
import barch.mc_extended.Minerals.Sapphire;
66
import net.minecraft.item.*;
77
import net.minecraft.recipe.Ingredient;
@@ -59,11 +59,11 @@ public static void RegisterArmor() {
5959

6060
public static void GroupArmor() {
6161

62-
ItemGrouper.GroupItem(SAPPHIRE_HELMET, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, RUBY_BOOTS)});
63-
ItemGrouper.GroupItem(SAPPHIRE_CHESTPLATE, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SAPPHIRE_HELMET)});
64-
ItemGrouper.GroupItem(SAPPHIRE_LEGGINGS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SAPPHIRE_CHESTPLATE)});
65-
ItemGrouper.GroupItem(SAPPHIRE_BOOTS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SAPPHIRE_LEGGINGS)});
66-
ItemGrouper.GroupItem(SAPPHIRE_HORSE_ARMOR, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, RUBY_HORSE_ARMOR)});
62+
MCE_ITEM_GROUPER.GroupItem(SAPPHIRE_HELMET, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, RUBY_BOOTS)});
63+
MCE_ITEM_GROUPER.GroupItem(SAPPHIRE_CHESTPLATE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SAPPHIRE_HELMET)});
64+
MCE_ITEM_GROUPER.GroupItem(SAPPHIRE_LEGGINGS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SAPPHIRE_CHESTPLATE)});
65+
MCE_ITEM_GROUPER.GroupItem(SAPPHIRE_BOOTS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SAPPHIRE_LEGGINGS)});
66+
MCE_ITEM_GROUPER.GroupItem(SAPPHIRE_HORSE_ARMOR, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, RUBY_HORSE_ARMOR)});
6767

6868
}
6969
}

‎src/main/java/barch/mc_extended/Armor/SilverArmorData.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package barch.mc_extended.Armor;
22

3-
import barch.mc_extended.Glue.ItemGrouped;
4-
import barch.mc_extended.Glue.ItemGrouper;
3+
import net.barch.barch_lib.Items.ItemGroupItem;
4+
import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
55
import barch.mc_extended.Minerals.Silver;
66
import net.minecraft.item.*;
77
import net.minecraft.recipe.Ingredient;
@@ -56,11 +56,11 @@ public static void RegisterArmor() {
5656

5757
public static void GroupArmor() {
5858

59-
ItemGrouper.GroupItem(SILVER_HELMET, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, Items.GOLDEN_BOOTS)});
60-
ItemGrouper.GroupItem(SILVER_CHESTPLATE, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SILVER_HELMET)});
61-
ItemGrouper.GroupItem(SILVER_LEGGINGS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SILVER_CHESTPLATE)});
62-
ItemGrouper.GroupItem(SILVER_BOOTS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SILVER_LEGGINGS)});
63-
ItemGrouper.GroupItem(SILVER_HORSE_ARMOR, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, Items.GOLDEN_HORSE_ARMOR)});
59+
MCE_ITEM_GROUPER.GroupItem(SILVER_HELMET, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, Items.GOLDEN_BOOTS)});
60+
MCE_ITEM_GROUPER.GroupItem(SILVER_CHESTPLATE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SILVER_HELMET)});
61+
MCE_ITEM_GROUPER.GroupItem(SILVER_LEGGINGS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SILVER_CHESTPLATE)});
62+
MCE_ITEM_GROUPER.GroupItem(SILVER_BOOTS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SILVER_LEGGINGS)});
63+
MCE_ITEM_GROUPER.GroupItem(SILVER_HORSE_ARMOR, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, Items.GOLDEN_HORSE_ARMOR)});
6464

6565
}
6666

‎src/main/java/barch/mc_extended/Armor/TinArmorData.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package barch.mc_extended.Armor;
22

3-
import barch.mc_extended.Glue.ItemGrouped;
4-
import barch.mc_extended.Glue.ItemGrouper;
3+
import net.barch.barch_lib.Items.ItemGroupItem;
4+
import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
55
import barch.mc_extended.Minerals.Tin;
66
import net.minecraft.item.*;
77
import net.minecraft.recipe.Ingredient;
@@ -59,11 +59,11 @@ public static void RegisterArmor() {
5959

6060
public static void GroupArmor() {
6161

62-
ItemGrouper.GroupItem(TIN_HELMET, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, BRONZE_BOOTS)});
63-
ItemGrouper.GroupItem(TIN_CHESTPLATE, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, TIN_HELMET)});
64-
ItemGrouper.GroupItem(TIN_LEGGINGS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, TIN_CHESTPLATE)});
65-
ItemGrouper.GroupItem(TIN_BOOTS, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, TIN_LEGGINGS)});
66-
ItemGrouper.GroupItem(TIN_HORSE_ARMOR, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, BRONZE_HORSE_ARMOR)});
62+
MCE_ITEM_GROUPER.GroupItem(TIN_HELMET, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, BRONZE_BOOTS)});
63+
MCE_ITEM_GROUPER.GroupItem(TIN_CHESTPLATE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, TIN_HELMET)});
64+
MCE_ITEM_GROUPER.GroupItem(TIN_LEGGINGS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, TIN_CHESTPLATE)});
65+
MCE_ITEM_GROUPER.GroupItem(TIN_BOOTS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, TIN_LEGGINGS)});
66+
MCE_ITEM_GROUPER.GroupItem(TIN_HORSE_ARMOR, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, BRONZE_HORSE_ARMOR)});
6767

6868
}
6969
}

‎src/main/java/barch/mc_extended/Entities/Entities.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package barch.mc_extended.Entities;
22

3-
import barch.mc_extended.Glue.ItemGrouper;
4-
import barch.mc_extended.Glue.ItemGrouped;
3+
import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
4+
import net.barch.barch_lib.Items.ItemGroupItem;
55
import barch.mc_extended.Tags;
66
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
77
import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
@@ -72,10 +72,10 @@ public static void RegisterAll() {
7272

7373
public static void GroupAll() {
7474

75-
ItemGrouper.GroupItem(ENDER_CUBE_SPAWN_EGG, new ItemGrouped[]{new ItemGrouped(ItemGroups.SPAWN_EGGS, Items.ELDER_GUARDIAN_SPAWN_EGG)});
76-
ItemGrouper.GroupItem(LOST_SPAWN_EGG, new ItemGrouped[]{new ItemGrouped(ItemGroups.SPAWN_EGGS, Items.LLAMA_SPAWN_EGG)});
77-
ItemGrouper.GroupItem(SILVER_GOLEM_SPAWN_EGG, new ItemGrouped[]{new ItemGrouped(ItemGroups.SPAWN_EGGS, Items.SILVERFISH_SPAWN_EGG)});
78-
ItemGrouper.GroupItem(TROUT_FISH_SPAWN_EGG, new ItemGrouped[]{new ItemGrouped(ItemGroups.SPAWN_EGGS, Items.TROPICAL_FISH_SPAWN_EGG)});
75+
MCE_ITEM_GROUPER.GroupItem(ENDER_CUBE_SPAWN_EGG, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.SPAWN_EGGS, Items.ELDER_GUARDIAN_SPAWN_EGG)});
76+
MCE_ITEM_GROUPER.GroupItem(LOST_SPAWN_EGG, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.SPAWN_EGGS, Items.LLAMA_SPAWN_EGG)});
77+
MCE_ITEM_GROUPER.GroupItem(SILVER_GOLEM_SPAWN_EGG, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.SPAWN_EGGS, Items.SILVERFISH_SPAWN_EGG)});
78+
MCE_ITEM_GROUPER.GroupItem(TROUT_FISH_SPAWN_EGG, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.SPAWN_EGGS, Items.TROPICAL_FISH_SPAWN_EGG)});
7979

8080
}
8181
}

‎src/main/java/barch/mc_extended/Foods/Cheese.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package barch.mc_extended.Foods;
22

3-
import barch.mc_extended.Glue.BlockBuilder;
4-
import barch.mc_extended.Glue.ItemGrouper;
5-
import barch.mc_extended.Glue.ItemGrouped;
3+
import net.barch.barch_lib.Blocks.BlockBuilder;
4+
import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
5+
import net.barch.barch_lib.Items.ItemGroupItem;
66
import net.minecraft.block.Block;
77
import net.minecraft.block.Blocks;
88
import net.minecraft.block.CakeBlock;
@@ -27,7 +27,7 @@ public static void RegisterAll() {
2727

2828
public static void GroupItems() {
2929

30-
ItemGrouper.GroupItem(CHEESE.asItem(), new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, Items.CAKE)});
30+
MCE_ITEM_GROUPER.GroupItem(CHEESE.asItem(), new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, Items.CAKE)});
3131

3232

3333
}

‎src/main/java/barch/mc_extended/Foods/Meats.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package barch.mc_extended.Foods;
22

3-
import barch.mc_extended.Glue.ItemGrouper;
4-
import barch.mc_extended.Glue.ItemGrouped;
3+
import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
4+
import net.barch.barch_lib.Items.ItemGroupItem;
55
import net.minecraft.component.type.FoodComponents;
66
import net.minecraft.item.*;
77
import net.minecraft.registry.Registries;
@@ -24,8 +24,8 @@ public static void RegisterAll() {
2424
}
2525
public static void GroupItems() {
2626

27-
ItemGrouper.GroupItem(TROUT, new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, Items.COOKED_SALMON)});
28-
ItemGrouper.GroupItem(COOKED_TROUT, new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, TROUT)});
27+
MCE_ITEM_GROUPER.GroupItem(TROUT, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, Items.COOKED_SALMON)});
28+
MCE_ITEM_GROUPER.GroupItem(COOKED_TROUT, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, TROUT)});
2929

3030
}
3131

‎src/main/java/barch/mc_extended/Foods/Mushrooms.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package barch.mc_extended.Foods;
22

3-
import barch.mc_extended.Glue.BlockBuilder;
4-
import barch.mc_extended.Glue.ItemGrouper;
5-
import barch.mc_extended.Glue.ItemGrouped;
3+
import net.barch.barch_lib.Blocks.BlockBuilder;
4+
import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
5+
import net.barch.barch_lib.Items.ItemGroupItem;
66
import net.minecraft.block.*;
77
import net.minecraft.item.BlockItem;
88
import net.minecraft.item.Item;
@@ -38,8 +38,8 @@ public static void RegisterItems() {
3838

3939
public static void GroupItems() {
4040

41-
ItemGrouper.GroupItem(WHITE_MUSHROOM.asItem(), new ItemGrouped[]{new ItemGrouped(ItemGroups.NATURAL, Blocks.RED_MUSHROOM)});
42-
ItemGrouper.GroupItem(WHITE_MUSHROOM_BLOCK.asItem(), new ItemGrouped[]{new ItemGrouped(ItemGroups.NATURAL, Blocks.RED_MUSHROOM_BLOCK)});
41+
MCE_ITEM_GROUPER.GroupItem(WHITE_MUSHROOM.asItem(), new ItemGroupItem[]{new ItemGroupItem(ItemGroups.NATURAL, Blocks.RED_MUSHROOM)});
42+
MCE_ITEM_GROUPER.GroupItem(WHITE_MUSHROOM_BLOCK.asItem(), new ItemGroupItem[]{new ItemGroupItem(ItemGroups.NATURAL, Blocks.RED_MUSHROOM_BLOCK)});
4343

4444
}
4545

‎src/main/java/barch/mc_extended/Foods/Onion.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package barch.mc_extended.Foods;
22

3-
import barch.mc_extended.Glue.BlockBuilder;
4-
import barch.mc_extended.Glue.ItemGrouper;
5-
import barch.mc_extended.Glue.ItemGrouped;
3+
import net.barch.barch_lib.Blocks.BlockBuilder;
4+
import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER;
5+
import net.barch.barch_lib.Items.ItemGroupItem;
66
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
77
import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
88
import net.fabricmc.fabric.api.registry.CompostingChanceRegistry;
@@ -55,8 +55,8 @@ public static void RegisterAll() {
5555

5656
public static void GroupItems() {
5757

58-
ItemGrouper.GroupItem(ONION, new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, Items.BAKED_POTATO)});
59-
ItemGrouper.GroupItem(FRIED_ONION, new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, ONION)});
58+
MCE_ITEM_GROUPER.GroupItem(ONION, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, Items.BAKED_POTATO)});
59+
MCE_ITEM_GROUPER.GroupItem(FRIED_ONION, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, ONION)});
6060

6161
}
6262

0 commit comments

Comments
 (0)