diff --git a/build.gradle b/build.gradle index 0c731679..e3f310b8 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ repositories { } dependencies { - deobfCompile "mezz.jei:jei_1.8.8:${jei_version}" + deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}" } minecraft { diff --git a/gradle.properties b/gradle.properties index 9866fd51..65a7614b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic mod_version=2.0.0 -mc_version=1.8.8 +mc_version=1.8.9 forge_version=latest curse_id=224791 mappings_version=snapshot_20151128 -jei_version=2.12.0.49 \ No newline at end of file +jei_version=2.13.0.52 \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 2f30852d..c594d0a4 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -28,7 +28,7 @@ import WayofTime.bloodmagic.registry.ModRecipes; import WayofTime.bloodmagic.registry.ModRituals; import WayofTime.bloodmagic.util.handler.EventHandler; -@Mod(modid = Constants.Mod.MODID, name = Constants.Mod.NAME, version = Constants.Mod.VERSION, dependencies = Constants.Mod.DEPEND, guiFactory = "WayofTime.bloodmagic.client.gui.ConfigGuiFactory") +@Mod(modid = Constants.Mod.MODID, name = Constants.Mod.NAME, version = Constants.Mod.VERSION, dependencies = Constants.Mod.DEPEND, acceptedMinecraftVersions = "[1.8.8,1.8.9]", guiFactory = "WayofTime.bloodmagic.client.gui.ConfigGuiFactory") @Getter public class BloodMagic { @@ -54,9 +54,6 @@ public class BloodMagic { ConfigHandler.init(new File(getConfigDir(), "BloodMagic.cfg")); MinecraftForge.EVENT_BUS.register(new EventHandler()); - - RecipeSorter.register("BloodMagic:shapedorb", ShapedBloodOrbRecipe.class, Category.SHAPED, "before:minecraft:shapeless"); - RecipeSorter.register("BloodMagic:shapelessorb", ShapelessBloodOrbRecipe.class, Category.SHAPELESS, "after:minecraft:shapeless"); ModBlocks.init(); ModItems.init(); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java index 2d50b298..67ef4ff5 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java @@ -45,7 +45,7 @@ public class BloodMagicPlugin implements IModPlugin { registry.addRecipes(BindingRecipeMaker.getRecipes()); registry.addRecipes(AlchemyArrayCraftingRecipeMaker.getRecipes()); - registry.addDescription(Collections.singletonList(new ItemStack(ModItems.altarMaker)), "jei.BloodMagic.desc.altarBuilder"); + registry.addDescription(new ItemStack(ModItems.altarMaker), "jei.BloodMagic.desc.altarBuilder"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index df53dc5e..bdafe660 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.registry; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -19,10 +20,14 @@ import WayofTime.bloodmagic.compress.AdvancedCompressionHandler; import WayofTime.bloodmagic.compress.BaseCompressionHandler; import WayofTime.bloodmagic.compress.StorageBlockCraftingManager; import WayofTime.bloodmagic.item.ItemComponent; +import net.minecraftforge.oredict.RecipeSorter; public class ModRecipes { public static void init() { + RecipeSorter.register(Constants.Mod.DOMAIN + "shapedorb", ShapedBloodOrbRecipe.class, RecipeSorter.Category.SHAPED, "before:minecraft:shapeless"); + RecipeSorter.register(Constants.Mod.DOMAIN + ":shapelessorb", ShapelessBloodOrbRecipe.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless"); + addCraftingRecipes(); addAltarRecipes(); addAlchemyArrayRecipes();