Made most of the recipes, just Blood Magic's to go. Really should get…

… on writing out the mod's documentation soon.

build.gradle

@@ -7,6 +7,16 @@ buildscript {
             url = "https://maven.ellpeck.de"
         }
         maven { url 'https://maven.blamejared.com' }
+        maven {
+            // location of the maven that hosts JEI files
+            name = "Progwml6 maven"
+            url = "https://dvs1.progwml6.com/files/maven/"
+        }
+        maven {
+            // location of a maven mirror for JEI files, as a fallback
+            name = "ModMaven"
+            url = "https://modmaven.k-4u.nl"
+        }
         jcenter()
         mavenCentral()
     }
@@ -37,7 +47,7 @@ minecraft {
     // Simply re-run your setup task after changing the mappings to update your workspace.
     mappings channel: 'snapshot', version: '20201028-1.16.3'
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
-
+    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
     // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
     // Default run configurations.
@@ -141,6 +151,9 @@ dependencies {
     runtimeOnly fg.deobf("curse.maven:natures-aura:3255666")
     compileOnly fg.deobf("curse.maven:botania:3233810")
     runtimeOnly fg.deobf("curse.maven:botania:3233810")
+    compileOnly fg.deobf("curse.maven:jei:3280391")
+    runtimeOnly fg.deobf("curse.maven:jei:3280391")
+
 
 
 }

gradle.properties

@@ -1,4 +1,7 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
+org.gradle.daemon=false
+
+mc_version=1.16.5
+jei_version=7.6.1.75

src/main/java/com/minttea/tomeofblood/TomeOfBloodMod.java

@@ -1,15 +1,19 @@
 package com.minttea.tomeofblood;
 
-import com.hollingsworth.arsnouveau.client.ClientHandler;
 import com.minttea.tomeofblood.common.capabilities.WarlockPowerCapability;
 import com.minttea.tomeofblood.common.events.LivingArmorManaBonus;
 import com.minttea.tomeofblood.common.network.Networking;
 import com.minttea.tomeofblood.setup.*;
+//import com.minttea.tomeofblood.setup.Registries.Registry;
+import com.minttea.tomeofblood.setup.Registries.ItemRegistry;
+import com.minttea.tomeofblood.setup.Registries.RecipeRegistry;
+import com.minttea.tomeofblood.setup.Registries.RitualRegistry;
+import com.minttea.tomeofblood.setup.Registries.SpellRegistry;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
@@ -27,15 +31,12 @@ public class TomeOfBloodMod
 
 
     /**
-     * TODO: Find a better Blood Scroll method
      * TODO: Implement Botanic Tome
-     * TODO: Finish Recipe for Natural Tome
      * TODO: Add Astral Sorcery into the Dev Environment and work on the Astral Tome
-     * TODO: Finish adding Occultism Recipes
-     * TODO: Add Warlock Tome Recipes and Empowering Prayers
+     * TODO: Add Warlock Tome Documentation <- Reliant on Eidolon, unless I'm really dumb
      * TODO: Update Blood Tome Recipes preserving NBT data
      * TODO: Don't forget to add in a Tome of Blood carry over for those who update
-     * TODO: Option Registering of items in case mods aren't present.
+     * Option Registering of items in case mods aren't present.<- Impossible, sadly
      */
     public static final String MODID = "tomeofblood";
     // Directly reference a log4j logger.
@@ -46,15 +47,15 @@ public class TomeOfBloodMod
     public static ItemGroup itemGroup = new ItemGroup(MODID) {
         @Override
         public ItemStack createIcon() {
-            return Registry.bloodTome3.getDefaultInstance();
+            return ItemRegistry.bloodTome3.getDefaultInstance();
         }
     };
 
     public TomeOfBloodMod() {
         // Register ourselves for server and other game events we are interested in
         MinecraftForge.EVENT_BUS.register(this);
         MinecraftForge.EVENT_BUS.register(LivingArmorManaBonus.class);
-        Registry.RegistrationHandler.registerSpells();
+
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::clientSetup);
         LivingUpgradeRegistry.register();
@@ -63,8 +64,11 @@ public TomeOfBloodMod() {
 
     public void setup(final FMLCommonSetupEvent event)
     {
+        SpellRegistry.registerSpells();
         WarlockPowerCapability.register();
+        //RitualRegistry.registerRituals();
         Networking.register();
+        RecipeRegistry.registerRecipes();
     }
     public void clientSetup(final FMLClientSetupEvent event){
         proxy.init();

src/main/java/com/minttea/tomeofblood/common/capabilities/WarlockPower.java

@@ -1,6 +1,8 @@
 package com.minttea.tomeofblood.common.capabilities;
 
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.util.Util;
+import net.minecraft.util.text.TranslationTextComponent;
 
 import javax.annotation.Nullable;
 
@@ -51,13 +53,28 @@ public int addPower(int powerToAdd) {
 
     @Override
     public int refreshPower() {
+        this.entity.sendMessage(new TranslationTextComponent("tomeofblood.alert.power_refresh"), Util.DUMMY_UUID);
         return this.setPower(this.getMaxPower());
     }
 
     @Override
     public int spendPower(int powerToSpend) {
         if(powerToSpend < 0)
             powerToSpend = 0;
+        int newPower = this.getCurrentPower()-powerToSpend;
+        if(this.getPowerPercentage() > .75 && (double)newPower/this.getMaxPower() < .75)
+            this.entity.sendMessage(new TranslationTextComponent("tomeofblood.alert.power_75"), Util.DUMMY_UUID);
+        else if(this.getPowerPercentage() > .5 && (double)newPower/this.getMaxPower() < .5)
+            this.entity.sendMessage(new TranslationTextComponent("tomeofblood.alert.power_50"), Util.DUMMY_UUID);
+        else if(this.getPowerPercentage() > .25 && (double)newPower/this.getMaxPower() < .25)
+            this.entity.sendMessage(new TranslationTextComponent("tomeofblood.alert.power_25"), Util.DUMMY_UUID);
+        else if((double)newPower/this.getMaxPower() < .05)
+            this.entity.sendMessage(new TranslationTextComponent("tomeofblood.alert.power_0"), Util.DUMMY_UUID);
+
         return this.setPower(this.getCurrentPower()-powerToSpend);
     }
+
+    private double getPowerPercentage() {
+        return (double) this.power/(double) this.maxPower;
+    }
 }

src/main/java/com/minttea/tomeofblood/common/items/SpellTome.java

@@ -114,5 +114,10 @@ public SpellResolver getSpellResolver(SpellContext context)
         return new SpellResolver(context);
     }
 
+    @Override
+    public boolean shouldDisplay(ItemStack stack)
+    {
+        return false;
+    }
 
 }

src/main/java/com/minttea/tomeofblood/common/items/bloodmagic/BloodSpellResolver.java

@@ -55,6 +55,7 @@ public boolean canCast(LivingEntity entity){
 
         if(entity instanceof PlayerEntity) {
             PlayerEntity player = (PlayerEntity) entity;
+            if(player.isCreative()) return true;
             int totalCost = getCastingCost(this.spell,player);
             SoulNetwork soulNetwork = NetworkHelper.getSoulNetwork(player.getUniqueID());
             //LOGGER.debug("Got soulnetwork for " + soulNetwork.getPlayer().getDisplayName().getString());
@@ -76,11 +77,12 @@ public void expendMana(LivingEntity entity)
     {
         if(entity instanceof PlayerEntity) {
             PlayerEntity player = (PlayerEntity) entity;
+            if(!player.isCreative()) {
             int totalCost = getCastingCost(this.spell,player);
             SoulNetwork soulNetwork = NetworkHelper.getSoulNetwork(player.getUniqueID());
             //LOGGER.debug("Got soulnetwork for " + soulNetwork.getPlayer().getDisplayName().getString());
             SoulTicket ticket = new SoulTicket(new StringTextComponent("Spell cast"), totalCost);
-            soulNetwork.syphonAndDamage(player, ticket);
+            soulNetwork.syphonAndDamage(player, ticket);}
         }
     }
 }

src/main/java/com/minttea/tomeofblood/common/items/bloodmagic/SentientHarmEffect.java

@@ -80,10 +80,11 @@ public void onResolve(RayTraceResult rayTraceResult, World world, LivingEntity s
 
     }
 
-    public float getExtraDamage(SpellContext spellContext, EnumDemonWillType type, int bracket)
+    public float getExtraDamage(SpellContext spellContext, EnumDemonWillType type, int souls)
     {
 
 
+        int bracket = getBracket(type, souls);
         if(bracket<0)
         {
             return 0;