Move default emc values to JSON files in datapack

6 files changed, 14 insertions, 161 deletions

diff --git a/src/main/java/lv/enes/mc/eris_alchemy/utils/AxeUtils.java b/src/main/java/lv/enes/mc/eris_alchemy/utils/AxeUtils.java
deleted file mode 100644
index 22c0bad..0000000
--- a/src/main/java/lv/enes/mc/eris_alchemy/utils/AxeUtils.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package lv.enes.mc.eris_alchemy.utils;
-
-import net.minecraft.world.item.AxeItem;
-import net.minecraft.world.item.Tier;
-import net.minecraft.world.level.block.Block;
-
-import java.util.Map;
-
-/** This extends AxeItem only to read the STRIPPABLES variable :3 */
-public final class AxeUtils extends AxeItem {
-        public static Map<Block, Block> getStrippables() {
-                return STRIPPABLES;
-        }
-
-        private AxeUtils(Tier material, float attackDamage, float attackSpeed, Properties settings) {
-                super(material, attackDamage, attackSpeed, settings);
-        }
-}
diff --git a/src/main/java/lv/enes/mc/eris_alchemy/utils/BlockUtils.java b/src/main/java/lv/enes/mc/eris_alchemy/utils/BlockUtils.java
deleted file mode 100644
index 88b6231..0000000
--- a/src/main/java/lv/enes/mc/eris_alchemy/utils/BlockUtils.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package lv.enes.mc.eris_alchemy.utils;
-
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.tags.TagKey;
-import net.minecraft.world.level.block.Block;
-
-import java.util.stream.Stream;
-
-public final class BlockUtils {
-        public static Stream<Block> streamTag(TagKey<Block> tag) {
-                return TagUtils.stream(BuiltInRegistries.BLOCK, tag);
-        }
-
-        private BlockUtils() {}
-}
diff --git a/src/main/java/lv/enes/mc/eris_alchemy/utils/CoralUtils.java b/src/main/java/lv/enes/mc/eris_alchemy/utils/CoralUtils.java
deleted file mode 100644
index 1136c9e..0000000
--- a/src/main/java/lv/enes/mc/eris_alchemy/utils/CoralUtils.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package lv.enes.mc.eris_alchemy.utils;
-
-import net.minecraft.tags.BlockTags;
-import net.minecraft.world.level.block.*;
-
-import java.util.stream.Stream;
-
-public final class CoralUtils {
-        /**
-         * @see lv.enes.mc.eris_alchemy.mixin.CoralBlockMixin
-         * @see lv.enes.mc.eris_alchemy.mixin.CoralFanBlockMixin
-         * @see lv.enes.mc.eris_alchemy.mixin.CoralPlantBlockMixin
-         * @see lv.enes.mc.eris_alchemy.mixin.CoralWallFanBlockMixin
-         */
-        public interface CoralSuper {
-                Block lv_enes_mc$getDead();
-        }
-
-        public static Stream<CoralBlock> streamAllCoralBlocks() {
-                return BlockUtils.streamTag(BlockTags.CORAL_BLOCKS).map(b -> (CoralBlock)b);
-        }
-
-        public static Stream<BaseCoralPlantTypeBlock> streamAllCorals() {
-                return BlockUtils.streamTag(BlockTags.CORALS).map(b -> (BaseCoralPlantTypeBlock)b);
-        }
-
-        public static Stream<Block> streamAllDeadCoralBlocks() {
-                return streamAllCoralBlocks().map(CoralUtils::getDeadCoralBlock);
-        }
-
-        public static Stream<Block> streamAllDeadCorals() {
-                return streamAllCorals().map(CoralUtils::getDeadCoral);
-        }
-
-        public static Block getDeadCoral(BaseCoralPlantTypeBlock live ) {
-                return ((CoralSuper)live).lv_enes_mc$getDead();
-        }
-
-        public static Block getDeadCoralBlock(CoralBlock live) {
-                return ((CoralSuper)live).lv_enes_mc$getDead();
-        }
-
-        private CoralUtils() {}
-}
diff --git a/src/main/java/lv/enes/mc/eris_alchemy/utils/DyeUtils.java b/src/main/java/lv/enes/mc/eris_alchemy/utils/DyeUtils.java
deleted file mode 100644
index 3ceb965..0000000
--- a/src/main/java/lv/enes/mc/eris_alchemy/utils/DyeUtils.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package lv.enes.mc.eris_alchemy.utils;
-
-import net.minecraft.world.item.DyeColor;
-import net.minecraft.world.item.DyeItem;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.ConcretePowderBlock;
-import net.minecraft.world.level.block.ShulkerBoxBlock;
-
-public final class DyeUtils {
-        public static Block getConcrete(DyeColor color) {
-                return switch (color) {
-                        case BLACK -> Blocks.BLACK_CONCRETE;
-                        case BLUE -> Blocks.BLUE_CONCRETE;
-                        case BROWN -> Blocks.BROWN_CONCRETE;
-                        case CYAN -> Blocks.CYAN_CONCRETE;
-                        case GRAY -> Blocks.GRAY_CONCRETE;
-                        case GREEN -> Blocks.GREEN_CONCRETE;
-                        case LIGHT_BLUE -> Blocks.LIGHT_BLUE_CONCRETE;
-                        case LIGHT_GRAY -> Blocks.LIGHT_GRAY_CONCRETE;
-                        case LIME -> Blocks.LIME_CONCRETE;
-                        case MAGENTA -> Blocks.MAGENTA_CONCRETE;
-                        case ORANGE -> Blocks.ORANGE_CONCRETE;
-                        case PINK -> Blocks.PINK_CONCRETE;
-                        case PURPLE -> Blocks.PURPLE_CONCRETE;
-                        case RED -> Blocks.RED_CONCRETE;
-                        case WHITE -> Blocks.WHITE_CONCRETE;
-                        case YELLOW -> Blocks.YELLOW_CONCRETE;
-                };
-        }
-
-        public static ConcretePowderBlock getConcretePowder(DyeColor color) {
-                return (ConcretePowderBlock)switch (color) {
-                        case BLACK -> Blocks.BLACK_CONCRETE_POWDER;
-                        case BLUE -> Blocks.BLUE_CONCRETE_POWDER;
-                        case BROWN -> Blocks.BROWN_CONCRETE_POWDER;
-                        case CYAN -> Blocks.CYAN_CONCRETE_POWDER;
-                        case GRAY -> Blocks.GRAY_CONCRETE_POWDER;
-                        case GREEN -> Blocks.GREEN_CONCRETE_POWDER;
-                        case LIGHT_BLUE -> Blocks.LIGHT_BLUE_CONCRETE_POWDER;
-                        case LIGHT_GRAY -> Blocks.LIGHT_GRAY_CONCRETE_POWDER;
-                        case LIME -> Blocks.LIME_CONCRETE_POWDER;
-                        case MAGENTA -> Blocks.MAGENTA_CONCRETE_POWDER;
-                        case ORANGE -> Blocks.ORANGE_CONCRETE_POWDER;
-                        case PINK -> Blocks.PINK_CONCRETE_POWDER;
-                        case PURPLE -> Blocks.PURPLE_CONCRETE_POWDER;
-                        case RED -> Blocks.RED_CONCRETE_POWDER;
-                        case WHITE -> Blocks.WHITE_CONCRETE_POWDER;
-                        case YELLOW -> Blocks.YELLOW_CONCRETE_POWDER;
-                };
-        }
-
-        public static DyeItem getDye(DyeColor color) {
-                return DyeItem.byColor(color);
-        }
-
-        public static ShulkerBoxBlock getShulkerBox(DyeColor color) {
-                return (ShulkerBoxBlock)ShulkerBoxBlock.getBlockByColor(color);
-        }
-
-        private DyeUtils() {}
-}
diff --git a/src/main/java/lv/enes/mc/eris_alchemy/utils/ItemUtils.java b/src/main/java/lv/enes/mc/eris_alchemy/utils/ItemUtils.java
index 26d4405..4414d06 100644
--- a/src/main/java/lv/enes/mc/eris_alchemy/utils/ItemUtils.java
+++ b/src/main/java/lv/enes/mc/eris_alchemy/utils/ItemUtils.java
@@ -1,14 +1,22 @@
 package lv.enes.mc.eris_alchemy.utils;
 
