Merge branch '1.8' of https://github.com/WayofTime/BloodMagic into 1.8

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

@@ -21,7 +21,6 @@ public class AlchemyArrayRecipeRegistry
 {
     public static final AlchemyCircleRenderer defaultRenderer = new AlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/BaseArray.png"));
 
-    @Getter
     private static BiMap<ItemStackWrapper, AlchemyArrayRecipe> recipes = HashBiMap.create();
 
     /**
@@ -223,4 +222,8 @@ public class AlchemyArrayRecipeRegistry
             return null;
         }
     }
+
+    public static BiMap<ItemStackWrapper, AlchemyArrayRecipe> getRecipes() {
+        return HashBiMap.create(recipes);
+    }
 }

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

@@ -13,7 +13,6 @@ import javax.annotation.Nullable;
 
 public class AltarRecipeRegistry
 {
-    @Getter
     private static BiMap<ItemStack, AltarRecipe> recipes = HashBiMap.create();
 
     public static void registerRecipe(AltarRecipe recipe)
@@ -92,4 +91,8 @@ public class AltarRecipeRegistry
             // (this.fillable this.areRequiredTagsEqual(comparedStack) : true);
         }
     }
+
+    public static BiMap<ItemStack, AltarRecipe> getRecipes() {
+        return HashBiMap.create(recipes);
+    }
 }

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

@@ -2,7 +2,6 @@ package WayofTime.bloodmagic.api.registry;
 
 import WayofTime.bloodmagic.api.BlockStack;
 import WayofTime.bloodmagic.api.iface.IHarvestHandler;
-import lombok.Getter;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockStem;
 
@@ -10,15 +9,10 @@ import java.util.*;
 
 public class HarvestRegistry
 {
-    @Getter
     private static List<IHarvestHandler> handlerList = new ArrayList<IHarvestHandler>();
-    @Getter
     private static Map<Block, Integer> standardCrops = new HashMap<Block, Integer>();
-    @Getter
     private static Set<BlockStack> tallCrops = new HashSet<BlockStack>();
-    @Getter
     private static Map<BlockStack, BlockStack> stemCrops = new HashMap<BlockStack, BlockStack>();
-    @Getter
     private static Map<BlockStack, Integer> amplifierMap = new HashMap<BlockStack, Integer>();
 
     /**
@@ -98,4 +92,24 @@ public class HarvestRegistry
         if (!amplifierMap.containsKey(blockStack))
             amplifierMap.put(blockStack, range);
     }
+
+    public static List<IHarvestHandler> getHandlerList() {
+        return new ArrayList<IHarvestHandler>(handlerList);
+    }
+
+    public static Map<Block, Integer> getStandardCrops() {
+        return new HashMap<Block, Integer>(standardCrops);
+    }
+
+    public static Set<BlockStack> getTallCrops() {
+        return new HashSet<BlockStack>(tallCrops);
+    }
+
+    public static Map<BlockStack, BlockStack> getStemCrops() {
+        return new HashMap<BlockStack, BlockStack>(stemCrops);
+    }
+
+    public static Map<BlockStack, Integer> getAmplifierMap() {
+        return new HashMap<BlockStack, Integer>(amplifierMap);
+    }
 }

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

@@ -6,7 +6,6 @@ import WayofTime.bloodmagic.api.altar.EnumAltarTier;
 import WayofTime.bloodmagic.api.orb.BloodOrb;
 import WayofTime.bloodmagic.api.orb.IBloodOrb;
 import com.google.common.collect.ArrayListMultimap;
-import lombok.Getter;
 import net.minecraft.client.resources.model.ModelBakery;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.item.Item;
@@ -26,9 +25,7 @@ import java.util.List;
  */
 public class OrbRegistry
 {
-    @Getter
     private static List<BloodOrb> orbs = new ArrayList<BloodOrb>();
-    @Getter
     private static ArrayListMultimap<Integer, ItemStack> tierMap = ArrayListMultimap.create();
 
     private static Item orbItem = Constants.BloodMagicItem.BLOOD_ORB.getItem();
@@ -111,4 +108,12 @@ public class OrbRegistry
     {
         return new ItemStack(orbItem, 1, getIndexOf(orb));
     }
+
+    public static List<BloodOrb> getOrbs() {
+        return new ArrayList<BloodOrb>(orbs);
+    }
+
+    public static ArrayListMultimap<Integer, ItemStack> getTierMap() {
+        return ArrayListMultimap.create(tierMap);
+    }
 }

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

@@ -3,7 +3,6 @@ package WayofTime.bloodmagic.api.registry;
 import java.util.ArrayList;
 import java.util.List;
 
-import lombok.Getter;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
@@ -11,7 +10,6 @@ import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe;
 
 public class TartaricForgeRecipeRegistry
 {
-    @Getter
     private static List<TartaricForgeRecipe> recipeList = new ArrayList<TartaricForgeRecipe>();
 
     public static void registerRecipe(TartaricForgeRecipe recipe)
@@ -36,4 +34,8 @@ public class TartaricForgeRecipeRegistry
 
         return null;
     }
+
+    public static List<TartaricForgeRecipe> getRecipeList() {
+        return new ArrayList<TartaricForgeRecipe>(recipeList);
+    }
 }

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

