Cleaned up a lot of different inspections

src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java

@@ -28,7 +28,7 @@ import java.util.*;
  */
 public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect {
     private FakePlayer target;
-    private Set<EntityLiving> tracking = new HashSet<EntityLiving>();
+    private Set<EntityLiving> tracking = new HashSet<>();
 
     private int counter = 0;
     private int maxMobsAttracted = 10000;
@@ -48,9 +48,7 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect {
         BlockPos pos = tile.getPos();
         counter++;
         if (counter < 10) {
-            Iterator<EntityLiving> itr = tracking.iterator();
+            for (EntityLiving ent : tracking) {
-            while (itr.hasNext()) {
-                EntityLiving ent = itr.next();
                 onEntityTick(pos, ent);
             }
 
@@ -61,7 +59,7 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect {
 
         World world = tile.getWorld();
 
-        Set<EntityLiving> trackingThisTick = new HashSet<EntityLiving>();
+        Set<EntityLiving> trackingThisTick = new HashSet<>();
         List<EntityLiving> entsInBounds = world.getEntitiesWithinAABB(EntityLiving.class, getBounds(pos));
 
         for (EntityLiving ent : entsInBounds) {
@@ -268,7 +266,7 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect {
     private void cancelCurrentTasks(EntityLiving ent) {
         Iterator<EntityAITaskEntry> iterator = ent.tasks.taskEntries.iterator();
 
-        List<EntityAITasks.EntityAITaskEntry> currentTasks = new ArrayList<EntityAITasks.EntityAITaskEntry>();
+        List<EntityAITasks.EntityAITaskEntry> currentTasks = new ArrayList<>();
         while (iterator.hasNext()) {
             EntityAITaskEntry entityaitaskentry = iterator.next();
             if (entityaitaskentry != null) {

src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java

@@ -25,12 +25,7 @@ import java.util.List;
  * Credits for the initial code go to Crazy Pants of EIO.
  */
 public class AlchemyArrayEffectSkeletonTurret extends AlchemyArrayEffect {
-    public static Predicate<EntityMob> checkSkeleton = new Predicate<EntityMob>() {
+    public static Predicate<EntityMob> checkSkeleton = input -> !(input instanceof EntitySkeleton);
-        @Override
-        public boolean apply(EntityMob input) {
-            return !(input instanceof EntitySkeleton);
-        }
-    };
     private EntitySkeleton turret;
 
     public AlchemyArrayEffectSkeletonTurret(String key) {
@@ -105,7 +100,7 @@ public class AlchemyArrayEffectSkeletonTurret extends AlchemyArrayEffect {
     private void cancelCurrentTargetTasks(EntityLiving entity) {
         Iterator<EntityAITaskEntry> iterator = entity.targetTasks.taskEntries.iterator();
 
-        List<EntityAITasks.EntityAITaskEntry> currentTasks = new ArrayList<EntityAITasks.EntityAITaskEntry>();
+        List<EntityAITasks.EntityAITaskEntry> currentTasks = new ArrayList<>();
         while (iterator.hasNext()) {
             EntityAITaskEntry entityaitaskentry = iterator.next();
             if (entityaitaskentry != null)// && entityaitaskentry.action instanceof EntityAITarget)

src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java

@@ -14,7 +14,6 @@ import WayofTime.bloodmagic.util.helper.NetworkHelper;
 import WayofTime.bloodmagic.block.BlockLifeEssence;
 import WayofTime.bloodmagic.tile.TileAltar;
 import com.google.common.base.Enums;
-import com.google.common.base.Strings;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;

src/main/java/WayofTime/bloodmagic/altar/EnumAltarTier.java

@@ -122,7 +122,7 @@ public enum EnumAltarTier {
 
     public static final int MAXTIERS = values().length;
 
-    ArrayList<AltarComponent> altarComponents = new ArrayList<AltarComponent>();
+    ArrayList<AltarComponent> altarComponents = new ArrayList<>();
 
     public void buildComponents() {
 

src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java

@@ -25,7 +25,7 @@ import javax.annotation.Nullable;
 
 public class BlockAlchemyTable extends Block implements IBMBlock {
     public static final PropertyBool INVISIBLE = PropertyBool.create("invisible");
-    public static final PropertyEnum<EnumFacing> DIRECTION = PropertyEnum.<EnumFacing>create("direction", EnumFacing.class);
+    public static final PropertyEnum<EnumFacing> DIRECTION = PropertyEnum.create("direction", EnumFacing.class);
 
     public BlockAlchemyTable() {
         super(Material.ROCK);

src/main/java/WayofTime/bloodmagic/block/BlockAltar.java

@@ -164,8 +164,8 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "normal"));
+        ret.add(new ImmutablePair<>(0, "normal"));
         return ret;
     }
 
@@ -173,7 +173,7 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl
 
     @Override
     public List<ITextComponent> getDocumentation(EntityPlayer player, World world, BlockPos pos, IBlockState state) {
-        List<ITextComponent> docs = new ArrayList<ITextComponent>();
+        List<ITextComponent> docs = new ArrayList<>();
         IBloodAltar altar = ((IBloodAltar) world.getTileEntity(pos));
         Pair<BlockPos, EnumAltarComponent> missingBlock = BloodAltar.getAltarMissingBlock(world, pos, altar.getTier().toInt());
         if (missingBlock != null)

src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java

@@ -101,8 +101,8 @@ public class BlockDemonCrucible extends Block implements IVariantProvider, IBMBl
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "normal"));
+        ret.add(new ImmutablePair<>(0, "normal"));
         return ret;
     }
 

src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java

@@ -27,8 +27,8 @@ import java.util.Random;
 
 public class BlockDemonCrystal extends Block {
     public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 6);
-    public static final PropertyEnum<EnumDemonWillType> TYPE = PropertyEnum.<EnumDemonWillType>create("type", EnumDemonWillType.class);
+    public static final PropertyEnum<EnumDemonWillType> TYPE = PropertyEnum.create("type", EnumDemonWillType.class);
-    public static final PropertyEnum<EnumFacing> ATTACHED = PropertyEnum.<EnumFacing>create("attached", EnumFacing.class);
+    public static final PropertyEnum<EnumFacing> ATTACHED = PropertyEnum.create("attached", EnumFacing.class);
 
     public BlockDemonCrystal() {
         super(Material.ROCK);

src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java

@@ -69,8 +69,8 @@ public class BlockDemonCrystallizer extends BlockContainer implements IVariantPr
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "normal"));
+        ret.add(new ImmutablePair<>(0, "normal"));
         return ret;
     }
 

src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java

@@ -62,8 +62,8 @@ public class BlockDemonPylon extends BlockContainer implements IVariantProvider
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "normal"));
+        ret.add(new ImmutablePair<>(0, "normal"));
         return ret;
     }
 }

src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java

@@ -85,8 +85,8 @@ public class BlockIncenseAltar extends Block implements IVariantProvider, IBMBlo
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "normal"));
+        ret.add(new ImmutablePair<>(0, "normal"));
         return ret;
     }
 

src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java

@@ -74,7 +74,7 @@ public class BlockInversionPillar extends BlockEnum<EnumSubWillType> {
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
         for (int i = 0; i < this.getTypes().length; i++)
             ret.add(Pair.of(i, "static=false,type=" + this.getTypes()[i]));
         return ret;

src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java

@@ -55,9 +55,9 @@ public class BlockInversionPillarEnd extends BlockEnum<EnumInversionCap> impleme
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
         for (int i = 0; i < this.getTypes().length; i++)
-            ret.add(new ImmutablePair<Integer, String>(i, "type=" + this.getTypes()[i]));
+            ret.add(new ImmutablePair<>(i, "type=" + this.getTypes()[i]));
         return ret;
     }
 }

src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java

@@ -86,8 +86,8 @@ public class BlockPhantom extends Block implements IVariantProvider {
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "normal"));
+        ret.add(new ImmutablePair<>(0, "normal"));
         return ret;
     }
 }

src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java

@@ -14,7 +14,6 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.tile.TileImperfectRitualStone;
 import WayofTime.bloodmagic.tile.TileMasterRitualStone;
 import amerifrance.guideapi.api.IGuideLinked;
-import com.google.common.base.Strings;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;

src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java

@@ -99,8 +99,8 @@ public class BlockSoulForge extends Block implements IVariantProvider, IBMBlock
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "normal"));
+        ret.add(new ImmutablePair<>(0, "normal"));
         return ret;
     }
 

src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java

@@ -109,8 +109,8 @@ public class BlockSpectral extends Block implements IVariantProvider {
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "normal"));
+        ret.add(new ImmutablePair<>(0, "normal"));
         return ret;
     }
 }

src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java

@@ -66,8 +66,8 @@ public class BlockTeleposer extends BlockContainer implements IVariantProvider,
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "normal"));
+        ret.add(new ImmutablePair<>(0, "normal"));
         return ret;
     }
 

src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java