+import net.minecraft.core.Holder;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.tags.TagKey;
-import net.minecraft.world.item.Item;
-
-import java.util.stream.Stream;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.ItemLike;
 
 public final class ItemUtils {
-        public static Stream<Item> streamTag(TagKey<Item> tag) {
-                return TagUtils.stream(BuiltInRegistries.ITEM, tag);
+        public static <I extends ItemLike> ResourceLocation getId(Holder<I> holder) {
+                return getId(holder.value());
+        }
+
+        public static ResourceLocation getId(ItemLike item) {
+                return BuiltInRegistries.ITEM.getKey(item.asItem());
+        }
+
+        public static ResourceLocation getId(ItemStack stack) {
+                return getId(stack.getItem());
         }
 
         private ItemUtils() {}
diff --git a/src/main/java/lv/enes/mc/eris_alchemy/utils/TagUtils.java b/src/main/java/lv/enes/mc/eris_alchemy/utils/TagUtils.java
deleted file mode 100644
index 93e577f..0000000
--- a/src/main/java/lv/enes/mc/eris_alchemy/utils/TagUtils.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package lv.enes.mc.eris_alchemy.utils;
-
-import net.minecraft.core.Holder;
-import net.minecraft.core.Registry;
-import net.minecraft.tags.TagKey;
-
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-public final class TagUtils {
-        public static <T> Stream<T> stream(Registry<T> registry, TagKey<T> tag) {
-                return StreamSupport.stream(registry.getTagOrEmpty(tag).spliterator(), false).map(Holder::value);
-        }
-
-        private TagUtils() {}
-}