@@ -60,6 +60,10 @@ public class ItemBindable extends Item implements IBindable
             {
                 IBindable itemBindable = (IBindable) stack.getItem();
                 String owner = itemBindable.getOwnerUUID(stack);
+
+                if (Strings.isNullOrEmpty(owner))
+                    return false;
+
                 SoulNetwork network = NetworkHelper.getSoulNetwork(owner);
                 return NetworkHelper.syphonAndDamage(network, player, lpUsed);
             }

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

@@ -2,6 +2,7 @@ package WayofTime.bloodmagic.item.sigil;
 
 import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.util.helper.BindableHelper;
+import net.minecraft.block.BlockCauldron;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
@@ -42,29 +43,21 @@ public class ItemSigilWater extends ItemSigilBase
                     BlockPos blockpos = movingobjectposition.getBlockPos();
 
                     if (!world.isBlockModifiable(player, blockpos))
-                    {
                         return stack;
-                    }
 
                     if (!player.canPlayerEdit(blockpos.offset(movingobjectposition.sideHit), movingobjectposition.sideHit, stack))
-                    {
                         return stack;
-                    }
 
                     BlockPos blockpos1 = blockpos.offset(movingobjectposition.sideHit);
 
                     if (!player.canPlayerEdit(blockpos1, movingobjectposition.sideHit, stack))
-                    {
                         return stack;
-                    }
 
                     if (this.canPlaceWater(world, blockpos1) && syphonNetwork(stack, player, getLPUsed()) && this.tryPlaceWater(world, blockpos1))
-                    {
                         return stack;
                 }
             }
         }
-        }
 
         return stack;
     }
@@ -75,14 +68,10 @@ public class ItemSigilWater extends ItemSigilBase
         super.onItemUse(stack, player, world, blockPos, side, hitX, hitY, hitZ);
 
         if (world.isRemote || player.isSneaking() || isUnusable(stack))
-        {
             return false;
-        }
 
         if (!world.canMineBlockBody(player, blockPos))
-        {
             return false;
-        }
 
         TileEntity tile = world.getTileEntity(blockPos);
         if (tile instanceof IFluidHandler)
@@ -91,52 +80,36 @@ public class ItemSigilWater extends ItemSigilBase
             int amount = ((IFluidHandler) tile).fill(side, fluid, false);
 
             if (amount > 0 && syphonNetwork(stack, player, getLPUsed()))
-            {
                 ((IFluidHandler) tile).fill(side, fluid, true);
-            }
-
             return false;
         }
-        // else if (tile instanceof TESocket) {
+
-        // return false;
+        if (world.getBlockState(blockPos).getBlock() == Blocks.cauldron && syphonNetwork(stack, player, getLPUsed())) {
-        // }
+            world.setBlockState(blockPos, Blocks.cauldron.getDefaultState().withProperty(BlockCauldron.LEVEL, 3));
+            return true;
+        }
 
         BlockPos newPos = blockPos.offset(side);
-
+        return player.canPlayerEdit(newPos, side, stack) && this.canPlaceWater(world, newPos) && syphonNetwork(stack, player, getLPUsed()) && this.tryPlaceWater(world, newPos);
-        if (!player.canPlayerEdit(newPos, side, stack))
-        {
-            return false;
-        }
-
-        if (this.canPlaceWater(world, newPos) && syphonNetwork(stack, player, getLPUsed()))
-        {
-            return this.tryPlaceWater(world, newPos);
-        }
-
-        return false;
     }
 
     public boolean canPlaceWater(World world, BlockPos blockPos)
     {
         if (!world.isAirBlock(blockPos) && world.getBlockState(blockPos).getBlock().getMaterial().isSolid())
-        {
             return false;
-        } else if ((world.getBlockState(blockPos).getBlock() == Blocks.water || world.getBlockState(blockPos).getBlock() == Blocks.flowing_water) && world.getBlockState(blockPos).getBlock().getMetaFromState(world.getBlockState(blockPos)) == 0)
+        else if ((world.getBlockState(blockPos).getBlock() == Blocks.water || world.getBlockState(blockPos).getBlock() == Blocks.flowing_water) && world.getBlockState(blockPos).getBlock().getMetaFromState(world.getBlockState(blockPos)) == 0)
-        {
             return false;
-        } else
+        else
-        {
             return true;
     }
-    }
 
     public boolean tryPlaceWater(World worldIn, BlockPos pos)
     {
 
         Material material = worldIn.getBlockState(pos).getBlock().getMaterial();
-        boolean flag = !material.isSolid();
+        boolean notSolid = !material.isSolid();
 
-        if (!worldIn.isAirBlock(pos) && !flag)
+        if (!worldIn.isAirBlock(pos) && !notSolid)
         {
             return false;
         } else
@@ -149,15 +122,11 @@ public class ItemSigilWater extends ItemSigilBase
                 worldIn.playSoundEffect((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), "random.fizz", 0.5F, 2.6F + (worldIn.rand.nextFloat() - worldIn.rand.nextFloat()) * 0.8F);
 
                 for (int l = 0; l < 8; ++l)
-                {
                     worldIn.spawnParticle(EnumParticleTypes.SMOKE_LARGE, (double) i + Math.random(), (double) j + Math.random(), (double) k + Math.random(), 0.0D, 0.0D, 0.0D, 0);
-                }
             } else
             {
-                if (!worldIn.isRemote && flag && !material.isLiquid())
+                if (!worldIn.isRemote && notSolid && !material.isLiquid())
-                {
                     worldIn.destroyBlock(pos, true);
-                }
 
                 worldIn.setBlockState(pos, Blocks.flowing_water.getDefaultState(), 3);
             }