@@ -25,15 +25,6 @@ import java.io.IOException;
 
 @SideOnly(Side.CLIENT)
 public class GuiItemRoutingNode extends GuiContainer {
-    private GuiButton downButton;
-    private GuiButton upButton;
-    private GuiButton northButton;
-    private GuiButton southButton;
-    private GuiButton westButton;
-    private GuiButton eastButton;
-    private GuiButton incrementButton;
-    private GuiButton decrementButton;
-
     private GuiTextField textBox;
 
     private TileFilteredRoutingNode inventory;
@@ -65,14 +56,14 @@ public class GuiItemRoutingNode extends GuiContainer {
         top = (this.height - this.ySize) / 2;
 
         this.buttonList.clear();
-        this.buttonList.add(this.downButton = new GuiButton(0, left + 176, top + 14, 18, 18, "D"));
+        this.buttonList.add(new GuiButton(0, left + 176, top + 14, 18, 18, "D"));
-        this.buttonList.add(this.upButton = new GuiButton(1, left + 176, top + 32, 18, 18, "U"));
+        this.buttonList.add(new GuiButton(1, left + 176, top + 32, 18, 18, "U"));
-        this.buttonList.add(this.northButton = new GuiButton(2, left + 176, top + 50, 18, 18, "N"));
+        this.buttonList.add(new GuiButton(2, left + 176, top + 50, 18, 18, "N"));
-        this.buttonList.add(this.southButton = new GuiButton(3, left + 176, top + 68, 18, 18, "S"));
+        this.buttonList.add(new GuiButton(3, left + 176, top + 68, 18, 18, "S"));
-        this.buttonList.add(this.westButton = new GuiButton(4, left + 176, top + 86, 18, 18, "W"));
+        this.buttonList.add(new GuiButton(4, left + 176, top + 86, 18, 18, "W"));
-        this.buttonList.add(this.eastButton = new GuiButton(5, left + 176, top + 104, 18, 18, "E"));
+        this.buttonList.add(new GuiButton(5, left + 176, top + 104, 18, 18, "E"));
-        this.buttonList.add(this.incrementButton = new GuiButton(6, left + 160, top + 50, 10, 18, ">"));
+        this.buttonList.add(new GuiButton(6, left + 160, top + 50, 10, 18, ">"));
-        this.buttonList.add(this.decrementButton = new GuiButton(7, left + 132, top + 50, 10, 18, "<"));
+        this.buttonList.add(new GuiButton(7, left + 132, top + 50, 10, 18, "<"));
         disableDirectionalButton(inventory.currentActiveSlot);
 
         this.textBox = new GuiTextField(0, this.fontRenderer, left + 94, top + 37, 70, 12);
@@ -92,7 +83,7 @@ public class GuiItemRoutingNode extends GuiContainer {
                     try {
                         Integer testVal = Integer.decode(str);
                         if (testVal != null) {
-                            amount = testVal.intValue();
+                            amount = testVal;
                         }
                     } catch (NumberFormatException d) {
                     }
@@ -120,7 +111,7 @@ public class GuiItemRoutingNode extends GuiContainer {
         if (container.lastGhostSlotClicked != -1) {
             Slot slot = container.getSlot(container.lastGhostSlotClicked + 1);
             ItemStack stack = slot.getStack();
-            if (stack != null) {
+            if (!stack.isEmpty()) {
                 int amount = GhostItemHelper.getItemGhostAmount(stack);
                 this.textBox.setText("" + amount);
             } else {
@@ -173,7 +164,7 @@ public class GuiItemRoutingNode extends GuiContainer {
         String s = "";
         if (container.lastGhostSlotClicked != -1) {
             ItemStack clickedStack = inventorySlots.getSlot(1 + container.lastGhostSlotClicked).getStack();
-            if (clickedStack != null) {
+            if (!clickedStack.isEmpty()) {
                 s = clickedStack.getDisplayName();
             }
         }

src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java

@@ -6,20 +6,17 @@ import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IInventory;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 @SideOnly(Side.CLIENT)
 public class GuiMasterRoutingNode extends GuiContainer {
-    private TileEntity inventory;
 
     public GuiMasterRoutingNode(InventoryPlayer playerInventory, IInventory tileRoutingNode) {
         super(new ContainerMasterRoutingNode(playerInventory, tileRoutingNode));
         this.xSize = 216;
         this.ySize = 216;
-        inventory = (TileEntity) tileRoutingNode;
     }
 
     @Override

src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java

@@ -1,13 +1,3 @@
-/**
- * This class was created by <Vazkii>. It's distributed as
- * part of the Botania Mod. Get the Source Code in github:
- * https://github.com/Vazkii/Botania
- * <p>
- * Botania is Open Source and distributed under the
- * Botania License: http://botaniamod.net/license.php
- * <p>
- * File Created @ [Apr 9, 2014, 11:20:26 PM (GMT)]
- */
 package WayofTime.bloodmagic.client.helper;
 
 import net.minecraft.client.renderer.OpenGlHelper;
@@ -22,6 +12,16 @@ import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
+/**
+ * This class was created by <Vazkii>. It's distributed as
+ * part of the Botania Mod. Get the Source Code in github:
+ * https://github.com/Vazkii/Botania
+ * <p>
+ * Botania is Open Source and distributed under the
+ * Botania License: http://botaniamod.net/license.php
+ * <p>
+ * File Created @ [Apr 9, 2014, 11:20:26 PM (GMT)]
+ */
 public final class ShaderHelper {
     private static final int VERT_ST = ARBVertexShader.GL_VERTEX_SHADER_ARB;
     private static final int FRAG_ST = ARBFragmentShader.GL_FRAGMENT_SHADER_ARB;

src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java

@@ -15,7 +15,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class HUDElementDemonWillAura extends HUDElement {
-    protected List<EnumDemonWillType> barOrder = new ArrayList<EnumDemonWillType>();
+    protected List<EnumDemonWillType> barOrder = new ArrayList<>();
 
     public HUDElementDemonWillAura() {
         super(5, 5, RenderGameOverlayEvent.ElementType.HOTBAR);

src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedChicken.java

@@ -16,7 +16,7 @@ public class RenderCorruptedChicken extends RenderLiving<EntityCorruptedChicken>
 
     public RenderCorruptedChicken(RenderManager renderManagerIn) {
         super(renderManagerIn, new ModelCorruptedChicken(0), 0.3f);
-        this.addLayer(new LayerWill<EntityCorruptedChicken>(this, new ModelCorruptedChicken(1.1f)));
+        this.addLayer(new LayerWill<>(this, new ModelCorruptedChicken(1.1f)));
     }
 
     @Override

src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSheep.java

@@ -19,9 +19,9 @@ public class RenderCorruptedSheep extends RenderLiving<EntityCorruptedSheep> {
     public RenderCorruptedSheep(RenderManager renderManagerIn) {
         super(renderManagerIn, new ModelCorruptedSheep2(0), 0.7F);
         this.addLayer(new LayerCorruptedSheepWool(this));
-        this.addLayer(new LayerWill<EntityCorruptedSheep>(this, new ModelCorruptedSheep(1.1f)));
+        this.addLayer(new LayerWill<>(this, new ModelCorruptedSheep(1.1f)));
-        this.addLayer(new LayerWill<EntityCorruptedSheep>(this, new ModelCorruptedSheep2(1.1f)));
+        this.addLayer(new LayerWill<>(this, new ModelCorruptedSheep2(1.1f)));
-        this.addLayer(new LayerAlchemyCircle<EntityCorruptedSheep>());
+        this.addLayer(new LayerAlchemyCircle<>());
     }
 
     @Override

src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSpider.java

@@ -18,7 +18,7 @@ public class RenderCorruptedSpider extends RenderLiving<EntityCorruptedSpider> {
     public RenderCorruptedSpider(RenderManager renderManagerIn) {
         super(renderManagerIn, new ModelSpider(), 1.0F);
         this.addLayer(new LayerCorruptedSpiderEyes(this));
-        this.addLayer(new LayerWill<EntityCorruptedSpider>(this, new ModelCorruptedSpider(1.1f)));
+        this.addLayer(new LayerWill<>(this, new ModelCorruptedSpider(1.1f)));
     }
 
     protected float getDeathMaxRotation(EntityCorruptedSpider entityLivingBaseIn) {

src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedZombie.java

@@ -38,7 +38,7 @@ public class RenderCorruptedZombie extends RenderBiped<EntityCorruptedZombie> {
         }
 
         this.layerRenderers.remove(layerbipedarmor);
-        this.addLayer(new LayerWill<EntityCorruptedZombie>(this, new ModelZombie(1.2f, false)));
+        this.addLayer(new LayerWill<>(this, new ModelZombie(1.2f, false)));
     }
 
     /**

src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java

@@ -10,9 +10,11 @@ import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.util.ResourceLocation;
 
 public class RenderEntityMeteor extends Render<EntityMeteor> {
-    private static final ResourceLocation resource = new ResourceLocation(BloodMagic.MODID, "textures/models/Meteor.png");
+
+    private static final ResourceLocation TEXTURE = new ResourceLocation(BloodMagic.MODID, "textures/models/Meteor.png");
+    private static final float SCALE = 1;
+
     public ModelBase model = new ModelMeteor();
-    private float scale = 1;
 
     public RenderEntityMeteor(RenderManager renderManagerIn) {
         super(renderManagerIn);
@@ -20,24 +22,11 @@ public class RenderEntityMeteor extends Render<EntityMeteor> {
 
     @Override
     public void doRender(EntityMeteor entity, double x, double y, double z, float entityYaw, float partialTicks) {
-//        GlStateManager.pushMatrix();
-//        GlStateManager.translate((float) x, (float) y, (float) z);
-//        GlStateManager.enableRescaleNormal();
-//        GlStateManager.scale(0.5F, 0.5F, 0.5F);
-//        GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
-//        GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
-//        this.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
-//        this.renderItem.renderItem(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT), ItemCameraTransforms.TransformType.GROUND);
-//        GlStateManager.disableRescaleNormal();
-//        GlStateManager.popMatrix();
-
         GlStateManager.pushMatrix();
         GlStateManager.translate((float) x, (float) y, (float) z);
         GlStateManager.enableRescaleNormal();
-        GlStateManager.scale(scale, scale, scale);
+        GlStateManager.scale(SCALE, SCALE, SCALE);
-        this.bindTexture(this.getEntityTexture(entity));
+        this.bindTexture(TEXTURE);
-//        GL11.glRotatef(entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * f1, 0.0F, 1.0F, 0.0F);
-//        GL11.glRotatef(180.0f - entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * f1, 1.0F, 0.0F, 0.0f);
         model.render(entity, 0, (float) x, (float) y, (float) z, entityYaw, partialTicks);
         GlStateManager.disableRescaleNormal();
         GlStateManager.popMatrix();
@@ -47,6 +36,6 @@ public class RenderEntityMeteor extends Render<EntityMeteor> {
 
     @Override
     protected ResourceLocation getEntityTexture(EntityMeteor entity) {
-        return resource;
+        return TEXTURE;
     }
 }

src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java

@@ -37,7 +37,7 @@ public class RenderEntitySentientArrow extends Render<EntitySentientArrow> {
         int i = 0;
         float f = 0.0F;
         float f1 = 0.5F;
-        float f2 = (float) (0 + i * 10) / 32.0F;
+        float f2 = (float) (i * 10) / 32.0F;
         float f3 = (float) (5 + i * 10) / 32.0F;
         float f4 = 0.0F;
         float f5 = 0.15625F;

src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java

@@ -1,12 +1,9 @@
 package WayofTime.bloodmagic.command.sub;
 
 import WayofTime.bloodmagic.core.data.Binding;
-import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.iface.IBindable;
 import WayofTime.bloodmagic.util.helper.BindableHelper;
-import WayofTime.bloodmagic.util.helper.PlayerHelper;
 import WayofTime.bloodmagic.util.helper.TextHelper;
-import com.google.common.base.Strings;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;

src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java

@@ -22,7 +22,7 @@ public class BookUtils {
 
             AlchemyCircleRenderer renderer = AlchemyArrayRecipeRegistry.getAlchemyCircleRenderer(inputStack, catalystStack);
             if (renderer instanceof DualAlchemyCircleRenderer) {
-                List<ResourceLocation> resources = new ArrayList<ResourceLocation>();
+                List<ResourceLocation> resources = new ArrayList<>();
                 resources.add(((DualAlchemyCircleRenderer) renderer).arrayResource);
                 resources.add(((DualAlchemyCircleRenderer) renderer).secondaryArrayResource);
                 return new PageAlchemyArray(resources, inputStack, catalystStack);
@@ -43,7 +43,7 @@ public class BookUtils {
             AlchemyCircleRenderer renderer = AlchemyArrayRecipeRegistry.getAlchemyCircleRenderer(inputStack, catalystStack);
             if (renderer != null) {
                 if (renderer instanceof DualAlchemyCircleRenderer) {
-                    List<ResourceLocation> resources = new ArrayList<ResourceLocation>();
+                    List<ResourceLocation> resources = new ArrayList<>();
                     resources.add(((DualAlchemyCircleRenderer) renderer).arrayResource);
                     resources.add(((DualAlchemyCircleRenderer) renderer).secondaryArrayResource);
                     return new PageAlchemyArray(resources, inputStack, catalystStack, outputStack);

src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java

@@ -26,14 +26,14 @@ public class CategoryAlchemy
 {
     public static Map<ResourceLocation, EntryAbstract> buildCategory()
     {
-        Map<ResourceLocation, EntryAbstract> entries = new LinkedHashMap<ResourceLocation, EntryAbstract>();
+        Map<ResourceLocation, EntryAbstract> entries = new LinkedHashMap<>();
         String keyBase = "guide." + BloodMagic.MODID + ".entry.alchemy.";
 
-        List<IPage> introPages = new ArrayList<IPage>();
+        List<IPage> introPages = new ArrayList<>();
         introPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "intro" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "intro"), new EntryText(introPages, TextHelper.localize(keyBase + "intro"), true));
 
-        List<IPage> ashPages = new ArrayList<IPage>();
+        List<IPage> ashPages = new ArrayList<>();
 
         TartaricForgeRecipe ashRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES));
         if (ashRecipe != null)
@@ -43,7 +43,7 @@ public class CategoryAlchemy
         ashPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "ash" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "ash"), new EntryText(ashPages, TextHelper.localize(keyBase + "ash"), true));
 
-        List<IPage> furnacePages = new ArrayList<IPage>();
+        List<IPage> furnacePages = new ArrayList<>();
 
         PageAlchemyArray furnaceRecipePage = BookUtils.getAlchemyPage("furnace");
         if (furnaceRecipePage != null)
@@ -53,7 +53,7 @@ public class CategoryAlchemy
         furnacePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "furnace" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "furnace"), new EntryText(furnacePages, TextHelper.localize(keyBase + "furnace"), true));
 
-        List<IPage> speedPages = new ArrayList<IPage>();
+        List<IPage> speedPages = new ArrayList<>();
 
         PageAlchemyArray speedRecipePage = BookUtils.getAlchemyPage("movement");
         if (speedRecipePage != null)
@@ -63,7 +63,7 @@ public class CategoryAlchemy
         speedPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "speed" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "speed"), new EntryText(speedPages, TextHelper.localize(keyBase + "speed"), true));
 
-        List<IPage> updraftPages = new ArrayList<IPage>();
+        List<IPage> updraftPages = new ArrayList<>();
 
         PageAlchemyArray updraftRecipePage = BookUtils.getAlchemyPage("updraft");
         if (updraftRecipePage != null)
@@ -73,7 +73,7 @@ public class CategoryAlchemy
         updraftPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "updraft" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "updraft"), new EntryText(updraftPages, TextHelper.localize(keyBase + "updraft"), true));
 
-        List<IPage> turretPages = new ArrayList<IPage>();
+        List<IPage> turretPages = new ArrayList<>();
 
         PageAlchemyArray turretRecipePage = BookUtils.getAlchemyPage("skeletonTurret");
         if (turretRecipePage != null)
@@ -83,7 +83,7 @@ public class CategoryAlchemy
         turretPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "turret" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "turret"), new EntryText(turretPages, TextHelper.localize(keyBase + "turret"), true));
 
-        List<IPage> bouncePages = new ArrayList<IPage>();
+        List<IPage> bouncePages = new ArrayList<>();
 
         PageAlchemyArray bounceRecipePage = BookUtils.getAlchemyPage("bounce");
         if (bounceRecipePage != null)
@@ -93,12 +93,12 @@ public class CategoryAlchemy
         bouncePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bounce" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "bounce"), new EntryText(bouncePages, TextHelper.localize(keyBase + "bounce"), true));
 
-        List<IPage> buffPages = new ArrayList<IPage>();
+        List<IPage> buffPages = new ArrayList<>();
 
         buffPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "buff" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "buff"), new EntryText(buffPages, TextHelper.localize(keyBase + "buff"), true));
 
-        List<IPage> fastMinerPages = new ArrayList<IPage>();
+        List<IPage> fastMinerPages = new ArrayList<>();
 
         PageAlchemyArray fastMinerRecipePage = BookUtils.getAlchemyPage("fastMiner");
         if (fastMinerRecipePage != null)

src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java

@@ -31,15 +31,15 @@ import java.util.Map.Entry;
 
 public class CategoryArchitect {
     public static Map<ResourceLocation, EntryAbstract> buildCategory() {
-        Map<ResourceLocation, EntryAbstract> entries = new LinkedHashMap<ResourceLocation, EntryAbstract>();
+        Map<ResourceLocation, EntryAbstract> entries = new LinkedHashMap<>();
         String keyBase = "guide." + BloodMagic.MODID + ".entry.architect.";
 
-        List<IPage> introPages = new ArrayList<IPage>();
+        List<IPage> introPages = new ArrayList<>();
         introPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "intro" + ".info"), 370));
 //        introPages.add(new PageImage(new ResourceLocation("bloodmagicguide", "textures/guide/" + ritual.getName() + ".png")));
         entries.put(new ResourceLocation(keyBase + "intro"), new EntryText(introPages, TextHelper.localize(keyBase + "intro"), true));
 
-        List<IPage> altarPages = new ArrayList<IPage>();
+        List<IPage> altarPages = new ArrayList<>();
 
         IRecipe altarRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.ALTAR));
         if (altarRecipe != null) {
@@ -56,7 +56,7 @@ public class CategoryArchitect {
         altarPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bloodaltar" + ".info.2"), 370));
         entries.put(new ResourceLocation(keyBase + "bloodaltar"), new EntryText(altarPages, TextHelper.localize(keyBase + "bloodaltar"), true));
 
-        List<IPage> ashPages = new ArrayList<IPage>();
+        List<IPage> ashPages = new ArrayList<>();
 
         TartaricForgeRecipe ashRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES));
         if (ashRecipe != null) {
@@ -65,7 +65,7 @@ public class CategoryArchitect {
         ashPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "ash" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "ash"), new EntryText(ashPages, TextHelper.localize(keyBase + "ash"), true));
 
-        List<IPage> divinationPages = new ArrayList<IPage>();
+        List<IPage> divinationPages = new ArrayList<>();
 
         PageAlchemyArray divinationRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION));
         if (divinationRecipePage != null) {
@@ -75,12 +75,12 @@ public class CategoryArchitect {
         divinationPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "divination" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "divination"), new EntryText(divinationPages, TextHelper.localize(keyBase + "divination"), true));
 
-        List<IPage> soulnetworkPages = new ArrayList<IPage>();
+        List<IPage> soulnetworkPages = new ArrayList<>();
 
         soulnetworkPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "soulnetwork" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "soulnetwork"), new EntryText(soulnetworkPages, TextHelper.localize(keyBase + "soulnetwork"), true));
 
-        List<IPage> weakorbPages = new ArrayList<IPage>();
+        List<IPage> weakorbPages = new ArrayList<>();
         weakorbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "weakorb" + ".info.1"), 370));
 
         AltarRecipe weakorbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK));
@@ -91,7 +91,7 @@ public class CategoryArchitect {
         weakorbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "weakorb" + ".info.2"), 370));
         entries.put(new ResourceLocation(keyBase + "weakorb"), new EntryText(weakorbPages, TextHelper.localize(keyBase + "weakorb"), true));
 
-        List<IPage> incensePages = new ArrayList<IPage>();
+        List<IPage> incensePages = new ArrayList<>();
 
         IRecipe incenseRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.INCENSE_ALTAR));
         if (incenseRecipe != null) {
@@ -108,7 +108,7 @@ public class CategoryArchitect {
         incensePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "incense" + ".info.2"), 370));
         entries.put(new ResourceLocation(keyBase + "incense"), new EntryText(incensePages, TextHelper.localize(keyBase + "incense"), true));
 
-        List<IPage> runePages = new ArrayList<IPage>();
+        List<IPage> runePages = new ArrayList<>();
 
         IRecipe runeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 0));
         if (runeRecipe != null) {
@@ -118,7 +118,7 @@ public class CategoryArchitect {
         runePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bloodrune" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "bloodrune"), new EntryText(runePages, TextHelper.localize(keyBase + "bloodrune"), true));
 
-        List<IPage> inspectPages = new ArrayList<IPage>();
+        List<IPage> inspectPages = new ArrayList<>();
 
         AltarRecipe inspectRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK));
         if (inspectRecipe != null) {
@@ -128,7 +128,7 @@ public class CategoryArchitect {
         inspectPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "inspectoris" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "inspectoris"), new EntryText(inspectPages, TextHelper.localize(keyBase + "inspectoris"), true));
 
-        List<IPage> speedRunePages = new ArrayList<IPage>();
+        List<IPage> speedRunePages = new ArrayList<>();
 
         IRecipe speedRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 1));
         if (speedRecipe != null) {
@@ -138,7 +138,7 @@ public class CategoryArchitect {
         speedRunePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "runeSpeed" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "runeSpeed"), new EntryText(speedRunePages, TextHelper.localize(keyBase + "runeSpeed"), true));
 
-        List<IPage> waterPages = new ArrayList<IPage>();
+        List<IPage> waterPages = new ArrayList<>();
 
         TartaricForgeRecipe waterRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_WATER.getStack());
         if (waterRecipe != null) {
@@ -153,7 +153,7 @@ public class CategoryArchitect {
         waterPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "water" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "water"), new EntryText(waterPages, TextHelper.localize(keyBase + "water"), true));
 
-        List<IPage> lavaPages = new ArrayList<IPage>();
+        List<IPage> lavaPages = new ArrayList<>();
 
         TartaricForgeRecipe lavaRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_LAVA.getStack());
         if (lavaRecipe != null) {
@@ -168,7 +168,7 @@ public class CategoryArchitect {
         lavaPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lava" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "lava"), new EntryText(lavaPages, TextHelper.localize(keyBase + "lava"), true));
 
-        List<IPage> lavaCrystalPages = new ArrayList<IPage>();
+        List<IPage> lavaCrystalPages = new ArrayList<>();
 
         IRecipe lavaCrystalRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.LAVA_CRYSTAL));
         if (lavaCrystalRecipe != null) {
@@ -178,7 +178,7 @@ public class CategoryArchitect {
         lavaCrystalPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lavaCrystal" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "lavaCrystal"), new EntryText(lavaCrystalPages, TextHelper.localize(keyBase + "lavaCrystal"), true));
 
-        List<IPage> apprenticeorbPages = new ArrayList<IPage>();
+        List<IPage> apprenticeorbPages = new ArrayList<>();
 
         AltarRecipe apprenticeorbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE));
         if (apprenticeorbRecipe != null) {
@@ -188,7 +188,7 @@ public class CategoryArchitect {
         apprenticeorbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "apprenticeorb" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "apprenticeorb"), new EntryText(apprenticeorbPages, TextHelper.localize(keyBase + "apprenticeorb"), true));
 
-        List<IPage> daggerPages = new ArrayList<IPage>();
+        List<IPage> daggerPages = new ArrayList<>();
 
         AltarRecipe daggerOfSacrificeRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE));
         if (daggerOfSacrificeRecipe != null) {
@@ -198,7 +198,7 @@ public class CategoryArchitect {
         daggerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "dagger" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "dagger"), new EntryText(daggerPages, TextHelper.localize(keyBase + "dagger"), true));
 
-        List<IPage> runeSacrificePages = new ArrayList<IPage>();
+        List<IPage> runeSacrificePages = new ArrayList<>();
 
         IRecipe runeSacrificeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 3));
         if (runeSacrificeRecipe != null) {
@@ -208,7 +208,7 @@ public class CategoryArchitect {
         runeSacrificePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "runeSacrifice" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "runeSacrifice"), new EntryText(runeSacrificePages, TextHelper.localize(keyBase + "runeSacrifice"), true));
 
-        List<IPage> runeSelfSacrificePages = new ArrayList<IPage>();
+        List<IPage> runeSelfSacrificePages = new ArrayList<>();
 
         IRecipe runeSelfSacrificeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4));
         if (runeSelfSacrificeRecipe != null) {
@@ -218,7 +218,7 @@ public class CategoryArchitect {
         runeSelfSacrificePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "runeSelfSacrifice" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "runeSelfSacrifice"), new EntryText(runeSelfSacrificePages, TextHelper.localize(keyBase + "runeSelfSacrifice"), true));
 
-        List<IPage> holdingPages = new ArrayList<IPage>();
+        List<IPage> holdingPages = new ArrayList<>();
 
         TartaricForgeRecipe holdingRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_HOLDING.getStack());
         if (holdingRecipe != null) {
@@ -233,7 +233,7 @@ public class CategoryArchitect {
         holdingPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "holding" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "holding"), new EntryText(holdingPages, TextHelper.localize(keyBase + "holding"), true));
 
-        List<IPage> airPages = new ArrayList<IPage>();
+        List<IPage> airPages = new ArrayList<>();
 
         TartaricForgeRecipe airRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_AIR.getStack());
         if (airRecipe != null) {
@@ -248,7 +248,7 @@ public class CategoryArchitect {
         airPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "air" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "air"), new EntryText(airPages, TextHelper.localize(keyBase + "air"), true));
 
-        List<IPage> voidPages = new ArrayList<IPage>();
+        List<IPage> voidPages = new ArrayList<>();
 
         TartaricForgeRecipe voidRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_VOID.getStack());
         if (voidRecipe != null) {
@@ -263,7 +263,7 @@ public class CategoryArchitect {
         voidPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "void" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "void"), new EntryText(voidPages, TextHelper.localize(keyBase + "void"), true));
 
-        List<IPage> greenGrovePages = new ArrayList<IPage>();
+        List<IPage> greenGrovePages = new ArrayList<>();
 
         TartaricForgeRecipe greenGroveRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_GROWTH.getStack());
         if (greenGroveRecipe != null) {
@@ -278,7 +278,7 @@ public class CategoryArchitect {
         greenGrovePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "greenGrove" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "greenGrove"), new EntryText(greenGrovePages, TextHelper.localize(keyBase + "greenGrove"), true));
 
-        List<IPage> fastMinerPages = new ArrayList<IPage>();
+        List<IPage> fastMinerPages = new ArrayList<>();
 
         TartaricForgeRecipe fastMinerRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_FAST_MINER.getStack());
         if (fastMinerRecipe != null) {
@@ -293,7 +293,7 @@ public class CategoryArchitect {
         fastMinerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "fastMiner" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "fastMiner"), new EntryText(fastMinerPages, TextHelper.localize(keyBase + "fastMiner"), true));
 
-        List<IPage> seerPages = new ArrayList<IPage>();
+        List<IPage> seerPages = new ArrayList<>();
 
         TartaricForgeRecipe seerRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_SIGHT.getStack());
         if (seerRecipe != null) {
@@ -308,7 +308,7 @@ public class CategoryArchitect {
         seerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "seer" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "seer"), new EntryText(seerPages, TextHelper.localize(keyBase + "seer"), true));
 
-        List<IPage> magicianOrbPages = new ArrayList<IPage>();
+        List<IPage> magicianOrbPages = new ArrayList<>();
 
         AltarRecipe magicianOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN));
         if (magicianOrbRecipe != null) {
@@ -318,7 +318,7 @@ public class CategoryArchitect {
         magicianOrbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "magicianOrb" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "magicianOrb"), new EntryText(magicianOrbPages, TextHelper.localize(keyBase + "magicianOrb"), true));
 
-        List<IPage> capacityPages = new ArrayList<IPage>();
+        List<IPage> capacityPages = new ArrayList<>();
 
         IRecipe capacityRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4));
         if (capacityRecipe != null) {
@@ -328,7 +328,7 @@ public class CategoryArchitect {
         capacityPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "capacity" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "capacity"), new EntryText(capacityPages, TextHelper.localize(keyBase + "capacity"), true));
 
-        List<IPage> displacementPages = new ArrayList<IPage>();
+        List<IPage> displacementPages = new ArrayList<>();
 
         IRecipe displacementRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4));
         if (displacementRecipe != null) {
@@ -338,7 +338,7 @@ public class CategoryArchitect {
         displacementPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "displacement" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "displacement"), new EntryText(displacementPages, TextHelper.localize(keyBase + "displacement"), true));
 
-        List<IPage> affinityPages = new ArrayList<IPage>();
+        List<IPage> affinityPages = new ArrayList<>();
 
         TartaricForgeRecipe affinityRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_AFFINITY.getStack());
         if (affinityRecipe != null) {
@@ -353,7 +353,7 @@ public class CategoryArchitect {
         affinityPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "affinity" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "affinity"), new EntryText(affinityPages, TextHelper.localize(keyBase + "affinity"), true));
 
-        List<IPage> lampPages = new ArrayList<IPage>();
+        List<IPage> lampPages = new ArrayList<>();
 
         TartaricForgeRecipe lampRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_BLOOD_LIGHT.getStack());
         if (lampRecipe != null) {
@@ -368,7 +368,7 @@ public class CategoryArchitect {
         lampPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lamp" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "lamp"), new EntryText(lampPages, TextHelper.localize(keyBase + "lamp"), true));
 
-        List<IPage> magnetismPages = new ArrayList<IPage>();
+        List<IPage> magnetismPages = new ArrayList<>();
 
         TartaricForgeRecipe magnetismRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_MAGNETISM.getStack());
         if (magnetismRecipe != null) {
@@ -383,7 +383,7 @@ public class CategoryArchitect {
         magnetismPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "magnetism" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "magnetism"), new EntryText(magnetismPages, TextHelper.localize(keyBase + "magnetism"), true));
 
-        List<IPage> peritiaPages = new ArrayList<IPage>();
+        List<IPage> peritiaPages = new ArrayList<>();
 
         IRecipe peritiaRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.EXPERIENCE_TOME));
         if (peritiaRecipe != null) {
@@ -393,7 +393,7 @@ public class CategoryArchitect {
         peritiaPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "peritia" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "peritia"), new EntryText(peritiaPages, TextHelper.localize(keyBase + "peritia"), true));
 
-        List<IPage> livingArmourPages = new ArrayList<IPage>();
+        List<IPage> livingArmourPages = new ArrayList<>();
 
         TartaricForgeRecipe bindingRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_BINDING.getStack());
         if (bindingRecipe != null) {
@@ -423,17 +423,17 @@ public class CategoryArchitect {
         livingArmourPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "livingArmour" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "livingArmour"), new EntryText(livingArmourPages, TextHelper.localize(keyBase + "livingArmour"), true));
 
-        List<IPage> upgradePages = new ArrayList<IPage>();
+        List<IPage> upgradePages = new ArrayList<>();
 
         upgradePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "upgradeTome" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "upgradeTome"), new EntryText(upgradePages, TextHelper.localize(keyBase + "upgradeTome"), true));
 
-        List<IPage> downgradePages = new ArrayList<IPage>();
+        List<IPage> downgradePages = new ArrayList<>();
 
         downgradePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "downgrade" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "downgrade"), new EntryText(downgradePages, TextHelper.localize(keyBase + "downgrade"), true));
 
-        List<IPage> teleposerPages = new ArrayList<IPage>();
+        List<IPage> teleposerPages = new ArrayList<>();
 
         AltarRecipe teleposerFocusRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS));
         if (teleposerFocusRecipe != null) {
@@ -448,7 +448,7 @@ public class CategoryArchitect {
         teleposerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "teleposer" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "teleposer"), new EntryText(teleposerPages, TextHelper.localize(keyBase + "teleposer"), true));
 
-        List<IPage> boundBladePages = new ArrayList<IPage>();
+        List<IPage> boundBladePages = new ArrayList<>();
 
         PageAlchemyArray boundBladePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD));
         if (boundBladePage != null) {
@@ -458,7 +458,7 @@ public class CategoryArchitect {
         boundBladePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "boundBlade" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "boundBlade"), new EntryText(boundBladePages, TextHelper.localize(keyBase + "boundBlade"), true));
 
-        List<IPage> boundToolPages = new ArrayList<IPage>();
+        List<IPage> boundToolPages = new ArrayList<>();
 
         PageAlchemyArray boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE));
         if (boundToolPage != null) {
@@ -478,12 +478,12 @@ public class CategoryArchitect {
         boundToolPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "boundTool" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "boundTool"), new EntryText(boundToolPages, TextHelper.localize(keyBase + "boundTool"), true));
 
-        List<IPage> weakShardPages = new ArrayList<IPage>();
+        List<IPage> weakShardPages = new ArrayList<>();
 
         weakShardPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "weakShard" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "weakShard"), new EntryText(weakShardPages, TextHelper.localize(keyBase + "weakShard"), true));
 
-        List<IPage> masterOrbPages = new ArrayList<IPage>();
+        List<IPage> masterOrbPages = new ArrayList<>();
 
         AltarRecipe masterOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER));
         if (magicianOrbRecipe != null) {
@@ -493,7 +493,7 @@ public class CategoryArchitect {
         masterOrbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "masterOrb" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "masterOrb"), new EntryText(masterOrbPages, TextHelper.localize(keyBase + "masterOrb"), true));
 
-        List<IPage> orbRunePages = new ArrayList<IPage>();
+        List<IPage> orbRunePages = new ArrayList<>();
 
         IRecipe orbRuneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 8));
         if (orbRuneRecipe != null) {
@@ -503,7 +503,7 @@ public class CategoryArchitect {
         orbRunePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "runeOrb" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "runeOrb"), new EntryText(orbRunePages, TextHelper.localize(keyBase + "runeOrb"), true));
 
-        List<IPage> augmentedCapacityPages = new ArrayList<IPage>();
+        List<IPage> augmentedCapacityPages = new ArrayList<>();
 
         IRecipe augmentedCapacityRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 7));
         if (orbRuneRecipe != null) {
@@ -513,7 +513,7 @@ public class CategoryArchitect {
         augmentedCapacityPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "augmentedCapacity" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "augmentedCapacity"), new EntryText(augmentedCapacityPages, TextHelper.localize(keyBase + "augmentedCapacity"), true));
 
-        List<IPage> chargingPages = new ArrayList<IPage>();
+        List<IPage> chargingPages = new ArrayList<>();
 
         IRecipe chargingRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 10));
         if (orbRuneRecipe != null) {
@@ -523,7 +523,7 @@ public class CategoryArchitect {
         chargingPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "charging" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "charging"), new EntryText(chargingPages, TextHelper.localize(keyBase + "charging"), true));
 
-        List<IPage> accelerationPages = new ArrayList<IPage>();
+        List<IPage> accelerationPages = new ArrayList<>();
 
         IRecipe accelerationRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 9));
         if (orbRuneRecipe != null) {
@@ -533,7 +533,7 @@ public class CategoryArchitect {
         accelerationPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "acceleration" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "acceleration"), new EntryText(accelerationPages, TextHelper.localize(keyBase + "acceleration"), true));
 
-        List<IPage> suppressionPages = new ArrayList<IPage>();
+        List<IPage> suppressionPages = new ArrayList<>();
 
         TartaricForgeRecipe suppressionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_SUPPRESSION.getStack());
         if (suppressionRecipe != null) {
@@ -548,7 +548,7 @@ public class CategoryArchitect {
         suppressionPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "suppression" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "suppression"), new EntryText(suppressionPages, TextHelper.localize(keyBase + "suppression"), true));
 
-        List<IPage> hastePages = new ArrayList<IPage>();
+        List<IPage> hastePages = new ArrayList<>();
 
         TartaricForgeRecipe hasteRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_HASTE.getStack());
         if (hasteRecipe != null) {
@@ -563,7 +563,7 @@ public class CategoryArchitect {
         hastePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "haste" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "haste"), new EntryText(hastePages, TextHelper.localize(keyBase + "haste"), true));
 
-        List<IPage> severancePages = new ArrayList<IPage>();
+        List<IPage> severancePages = new ArrayList<>();
 
         TartaricForgeRecipe severanceRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_SEVERANCE.getStack());
         if (severanceRecipe != null) {
@@ -578,7 +578,7 @@ public class CategoryArchitect {
         severancePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "severance" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "severance"), new EntryText(severancePages, TextHelper.localize(keyBase + "severance"), true));
 
-        List<IPage> telepositionPages = new ArrayList<IPage>();
+        List<IPage> telepositionPages = new ArrayList<>();
 
         TartaricForgeRecipe telepositionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_TELEPOSITION.getStack());
         if (telepositionRecipe != null) {
@@ -593,7 +593,7 @@ public class CategoryArchitect {
         telepositionPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "teleposition" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "teleposition"), new EntryText(telepositionPages, TextHelper.localize(keyBase + "teleposition"), true));
 
-        List<IPage> compressionPages = new ArrayList<IPage>();
+        List<IPage> compressionPages = new ArrayList<>();
 
         TartaricForgeRecipe compressionRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_COMPRESSION.getStack());
         if (compressionRecipe != null) {
@@ -608,7 +608,7 @@ public class CategoryArchitect {
         compressionPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "compression" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "compression"), new EntryText(compressionPages, TextHelper.localize(keyBase + "compression"), true));
 
-        List<IPage> bridgePages = new ArrayList<IPage>();
+        List<IPage> bridgePages = new ArrayList<>();
 
         TartaricForgeRecipe bridgeRecipe = RecipeHelper.getForgeRecipeForOutput(ComponentTypes.REAGENT_BRIDGE.getStack());
         if (bridgeRecipe != null) {
@@ -623,7 +623,7 @@ public class CategoryArchitect {
         bridgePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bridge" + ".info.1"), 370));
         entries.put(new ResourceLocation(keyBase + "bridge"), new EntryText(bridgePages, TextHelper.localize(keyBase + "bridge"), true));
 
-        List<IPage> mimicPages = new ArrayList<IPage>();
+        List<IPage> mimicPages = new ArrayList<>();
 
         IRecipe mimicRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.MIMIC, 1, 1));
         if (mimicRecipe != null) {

src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java

@@ -26,15 +26,15 @@ import java.util.Map.Entry;
 public class CategoryDemon {
     //TODO: Add Forge recipe pages
     public static Map<ResourceLocation, EntryAbstract> buildCategory() {
-        Map<ResourceLocation, EntryAbstract> entries = new LinkedHashMap<ResourceLocation, EntryAbstract>();
+        Map<ResourceLocation, EntryAbstract> entries = new LinkedHashMap<>();
         String keyBase = "guide." + BloodMagic.MODID + ".entry.demon.";
 
-        List<IPage> introPages = new ArrayList<IPage>();
+        List<IPage> introPages = new ArrayList<>();
         introPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "intro" + ".info"), 370));
 //        introPages.add(new PageImage(new ResourceLocation("bloodmagicguide", "textures/guide/" + ritual.getName() + ".png")));
         entries.put(new ResourceLocation(keyBase + "intro"), new EntryText(introPages, TextHelper.localize(keyBase + "intro"), true));
 
-        List<IPage> snarePages = new ArrayList<IPage>();
+        List<IPage> snarePages = new ArrayList<>();
         snarePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "snare" + ".info.1"), 370));
 
         IRecipe snareRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SOUL_SNARE));
@@ -45,7 +45,7 @@ public class CategoryDemon {
         snarePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "snare" + ".info.2"), 370));
         entries.put(new ResourceLocation(keyBase + "snare"), new EntryText(snarePages, TextHelper.localize(keyBase + "snare"), true));
 
-        List<IPage> forgePages = new ArrayList<IPage>();
+        List<IPage> forgePages = new ArrayList<>();
         forgePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "forge" + ".info.1"), 370));
 
         IRecipe forgeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.SOUL_FORGE));
@@ -56,7 +56,7 @@ public class CategoryDemon {
         forgePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "forge" + ".info.2"), 370));
         entries.put(new ResourceLocation(keyBase + "forge"), new EntryText(forgePages, TextHelper.localize(keyBase + "forge"), true));
 
-        List<IPage> pettyPages = new ArrayList<IPage>();
+        List<IPage> pettyPages = new ArrayList<>();
         pettyPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "petty" + ".info.1"), 370));
         TartaricForgeRecipe pettyRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM));
         if (pettyRecipe != null) {
@@ -65,7 +65,7 @@ public class CategoryDemon {
         pettyPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "petty" + ".info.2"), 370));
         entries.put(new ResourceLocation(keyBase + "petty"), new EntryText(pettyPages, TextHelper.localize(keyBase + "petty"), true));
 
-        List<IPage> swordPages = new ArrayList<IPage>();
+        List<IPage> swordPages = new ArrayList<>();
         swordPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "sword" + ".info.1"), 370));
         TartaricForgeRecipe swordRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SWORD));
         if (swordRecipe != null) {
@@ -74,7 +74,7 @@ public class CategoryDemon {
         swordPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "sword" + ".info.2"), 370));
         entries.put(new ResourceLocation(keyBase + "sword"), new EntryText(swordPages, TextHelper.localize(keyBase + "sword"), true));
 
-        List<IPage> lesserPages = new ArrayList<IPage>();
+        List<IPage> lesserPages = new ArrayList<>();
         lesserPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lesser" + ".info.1"), 370));
         TartaricForgeRecipe lesserRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1));
         if (lesserRecipe != null) {
@@ -83,16 +83,16 @@ public class CategoryDemon {
         lesserPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lesser" + ".info.2"), 370));
         entries.put(new ResourceLocation(keyBase + "lesser"), new EntryText(lesserPages, TextHelper.localize(keyBase + "lesser"), true));
 
-        List<IPage> reactionsPages = new ArrayList<IPage>();
+        List<IPage> reactionsPages = new ArrayList<>();
         reactionsPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "reactions" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "reactions"), new EntryText(reactionsPages, TextHelper.localize(keyBase + "reactions"), true));
 
-        List<IPage> sentientGemPages = new ArrayList<IPage>();
+        List<IPage> sentientGemPages = new ArrayList<>();
         sentientGemPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "sentientGem" + ".info.1"), 370));
         sentientGemPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "sentientGem" + ".info.2"), 370));
         entries.put(new ResourceLocation(keyBase + "sentientGem"), new EntryText(sentientGemPages, TextHelper.localize(keyBase + "sentientGem"), true));
 
-        List<IPage> routingPages = new ArrayList<IPage>();
+        List<IPage> routingPages = new ArrayList<>();
         TartaricForgeRecipe nodeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE));
         if (nodeRecipe != null) {
             routingPages.add(new PageTartaricForgeRecipe(nodeRecipe));
@@ -118,17 +118,17 @@ public class CategoryDemon {
         routingPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "routing" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "routing"), new EntryText(routingPages, TextHelper.localize(keyBase + "routing"), true));
 
-        List<IPage> auraPages = new ArrayList<IPage>();
+        List<IPage> auraPages = new ArrayList<>();
 
         auraPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "aura" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "aura"), new EntryText(auraPages, TextHelper.localize(keyBase + "aura"), true));
 
-        List<IPage> typesPages = new ArrayList<IPage>();
+        List<IPage> typesPages = new ArrayList<>();
 
         typesPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "types" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "types"), new EntryText(typesPages, TextHelper.localize(keyBase + "types"), true));
 
-        List<IPage> cruciblePages = new ArrayList<IPage>();
+        List<IPage> cruciblePages = new ArrayList<>();
 
         TartaricForgeRecipe crucibleRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRUCIBLE));
         if (crucibleRecipe != null) {
@@ -138,7 +138,7 @@ public class CategoryDemon {
         cruciblePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "crucible" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "crucible"), new EntryText(cruciblePages, TextHelper.localize(keyBase + "crucible"), true));
 
-        List<IPage> crystallizerPages = new ArrayList<IPage>();
+        List<IPage> crystallizerPages = new ArrayList<>();
 
         TartaricForgeRecipe crystallizerRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTALLIZER));
         if (crystallizerRecipe != null) {
@@ -148,7 +148,7 @@ public class CategoryDemon {
         crystallizerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "crystallizer" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "crystallizer"), new EntryText(crystallizerPages, TextHelper.localize(keyBase + "crystallizer"), true));
 
-        List<IPage> clusterPages = new ArrayList<IPage>();
+        List<IPage> clusterPages = new ArrayList<>();
 
         TartaricForgeRecipe clusterRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL));
         if (clusterRecipe != null) {
@@ -158,7 +158,7 @@ public class CategoryDemon {
         clusterPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "cluster" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "cluster"), new EntryText(clusterPages, TextHelper.localize(keyBase + "cluster"), true));
 
-        List<IPage> pylonPages = new ArrayList<IPage>();
+        List<IPage> pylonPages = new ArrayList<>();
 
         TartaricForgeRecipe pylonRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_PYLON));
         if (pylonRecipe != null) {
@@ -168,7 +168,7 @@ public class CategoryDemon {
         pylonPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "pylon" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "pylon"), new EntryText(pylonPages, TextHelper.localize(keyBase + "pylon"), true));
 
-        List<IPage> gaugePages = new ArrayList<IPage>();
+        List<IPage> gaugePages = new ArrayList<>();
 
         TartaricForgeRecipe gaugeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.DEMON_WILL_GAUGE));
         if (gaugeRecipe != null) {

src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java

@@ -28,12 +28,12 @@ public class CategoryRitual {
     static String keyBase = "guide." + BloodMagic.MODID + ".entry.ritual.";
 
     public static Map<ResourceLocation, EntryAbstract> buildCategory() {
-        Map<ResourceLocation, EntryAbstract> entries = new LinkedHashMap<ResourceLocation, EntryAbstract>();
+        Map<ResourceLocation, EntryAbstract> entries = new LinkedHashMap<>();
 
         addRitualPagesToEntries("intro", entries);
         addRitualPagesToEntries("basics", entries);
 
-        List<IPage> ritualStonePages = new ArrayList<IPage>();
+        List<IPage> ritualStonePages = new ArrayList<>();
 
         IRecipe ritualStoneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_STONE));
         if (ritualStoneRecipe != null) {
@@ -53,7 +53,7 @@ public class CategoryRitual {
         ritualStonePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "ritualStone" + ".info.2"), 370));
         entries.put(new ResourceLocation(keyBase + "ritualStone"), new EntryText(ritualStonePages, TextHelper.localize(keyBase + "ritualStone"), true));
 
-        List<IPage> masterRitualStonePages = new ArrayList<IPage>();
+        List<IPage> masterRitualStonePages = new ArrayList<>();
 
         IRecipe masterRitualStoneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER, 1, 0));
         if (masterRitualStoneRecipe != null) {
@@ -63,7 +63,7 @@ public class CategoryRitual {
         masterRitualStonePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "masterRitualStone" + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + "masterRitualStone"), new EntryText(masterRitualStonePages, TextHelper.localize(keyBase + "masterRitualStone"), true));
 
-        List<IPage> activationCrystalPages = new ArrayList<IPage>();
+        List<IPage> activationCrystalPages = new ArrayList<>();
 
         activationCrystalPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "activationCrystal" + ".info.1"), 370));
 
@@ -75,7 +75,7 @@ public class CategoryRitual {
         activationCrystalPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "activationCrystal" + ".info.2"), 370));
         entries.put(new ResourceLocation(keyBase + "activationCrystal"), new EntryText(activationCrystalPages, TextHelper.localize(keyBase + "activationCrystal"), true));
 
-        List<IPage> divinerPages = new ArrayList<IPage>();
+        List<IPage> divinerPages = new ArrayList<>();
 
         divinerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "diviner" + ".info.1"), 370));
 
@@ -120,7 +120,7 @@ public class CategoryRitual {
     }
 
     public static void addRitualPagesToEntries(String name, Map<ResourceLocation, EntryAbstract> entries) {
-        List<IPage> pages = new ArrayList<IPage>();
+        List<IPage> pages = new ArrayList<>();
         pages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + name + ".info"), 370));
         entries.put(new ResourceLocation(keyBase + name), new EntryText(pages, TextHelper.localize(keyBase + name), true));
     }

src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java

@@ -9,7 +9,7 @@ import java.util.Map;
 
 public class CategorySpell {
     public static Map<ResourceLocation, EntryAbstract> buildCategory() {
-        Map<ResourceLocation, EntryAbstract> entries = new LinkedHashMap<ResourceLocation, EntryAbstract>();
+        Map<ResourceLocation, EntryAbstract> entries = new LinkedHashMap<>();
         String keyBase = Constants.Mod.DOMAIN + "spell_";
 
         return entries;

src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java

@@ -24,7 +24,7 @@ public class PageAlchemyArray extends Page {
     public final ItemStack inputStack;
     public final ItemStack catalystStack;
     public final ItemStack outputStack;
-    public List<ResourceLocation> arrayResources = new ArrayList<ResourceLocation>();
+    public List<ResourceLocation> arrayResources = new ArrayList<>();
 
     public PageAlchemyArray(List<ResourceLocation> arrayResources, ItemStack inputStack, ItemStack catalystStack, ItemStack outputStack) {
         this.arrayResources = arrayResources;

src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java

@@ -45,7 +45,7 @@ public class AlchemyTableRecipeJEI implements IRecipeWrapper {
 
     @Override
     public List<String> getTooltipStrings(int mouseX, int mouseY) {
-        ArrayList<String> ret = new ArrayList<String>();
+        ArrayList<String> ret = new ArrayList<>();
         if (mouseX >= 58 && mouseX <= 78 && mouseY >= 21 && mouseY <= 34) {
             ret.add(TextHelper.localize("tooltip.bloodmagic.tier", tier));
             ret.add(TextHelper.localize("jei.bloodmagic.recipe.lpDrained", syphon));

src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java

@@ -11,7 +11,7 @@ public class ArmourDowngradeRecipeMaker {
     @Nonnull
     public static List<ArmourDowngradeRecipeJEI> getRecipes() {
         List<LivingArmourDowngradeRecipe> recipeList = LivingArmourDowngradeRecipeRegistry.getRecipeList();
-        ArrayList<ArmourDowngradeRecipeJEI> recipes = new ArrayList<ArmourDowngradeRecipeJEI>();
+        ArrayList<ArmourDowngradeRecipeJEI> recipes = new ArrayList<>();
 
         for (LivingArmourDowngradeRecipe recipe : recipeList)
             recipes.add(new ArmourDowngradeRecipeJEI(recipe));

src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java

@@ -17,7 +17,7 @@ public class BindingRecipeMaker {
     public static List<BindingRecipeJEI> getRecipes() {
         Map<List<ItemStack>, AlchemyArrayRecipeRegistry.AlchemyArrayRecipe> alchemyArrayRecipeMap = AlchemyArrayRecipeRegistry.getRecipes();
 
-        ArrayList<BindingRecipeJEI> recipes = new ArrayList<BindingRecipeJEI>();
+        ArrayList<BindingRecipeJEI> recipes = new ArrayList<>();
 
         for (Map.Entry<List<ItemStack>, AlchemyArrayRecipeRegistry.AlchemyArrayRecipe> itemStackAlchemyArrayRecipeEntry : alchemyArrayRecipeMap.entrySet()) {
             List<ItemStack> input = itemStackAlchemyArrayRecipeEntry.getValue().getInput();

src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java

@@ -8,7 +8,6 @@ import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual;
 import WayofTime.bloodmagic.util.helper.PlayerHelper;
 import WayofTime.bloodmagic.tile.TileMasterRitualStone;
 import WayofTime.bloodmagic.util.helper.TextHelper;
-import joptsimple.internal.Strings;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;

src/main/java/WayofTime/bloodmagic/compress/CompressionRegistry.java

@@ -18,8 +18,8 @@ import java.util.Map;
  * form.
  */
 public class CompressionRegistry {
-    public static List<CompressionHandler> compressionRegistry = new ArrayList<CompressionHandler>();
+    public static List<CompressionHandler> compressionRegistry = new ArrayList<>();
-    public static Map<ItemStack, Integer> thresholdMap = new HashMap<ItemStack, Integer>();
+    public static Map<ItemStack, Integer> thresholdMap = new HashMap<>();
 
     public static void registerHandler(CompressionHandler handler) {
         compressionRegistry.add(handler);

src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java

@@ -13,7 +13,7 @@ import java.util.UUID;
 public class BMWorldSavedData extends WorldSavedData {
     public static final String ID = "BloodMagic-SoulNetworks";
 
-    private Map<UUID, SoulNetwork> soulNetworks = new HashMap<UUID, SoulNetwork>();
+    private Map<UUID, SoulNetwork> soulNetworks = new HashMap<>();
 
     public BMWorldSavedData(String id) {
         super(id);

src/main/java/WayofTime/bloodmagic/core/registry/AlchemyArrayRecipeRegistry.java

@@ -20,7 +20,7 @@ public class AlchemyArrayRecipeRegistry {
     public static final AlchemyCircleRenderer DEFAULT_RENDERER = new AlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BaseArray.png"));
 
     private static BiMap<List<ItemStack>, AlchemyArrayRecipe> recipes = HashBiMap.create();
-    private static HashMap<String, AlchemyArrayEffect> effectMap = new HashMap<String, AlchemyArrayEffect>();
+    private static HashMap<String, AlchemyArrayEffect> effectMap = new HashMap<>();
 
     /**
      * General case for creating an AlchemyArrayEffect for a given input.
@@ -120,7 +120,7 @@ public class AlchemyArrayRecipeRegistry {
     }
 
     public static void registerCraftingRecipe(String inputOreDict, ItemStack catalystStack, ItemStack outputStack, ResourceLocation arrayResource) {
-        registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.<ItemStack>emptyList(), catalystStack, new AlchemyArrayEffectCrafting(outputStack), arrayResource);
+        registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, new AlchemyArrayEffectCrafting(outputStack), arrayResource);
     }
 
     public static void registerCraftingRecipe(ItemStack input, ItemStack catalystStack, ItemStack outputStack) {
@@ -132,7 +132,7 @@ public class AlchemyArrayRecipeRegistry {
     }
 
     public static void registerCraftingRecipe(String inputOreDict, ItemStack catalystStack, ItemStack outputStack) {
-        registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.<ItemStack>emptyList(), catalystStack, new AlchemyArrayEffectCrafting(outputStack));
+        registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, new AlchemyArrayEffectCrafting(outputStack));
     }
 
     public static void registerRecipe(ItemStack inputStacks, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, ResourceLocation arrayResource) {
@@ -151,7 +151,7 @@ public class AlchemyArrayRecipeRegistry {
 
     public static void registerRecipe(String inputOreDict, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, ResourceLocation arrayResource) {
         AlchemyCircleRenderer circleRenderer = arrayResource == null ? DEFAULT_RENDERER : new AlchemyCircleRenderer(arrayResource);
-        registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.<ItemStack>emptyList(), catalystStack, arrayEffect, circleRenderer);
+        registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, arrayEffect, circleRenderer);
     }
 
     public static void registerRecipe(ItemStack input, ItemStack catalystStack, AlchemyArrayEffect arrayEffect) {
@@ -163,7 +163,7 @@ public class AlchemyArrayRecipeRegistry {
     }
 
     public static void registerRecipe(String inputOreDict, ItemStack catalystStack, AlchemyArrayEffect arrayEffect) {
-        registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.<ItemStack>emptyList(), catalystStack, arrayEffect, (AlchemyCircleRenderer) null);
+        registerRecipe(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, arrayEffect, (AlchemyCircleRenderer) null);
     }
 
     public static void replaceAlchemyCircle(List<ItemStack> input, AlchemyCircleRenderer circleRenderer) {
@@ -250,7 +250,7 @@ public class AlchemyArrayRecipeRegistry {
         }
 
         public AlchemyArrayRecipe(String inputOreDict, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, AlchemyCircleRenderer circleRenderer) {
-            this(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.<ItemStack>emptyList(), catalystStack, arrayEffect, circleRenderer, false);
+            this(OreDictionary.doesOreNameExist(inputOreDict) && OreDictionary.getOres(inputOreDict).size() > 0 ? OreDictionary.getOres(inputOreDict) : Collections.emptyList(), catalystStack, arrayEffect, circleRenderer, false);
         }
 
         public AlchemyArrayRecipe(List<ItemStack> inputStacks, ItemStack catalystStack, AlchemyArrayEffect arrayEffect, AlchemyCircleRenderer circleRenderer) {

src/main/java/WayofTime/bloodmagic/core/registry/AlchemyTableRecipeRegistry.java

@@ -9,7 +9,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class AlchemyTableRecipeRegistry {
-    private static List<AlchemyTableRecipe> recipeList = new ArrayList<AlchemyTableRecipe>();
+    private static List<AlchemyTableRecipe> recipeList = new ArrayList<>();
 
     public static void registerRecipe(AlchemyTableRecipe recipe) {
         recipeList.add(recipe);
@@ -34,6 +34,6 @@ public class AlchemyTableRecipeRegistry {
     }
 
     public static List<AlchemyTableRecipe> getRecipeList() {
-        return new ArrayList<AlchemyTableRecipe>(recipeList);
+        return new ArrayList<>(recipeList);
     }
 }

src/main/java/WayofTime/bloodmagic/core/registry/AltarRecipeRegistry.java

@@ -1,6 +1,5 @@
 package WayofTime.bloodmagic.core.registry;
 
-import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.util.BMLog;
 import WayofTime.bloodmagic.util.ItemStackWrapper;
 import WayofTime.bloodmagic.altar.EnumAltarTier;
@@ -119,11 +118,11 @@ public class AltarRecipeRegistry {
         }
 
         public AltarRecipe(String inputEntry, ItemStack output, EnumAltarTier minTier, int syphon, int consumeRate, int drainRate, boolean fillable) {
-            this(OreDictionary.doesOreNameExist(inputEntry) && OreDictionary.getOres(inputEntry).size() > 0 ? OreDictionary.getOres(inputEntry) : Collections.<ItemStack>emptyList(), output, minTier, syphon, consumeRate, drainRate, fillable);
+            this(OreDictionary.doesOreNameExist(inputEntry) && OreDictionary.getOres(inputEntry).size() > 0 ? OreDictionary.getOres(inputEntry) : Collections.emptyList(), output, minTier, syphon, consumeRate, drainRate, fillable);
         }
 
         public AltarRecipe(String inputEntry, ItemStack output, EnumAltarTier minTier, int syphon, int consumeRate, int drainRate) {
-            this(OreDictionary.doesOreNameExist(inputEntry) && OreDictionary.getOres(inputEntry).size() > 0 ? OreDictionary.getOres(inputEntry) : Collections.<ItemStack>emptyList(), output, minTier, syphon, consumeRate, drainRate, false);
+            this(OreDictionary.doesOreNameExist(inputEntry) && OreDictionary.getOres(inputEntry).size() > 0 ? OreDictionary.getOres(inputEntry) : Collections.emptyList(), output, minTier, syphon, consumeRate, drainRate, false);
         }
 
         public boolean doesRequiredItemMatch(ItemStack comparedStack, EnumAltarTier tierCheck) {

src/main/java/WayofTime/bloodmagic/core/registry/HarvestRegistry.java

@@ -8,11 +8,11 @@ import net.minecraft.block.BlockStem;
 import java.util.*;
 
 public class HarvestRegistry {
-    private static List<IHarvestHandler> handlerList = new ArrayList<IHarvestHandler>();
+    private static List<IHarvestHandler> handlerList = new ArrayList<>();
-    private static Map<Block, Integer> standardCrops = new HashMap<Block, Integer>();
+    private static Map<Block, Integer> standardCrops = new HashMap<>();
-    private static Set<BlockStack> tallCrops = new HashSet<BlockStack>();
+    private static Set<BlockStack> tallCrops = new HashSet<>();
-    private static Map<BlockStack, BlockStack> stemCrops = new HashMap<BlockStack, BlockStack>();
+    private static Map<BlockStack, BlockStack> stemCrops = new HashMap<>();
-    private static Map<BlockStack, Integer> amplifierMap = new HashMap<BlockStack, Integer>();
+    private static Map<BlockStack, Integer> amplifierMap = new HashMap<>();
 
     /**
      * Registers a handler for the Harvest Ritual to call.
@@ -81,22 +81,22 @@ public class HarvestRegistry {
     }
 
     public static List<IHarvestHandler> getHandlerList() {
-        return new ArrayList<IHarvestHandler>(handlerList);
+        return new ArrayList<>(handlerList);
     }
 
     public static Map<Block, Integer> getStandardCrops() {
-        return new HashMap<Block, Integer>(standardCrops);
+        return new HashMap<>(standardCrops);
     }
 
     public static Set<BlockStack> getTallCrops() {
-        return new HashSet<BlockStack>(tallCrops);
+        return new HashSet<>(tallCrops);
     }
 
     public static Map<BlockStack, BlockStack> getStemCrops() {
-        return new HashMap<BlockStack, BlockStack>(stemCrops);
+        return new HashMap<>(stemCrops);
     }
 
     public static Map<BlockStack, Integer> getAmplifierMap() {
-        return new HashMap<BlockStack, Integer>(amplifierMap);
+        return new HashMap<>(amplifierMap);
     }
 }

src/main/java/WayofTime/bloodmagic/core/registry/ImperfectRitualRegistry.java

@@ -1,6 +1,5 @@
 package WayofTime.bloodmagic.core.registry;
 
-import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.util.BMLog;
 import WayofTime.bloodmagic.util.BlockStack;
 import WayofTime.bloodmagic.ritual.data.imperfect.ImperfectRitual;
@@ -12,7 +11,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class ImperfectRitualRegistry {
-    public static final Map<ImperfectRitual, Boolean> enabledRituals = new HashMap<ImperfectRitual, Boolean>();
+    public static final Map<ImperfectRitual, Boolean> enabledRituals = new HashMap<>();
     private static final BiMap<String, ImperfectRitual> registry = HashBiMap.create();
 
     /**
@@ -90,10 +89,10 @@ public class ImperfectRitualRegistry {
     }
 
     public static ArrayList<String> getIds() {
-        return new ArrayList<String>(registry.keySet());
+        return new ArrayList<>(registry.keySet());
     }
 
     public static ArrayList<ImperfectRitual> getRituals() {
-        return new ArrayList<ImperfectRitual>(registry.values());
+        return new ArrayList<>(registry.values());
     }
 }

src/main/java/WayofTime/bloodmagic/core/registry/LivingArmourDowngradeRecipeRegistry.java

@@ -15,8 +15,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 public class LivingArmourDowngradeRecipeRegistry {
-    private static List<LivingArmourDowngradeRecipe> recipeList = new ArrayList<LivingArmourDowngradeRecipe>();
+    private static List<LivingArmourDowngradeRecipe> recipeList = new ArrayList<>();
-    private static Map<ItemStack, Map<Integer, List<ITextComponent>>> dialogueMap = new HashMap<ItemStack, Map<Integer, List<ITextComponent>>>();
+    private static Map<ItemStack, Map<Integer, List<ITextComponent>>> dialogueMap = new HashMap<>();
 
     public static void registerRecipe(LivingArmourDowngradeRecipe recipe) {
         recipeList.add(recipe);
@@ -55,6 +55,6 @@ public class LivingArmourDowngradeRecipeRegistry {
     }
 
     public static List<LivingArmourDowngradeRecipe> getRecipeList() {
-        return new ArrayList<LivingArmourDowngradeRecipe>(recipeList);
+        return new ArrayList<>(recipeList);
     }
 }

src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java

@@ -21,7 +21,7 @@ public class OrbRegistry {
     @GameRegistry.ObjectHolder("bloodmagic:blood_orb")
     private static final Item ORB_ITEM = null;
     public static ArrayListMultimap<Integer, ItemStack> tierMap = ArrayListMultimap.create();
-    private static List<BloodOrb> orbs = new ArrayList<BloodOrb>();
+    private static List<BloodOrb> orbs = new ArrayList<>();
 
     public static List<ItemStack> getOrbsForTier(int tier) {
         if (getTierMap().containsKey(tier))
@@ -31,7 +31,7 @@ public class OrbRegistry {
     }
 
     public static List<ItemStack> getOrbsUpToTier(int tier) {
-        List<ItemStack> ret = new ArrayList<ItemStack>();
+        List<ItemStack> ret = new ArrayList<>();
 
         for (int i = 1; i <= tier; i++)
             ret.addAll(getOrbsForTier(i));
@@ -40,7 +40,7 @@ public class OrbRegistry {
     }
 
     public static List<ItemStack> getOrbsDownToTier(int tier) {
-        List<ItemStack> ret = new ArrayList<ItemStack>();
+        List<ItemStack> ret = new ArrayList<>();
 
         for (int i = EnumAltarTier.MAXTIERS; i >= tier; i--)
             ret.addAll(getOrbsForTier(i));

src/main/java/WayofTime/bloodmagic/core/registry/RitualRegistry.java

@@ -9,14 +9,14 @@ import javax.annotation.Nullable;
 import java.util.*;
 
 public class RitualRegistry {
-    public static final Map<Ritual, Boolean> enabledRituals = new HashMap<Ritual, Boolean>();
+    public static final Map<Ritual, Boolean> enabledRituals = new HashMap<>();
     private static final BiMap<String, Ritual> registry = HashBiMap.create();
-    private static final List<String> lookupList = new ArrayList<String>();
+    private static final List<String> lookupList = new ArrayList<>();
     /**
      * Ordered list for actions that depend on the order that the rituals were
      * registered in
      */
-    private static final ArrayList<String> orderedIdList = new ArrayList<String>();
+    private static final ArrayList<String> orderedIdList = new ArrayList<>();
 
     private static boolean locked;
 
@@ -92,11 +92,11 @@ public class RitualRegistry {
     }
 
     public static Map<Ritual, Boolean> getEnabledMap() {
-        return new HashMap<Ritual, Boolean>(enabledRituals);
+        return new HashMap<>(enabledRituals);
     }
 
     public static ArrayList<String> getIds() {
-        return new ArrayList<String>(lookupList);
+        return new ArrayList<>(lookupList);
     }
 
     public static ArrayList<String> getOrderedIds() {
@@ -104,14 +104,14 @@ public class RitualRegistry {
     }
 
     public static ArrayList<Ritual> getRituals() {
-        return new ArrayList<Ritual>(registry.values());
+        return new ArrayList<>(registry.values());
     }
 
     public static void orderLookupList() {
         locked = true; // Lock registry so no no rituals can be registered
         lookupList.clear(); // Make sure it's empty
         lookupList.addAll(registry.keySet());
-        Collections.sort(lookupList, (o1, o2) -> {
+        lookupList.sort((o1, o2) -> {
             Ritual ritual1 = registry.get(o1);
             Ritual ritual2 = registry.get(o2);
             return ritual1.getComponents().size() > ritual2.getComponents().size() ? -1 : 0; // Put earlier if bigger

src/main/java/WayofTime/bloodmagic/core/registry/TartaricForgeRecipeRegistry.java

@@ -9,7 +9,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class TartaricForgeRecipeRegistry {
-    private static List<TartaricForgeRecipe> recipeList = new ArrayList<TartaricForgeRecipe>();
+    private static List<TartaricForgeRecipe> recipeList = new ArrayList<>();
 
     public static void registerRecipe(TartaricForgeRecipe recipe) {
         recipeList.add(recipe);
@@ -34,6 +34,6 @@ public class TartaricForgeRecipeRegistry {
     }
 
     public static List<TartaricForgeRecipe> getRecipeList() {
-        return new ArrayList<TartaricForgeRecipe>(recipeList);
+        return new ArrayList<>(recipeList);
     }
 }

src/main/java/WayofTime/bloodmagic/demonAura/WillWorld.java

@@ -4,7 +4,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public class WillWorld {
     int dim;
-    ConcurrentHashMap<PosXY, WillChunk> willChunks = new ConcurrentHashMap<PosXY, WillChunk>();
+    ConcurrentHashMap<PosXY, WillChunk> willChunks = new ConcurrentHashMap<>();
 
 //    private static ConcurrentHashMap<PosXY, AspectList> nodeTickets = new ConcurrentHashMap();
 

src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java

@@ -1,6 +1,5 @@
 package WayofTime.bloodmagic.demonAura;
 
-import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.soul.DemonWillHolder;
 import WayofTime.bloodmagic.soul.EnumDemonWillType;
 import WayofTime.bloodmagic.util.BMLog;
@@ -13,8 +12,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 public class WorldDemonWillHandler {
-    public static ConcurrentHashMap<Integer, CopyOnWriteArrayList<PosXY>> dirtyChunks = new ConcurrentHashMap<Integer, CopyOnWriteArrayList<PosXY>>();
+    public static ConcurrentHashMap<Integer, CopyOnWriteArrayList<PosXY>> dirtyChunks = new ConcurrentHashMap<>();
-    static ConcurrentHashMap<Integer, WillWorld> containedWills = new ConcurrentHashMap<Integer, WillWorld>();
+    static ConcurrentHashMap<Integer, WillWorld> containedWills = new ConcurrentHashMap<>();
 
     @Nullable
     public static DemonWillHolder getWillHolder(int dim, int x, int y) {
@@ -165,7 +164,7 @@ public class WorldDemonWillHandler {
         }
         PosXY pos = new PosXY(chunk.loc.x, chunk.loc.y);
         if (!dirtyChunks.containsKey(dim)) {
-            dirtyChunks.put(dim, new CopyOnWriteArrayList<PosXY>());
+            dirtyChunks.put(dim, new CopyOnWriteArrayList<>());
         }
         CopyOnWriteArrayList<PosXY> dc = dirtyChunks.get(dim);
         if (!dc.contains(pos)) {

src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java

@@ -36,7 +36,7 @@ public class EntityAIRetreatToHeal<T extends Entity> extends EntityAIBase {
     private Predicate<? super T> avoidTargetSelector;
 
     public EntityAIRetreatToHeal(EntityDemonBase theEntityIn, Class<T> classToAvoidIn, float avoidDistanceIn, double farSpeedIn, double nearSpeedIn) {
-        this(theEntityIn, classToAvoidIn, Predicates.<T>alwaysTrue(), avoidDistanceIn, farSpeedIn, nearSpeedIn);
+        this(theEntityIn, classToAvoidIn, Predicates.alwaysTrue(), avoidDistanceIn, farSpeedIn, nearSpeedIn);
     }
 
     public EntityAIRetreatToHeal(EntityDemonBase theEntityIn, Class<T> classToAvoidIn, Predicate<? super T> avoidTargetSelectorIn, float avoidDistanceIn, double farSpeedIn, double nearSpeedIn) {

src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java

@@ -16,7 +16,7 @@ import net.minecraft.world.World;
 import java.util.Locale;
 
 public abstract class EntityAspectedDemonBase extends EntityDemonBase {
-    protected static final DataParameter<EnumDemonWillType> TYPE = EntityDataManager.<EnumDemonWillType>createKey(EntityAspectedDemonBase.class, Serializers.WILL_TYPE_SERIALIZER);
+    protected static final DataParameter<EnumDemonWillType> TYPE = EntityDataManager.createKey(EntityAspectedDemonBase.class, Serializers.WILL_TYPE_SERIALIZER);
 
     public EntityAspectedDemonBase(World worldIn) {
         super(worldIn);

src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java

@@ -63,8 +63,8 @@ public class EntityCorruptedChicken extends EntityAspectedDemonBase {
         this.tasks.addTask(6, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F));
         this.tasks.addTask(7, new EntityAILookIdle(this));
 
-        this.targetTasks.addTask(1, new EntityAINearestAttackableTarget<EntityPlayer>(this, EntityPlayer.class, true));
+        this.targetTasks.addTask(1, new EntityAINearestAttackableTarget<>(this, EntityPlayer.class, true));
-        this.targetTasks.addTask(2, new EntityAINearestAttackableTarget<EntityLivingBase>(this, EntityLivingBase.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this)));
+        this.targetTasks.addTask(2, new EntityAINearestAttackableTarget<>(this, EntityLivingBase.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this)));
     }
 
     @Override

src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java

@@ -30,12 +30,13 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import javax.annotation.Nullable;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
 public class EntityCorruptedSheep extends EntityAspectedDemonBase implements IShearable {
-    private static final DataParameter<Byte> DYE_COLOR = EntityDataManager.<Byte>createKey(EntityCorruptedSheep.class, DataSerializers.BYTE);
+    private static final DataParameter<Byte> DYE_COLOR = EntityDataManager.createKey(EntityCorruptedSheep.class, DataSerializers.BYTE);
 
     private static final Map<EnumDyeColor, float[]> DYE_TO_RGB = Maps.newEnumMap(EnumDyeColor.class);
     public static int maxProtectionCooldown = 90 * 20; //90 second cooldown
@@ -93,8 +94,8 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh
         this.tasks.addTask(7, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F));
         this.tasks.addTask(8, new EntityAILookIdle(this));
 
-        this.targetTasks.addTask(1, new EntityAINearestAttackableTarget<EntityPlayer>(this, EntityPlayer.class, true));
+        this.targetTasks.addTask(1, new EntityAINearestAttackableTarget<>(this, EntityPlayer.class, true));
-        this.targetTasks.addTask(2, new EntityAINearestAttackableTarget<EntityLivingBase>(this, EntityLivingBase.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this)));
+        this.targetTasks.addTask(2, new EntityAINearestAttackableTarget<>(this, EntityLivingBase.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this)));
     }
 
     @Override
@@ -180,7 +181,7 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh
     @Override
     protected void entityInit() {
         super.entityInit();
-        this.dataManager.register(DYE_COLOR, Byte.valueOf((byte) 0));
+        this.dataManager.register(DYE_COLOR, (byte) 0);
     }
 
     @Override
@@ -255,34 +256,34 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh
      * Gets the wool color of this sheep.
      */
     public EnumDyeColor getFleeceColor() {
-        return EnumDyeColor.byMetadata(this.dataManager.get(DYE_COLOR).byteValue() & 15);
+        return EnumDyeColor.byMetadata(this.dataManager.get(DYE_COLOR) & 15);
     }
 
     /**
      * Sets the wool color of this sheep
      */
     public void setFleeceColor(EnumDyeColor color) {
-        byte b0 = this.dataManager.get(DYE_COLOR).byteValue();
+        byte b0 = this.dataManager.get(DYE_COLOR);
-        this.dataManager.set(DYE_COLOR, Byte.valueOf((byte) (b0 & 240 | color.getMetadata() & 15)));
+        this.dataManager.set(DYE_COLOR, (byte) (b0 & 240 | color.getMetadata() & 15));
     }
 
     /**
      * returns true if a sheeps wool has been sheared
      */
     public boolean getSheared() {
-        return (this.dataManager.get(DYE_COLOR).byteValue() & 16) != 0;
+        return (this.dataManager.get(DYE_COLOR) & 16) != 0;
     }
 
     /**
      * make a sheep sheared if set to true
      */
     public void setSheared(boolean sheared) {
-        byte b0 = this.dataManager.get(DYE_COLOR).byteValue();
+        byte b0 = this.dataManager.get(DYE_COLOR);
 
         if (sheared) {
-            this.dataManager.set(DYE_COLOR, Byte.valueOf((byte) (b0 | 16)));
+            this.dataManager.set(DYE_COLOR, (byte) (b0 | 16));
         } else {
-            this.dataManager.set(DYE_COLOR, Byte.valueOf((byte) (b0 & -17)));
+            this.dataManager.set(DYE_COLOR, (byte) (b0 & -17));
         }
     }
 
@@ -327,7 +328,7 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh
         this.setSheared(true);
         int i = 1 + this.rand.nextInt(3);
 
-        java.util.List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
+        List<ItemStack> ret = new ArrayList<>();
         for (int j = 0; j < i; ++j)
             ret.add(new ItemStack(Item.getItemFromBlock(Blocks.WOOL), 1, this.getFleeceColor().getMetadata()));
 

src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java

@@ -20,7 +20,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public class EntityCorruptedSpider extends EntityAspectedDemonBase {
-    private static final DataParameter<Byte> CLIMBING = EntityDataManager.<Byte>createKey(EntityCorruptedSpider.class, DataSerializers.BYTE);
+    private static final DataParameter<Byte> CLIMBING = EntityDataManager.createKey(EntityCorruptedSpider.class, DataSerializers.BYTE);
 
     public EntityCorruptedSpider(World world) {
         this(world, EnumDemonWillType.DEFAULT);
@@ -43,8 +43,8 @@ public class EntityCorruptedSpider extends EntityAspectedDemonBase {
         this.tasks.addTask(6, new EntityAILookIdle(this));
         this.targetTasks.addTask(1, new EntityAIHurtByTarget(this, false));
 
-        this.targetTasks.addTask(1, new EntityAINearestAttackableTarget<EntityPlayer>(this, EntityPlayer.class, true));
+        this.targetTasks.addTask(1, new EntityAINearestAttackableTarget<>(this, EntityPlayer.class, true));
-        this.targetTasks.addTask(2, new EntityAINearestAttackableTarget<EntityLivingBase>(this, EntityLivingBase.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this)));
+        this.targetTasks.addTask(2, new EntityAINearestAttackableTarget<>(this, EntityLivingBase.class, 10, true, false, new EntityAspectedDemonBase.TeamAttackPredicate(this)));
     }
 
     @Override

src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java

@@ -45,7 +45,7 @@ public class EntityDemonBase extends EntityCreature implements IEntityOwnable {
     protected void entityInit() {
         super.entityInit();
         this.dataManager.register(TAMED, (byte) 0);
-        this.dataManager.register(OWNER_UNIQUE_ID, Optional.<UUID>absent());
+        this.dataManager.register(OWNER_UNIQUE_ID, Optional.absent());
     }
 
     @Override

src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java

@@ -57,7 +57,7 @@ public class EntitySentientSpecter extends EntityDemonBase {
         this.setSize(0.6F, 1.95F);
 //        ((PathNavigateGround) getNavigator()).setCanSwim(false);
         this.tasks.addTask(0, new EntityAISwimming(this));
-        this.tasks.addTask(2, new EntityAIRetreatToHeal<EntityCreature>(this, EntityCreature.class, 6.0F, 1.0D, 1.2D));
+        this.tasks.addTask(2, new EntityAIRetreatToHeal<>(this, EntityCreature.class, 6.0F, 1.0D, 1.2D));
         this.tasks.addTask(attackPriority, aiAttackOnCollide);
         this.tasks.addTask(4, new EntityAIGrabEffectsFromOwner(this, 2.0D, 1.0F));
         this.tasks.addTask(5, new EntityAIFollowOwner(this, 1.0D, 10.0F, 2.0F));
@@ -67,9 +67,9 @@ public class EntitySentientSpecter extends EntityDemonBase {
 
         this.targetTasks.addTask(1, new EntityAIOwnerHurtByTarget(this));
         this.targetTasks.addTask(2, new EntityAIOwnerHurtTarget(this));
-        this.targetTasks.addTask(3, new EntityAINearestAttackableTarget<EntityPlayer>(this, EntityPlayer.class, true));
+        this.targetTasks.addTask(3, new EntityAINearestAttackableTarget<>(this, EntityPlayer.class, true));
 
-        this.targetTasks.addTask(4, new EntityAIHurtByTargetIgnoreTamed(this, false, new Class[0]));
+        this.targetTasks.addTask(4, new EntityAIHurtByTargetIgnoreTamed(this, false));
 
         this.setCombatTask();
 //        this.targetTasks.addTask(8, new EntityAINearestAttackableTarget<EntityMob>(this, EntityMob.class, 10, true, false, new TargetPredicate(this)));
@@ -138,7 +138,7 @@ public class EntitySentientSpecter extends EntityDemonBase {
 
         boolean hasStolenEffect = false;
 
-        List<PotionEffect> removedEffects = new ArrayList<PotionEffect>();
+        List<PotionEffect> removedEffects = new ArrayList<>();
 
         for (PotionEffect eff : owner.getActivePotionEffects()) {
             if (canStealEffectFromOwner(owner, eff)) {
@@ -157,7 +157,7 @@ public class EntitySentientSpecter extends EntityDemonBase {
 
     public boolean applyNegativeEffectsToAttacked(EntityLivingBase attackedEntity, float percentTransmitted) {
         boolean hasProvidedEffect = false;
-        List<PotionEffect> removedEffects = new ArrayList<PotionEffect>();
+        List<PotionEffect> removedEffects = new ArrayList<>();
         for (PotionEffect eff : this.getActivePotionEffects()) {
             if (eff.getPotion().isBadEffect() && attackedEntity.isPotionApplicable(eff)) {
                 if (!attackedEntity.isPotionActive(eff.getPotion())) {
@@ -197,13 +197,13 @@ public class EntitySentientSpecter extends EntityDemonBase {
     }
 
     public List<PotionEffect> getPotionEffectsForArrowRemovingDuration(float percentTransmitted) {
-        List<PotionEffect> arrowEffects = new ArrayList<PotionEffect>();
+        List<PotionEffect> arrowEffects = new ArrayList<>();
 
         if (type != EnumDemonWillType.CORROSIVE) {
             return arrowEffects;
         }
 
-        List<PotionEffect> removedEffects = new ArrayList<PotionEffect>();
+        List<PotionEffect> removedEffects = new ArrayList<>();
         for (PotionEffect eff : this.getActivePotionEffects()) {
             if (eff.getPotion().isBadEffect()) {
                 removedEffects.add(eff);
@@ -310,7 +310,7 @@ public class EntitySentientSpecter extends EntityDemonBase {
 
         if (getEntityWorld() instanceof WorldServer) {
             WorldServer server = (WorldServer) getEntityWorld();
-            server.spawnParticle(EnumParticleTypes.HEART, this.posX + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, this.posY + 0.5D + (double) (this.rand.nextFloat() * this.height), this.posZ + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, 7, 0.2, 0.2, 0.2, 0, new int[0]);
+            server.spawnParticle(EnumParticleTypes.HEART, this.posX + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, this.posY + 0.5D + (double) (this.rand.nextFloat() * this.height), this.posZ + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, 7, 0.2, 0.2, 0.2, 0);
         }
     }
 

src/main/java/WayofTime/bloodmagic/incense/EnumTranquilityType.java

@@ -7,5 +7,6 @@ public enum EnumTranquilityType {
     EARTHEN(),
     WATER(),
     FIRE(),
-    LAVA();
+    LAVA(),
+    ;
 }

src/main/java/WayofTime/bloodmagic/incense/IncenseAltarHandler.java

@@ -12,7 +12,7 @@ import java.util.Map;
 import java.util.TreeMap;
 
 public class IncenseAltarHandler {
-    public static Map<Integer, List<IncenseAltarComponent>> incenseComponentMap = new TreeMap<Integer, List<IncenseAltarComponent>>();
+    public static Map<Integer, List<IncenseAltarComponent>> incenseComponentMap = new TreeMap<>();
     //Incense bonus maximum applied for the tier of blocks.
     public static double[] incenseBonuses = new double[]{0.2, 0.6, 1.2, 2, 3, 4.5};
     public static double[] tranquilityRequired = new double[]{0, 6, 14.14, 28, 44.09, 83.14};
@@ -22,7 +22,7 @@ public class IncenseAltarHandler {
         if (incenseComponentMap.containsKey(altarLevel)) {
             incenseComponentMap.get(altarLevel).add(component);
         } else {
-            List<IncenseAltarComponent> list = new ArrayList<IncenseAltarComponent>();
+            List<IncenseAltarComponent> list = new ArrayList<>();
             list.add(component);
             incenseComponentMap.put(altarLevel, list);
         }

src/main/java/WayofTime/bloodmagic/incense/IncenseTranquilityRegistry.java

@@ -9,7 +9,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class IncenseTranquilityRegistry {
-    public static List<ITranquilityHandler> handlerList = new ArrayList<ITranquilityHandler>();
+    public static List<ITranquilityHandler> handlerList = new ArrayList<>();
 
     public static void registerTranquilityHandler(ITranquilityHandler handler) {
         handlerList.add(handler);

src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java

@@ -11,7 +11,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class CorruptionHandler {
-    public static Map<Pair<Block, Integer>, Map<EnumDemonWillType, IBlockState>> corruptBlockMap = new HashMap<Pair<Block, Integer>, Map<EnumDemonWillType, IBlockState>>();
+    public static Map<Pair<Block, Integer>, Map<EnumDemonWillType, IBlockState>> corruptBlockMap = new HashMap<>();
 
     public static void registerBlockCorruption(EnumDemonWillType type, Block block, int meta, IBlockState corruptedState) {
         Pair<Block, Integer> pair = Pair.of(block, meta);
@@ -19,7 +19,7 @@ public class CorruptionHandler {
             Map<EnumDemonWillType, IBlockState> stateMap = corruptBlockMap.get(pair);
             stateMap.put(type, corruptedState);
         } else {
-            Map<EnumDemonWillType, IBlockState> stateMap = new HashMap<EnumDemonWillType, IBlockState>();
+            Map<EnumDemonWillType, IBlockState> stateMap = new HashMap<>();
             stateMap.put(type, corruptedState);
             corruptBlockMap.put(pair, stateMap);
         }

src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java

@@ -9,8 +9,8 @@ import java.util.*;
 
 public class InversionPillarHandler {
     public static final double farthestDistanceSquared = 16 * 16;
-    public static Map<Integer, Map<EnumDemonWillType, List<BlockPos>>> pillarMap = new HashMap<Integer, Map<EnumDemonWillType, List<BlockPos>>>();
+    public static Map<Integer, Map<EnumDemonWillType, List<BlockPos>>> pillarMap = new HashMap<>();
-    public static Map<Integer, Map<EnumDemonWillType, Map<BlockPos, List<BlockPos>>>> nearPillarMap = new HashMap<Integer, Map<EnumDemonWillType, Map<BlockPos, List<BlockPos>>>>();
+    public static Map<Integer, Map<EnumDemonWillType, Map<BlockPos, List<BlockPos>>>> nearPillarMap = new HashMap<>();
 
     public static boolean addPillarToMap(World world, EnumDemonWillType type, BlockPos pos) {
         int dim = world.provider.getDimension();
@@ -25,15 +25,15 @@ public class InversionPillarHandler {
                     return false;
                 }
             } else {
-                List<BlockPos> posList = new ArrayList<BlockPos>();
+                List<BlockPos> posList = new ArrayList<>();
                 posList.add(pos);
                 willMap.put(type, posList);
                 onPillarAdded(world, type, pos);
                 return true;
             }
         } else {
-            Map<EnumDemonWillType, List<BlockPos>> willMap = new HashMap<EnumDemonWillType, List<BlockPos>>();
+            Map<EnumDemonWillType, List<BlockPos>> willMap = new HashMap<>();
-            List<BlockPos> posList = new ArrayList<BlockPos>();
+            List<BlockPos> posList = new ArrayList<>();
             posList.add(pos);
 
             willMap.put(type, posList);
@@ -65,7 +65,7 @@ public class InversionPillarHandler {
     //Assume that it has been added already.
     private static void onPillarAdded(World world, EnumDemonWillType type, BlockPos pos) {
         BMLog.DEBUG.info("Adding...");
-        List<BlockPos> closePosList = new ArrayList<BlockPos>();
+        List<BlockPos> closePosList = new ArrayList<>();
 
         int dim = world.provider.getDimension();
         if (pillarMap.containsKey(dim)) {
@@ -91,7 +91,7 @@ public class InversionPillarHandler {
                     if (posList != null && !posList.contains(pos)) {
                         posList.add(pos);
                     } else {
-                        posList = new ArrayList<BlockPos>();
+                        posList = new ArrayList<>();
                         posList.add(pos);
                         posMap.put(closePos, posList);
                     }
@@ -99,14 +99,14 @@ public class InversionPillarHandler {
 
                 posMap.put(pos, closePosList);
             } else {
-                Map<BlockPos, List<BlockPos>> posMap = new HashMap<BlockPos, List<BlockPos>>();
+                Map<BlockPos, List<BlockPos>> posMap = new HashMap<>();
 
                 posMap.put(pos, closePosList);
                 willMap.put(type, posMap);
             }
         } else {
-            Map<EnumDemonWillType, Map<BlockPos, List<BlockPos>>> willMap = new HashMap<EnumDemonWillType, Map<BlockPos, List<BlockPos>>>();
+            Map<EnumDemonWillType, Map<BlockPos, List<BlockPos>>> willMap = new HashMap<>();
-            Map<BlockPos, List<BlockPos>> posMap = new HashMap<BlockPos, List<BlockPos>>();
+            Map<BlockPos, List<BlockPos>> posMap = new HashMap<>();
 
             posMap.put(pos, closePosList);
             willMap.put(type, posMap);
@@ -123,9 +123,7 @@ public class InversionPillarHandler {
                 Map<BlockPos, List<BlockPos>> posMap = willMap.get(type);
                 List<BlockPos> posList = posMap.get(pos);
                 if (posList != null) {
-                    Iterator<BlockPos> itr = posList.iterator();
+                    for (BlockPos checkPos : posList) {
-                    while (itr.hasNext()) {
-                        BlockPos checkPos = itr.next();
                         List<BlockPos> checkPosList = posMap.get(checkPos);
                         if (checkPosList != null) {
                             checkPosList.remove(pos);
@@ -152,12 +150,12 @@ public class InversionPillarHandler {
             }
         }
 
-        return new ArrayList<BlockPos>();
+        return new ArrayList<>();
     }
 
     public static List<BlockPos> getAllConnectedPillars(World world, EnumDemonWillType type, BlockPos pos) {
-        List<BlockPos> checkedPosList = new ArrayList<BlockPos>();
+        List<BlockPos> checkedPosList = new ArrayList<>();
-        List<BlockPos> uncheckedPosList = new ArrayList<BlockPos>(); //Positions where we did not check their connections.
+        List<BlockPos> uncheckedPosList = new ArrayList<>(); //Positions where we did not check their connections.
 
         uncheckedPosList.add(pos);
 
@@ -170,7 +168,7 @@ public class InversionPillarHandler {
 
                 while (!uncheckedPosList.isEmpty()) {
                     //Positions that are new this iteration and need to be dumped into uncheckedPosList next iteration.
-                    List<BlockPos> newPosList = new ArrayList<BlockPos>();
+                    List<BlockPos> newPosList = new ArrayList<>();
 
                     for (BlockPos checkPos : uncheckedPosList) {
                         List<BlockPos> posList = posMap.get(checkPos);

src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java

@@ -89,8 +89,8 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "type=altarmaker"));
+        ret.add(new ImmutablePair<>(0, "type=altarmaker"));
         return ret;
     }
 

src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java

@@ -62,8 +62,8 @@ public class ItemArcaneAshes extends Item implements IVariantProvider {
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "type=arcaneashes"));
+        ret.add(new ImmutablePair<>(0, "type=arcaneashes"));
         return ret;
     }
 }

src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java

@@ -131,7 +131,7 @@ public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider {
 
     @Override
     public List<String> getVariants() {
-        List<String> ret = new ArrayList<String>();
+        List<String> ret = new ArrayList<>();
         ret.add("active=true");
         ret.add("active=false");
         return ret;

src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java

@@ -144,7 +144,7 @@ public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider {
 
     @Override
     public List<String> getVariants() {
-        List<String> ret = new ArrayList<String>();
+        List<String> ret = new ArrayList<>();
         ret.add("active=true");
         ret.add("active=false");
         return ret;

src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java

@@ -130,7 +130,7 @@ public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider {
 
     @Override
     public List<String> getVariants() {
-        List<String> ret = new ArrayList<String>();
+        List<String> ret = new ArrayList<>();
         ret.add("active=true");
         ret.add("active=false");
         return ret;

src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java

@@ -118,7 +118,7 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable
 
     @Override
     public Multimap<String, AttributeModifier> getAttributeModifiers(EntityEquipmentSlot equipmentSlot, ItemStack stack) {
-        Multimap<String, AttributeModifier> multimap = HashMultimap.<String, AttributeModifier>create();
+        Multimap<String, AttributeModifier> multimap = HashMultimap.create();
         if (equipmentSlot == EntityEquipmentSlot.MAINHAND) {
             multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getActivated(stack) ? 8 : 2, 0));
             multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -2.4, 0));
@@ -140,7 +140,7 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable
 
     @Override
     public List<String> getVariants() {
-        List<String> ret = new ArrayList<String>();
+        List<String> ret = new ArrayList<>();
         ret.add("active=true");
         ret.add("active=false");
         return ret;

src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java

@@ -46,8 +46,8 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable {
     public final int chargeTime = 30;
     protected final String tooltipBase;
     private final String name;
-    public Map<ItemStack, Boolean> heldDownMap = new HashMap<ItemStack, Boolean>();
+    public Map<ItemStack, Boolean> heldDownMap = new HashMap<>();
-    public Map<ItemStack, Integer> heldDownCountMap = new HashMap<ItemStack, Integer>();
+    public Map<ItemStack, Integer> heldDownCountMap = new HashMap<>();
 
     public ItemBoundTool(String name, float damage, Set<Block> effectiveBlocks) {
         super(damage, 1, RegistrarBloodMagicItems.BOUND_TOOL_MATERIAL, effectiveBlocks);

src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java

@@ -33,8 +33,8 @@ public class ItemDemonWillGauge extends Item implements IVariantProvider, IDemon
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "type=willgauge"));
+        ret.add(new ImmutablePair<>(0, "type=willgauge"));
         return ret;
     }
 

src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java

@@ -60,13 +60,13 @@ public class ItemExperienceBook extends Item implements IVariantProvider {
                 giveOneLevelExpToPlayer(stack, player);
         }
 
-        return new ActionResult<ItemStack>(EnumActionResult.SUCCESS, stack);
+        return new ActionResult<>(EnumActionResult.SUCCESS, stack);
     }
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "type=experiencetome"));
+        ret.add(new ImmutablePair<>(0, "type=experiencetome"));
         return ret;
     }
 

src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java

@@ -2,11 +2,9 @@ package WayofTime.bloodmagic.item;
 
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.core.data.Binding;
-import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.util.helper.NetworkHelper;
 import WayofTime.bloodmagic.util.helper.PlayerHelper;
 import WayofTime.bloodmagic.client.IVariantProvider;
-import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.MobEffects;

src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java

@@ -95,10 +95,10 @@ public class ItemPotionFlask extends Item implements IMeshProvider {
         if (remainingUses <= 0) {
             NBTHelper.checkNBT(stack);
             stack.getTagCompound().setBoolean("empty", true);
-            return new ActionResult<ItemStack>(EnumActionResult.PASS, stack);
+            return new ActionResult<>(EnumActionResult.PASS, stack);
         }
         player.setActiveHand(hand);
-        return new ActionResult<ItemStack>(EnumActionResult.SUCCESS, stack);
+        return new ActionResult<>(EnumActionResult.SUCCESS, stack);
     }
 
     @Override

src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java

@@ -295,7 +295,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider {
         ItemStack stack = player.getHeldItem(hand);
         RayTraceResult ray = this.rayTrace(world, player, false);
         if (ray != null && ray.typeOfHit == RayTraceResult.Type.BLOCK) {
-            return new ActionResult<ItemStack>(EnumActionResult.PASS, stack);
+            return new ActionResult<>(EnumActionResult.PASS, stack);
         }
 
         if (player.isSneaking()) {
@@ -303,10 +303,10 @@ public class ItemRitualDiviner extends Item implements IVariantProvider {
                 cycleRitual(stack, player);
             }
 
-            return new ActionResult<ItemStack>(EnumActionResult.SUCCESS, stack);
+            return new ActionResult<>(EnumActionResult.SUCCESS, stack);
         }
 
-        return new ActionResult<ItemStack>(EnumActionResult.PASS, stack);
+        return new ActionResult<>(EnumActionResult.PASS, stack);
     }
 
     @Override
@@ -333,10 +333,10 @@ public class ItemRitualDiviner extends Item implements IVariantProvider {
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "type=basic"));
+        ret.add(new ImmutablePair<>(0, "type=basic"));
-        ret.add(new ImmutablePair<Integer, String>(1, "type=dusk"));
+        ret.add(new ImmutablePair<>(1, "type=dusk"));
-        ret.add(new ImmutablePair<Integer, String>(2, "type=dawn"));
+        ret.add(new ImmutablePair<>(2, "type=dawn"));
         return ret;
     }
 
@@ -549,14 +549,14 @@ public class ItemRitualDiviner extends Item implements IVariantProvider {
                 double d0 = itemRand.nextGaussian() * 0.02D;
                 double d1 = itemRand.nextGaussian() * 0.02D;
                 double d2 = itemRand.nextGaussian() * 0.02D;
-                worldIn.spawnParticle(EnumParticleTypes.VILLAGER_HAPPY, (double) ((float) pos.getX() + itemRand.nextFloat()), (double) pos.getY() + (double) itemRand.nextFloat(), (double) ((float) pos.getZ() + itemRand.nextFloat()), d0, d1, d2, new int[0]);
+                worldIn.spawnParticle(EnumParticleTypes.VILLAGER_HAPPY, (double) ((float) pos.getX() + itemRand.nextFloat()), (double) pos.getY() + (double) itemRand.nextFloat(), (double) ((float) pos.getZ() + itemRand.nextFloat()), d0, d1, d2);
             }
         } else {
             for (int i1 = 0; i1 < amount; ++i1) {
                 double d0 = itemRand.nextGaussian() * 0.02D;
                 double d1 = itemRand.nextGaussian() * 0.02D;
                 double d2 = itemRand.nextGaussian() * 0.02D;
-                worldIn.spawnParticle(EnumParticleTypes.VILLAGER_HAPPY, (double) ((float) pos.getX() + itemRand.nextFloat()), (double) pos.getY() + (double) itemRand.nextFloat() * 1.0f, (double) ((float) pos.getZ() + itemRand.nextFloat()), d0, d1, d2, new int[0]);
+                worldIn.spawnParticle(EnumParticleTypes.VILLAGER_HAPPY, (double) ((float) pos.getX() + itemRand.nextFloat()), (double) pos.getY() + (double) itemRand.nextFloat() * 1.0f, (double) ((float) pos.getZ() + itemRand.nextFloat()), d0, d1, d2);
             }
         }
     }

src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java

@@ -67,7 +67,7 @@ public class ItemRitualReader extends Item implements IVariantProvider {
         ItemStack stack = player.getHeldItem(hand);
         RayTraceResult ray = this.rayTrace(world, player, false);
         if (ray != null && ray.typeOfHit == RayTraceResult.Type.BLOCK) {
-            return new ActionResult<ItemStack>(EnumActionResult.PASS, stack);
+            return new ActionResult<>(EnumActionResult.PASS, stack);
         }
 
         if (player.isSneaking()) {
@@ -75,10 +75,10 @@ public class ItemRitualReader extends Item implements IVariantProvider {
                 cycleReader(stack, player);
             }
 
-            return new ActionResult<ItemStack>(EnumActionResult.SUCCESS, stack);
+            return new ActionResult<>(EnumActionResult.SUCCESS, stack);
         }
 
-        return new ActionResult<ItemStack>(EnumActionResult.PASS, stack);
+        return new ActionResult<>(EnumActionResult.PASS, stack);
     }
 
     @Override
@@ -107,7 +107,7 @@ public class ItemRitualReader extends Item implements IVariantProvider {
                         master.provideInformationOfRangeToPlayer(player, range);
                         break;
                     case SET_WILL_TYPES:
-                        List<EnumDemonWillType> typeList = new ArrayList<EnumDemonWillType>();
+                        List<EnumDemonWillType> typeList = new ArrayList<>();
                         NonNullList<ItemStack> inv = player.inventory.mainInventory;
                         for (int i = 0; i < 9; i++) {
                             ItemStack testStack = inv.get(i);
@@ -234,8 +234,8 @@ public class ItemRitualReader extends Item implements IVariantProvider {
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "type=normal"));
+        ret.add(new ImmutablePair<>(0, "type=normal"));
         return ret;
     }
 }

src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java

@@ -77,7 +77,7 @@ public class ItemSacrificialDagger extends ItemEnum<ItemSacrificialDagger.Dagger
 
         if (this.canUseForSacrifice(stack)) {
             player.setActiveHand(hand);
-            return new ActionResult<ItemStack>(EnumActionResult.SUCCESS, stack);
+            return new ActionResult<>(EnumActionResult.SUCCESS, stack);
         }
 
         int lpAdded = ConfigHandler.values.sacrificialDaggerConversion * 2;
@@ -166,7 +166,7 @@ public class ItemSacrificialDagger extends ItemEnum<ItemSacrificialDagger.Dagger
 
     @Override
     public List<String> getVariants() {
-        List<String> variants = new ArrayList<String>();
+        List<String> variants = new ArrayList<>();
         variants.add("type=normal");
         variants.add("type=creative");
         variants.add("type=ceremonial");

src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java

@@ -97,8 +97,8 @@ public class ItemUpgradeTome extends Item implements IVariantProvider {
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "type=upgradetome"));
+        ret.add(new ImmutablePair<>(0, "type=upgradetome"));
         return ret;
     }
 

src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java

@@ -61,7 +61,7 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian
 
     @Override
     public List<String> getTrainedUpgrades(ItemStack stack) {
-        List<String> keyList = new ArrayList<String>();
+        List<String> keyList = new ArrayList<>();
         String key = LivingUpgrades.getKey(stack);
 
         if (!key.isEmpty()) {
@@ -83,8 +83,8 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "type=upgradetrainer"));
+        ret.add(new ImmutablePair<>(0, "type=upgradetrainer"));
         return ret;
     }
 }

src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java

@@ -51,7 +51,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
     public static final boolean useSpecialArmourCalculation = true;
     public static String[] names = {"helmet", "chest", "legs", "boots"};
     //TODO: Save/delete cache periodically.
-    public static Map<UUID, LivingArmour> armourMap = new HashMap<UUID, LivingArmour>();
+    public static Map<UUID, LivingArmour> armourMap = new HashMap<>();
     private static Field _FLAGS = ReflectionHelper.findField(Entity.class, "FLAGS", "field_184240_ax");
     private static DataParameter<Byte> FLAGS = null;
 
@@ -283,9 +283,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
                 if (FLAGS == null) {
                     try {
                         FLAGS = (DataParameter<Byte>) _FLAGS.get(null);
-                    } catch (IllegalArgumentException e) {
+                    } catch (IllegalArgumentException | IllegalAccessException e) {
-                        e.printStackTrace();
-                    } catch (IllegalAccessException e) {
                         e.printStackTrace();
                     }
                 }
@@ -337,7 +335,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
             return armour.getAttributeModifiers();
         }
 
-        return HashMultimap.<String, AttributeModifier>create();
+        return HashMultimap.create();
     }
 
     @Override
@@ -367,7 +365,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
 
     @Override
     public List<String> getVariants() {
-        List<String> ret = new ArrayList<String>();
+        List<String> ret = new ArrayList<>();
         ret.add("armour=head");
         ret.add("armour=body");
         ret.add("armour=leg");

src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java

@@ -298,7 +298,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
 
     @Override
     public List<String> getVariants() {
-        List<String> ret = new ArrayList<String>();
+        List<String> ret = new ArrayList<>();
         for (EnumDemonWillType type : EnumDemonWillType.values()) {
             String additional = "_" + type.getName().toLowerCase();
 
@@ -313,7 +313,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
 
     @Override
     public Multimap<String, AttributeModifier> getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) {
-        Multimap<String, AttributeModifier> multimap = HashMultimap.<String, AttributeModifier>create();
+        Multimap<String, AttributeModifier> multimap = HashMultimap.create();
         if (slot == EntityEquipmentSlot.CHEST) {
             multimap.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(new UUID(0, 318145), "Armor modifier", this.getHealthBonus(stack), 0));
             multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getName(), new AttributeModifier(new UUID(0, 8145), "Armor modifier", this.getKnockbackResistance(stack), 0));

src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockString.java

@@ -1,32 +0,0 @@
-package WayofTime.bloodmagic.item.block.base;
-
-import WayofTime.bloodmagic.block.base.BlockString;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.MathHelper;
-
-public class ItemBlockString extends ItemBlock {
-
-    public ItemBlockString(BlockString block) {
-        super(block);
-
-        if (block.getTypes().length > 1)
-            setHasSubtypes(true);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public BlockString getBlock() {
-        return (BlockString) super.getBlock();
-    }
-
-    @Override
-    public String getUnlocalizedName(ItemStack stack) {
-        return getBlock().getUnlocalizedName() + "." + getBlock().getTypes()[MathHelper.clamp(stack.getItemDamage(), 0, 15)];
-    }
-
-    @Override
-    public int getMetadata(int damage) {
-        return damage;
-    }
-}

src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java

@@ -77,8 +77,8 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, I
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "type=normal"));
+        ret.add(new ImmutablePair<>(0, "type=normal"));
         return ret;
     }
 

src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java

@@ -102,8 +102,8 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "type=normal"));
+        ret.add(new ImmutablePair<>(0, "type=normal"));
         return ret;
     }
 

src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java

@@ -70,7 +70,7 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider,
                 testFilter = new RoutingFluidFilter();
         }
 
-        List<ItemStack> filteredList = new ArrayList<ItemStack>();
+        List<ItemStack> filteredList = new ArrayList<>();
         ItemInventory inv = new ItemInventory(filterStack, 9, "");
         for (int i = 0; i < inv.getSizeInventory(); i++) {
             ItemStack stack = inv.getStackInSlot(i);
@@ -100,7 +100,7 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider,
                 testFilter = new RoutingFluidFilter();
         }
 
-        List<ItemStack> filteredList = new ArrayList<ItemStack>();
+        List<ItemStack> filteredList = new ArrayList<>();
         ItemInventory inv = new ItemInventory(filterStack, 9, ""); //TODO: Change to grab the filter from the Item later.
         for (int i = 0; i < inv.getSizeInventory(); i++) {
             ItemStack stack = inv.getStackInSlot(i);
@@ -122,8 +122,8 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider,
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "type=exact"));
+        ret.add(new ImmutablePair<>(0, "type=exact"));
         return ret;
     }
 

src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java

@@ -84,7 +84,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
                     if (!node.isMaster(master)) {
                         if (node.getMasterPos().equals(BlockPos.ORIGIN)) //If the node is not the master and it is receptive
                         {
-                            node.connectMasterToRemainingNode(world, new LinkedList<BlockPos>(), master);
+                            node.connectMasterToRemainingNode(world, new LinkedList<>(), master);
                             master.addConnection(pos, containedPos);
                             master.addNodeToList(node);
                             node.addConnection(containedPos);
@@ -106,7 +106,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
                     if (!pastNode.isMaster(master)) {
                         if (pastNode.getMasterPos().equals(BlockPos.ORIGIN)) //TODO: This is where the issue is
                         {
-                            pastNode.connectMasterToRemainingNode(world, new LinkedList<BlockPos>(), master);
+                            pastNode.connectMasterToRemainingNode(world, new LinkedList<>(), master);
                             master.addConnection(pos, containedPos);
                             pastNode.addConnection(pos);
                             master.addNodeToList(pastNode);
@@ -143,7 +143,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
                             IMasterRoutingNode master = (IMasterRoutingNode) tile;
                             master.addConnection(pos, containedPos);
                             master.addNodeToList(pastNode);
-                            pastNode.connectMasterToRemainingNode(world, new LinkedList<BlockPos>(), master);
+                            pastNode.connectMasterToRemainingNode(world, new LinkedList<>(), master);
                         }
                         pastNode.addConnection(pos);
                         node.addConnection(containedPos);
@@ -157,7 +157,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
                             IMasterRoutingNode master = (IMasterRoutingNode) tile;
                             master.addConnection(pos, containedPos);
                             master.addNodeToList(node);
-                            node.connectMasterToRemainingNode(world, new LinkedList<BlockPos>(), master);
+                            node.connectMasterToRemainingNode(world, new LinkedList<>(), master);
                         }
                         pastNode.addConnection(pos);
                         node.addConnection(containedPos);
@@ -177,8 +177,8 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "type=normal"));
+        ret.add(new ImmutablePair<>(0, "type=normal"));
         return ret;
     }
 

src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java

@@ -78,7 +78,7 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari
                 testFilter = new DefaultItemFilter();
         }
 
-        List<ItemStack> filteredList = new ArrayList<ItemStack>();
+        List<ItemStack> filteredList = new ArrayList<>();
         ItemInventory inv = new ItemInventory(filterStack, 9, "");
         for (int i = 0; i < inv.getSizeInventory(); i++) {
             ItemStack stack = inv.getStackInSlot(i);
@@ -117,7 +117,7 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari
                 testFilter = new DefaultItemFilter();
         }
 
-        List<ItemStack> filteredList = new ArrayList<ItemStack>();
+        List<ItemStack> filteredList = new ArrayList<>();
         ItemInventory inv = new ItemInventory(filterStack, 9, ""); //TODO: Change to grab the filter from the Item later.
         for (int i = 0; i < inv.getSizeInventory(); i++) {
             ItemStack stack = inv.getStackInSlot(i);
@@ -139,11 +139,11 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "type=exact"));
+        ret.add(new ImmutablePair<>(0, "type=exact"));
-        ret.add(new ImmutablePair<Integer, String>(1, "type=ignorenbt"));
+        ret.add(new ImmutablePair<>(1, "type=ignorenbt"));
-        ret.add(new ImmutablePair<Integer, String>(2, "type=moditems"));
+        ret.add(new ImmutablePair<>(2, "type=moditems"));
-        ret.add(new ImmutablePair<Integer, String>(3, "type=oredict"));
+        ret.add(new ImmutablePair<>(3, "type=oredict"));
         return ret;
     }
 

src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java

@@ -3,10 +3,8 @@ package WayofTime.bloodmagic.item.sigil;
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.core.data.Binding;
 import WayofTime.bloodmagic.item.ItemSigil;
-import WayofTime.bloodmagic.util.helper.PlayerHelper;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.util.helper.TextHelper;
-import com.google.common.base.Strings;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
@@ -55,7 +53,7 @@ public class ItemSigilBase extends ItemSigil implements IVariantProvider {
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
         ret.add(Pair.of(0, "type=normal"));
         return ret;
     }

src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java

@@ -12,9 +12,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class ItemSigilPhantomBridge extends ItemSigilToggleableBase {
-    private Map<EntityPlayer, Pair<Double, Double>> prevPositionMap = new HashMap<EntityPlayer, Pair<Double, Double>>();
+    private static final double EXPANSION_FACTOR = 2;
-    private double expansionFactor = 2;
+    private static final int RANGE = 3;
-    private int range = 3;
+
+    private Map<EntityPlayer, Pair<Double, Double>> prevPositionMap = new HashMap<>();
 
     public ItemSigilPhantomBridge() {
         super("phantom_bridge", 100);
@@ -57,12 +58,12 @@ public class ItemSigilPhantomBridge extends ItemSigilToggleableBase {
         int posY = playerPos.getY();
         int posZ = playerPos.getZ();
 
-        double offsetPosX = posX + expansionFactor * playerVelX;
+        double offsetPosX = posX + EXPANSION_FACTOR * playerVelX;
-        double offsetPosZ = posZ + expansionFactor * playerVelZ;
+        double offsetPosZ = posZ + EXPANSION_FACTOR * playerVelZ;
         double avgX = (posX + offsetPosX) / 2;
         double avgZ = (posZ + offsetPosZ) / 2;
 
-        double C = 2 * (range + expansionFactor * totalVel) + 1;
+        double C = 2 * (RANGE + EXPANSION_FACTOR * totalVel) + 1;
         int truncC = (int) C;
 
         //TODO: Make this for-loop better.

src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java

@@ -3,11 +3,9 @@ package WayofTime.bloodmagic.item.sigil;
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.core.data.Binding;
 import WayofTime.bloodmagic.item.ItemSigilToggleable;
-import WayofTime.bloodmagic.util.helper.PlayerHelper;
 import WayofTime.bloodmagic.client.IMeshProvider;
 import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable;
 import WayofTime.bloodmagic.util.helper.TextHelper;
-import com.google.common.base.Strings;
 import net.minecraft.client.renderer.ItemMeshDefinition;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.item.ItemStack;
@@ -64,7 +62,7 @@ public class ItemSigilToggleableBase extends ItemSigilToggleable implements IMes
 
     @Override
     public List<String> getVariants() {
-        List<String> ret = new ArrayList<String>();
+        List<String> ret = new ArrayList<>();
         ret.add("active=false");
         ret.add("active=true");
 

src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java

@@ -53,7 +53,7 @@ public class ItemSentientArmourGem extends Item implements IMeshProvider {
             ItemSentientArmour.convertPlayerArmour(type, will, player);
         }
 
-        return new ActionResult<ItemStack>(EnumActionResult.PASS, player.getHeldItem(hand));
+        return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
     }
 
     @SideOnly(Side.CLIENT)

src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java

@@ -308,7 +308,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP
 
     @Override
     public List<String> getVariants() {
-        List<String> ret = new ArrayList<String>();
+        List<String> ret = new ArrayList<>();
         for (EnumDemonWillType type : EnumDemonWillType.values()) {
             ret.add("type=" + type.getName().toLowerCase());
         }
@@ -318,7 +318,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP
 
     @Override
     public List<ItemStack> getRandomDemonWillDrop(EntityLivingBase killedEntity, EntityLivingBase attackingEntity, ItemStack stack, int looting) {
-        List<ItemStack> soulList = new ArrayList<ItemStack>();
+        List<ItemStack> soulList = new ArrayList<>();
 
         if (killedEntity.getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL && !(killedEntity instanceof IMob)) {
             return soulList;
@@ -343,7 +343,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP
     //TODO: Change attack speed.
     @Override
     public Multimap<String, AttributeModifier> getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) {
-        Multimap<String, AttributeModifier> multimap = HashMultimap.<String, AttributeModifier>create();
+        Multimap<String, AttributeModifier> multimap = HashMultimap.create();
         if (slot == EntityEquipmentSlot.MAINHAND) {
             multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), 0));
             multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), 0));

src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java

@@ -307,7 +307,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon
 
     @Override
     public List<String> getVariants() {
-        List<String> ret = new ArrayList<String>();
+        List<String> ret = new ArrayList<>();
         for (EnumDemonWillType type : EnumDemonWillType.values()) {
             ret.add("type=" + type.getName().toLowerCase());
         }
@@ -317,7 +317,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon
 
     @Override
     public List<ItemStack> getRandomDemonWillDrop(EntityLivingBase killedEntity, EntityLivingBase attackingEntity, ItemStack stack, int looting) {
-        List<ItemStack> soulList = new ArrayList<ItemStack>();
+        List<ItemStack> soulList = new ArrayList<>();
 
         if (killedEntity.getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL && !(killedEntity instanceof IMob)) {
             return soulList;
@@ -342,7 +342,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon
     //TODO: Change attack speed.
     @Override
     public Multimap<String, AttributeModifier> getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) {
-        Multimap<String, AttributeModifier> multimap = HashMultimap.<String, AttributeModifier>create();
+        Multimap<String, AttributeModifier> multimap = HashMultimap.create();
         if (slot == EntityEquipmentSlot.MAINHAND) {
             multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), 0));
             multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), 0));

src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java

@@ -308,7 +308,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I
 
     @Override
     public List<String> getVariants() {
-        List<String> ret = new ArrayList<String>();
+        List<String> ret = new ArrayList<>();
         for (EnumDemonWillType type : EnumDemonWillType.values()) {
             ret.add("type=" + type.getName().toLowerCase());
         }
@@ -318,7 +318,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I
 
     @Override
     public List<ItemStack> getRandomDemonWillDrop(EntityLivingBase killedEntity, EntityLivingBase attackingEntity, ItemStack stack, int looting) {
-        List<ItemStack> soulList = new ArrayList<ItemStack>();
+        List<ItemStack> soulList = new ArrayList<>();
 
         if (killedEntity.getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL && !(killedEntity instanceof IMob)) {
             return soulList;
@@ -343,7 +343,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I
     //TODO: Change attack speed.
     @Override
     public Multimap<String, AttributeModifier> getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) {
-        Multimap<String, AttributeModifier> multimap = HashMultimap.<String, AttributeModifier>create();
+        Multimap<String, AttributeModifier> multimap = HashMultimap.create();
         if (slot == EntityEquipmentSlot.MAINHAND) {
             multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), 0));
             multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), 0));

src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java

@@ -283,7 +283,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM
 
     @Override
     public List<String> getVariants() {
-        List<String> ret = new ArrayList<String>();
+        List<String> ret = new ArrayList<>();
         for (EnumDemonWillType type : EnumDemonWillType.values()) {
             ret.add("type=" + type.getName().toLowerCase());
         }
@@ -293,7 +293,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM
 
     @Override
     public List<ItemStack> getRandomDemonWillDrop(EntityLivingBase killedEntity, EntityLivingBase attackingEntity, ItemStack stack, int looting) {
-        List<ItemStack> soulList = new ArrayList<ItemStack>();
+        List<ItemStack> soulList = new ArrayList<>();
 
         if (killedEntity.getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL && !(killedEntity instanceof IMob)) {
             return soulList;
@@ -318,7 +318,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM
     //TODO: Change attack speed.
     @Override
     public Multimap<String, AttributeModifier> getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) {
-        Multimap<String, AttributeModifier> multimap = HashMultimap.<String, AttributeModifier>create();
+        Multimap<String, AttributeModifier> multimap = HashMultimap.create();
         if (slot == EntityEquipmentSlot.MAINHAND) {
             multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), 0));
             multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), 0));

src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java

@@ -55,7 +55,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I
         double filled = PlayerDemonWillHandler.addDemonWill(type, player, drain, stack);
         this.drainWill(type, stack, filled, true);
 
-        return new ActionResult<ItemStack>(EnumActionResult.PASS, stack);
+        return new ActionResult<>(EnumActionResult.PASS, stack);
     }
 
     @Override
@@ -72,7 +72,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I
 
     @Override
     public List<String> getVariants() {
-        List<String> ret = new ArrayList<String>();
+        List<String> ret = new ArrayList<>();
         for (EnumDemonWillType type : EnumDemonWillType.values()) {
             ret.add("type=petty_" + type.getName().toLowerCase());
             ret.add("type=lesser_" + type.getName().toLowerCase());

src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java

@@ -48,7 +48,7 @@ public class ItemSoulSnare extends Item implements IVariantProvider {
             worldIn.spawnEntity(snare);
         }
 
-        return new ActionResult<ItemStack>(EnumActionResult.SUCCESS, stack);
+        return new ActionResult<>(EnumActionResult.SUCCESS, stack);
     }
 
     @Override
@@ -76,8 +76,8 @@ public class ItemSoulSnare extends Item implements IVariantProvider {
 
     @Override
     public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = new ArrayList<>();
-        ret.add(new ImmutablePair<Integer, String>(0, "type=soulsnare"));
+        ret.add(new ImmutablePair<>(0, "type=soulsnare"));
         return ret;
     }
 }

src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java

@@ -23,8 +23,8 @@ import java.util.Map.Entry;
 
 public class LivingArmour implements ILivingArmour {
     public static String chatBase = "chat.bloodmagic.livingArmour.";
-    public HashMap<String, StatTracker> trackerMap = new HashMap<String, StatTracker>();
+    public HashMap<String, StatTracker> trackerMap = new HashMap<>();
-    public HashMap<String, LivingArmourUpgrade> upgradeMap = new HashMap<String, LivingArmourUpgrade>();
+    public HashMap<String, LivingArmourUpgrade> upgradeMap = new HashMap<>();
 
     public int maxUpgradePoints = 100;
     public int totalUpgradePoints = 0;
@@ -60,7 +60,7 @@ public class LivingArmour implements ILivingArmour {
 
     @Override
     public Multimap<String, AttributeModifier> getAttributeModifiers() {
-        HashMultimap<String, AttributeModifier> modifierMap = HashMultimap.<String, AttributeModifier>create();
+        HashMultimap<String, AttributeModifier> modifierMap = HashMultimap.create();
 
         for (Entry<String, LivingArmourUpgrade> entry : upgradeMap.entrySet()) {
             LivingArmourUpgrade upgrade = entry.getValue();
@@ -165,7 +165,7 @@ public class LivingArmour implements ILivingArmour {
             return;
         }
 
-        List<String> allowedUpgradesList = new ArrayList<String>();
+        List<String> allowedUpgradesList = new ArrayList<>();
         for (ItemStack stack : player.inventory.mainInventory) {
             if (stack != null && stack.getItem() instanceof IUpgradeTrainer) {
                 List<String> keyList = ((IUpgradeTrainer) stack.getItem()).getTrainedUpgrades(stack);