From bd7e778c828b80eab80ffdf691415f1e36eb9164 Mon Sep 17 00:00:00 2001 From: BarchamMal <115943779+BarchamMal@users.noreply.github.com> Date: Fri, 2 Aug 2024 12:09:24 -0500 Subject: [PATCH] Officially depend on Barch-Lib... ... let's hope i get this working right. :smile: --- build.gradle | 17 ++++++++++------ gradle.properties | 3 ++- .../mc_extended/Armor/BronzeArmorData.java | 14 ++++++------- .../mc_extended/Armor/CopperArmorData.java | 14 ++++++------- .../mc_extended/Armor/CorundumArmorData.java | 14 ++++++------- .../mc_extended/Armor/RubyArmorData.java | 14 ++++++------- .../mc_extended/Armor/SapphireArmorData.java | 14 ++++++------- .../mc_extended/Armor/SilverArmorData.java | 14 ++++++------- .../barch/mc_extended/Armor/TinArmorData.java | 14 ++++++------- .../barch/mc_extended/Entities/Entities.java | 12 +++++------ .../java/barch/mc_extended/Foods/Cheese.java | 8 ++++---- .../java/barch/mc_extended/Foods/Meats.java | 8 ++++---- .../barch/mc_extended/Foods/Mushrooms.java | 10 +++++----- .../java/barch/mc_extended/Foods/Onion.java | 10 +++++----- .../barch/mc_extended/Foods/Specialty.java | 10 +++++----- .../java/barch/mc_extended/Foods/Spinach.java | 14 ++++++------- .../java/barch/mc_extended/Foods/Tomato.java | 14 ++++++------- .../barch/mc_extended/Glue/BlockBuilder.java | 1 - .../barch/mc_extended/Glue/ItemGrouper.java | 8 ++++---- .../java/barch/mc_extended/MCExtended.java | 14 ++----------- .../barch/mc_extended/Minerals/Bronze.java | 17 ++++++++-------- .../barch/mc_extended/Minerals/Corundum.java | 10 +++++----- .../java/barch/mc_extended/Minerals/Ruby.java | 14 ++++++------- .../barch/mc_extended/Minerals/Sapphire.java | 14 ++++++------- .../barch/mc_extended/Minerals/Silver.java | 20 +++++++++---------- .../java/barch/mc_extended/Minerals/Tin.java | 20 +++++++++---------- .../barch/mc_extended/Misc/FishBuckets.java | 6 +++--- .../Misc/MCExtendedSmithingTemplates.java | 6 +++--- .../barch/mc_extended/Misc/MiscTools.java | 6 +++--- .../barch/mc_extended/Misc/OtherMisc.java | 6 +++--- .../mc_extended/Tools/BronzeToolMaterial.java | 14 ++++++------- .../mc_extended/Tools/CopperToolMaterial.java | 18 +++++++---------- .../Tools/CorundumToolMaterial.java | 14 ++++++------- .../mc_extended/Tools/RubyToolMaterial.java | 14 ++++++------- .../Tools/SapphireToolMaterial.java | 14 ++++++------- .../mc_extended/Tools/SilverToolMaterial.java | 14 ++++++------- .../mc_extended/Tools/TinToolMaterial.java | 14 ++++++------- .../mc_extended/Villagers/WorkStations.java | 10 +++++----- src/main/resources/fabric.mod.json | 3 ++- 39 files changed, 226 insertions(+), 235 deletions(-) diff --git a/build.gradle b/build.gradle index 12a506c..f95b5f9 100644 --- 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 index f5c556c..0db70ec 100644 --- 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 \ No newline at end of file +fabric_version=0.100.7+1.21 +barch_version=5565253 \ No newline at end of file diff --git a/src/main/java/barch/mc_extended/Armor/BronzeArmorData.java b/src/main/java/barch/mc_extended/Armor/BronzeArmorData.java index 159da08..83d2710 100644 --- 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)}); } } \ No newline at end of file diff --git a/src/main/java/barch/mc_extended/Armor/CopperArmorData.java b/src/main/java/barch/mc_extended/Armor/CopperArmorData.java index 5c4a7b4..c1526dd 100644 --- 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)}); } } \ No newline at end of file diff --git a/src/main/java/barch/mc_extended/Armor/CorundumArmorData.java b/src/main/java/barch/mc_extended/Armor/CorundumArmorData.java index 218546d..e892497 100644 --- 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)}); } } \ No newline at end of file diff --git a/src/main/java/barch/mc_extended/Armor/RubyArmorData.java b/src/main/java/barch/mc_extended/Armor/RubyArmorData.java index 58433bb..0beadfe 100644 --- 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)}); } } \ No newline at end of file diff --git a/src/main/java/barch/mc_extended/Armor/SapphireArmorData.java b/src/main/java/barch/mc_extended/Armor/SapphireArmorData.java index 14a3fbd..5a18e57 100644 --- 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)}); } } \ No newline at end of file diff --git a/src/main/java/barch/mc_extended/Armor/SilverArmorData.java b/src/main/java/barch/mc_extended/Armor/SilverArmorData.java index f6a02ad..aed9534 100644 --- 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 index ae7a335..a335de1 100644 --- 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)}); } } \ No newline at end of file diff --git a/src/main/java/barch/mc_extended/Entities/Entities.java b/src/main/java/barch/mc_extended/Entities/Entities.java index 053d282..5ce7d44 100644 --- 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 index d7c0ba4..7c99513 100644 --- 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 index 5071113..98f2187 100644 --- 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 index 3cac11a..cfb2139 100644 --- 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 index df8371c..3663867 100644 --- 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)}); } diff --git a/src/main/java/barch/mc_extended/Foods/Specialty.java b/src/main/java/barch/mc_extended/Foods/Specialty.java index f84960b..34998da 100644 --- a/src/main/java/barch/mc_extended/Foods/Specialty.java +++ b/src/main/java/barch/mc_extended/Foods/Specialty.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.FoodComponent; import net.minecraft.item.Item; import net.minecraft.item.ItemGroups; @@ -29,9 +29,9 @@ public static void RegisterAll() { } public static void GroupItems() { - ItemGrouper.GroupItem(ONION_TOMATO_SAUCE, new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, Items.RABBIT_STEW)}); - ItemGrouper.GroupItem(BACON_AND_MUSHROOMS, new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, ONION_TOMATO_SAUCE)}); - ItemGrouper.GroupItem(CHEESY_SAAG, new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, BACON_AND_MUSHROOMS)}); + MCE_ITEM_GROUPER.GroupItem(ONION_TOMATO_SAUCE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, Items.RABBIT_STEW)}); + MCE_ITEM_GROUPER.GroupItem(BACON_AND_MUSHROOMS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, ONION_TOMATO_SAUCE)}); + MCE_ITEM_GROUPER.GroupItem(CHEESY_SAAG, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, BACON_AND_MUSHROOMS)}); } diff --git a/src/main/java/barch/mc_extended/Foods/Spinach.java b/src/main/java/barch/mc_extended/Foods/Spinach.java index a75b7b4..4d3bd24 100644 --- a/src/main/java/barch/mc_extended/Foods/Spinach.java +++ b/src/main/java/barch/mc_extended/Foods/Spinach.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; @@ -70,10 +70,10 @@ public static void RegisterAll() { public static void GroupItems() { - ItemGrouper.GroupItem(SPINACH_SEEDS, new ItemGrouped[]{new ItemGrouped(ItemGroups.NATURAL, Items.WHEAT_SEEDS)}); - ItemGrouper.GroupItem(SPINACH, new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, TOMATO)}); - ItemGrouper.GroupItem(COOKED_SPINACH, new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, ROAST_TOMATO)}); - ItemGrouper.GroupItem(SAAG, new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, TOMATO_SAUCE)}); + MCE_ITEM_GROUPER.GroupItem(SPINACH_SEEDS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.NATURAL, Items.WHEAT_SEEDS)}); + MCE_ITEM_GROUPER.GroupItem(SPINACH, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, TOMATO)}); + MCE_ITEM_GROUPER.GroupItem(COOKED_SPINACH, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, ROAST_TOMATO)}); + MCE_ITEM_GROUPER.GroupItem(SAAG, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, TOMATO_SAUCE)}); } diff --git a/src/main/java/barch/mc_extended/Foods/Tomato.java b/src/main/java/barch/mc_extended/Foods/Tomato.java index 97941b4..92f95ad 100644 --- a/src/main/java/barch/mc_extended/Foods/Tomato.java +++ b/src/main/java/barch/mc_extended/Foods/Tomato.java @@ -1,9 +1,9 @@ package barch.mc_extended.Foods; import barch.mc_extended.Foods.blocks.TomatoBlock; -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; @@ -63,10 +63,10 @@ public static void RegisterAll() { public static void GroupItems() { - ItemGrouper.GroupItem(TOMATO_SEEDS, new ItemGrouped[]{new ItemGrouped(ItemGroups.NATURAL, Items.BEETROOT_SEEDS)}); - ItemGrouper.GroupItem(TOMATO, new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, Items.BEETROOT), new ItemGrouped(ItemGroups.NATURAL, Blocks.PUMPKIN)}); - ItemGrouper.GroupItem(ROAST_TOMATO, new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, TOMATO)}); - ItemGrouper.GroupItem(TOMATO_SAUCE, new ItemGrouped[]{new ItemGrouped(ItemGroups.FOOD_AND_DRINK, Items.BEETROOT_SOUP)}); + MCE_ITEM_GROUPER.GroupItem(TOMATO_SEEDS, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.NATURAL, Items.BEETROOT_SEEDS)}); + MCE_ITEM_GROUPER.GroupItem(TOMATO, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, Items.BEETROOT), new ItemGroupItem(ItemGroups.NATURAL, Blocks.PUMPKIN)}); + MCE_ITEM_GROUPER.GroupItem(ROAST_TOMATO, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, TOMATO)}); + MCE_ITEM_GROUPER.GroupItem(TOMATO_SAUCE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FOOD_AND_DRINK, Items.BEETROOT_SOUP)}); } diff --git a/src/main/java/barch/mc_extended/Glue/BlockBuilder.java b/src/main/java/barch/mc_extended/Glue/BlockBuilder.java index 9c977c6..87a56f2 100644 --- a/src/main/java/barch/mc_extended/Glue/BlockBuilder.java +++ b/src/main/java/barch/mc_extended/Glue/BlockBuilder.java @@ -1,6 +1,5 @@ package barch.mc_extended.Glue; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; public class BlockBuilder { diff --git a/src/main/java/barch/mc_extended/Glue/ItemGrouper.java b/src/main/java/barch/mc_extended/Glue/ItemGrouper.java index 4544246..e5844b5 100644 --- a/src/main/java/barch/mc_extended/Glue/ItemGrouper.java +++ b/src/main/java/barch/mc_extended/Glue/ItemGrouper.java @@ -8,13 +8,13 @@ public class ItemGrouper { - public static void GroupItem(Item item, ItemGrouped[] groups) { + public static void GroupItem(Item item, ItemGroupItem[] groups) { ItemGroupEvents.modifyEntriesEvent(MC_EXTENDED_GROUP).register(content -> { content.add(item); }); - for (ItemGrouped group: groups) { + for (ItemGroupItem group: groups) { ItemGroupEvents.modifyEntriesEvent(group.group).register(content -> { content.addAfter(group.getItem(), item); @@ -23,13 +23,13 @@ public static void GroupItem(Item item, ItemGrouped[] groups) { } - public static void GroupItem(Block item, ItemGrouped[] groups) { + public static void GroupItem(Block item, ItemGroupItem[] groups) { ItemGroupEvents.modifyEntriesEvent(MC_EXTENDED_GROUP).register(content -> { content.add(item); }); - for (ItemGrouped group: groups) { + for (ItemGroupItem group: groups) { ItemGroupEvents.modifyEntriesEvent(group.group).register(content -> { content.addAfter(group.getItem(), item); diff --git a/src/main/java/barch/mc_extended/MCExtended.java b/src/main/java/barch/mc_extended/MCExtended.java index 8b03680..470eed1 100644 --- a/src/main/java/barch/mc_extended/MCExtended.java +++ b/src/main/java/barch/mc_extended/MCExtended.java @@ -1,5 +1,6 @@ package barch.mc_extended; +import net.barch.barch_lib.Items.ItemGrouper; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.biome.v1.BiomeModifications; @@ -29,18 +30,10 @@ public class MCExtended implements ModInitializer { public static final Logger LOGGER = LoggerFactory.getLogger(MC_EXTENDED); - - // initialize the item groups - - // MC-Extended public static final RegistryKey MC_EXTENDED_GROUP = RegistryKey.of(RegistryKeys.ITEM_GROUP, Identifier.of(MC_EXTENDED, "mc-extended")); + public static final ItemGrouper MCE_ITEM_GROUPER = new ItemGrouper(MC_EXTENDED_GROUP); - // initialize features - - // ores - - // ruby public static final RegistryKey SAPPHIRE_ORE_PLACED_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(MC_EXTENDED, "ore_sapphire")); // sapphire public static final RegistryKey RUBY_ORE_PLACED_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(MC_EXTENDED, "ore_ruby")); @@ -48,9 +41,6 @@ public class MCExtended implements ModInitializer { public static final RegistryKey SILVER_ORE_PLACED_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(MC_EXTENDED, "ore_silver")); // tin public static final RegistryKey TIN_ORE_PLACED_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(MC_EXTENDED, "ore_tin")); - - // mushrooms - // white mushroom public static final RegistryKey WHITE_MUSHROOM_PLACED_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(MC_EXTENDED, "huge_white_mushroom")); diff --git a/src/main/java/barch/mc_extended/Minerals/Bronze.java b/src/main/java/barch/mc_extended/Minerals/Bronze.java index ca65108..a2e874e 100644 --- a/src/main/java/barch/mc_extended/Minerals/Bronze.java +++ b/src/main/java/barch/mc_extended/Minerals/Bronze.java @@ -1,9 +1,8 @@ package barch.mc_extended.Minerals; -import barch.mc_extended.Glue.BlockBuilder; -import barch.mc_extended.Glue.ItemGrouper; -import barch.mc_extended.Glue.ItemGrouped; -//import barch.mc_extended.Misc.PlantSpecimenItem; +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.item.BlockItem; @@ -58,11 +57,11 @@ public static void RegisterItems() { public static void GroupItems() { - ItemGrouper.GroupItem(BRONZE_INGOT, new ItemGrouped[]{new ItemGrouped(ItemGroups.INGREDIENTS, Items.IRON_INGOT)}); - ItemGrouper.GroupItem(BRONZE_NUGGET, new ItemGrouped[]{new ItemGrouped(ItemGroups.INGREDIENTS, Items.IRON_NUGGET)}); - ItemGrouper.GroupItem(RAW_BRONZE, new ItemGrouped[]{new ItemGrouped(ItemGroups.INGREDIENTS, Items.RAW_IRON)}); - ItemGrouper.GroupItem(RAW_BRONZE_BLOCK, new ItemGrouped[]{new ItemGrouped(ItemGroups.NATURAL, Blocks.RAW_IRON_BLOCK)}); - ItemGrouper.GroupItem(BRONZE_BLOCK, new ItemGrouped[]{new ItemGrouped(ItemGroups.BUILDING_BLOCKS, Blocks.IRON_BLOCK)}); + MCE_ITEM_GROUPER.GroupItem(BRONZE_INGOT, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.INGREDIENTS, Items.IRON_INGOT)}); + MCE_ITEM_GROUPER.GroupItem(BRONZE_NUGGET, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.INGREDIENTS, Items.IRON_NUGGET)}); + MCE_ITEM_GROUPER.GroupItem(RAW_BRONZE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.INGREDIENTS, Items.RAW_IRON)}); + MCE_ITEM_GROUPER.GroupItem(RAW_BRONZE_BLOCK, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.NATURAL, Blocks.RAW_IRON_BLOCK)}); + MCE_ITEM_GROUPER.GroupItem(BRONZE_BLOCK, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.BUILDING_BLOCKS, Blocks.IRON_BLOCK)}); } } \ No newline at end of file diff --git a/src/main/java/barch/mc_extended/Minerals/Corundum.java b/src/main/java/barch/mc_extended/Minerals/Corundum.java index c4f2be4..7c3070b 100644 --- a/src/main/java/barch/mc_extended/Minerals/Corundum.java +++ b/src/main/java/barch/mc_extended/Minerals/Corundum.java @@ -1,8 +1,8 @@ package barch.mc_extended.Minerals; -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.item.*; @@ -47,8 +47,8 @@ public static void RegisterItems() { public static void GroupItems() { - ItemGrouper.GroupItem(CORUNDUM, new ItemGrouped[]{new ItemGrouped(ItemGroups.INGREDIENTS, Items.NETHERITE_INGOT)}); - ItemGrouper.GroupItem(CORUNDUM_BLOCK, new ItemGrouped[]{new ItemGrouped(ItemGroups.BUILDING_BLOCKS, Blocks.NETHERITE_BLOCK)}); + MCE_ITEM_GROUPER.GroupItem(CORUNDUM, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.INGREDIENTS, Items.NETHERITE_INGOT)}); + MCE_ITEM_GROUPER.GroupItem(CORUNDUM_BLOCK, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.BUILDING_BLOCKS, Blocks.NETHERITE_BLOCK)}); } } \ No newline at end of file diff --git a/src/main/java/barch/mc_extended/Minerals/Ruby.java b/src/main/java/barch/mc_extended/Minerals/Ruby.java index b9b831a..baa9fd3 100644 --- a/src/main/java/barch/mc_extended/Minerals/Ruby.java +++ b/src/main/java/barch/mc_extended/Minerals/Ruby.java @@ -1,8 +1,8 @@ package barch.mc_extended.Minerals; -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.ExperienceDroppingBlock; @@ -60,10 +60,10 @@ public static void RegisterItems() { public static void GroupItems() { - ItemGrouper.GroupItem(RUBY, new ItemGrouped[]{new ItemGrouped(ItemGroups.INGREDIENTS, Items.DIAMOND)}); - ItemGrouper.GroupItem(RUBY_ORE, new ItemGrouped[]{new ItemGrouped(ItemGroups.NATURAL, Blocks.DEEPSLATE_DIAMOND_ORE)}); - ItemGrouper.GroupItem(DEEPSLATE_RUBY_ORE, new ItemGrouped[]{new ItemGrouped(ItemGroups.NATURAL, RUBY_ORE)}); - ItemGrouper.GroupItem(RUBY_BLOCK, new ItemGrouped[]{new ItemGrouped(ItemGroups.BUILDING_BLOCKS, Blocks.DIAMOND_BLOCK)}); + MCE_ITEM_GROUPER.GroupItem(RUBY, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.INGREDIENTS, Items.DIAMOND)}); + MCE_ITEM_GROUPER.GroupItem(RUBY_ORE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.NATURAL, Blocks.DEEPSLATE_DIAMOND_ORE)}); + MCE_ITEM_GROUPER.GroupItem(DEEPSLATE_RUBY_ORE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.NATURAL, RUBY_ORE)}); + MCE_ITEM_GROUPER.GroupItem(RUBY_BLOCK, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.BUILDING_BLOCKS, Blocks.DIAMOND_BLOCK)}); } } \ No newline at end of file diff --git a/src/main/java/barch/mc_extended/Minerals/Sapphire.java b/src/main/java/barch/mc_extended/Minerals/Sapphire.java index a275056..1b6ef4f 100644 --- a/src/main/java/barch/mc_extended/Minerals/Sapphire.java +++ b/src/main/java/barch/mc_extended/Minerals/Sapphire.java @@ -1,8 +1,8 @@ package barch.mc_extended.Minerals; -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.ExperienceDroppingBlock; @@ -59,10 +59,10 @@ public static void RegisterItems() { public static void GroupItems() { - ItemGrouper.GroupItem(SAPPHIRE, new ItemGrouped[]{new ItemGrouped(ItemGroups.INGREDIENTS, RUBY)}); - ItemGrouper.GroupItem(SAPPHIRE_ORE, new ItemGrouped[]{new ItemGrouped(ItemGroups.NATURAL, DEEPSLATE_RUBY_ORE)}); - ItemGrouper.GroupItem(DEEPSLATE_SAPPHIRE_ORE, new ItemGrouped[]{new ItemGrouped(ItemGroups.NATURAL, SAPPHIRE_ORE)}); - ItemGrouper.GroupItem(SAPPHIRE_BLOCK, new ItemGrouped[]{new ItemGrouped(ItemGroups.BUILDING_BLOCKS, RUBY_BLOCK)}); + MCE_ITEM_GROUPER.GroupItem(SAPPHIRE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.INGREDIENTS, RUBY)}); + MCE_ITEM_GROUPER.GroupItem(SAPPHIRE_ORE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.NATURAL, DEEPSLATE_RUBY_ORE)}); + MCE_ITEM_GROUPER.GroupItem(DEEPSLATE_SAPPHIRE_ORE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.NATURAL, SAPPHIRE_ORE)}); + MCE_ITEM_GROUPER.GroupItem(SAPPHIRE_BLOCK, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.BUILDING_BLOCKS, RUBY_BLOCK)}); } } \ No newline at end of file diff --git a/src/main/java/barch/mc_extended/Minerals/Silver.java b/src/main/java/barch/mc_extended/Minerals/Silver.java index 9aef334..0ce66b4 100644 --- a/src/main/java/barch/mc_extended/Minerals/Silver.java +++ b/src/main/java/barch/mc_extended/Minerals/Silver.java @@ -1,8 +1,8 @@ package barch.mc_extended.Minerals; -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.item.BlockItem; @@ -64,13 +64,13 @@ public static void RegisterItems() { public static void GroupItems() { - ItemGrouper.GroupItem(SILVER_INGOT, new ItemGrouped[]{new ItemGrouped(ItemGroups.INGREDIENTS, Items.GOLD_INGOT)}); - ItemGrouper.GroupItem(SILVER_NUGGET, new ItemGrouped[]{new ItemGrouped(ItemGroups.INGREDIENTS, Items.GOLD_NUGGET)}); - ItemGrouper.GroupItem(RAW_SILVER, new ItemGrouped[]{new ItemGrouped(ItemGroups.INGREDIENTS, Items.RAW_GOLD)}); - ItemGrouper.GroupItem(SILVER_ORE, new ItemGrouped[]{new ItemGrouped(ItemGroups.NATURAL, Blocks.DEEPSLATE_GOLD_ORE)}); - ItemGrouper.GroupItem(DEEPSLATE_SILVER_ORE, new ItemGrouped[]{new ItemGrouped(ItemGroups.NATURAL, SILVER_ORE)}); - ItemGrouper.GroupItem(RAW_SILVER_BLOCK, new ItemGrouped[]{new ItemGrouped(ItemGroups.NATURAL, Blocks.RAW_GOLD_BLOCK)}); - ItemGrouper.GroupItem(SILVER_BLOCK, new ItemGrouped[]{new ItemGrouped(ItemGroups.BUILDING_BLOCKS, Blocks.GOLD_BLOCK)}); + MCE_ITEM_GROUPER.GroupItem(SILVER_INGOT, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.INGREDIENTS, Items.GOLD_INGOT)}); + MCE_ITEM_GROUPER.GroupItem(SILVER_NUGGET, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.INGREDIENTS, Items.GOLD_NUGGET)}); + MCE_ITEM_GROUPER.GroupItem(RAW_SILVER, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.INGREDIENTS, Items.RAW_GOLD)}); + MCE_ITEM_GROUPER.GroupItem(SILVER_ORE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.NATURAL, Blocks.DEEPSLATE_GOLD_ORE)}); + MCE_ITEM_GROUPER.GroupItem(DEEPSLATE_SILVER_ORE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.NATURAL, SILVER_ORE)}); + MCE_ITEM_GROUPER.GroupItem(RAW_SILVER_BLOCK, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.NATURAL, Blocks.RAW_GOLD_BLOCK)}); + MCE_ITEM_GROUPER.GroupItem(SILVER_BLOCK, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.BUILDING_BLOCKS, Blocks.GOLD_BLOCK)}); } } \ No newline at end of file diff --git a/src/main/java/barch/mc_extended/Minerals/Tin.java b/src/main/java/barch/mc_extended/Minerals/Tin.java index 6a0c452..56fd0d1 100644 --- a/src/main/java/barch/mc_extended/Minerals/Tin.java +++ b/src/main/java/barch/mc_extended/Minerals/Tin.java @@ -1,8 +1,8 @@ package barch.mc_extended.Minerals; -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.item.BlockItem; @@ -65,13 +65,13 @@ public static void RegisterItems() { public static void GroupItems() { - ItemGrouper.GroupItem(TIN_INGOT, new ItemGrouped[]{new ItemGrouped(ItemGroups.INGREDIENTS, BRONZE_INGOT)}); - ItemGrouper.GroupItem(TIN_NUGGET, new ItemGrouped[]{new ItemGrouped(ItemGroups.INGREDIENTS, BRONZE_NUGGET)}); - ItemGrouper.GroupItem(RAW_TIN, new ItemGrouped[]{new ItemGrouped(ItemGroups.INGREDIENTS, RAW_BRONZE)}); - ItemGrouper.GroupItem(TIN_ORE, new ItemGrouped[]{new ItemGrouped(ItemGroups.NATURAL, Blocks.IRON_ORE)}); - ItemGrouper.GroupItem(DEEPSLATE_TIN_ORE, new ItemGrouped[]{new ItemGrouped(ItemGroups.NATURAL, Blocks.DEEPSLATE_IRON_ORE)}); - ItemGrouper.GroupItem(RAW_TIN_BLOCK, new ItemGrouped[]{new ItemGrouped(ItemGroups.NATURAL, RAW_BRONZE_BLOCK)}); - ItemGrouper.GroupItem(TIN_BLOCK, new ItemGrouped[]{new ItemGrouped(ItemGroups.BUILDING_BLOCKS, BRONZE_BLOCK)}); + MCE_ITEM_GROUPER.GroupItem(TIN_INGOT, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.INGREDIENTS, BRONZE_INGOT)}); + MCE_ITEM_GROUPER.GroupItem(TIN_NUGGET, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.INGREDIENTS, BRONZE_NUGGET)}); + MCE_ITEM_GROUPER.GroupItem(RAW_TIN, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.INGREDIENTS, RAW_BRONZE)}); + MCE_ITEM_GROUPER.GroupItem(TIN_ORE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.NATURAL, Blocks.IRON_ORE)}); + MCE_ITEM_GROUPER.GroupItem(DEEPSLATE_TIN_ORE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.NATURAL, Blocks.DEEPSLATE_IRON_ORE)}); + MCE_ITEM_GROUPER.GroupItem(RAW_TIN_BLOCK, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.NATURAL, RAW_BRONZE_BLOCK)}); + MCE_ITEM_GROUPER.GroupItem(TIN_BLOCK, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.BUILDING_BLOCKS, BRONZE_BLOCK)}); } } \ No newline at end of file diff --git a/src/main/java/barch/mc_extended/Misc/FishBuckets.java b/src/main/java/barch/mc_extended/Misc/FishBuckets.java index f8490d9..c784681 100644 --- a/src/main/java/barch/mc_extended/Misc/FishBuckets.java +++ b/src/main/java/barch/mc_extended/Misc/FishBuckets.java @@ -1,7 +1,7 @@ package barch.mc_extended.Misc; -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.fluid.Fluids; import net.minecraft.item.EntityBucketItem; import net.minecraft.item.Item; @@ -28,7 +28,7 @@ public static void RegisterAll() { public static void GroupItems() { - ItemGrouper.GroupItem(TROUT_BUCKET, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, Items.SALMON_BUCKET)}); + MCE_ITEM_GROUPER.GroupItem(TROUT_BUCKET, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, Items.SALMON_BUCKET)}); } } diff --git a/src/main/java/barch/mc_extended/Misc/MCExtendedSmithingTemplates.java b/src/main/java/barch/mc_extended/Misc/MCExtendedSmithingTemplates.java index a5f9946..3d83a94 100644 --- a/src/main/java/barch/mc_extended/Misc/MCExtendedSmithingTemplates.java +++ b/src/main/java/barch/mc_extended/Misc/MCExtendedSmithingTemplates.java @@ -1,7 +1,7 @@ package barch.mc_extended.Misc; -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.ItemGroups; import net.minecraft.item.Items; import net.minecraft.item.SmithingTemplateItem; @@ -68,7 +68,7 @@ public static void RegisterItems() { public static void GroupItems() { - ItemGrouper.GroupItem(CORUNDUM_UPGRADE_SMITHING_TEMPLATE, new ItemGrouped[]{new ItemGrouped(ItemGroups.INGREDIENTS, Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE)}); + MCE_ITEM_GROUPER.GroupItem(CORUNDUM_UPGRADE_SMITHING_TEMPLATE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.INGREDIENTS, Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE)}); } diff --git a/src/main/java/barch/mc_extended/Misc/MiscTools.java b/src/main/java/barch/mc_extended/Misc/MiscTools.java index 16bf1ee..1e93757 100644 --- a/src/main/java/barch/mc_extended/Misc/MiscTools.java +++ b/src/main/java/barch/mc_extended/Misc/MiscTools.java @@ -1,7 +1,7 @@ package barch.mc_extended.Misc; -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.registry.Registries; import net.minecraft.registry.Registry; @@ -22,7 +22,7 @@ public static void RegisterAll() { public static void GroupItems() { - ItemGrouper.GroupItem(PLANT_SPECIMEN, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, Items.FLINT_AND_STEEL)}); + MCE_ITEM_GROUPER.GroupItem(PLANT_SPECIMEN, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, Items.FLINT_AND_STEEL)}); } } diff --git a/src/main/java/barch/mc_extended/Misc/OtherMisc.java b/src/main/java/barch/mc_extended/Misc/OtherMisc.java index 7a15ffa..61c0403 100644 --- a/src/main/java/barch/mc_extended/Misc/OtherMisc.java +++ b/src/main/java/barch/mc_extended/Misc/OtherMisc.java @@ -1,7 +1,7 @@ package barch.mc_extended.Misc; -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 com.mojang.serialization.Codec; import net.minecraft.component.ComponentType; import net.minecraft.item.Item; @@ -32,7 +32,7 @@ public static void RegisterAll() { public static void GroupItems() { - ItemGrouper.GroupItem(ENDER_CREAM, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, Items.MAGMA_CREAM)}); + MCE_ITEM_GROUPER.GroupItem(ENDER_CREAM, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, Items.MAGMA_CREAM)}); } } diff --git a/src/main/java/barch/mc_extended/Tools/BronzeToolMaterial.java b/src/main/java/barch/mc_extended/Tools/BronzeToolMaterial.java index e31a284..f12840d 100644 --- a/src/main/java/barch/mc_extended/Tools/BronzeToolMaterial.java +++ b/src/main/java/barch/mc_extended/Tools/BronzeToolMaterial.java @@ -1,7 +1,7 @@ package barch.mc_extended.Tools; -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.block.Block; import net.minecraft.item.*; @@ -57,11 +57,11 @@ public Ingredient getRepairIngredient() { public static void GroupTools() { - ItemGrouper.GroupItem(BRONZE_SWORD, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, Items.IRON_SWORD)}); - ItemGrouper.GroupItem(BRONZE_SHOVEL, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, Items.IRON_HOE)}); - ItemGrouper.GroupItem(BRONZE_PICKAXE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, BRONZE_SHOVEL)}); - ItemGrouper.GroupItem(BRONZE_AXE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, BRONZE_PICKAXE), new ItemGrouped(ItemGroups.COMBAT, Items.IRON_AXE)}); - ItemGrouper.GroupItem(BRONZE_HOE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, BRONZE_HOE)}); + MCE_ITEM_GROUPER.GroupItem(BRONZE_SWORD, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, Items.IRON_SWORD)}); + MCE_ITEM_GROUPER.GroupItem(BRONZE_SHOVEL, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, Items.IRON_HOE)}); + MCE_ITEM_GROUPER.GroupItem(BRONZE_PICKAXE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, BRONZE_SHOVEL)}); + MCE_ITEM_GROUPER.GroupItem(BRONZE_AXE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, BRONZE_PICKAXE), new ItemGroupItem(ItemGroups.COMBAT, Items.IRON_AXE)}); + MCE_ITEM_GROUPER.GroupItem(BRONZE_HOE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, BRONZE_HOE)}); } } diff --git a/src/main/java/barch/mc_extended/Tools/CopperToolMaterial.java b/src/main/java/barch/mc_extended/Tools/CopperToolMaterial.java index cda9f81..a8da751 100644 --- a/src/main/java/barch/mc_extended/Tools/CopperToolMaterial.java +++ b/src/main/java/barch/mc_extended/Tools/CopperToolMaterial.java @@ -1,17 +1,13 @@ package barch.mc_extended.Tools; -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.block.Block; import net.minecraft.item.*; import net.minecraft.recipe.Ingredient; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; import net.minecraft.registry.tag.BlockTags; import net.minecraft.registry.tag.TagKey; -import net.minecraft.util.Identifier; -import static barch.mc_extended.MCExtended.*; import static barch.mc_extended.Tools.MCEToolMaterials.*; import static barch.mc_extended.Tools.SilverToolMaterial.*; @@ -57,11 +53,11 @@ public Ingredient getRepairIngredient() { public static void GroupTools() { - ItemGrouper.GroupItem(COPPER_SWORD, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, SILVER_SWORD)}); - ItemGrouper.GroupItem(COPPER_SHOVEL, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, SILVER_HOE)}); - ItemGrouper.GroupItem(COPPER_PICKAXE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, COPPER_SHOVEL)}); - ItemGrouper.GroupItem(COPPER_AXE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, COPPER_PICKAXE), new ItemGrouped(ItemGroups.COMBAT, SILVER_AXE)}); - ItemGrouper.GroupItem(COPPER_HOE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, COPPER_HOE)}); + MCE_ITEM_GROUPER.GroupItem(COPPER_SWORD, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, SILVER_SWORD)}); + MCE_ITEM_GROUPER.GroupItem(COPPER_SHOVEL, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, SILVER_HOE)}); + MCE_ITEM_GROUPER.GroupItem(COPPER_PICKAXE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, COPPER_SHOVEL)}); + MCE_ITEM_GROUPER.GroupItem(COPPER_AXE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, COPPER_PICKAXE), new ItemGroupItem(ItemGroups.COMBAT, SILVER_AXE)}); + MCE_ITEM_GROUPER.GroupItem(COPPER_HOE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, COPPER_HOE)}); } } diff --git a/src/main/java/barch/mc_extended/Tools/CorundumToolMaterial.java b/src/main/java/barch/mc_extended/Tools/CorundumToolMaterial.java index 4256c5c..45786a5 100644 --- a/src/main/java/barch/mc_extended/Tools/CorundumToolMaterial.java +++ b/src/main/java/barch/mc_extended/Tools/CorundumToolMaterial.java @@ -1,7 +1,7 @@ package barch.mc_extended.Tools; -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.block.Block; import net.minecraft.item.*; @@ -57,11 +57,11 @@ public Ingredient getRepairIngredient() { public static void GroupTools() { - ItemGrouper.GroupItem(CORUNDUM_SWORD, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, Items.NETHERITE_SWORD)}); - ItemGrouper.GroupItem(CORUNDUM_SHOVEL, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, Items.NETHERITE_HOE)}); - ItemGrouper.GroupItem(CORUNDUM_PICKAXE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, CORUNDUM_SHOVEL)}); - ItemGrouper.GroupItem(CORUNDUM_AXE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, CORUNDUM_PICKAXE), new ItemGrouped(ItemGroups.COMBAT, Items.NETHERITE_AXE)}); - ItemGrouper.GroupItem(CORUNDUM_HOE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, CORUNDUM_HOE)}); + MCE_ITEM_GROUPER.GroupItem(CORUNDUM_SWORD, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, Items.NETHERITE_SWORD)}); + MCE_ITEM_GROUPER.GroupItem(CORUNDUM_SHOVEL, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, Items.NETHERITE_HOE)}); + MCE_ITEM_GROUPER.GroupItem(CORUNDUM_PICKAXE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, CORUNDUM_SHOVEL)}); + MCE_ITEM_GROUPER.GroupItem(CORUNDUM_AXE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, CORUNDUM_PICKAXE), new ItemGroupItem(ItemGroups.COMBAT, Items.NETHERITE_AXE)}); + MCE_ITEM_GROUPER.GroupItem(CORUNDUM_HOE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, CORUNDUM_HOE)}); } } diff --git a/src/main/java/barch/mc_extended/Tools/RubyToolMaterial.java b/src/main/java/barch/mc_extended/Tools/RubyToolMaterial.java index ac62c0a..3330223 100644 --- a/src/main/java/barch/mc_extended/Tools/RubyToolMaterial.java +++ b/src/main/java/barch/mc_extended/Tools/RubyToolMaterial.java @@ -1,7 +1,7 @@ package barch.mc_extended.Tools; -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.block.Block; import net.minecraft.item.*; import net.minecraft.recipe.Ingredient; @@ -57,11 +57,11 @@ public Ingredient getRepairIngredient() { public static void GroupTools() { - ItemGrouper.GroupItem(RUBY_SWORD, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, Items.DIAMOND_SWORD)}); - ItemGrouper.GroupItem(RUBY_SHOVEL, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, Items.DIAMOND_HOE)}); - ItemGrouper.GroupItem(RUBY_PICKAXE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, RUBY_SHOVEL)}); - ItemGrouper.GroupItem(RUBY_AXE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, RUBY_PICKAXE), new ItemGrouped(ItemGroups.COMBAT, Items.DIAMOND_AXE)}); - ItemGrouper.GroupItem(RUBY_HOE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, RUBY_HOE)}); + MCE_ITEM_GROUPER.GroupItem(RUBY_SWORD, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, Items.DIAMOND_SWORD)}); + MCE_ITEM_GROUPER.GroupItem(RUBY_SHOVEL, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, Items.DIAMOND_HOE)}); + MCE_ITEM_GROUPER.GroupItem(RUBY_PICKAXE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, RUBY_SHOVEL)}); + MCE_ITEM_GROUPER.GroupItem(RUBY_AXE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, RUBY_PICKAXE), new ItemGroupItem(ItemGroups.COMBAT, Items.DIAMOND_AXE)}); + MCE_ITEM_GROUPER.GroupItem(RUBY_HOE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, RUBY_HOE)}); } } diff --git a/src/main/java/barch/mc_extended/Tools/SapphireToolMaterial.java b/src/main/java/barch/mc_extended/Tools/SapphireToolMaterial.java index 962759d..54933ba 100644 --- a/src/main/java/barch/mc_extended/Tools/SapphireToolMaterial.java +++ b/src/main/java/barch/mc_extended/Tools/SapphireToolMaterial.java @@ -1,7 +1,7 @@ package barch.mc_extended.Tools; -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.block.Block; import net.minecraft.item.*; import net.minecraft.recipe.Ingredient; @@ -58,11 +58,11 @@ public Ingredient getRepairIngredient() { public static void GroupTools() { - ItemGrouper.GroupItem(SAPPHIRE_SWORD, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, RUBY_SWORD)}); - ItemGrouper.GroupItem(SAPPHIRE_SHOVEL, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, RUBY_HOE)}); - ItemGrouper.GroupItem(SAPPHIRE_PICKAXE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, SAPPHIRE_SHOVEL)}); - ItemGrouper.GroupItem(SAPPHIRE_AXE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, SAPPHIRE_PICKAXE), new ItemGrouped(ItemGroups.COMBAT, RUBY_AXE)}); - ItemGrouper.GroupItem(SAPPHIRE_HOE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, SAPPHIRE_HOE)}); + MCE_ITEM_GROUPER.GroupItem(SAPPHIRE_SWORD, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, RUBY_SWORD)}); + MCE_ITEM_GROUPER.GroupItem(SAPPHIRE_SHOVEL, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, RUBY_HOE)}); + MCE_ITEM_GROUPER.GroupItem(SAPPHIRE_PICKAXE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, SAPPHIRE_SHOVEL)}); + MCE_ITEM_GROUPER.GroupItem(SAPPHIRE_AXE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, SAPPHIRE_PICKAXE), new ItemGroupItem(ItemGroups.COMBAT, RUBY_AXE)}); + MCE_ITEM_GROUPER.GroupItem(SAPPHIRE_HOE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, SAPPHIRE_HOE)}); } } diff --git a/src/main/java/barch/mc_extended/Tools/SilverToolMaterial.java b/src/main/java/barch/mc_extended/Tools/SilverToolMaterial.java index dc32bbe..22ee46f 100644 --- a/src/main/java/barch/mc_extended/Tools/SilverToolMaterial.java +++ b/src/main/java/barch/mc_extended/Tools/SilverToolMaterial.java @@ -1,7 +1,7 @@ package barch.mc_extended.Tools; -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.block.Block; import net.minecraft.item.*; @@ -57,11 +57,11 @@ public Ingredient getRepairIngredient() { public static void GroupTools() { - ItemGrouper.GroupItem(SILVER_SWORD, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, Items.GOLDEN_SWORD)}); - ItemGrouper.GroupItem(SILVER_SHOVEL, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, Items.GOLDEN_HOE)}); - ItemGrouper.GroupItem(SILVER_PICKAXE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, SILVER_SHOVEL)}); - ItemGrouper.GroupItem(SILVER_AXE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, SILVER_PICKAXE), new ItemGrouped(ItemGroups.COMBAT, Items.GOLDEN_AXE)}); - ItemGrouper.GroupItem(SILVER_HOE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, SILVER_HOE)}); + MCE_ITEM_GROUPER.GroupItem(SILVER_SWORD, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, Items.GOLDEN_SWORD)}); + MCE_ITEM_GROUPER.GroupItem(SILVER_SHOVEL, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, Items.GOLDEN_HOE)}); + MCE_ITEM_GROUPER.GroupItem(SILVER_PICKAXE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, SILVER_SHOVEL)}); + MCE_ITEM_GROUPER.GroupItem(SILVER_AXE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, SILVER_PICKAXE), new ItemGroupItem(ItemGroups.COMBAT, Items.GOLDEN_AXE)}); + MCE_ITEM_GROUPER.GroupItem(SILVER_HOE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, SILVER_HOE)}); } } diff --git a/src/main/java/barch/mc_extended/Tools/TinToolMaterial.java b/src/main/java/barch/mc_extended/Tools/TinToolMaterial.java index 7ca0012..fc94d63 100644 --- a/src/main/java/barch/mc_extended/Tools/TinToolMaterial.java +++ b/src/main/java/barch/mc_extended/Tools/TinToolMaterial.java @@ -1,7 +1,7 @@ package barch.mc_extended.Tools; -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.block.Block; import net.minecraft.item.*; @@ -57,11 +57,11 @@ public Ingredient getRepairIngredient() { public static void GroupTools() { - ItemGrouper.GroupItem(TIN_SWORD, new ItemGrouped[]{new ItemGrouped(ItemGroups.COMBAT, TIN_SWORD)}); - ItemGrouper.GroupItem(TIN_SHOVEL, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, TIN_HOE)}); - ItemGrouper.GroupItem(TIN_PICKAXE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, TIN_SHOVEL)}); - ItemGrouper.GroupItem(TIN_AXE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, TIN_PICKAXE), new ItemGrouped(ItemGroups.COMBAT, TIN_AXE)}); - ItemGrouper.GroupItem(TIN_HOE, new ItemGrouped[]{new ItemGrouped(ItemGroups.TOOLS, TIN_HOE)}); + MCE_ITEM_GROUPER.GroupItem(TIN_SWORD, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.COMBAT, TIN_SWORD)}); + MCE_ITEM_GROUPER.GroupItem(TIN_SHOVEL, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, TIN_HOE)}); + MCE_ITEM_GROUPER.GroupItem(TIN_PICKAXE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, TIN_SHOVEL)}); + MCE_ITEM_GROUPER.GroupItem(TIN_AXE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, TIN_PICKAXE), new ItemGroupItem(ItemGroups.COMBAT, TIN_AXE)}); + MCE_ITEM_GROUPER.GroupItem(TIN_HOE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.TOOLS, TIN_HOE)}); } } diff --git a/src/main/java/barch/mc_extended/Villagers/WorkStations.java b/src/main/java/barch/mc_extended/Villagers/WorkStations.java index 858e286..438ad3b 100644 --- a/src/main/java/barch/mc_extended/Villagers/WorkStations.java +++ b/src/main/java/barch/mc_extended/Villagers/WorkStations.java @@ -1,8 +1,8 @@ package barch.mc_extended.Villagers; -import barch.mc_extended.Glue.BlockBuilder; -import barch.mc_extended.Glue.ItemGrouped; -import barch.mc_extended.Glue.ItemGrouper; +import net.barch.barch_lib.Blocks.BlockBuilder; +import net.barch.barch_lib.Items.ItemGroupItem; +import static barch.mc_extended.MCExtended.MCE_ITEM_GROUPER; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.item.BlockItem; @@ -40,8 +40,8 @@ public static void RegisterItems() { public static void GroupItems() { - ItemGrouper.GroupItem(GEM_TABLE, new ItemGrouped[]{new ItemGrouped(ItemGroups.FUNCTIONAL, Items.FLETCHING_TABLE)}); - ItemGrouper.GroupItem(BOTANY_TABLE, new ItemGrouped[]{new ItemGrouped(ItemGroups.FUNCTIONAL, GEM_TABLE)}); + MCE_ITEM_GROUPER.GroupItem(GEM_TABLE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FUNCTIONAL, Items.FLETCHING_TABLE)}); + MCE_ITEM_GROUPER.GroupItem(BOTANY_TABLE, new ItemGroupItem[]{new ItemGroupItem(ItemGroups.FUNCTIONAL, GEM_TABLE)}); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 1b6b5b8..fd4d209 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -34,7 +34,8 @@ "fabricloader": ">=0.15.11", "minecraft": "~1.21", "java": ">=21", - "fabric-api": "*" + "fabric-api": "*", + "barch-lib": "*" }, "suggests": { "another-mod": "*"