Updated libs, forge version

Fixes for the new fluid stuff, fixing the issue with HEE not being happy
about a recipe, fixing compatibility with latest Waila, fixing the Soul
Transporter, and moving my OpenComputers dependency to maven.

build.gradle

@@ -10,20 +10,19 @@ buildscript {
     }
 }
 
+import org.ajoberstar.grgit.Grgit
+
 apply plugin: 'forge'
-apply plugin: 'curseforge'
 apply plugin: 'maven-publish'
 
 def build_number = 'CUSTOM'
 
-if (System.getenv('BUILD_NUMBER') != null)
-    build_number = System.getenv('BUILD_NUMBER')
-
 group = package_group
 archivesBaseName = mod_name
 version = "${mc_version}-${mod_version}-${build_number}"
 
-import org.ajoberstar.grgit.Grgit
+if (System.getenv('BUILD_NUMBER') != null)
+    build_number = System.getenv('BUILD_NUMBER')
 
 def gitHash = 'unknown'
 if (new File(projectDir, '.git').exists()) {
@@ -63,35 +62,53 @@ repositories {
         name "Mobius Repo"
         url "http://mobiusstrip.eu/maven"
     }
-    maven { // CCC/NEI (for WAILA)
+    maven {
         name 'CB Repo'
         url "http://chickenbones.net/maven/"
     }
-	 maven { 
+	maven { 
 		name 'TehNut Repo'
 		url "http://tehnut.info/maven/"
-	} 
+	}
+	maven {
+		name 'OpenComputers Repo'
+		url "http://maven.cil.li/"
+	}
 }
 
 dependencies {
-    compile "mcp.mobius.waila:Waila:1.5.5_1.7.10"
-	compile "codechicken:NotEnoughItems:1.7.10-1.0.3.64:dev"
+	compile "codechicken:CodeChickenCore:${mc_version}-${ccc_version}:dev"
+	compile "codechicken:CodeChickenLib:${mc_version}-${ccl_version}:dev"
+	compile "codechicken:NotEnoughItems:${mc_version}-${nei_version}:dev"
+
+	compile "mcp.mobius.waila:Waila:${waila_version}_${mc_version}:dev"
+
+	compile "li.cil.oc:OpenComputers:MC${mc_version}-${oc_version}-dev:dev"
+
 	compile "info.amerifrance.guideapi:Guide-API:${mc_version}-${guideapi_version}:deobf"
     compile fileTree(dir: 'libs', include: '*.jar')
 }
 
-task copyChicken(type: Copy, dependsOn: "extractUserDev") {
-    from { configurations.compile }
-    include "**/*Chicken*.jar", "**/*NotEnoughItems*.jar"
-    exclude "**/CodeChickenLib*" // because CCC downloads it anyways.. -_-
-    into file(minecraft.runDir + "/mods")
-
-    mustRunAfter "deobfBinJar"
+task copyModDeps(type: Copy, dependsOn: "extractUserDev") {
+	from { configurations.compile }
+	include "**/*CodeChickenCore*.jar", "**/*NotEnoughItems*.jar"
+	into file(minecraft.runDir + "/mods")
+
+	mustRunAfter "deobfBinJar"
+    mustRunAfter "repackMinecraft"
+}
+
+task copyLibDeps(type: Copy, dependsOn: "extractUserDev") {
+	from { configurations.compile }
+	include "**/CodeChickenLib*.jar"
+	into file(minecraft.runDir + "/mods/1.7.10")
+
+	mustRunAfter "deobfBinJar"
     mustRunAfter "repackMinecraft"
 }
 
-tasks.setupDevWorkspace.dependsOn copyChicken
-tasks.setupDecompWorkspace.dependsOn copyChicken
+tasks.setupDevWorkspace.dependsOn copyModDeps, copyLibDeps
+tasks.setupDecompWorkspace.dependsOn copyModDeps, copyLibDeps
 
 jar {
     classifier = ''
@@ -104,19 +121,19 @@ jar {
     )
 }
 
-// add a source jar
+// Add a source jar
 task sourceJar(type: Jar) {
     from sourceSets.main.allSource
     classifier = 'sources'
 }
 
-// add a javadoc jar
+// Add a javadoc jar
 task javadocJar(type: Jar, dependsOn: javadoc) {
     from javadoc.destinationDir
     classifier = 'javadoc'
 }
 
-// because the normal output has been made to be obfuscated
+// Adds a deobfuscated jar
 task deobfJar(type: Jar) {
     from sourceSets.main.output
     classifier = 'deobf'
@@ -147,13 +164,4 @@ publishing {
     }
 }
 
-curse {
-    projectId = '229339'
-	if (project.hasProperty('curse_key'))
-		apiKey = project.curse_key
-    releaseType = 'beta'
-
-    changelog = project.hasProperty('changelog') ? project.changelog : ''
-    relatedProject 'blood-magic': 'requiredLibrary'
-    relatedProject 'guide-api': 'requiredLibrary'
-}
+fileTree('gradle').include('curse.gradle').collect().sort().each { apply from: it }

gradle.properties

@@ -1,8 +1,13 @@
 mod_name=Sanguimancy
 package_group=com.tombenpotter.sanguimancy
+mod_version=1.1.9
 
+forge_version=latest
 mc_version=1.7.10
-guideapi_version=1.0-8
-forge_version=10.13.2.1236
 
-mod_version=1.1.9
+guideapi_version=1.0-10
+ccc_version=1.0.6.39
+ccl_version=1.1.1.106
+nei_version=1.0.4.99
+waila_version=1.5.10
+oc_version=1.5.9.592

src/main/java/tombenpotter/sanguimancy/compat/waila/WailaAltarDiviner.java

@@ -4,8 +4,12 @@
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.api.IWailaRegistrar;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
 import tombenpotter.sanguimancy.blocks.BlockAltarDiviner;
 import tombenpotter.sanguimancy.tile.TileAltarDiviner;
 
@@ -44,4 +48,9 @@ public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, I
     public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
         return currenttip;
     }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
+        return tag;
+    }
 }

src/main/java/tombenpotter/sanguimancy/compat/waila/WailaAltarEmitter.java

@@ -4,8 +4,12 @@
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.api.IWailaRegistrar;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
 import tombenpotter.sanguimancy.blocks.BlockAltarEmitter;
 import tombenpotter.sanguimancy.tile.TileAltarEmitter;
 
@@ -41,4 +45,9 @@ public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, I
     public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
         return currenttip;
     }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
+        return tag;
+    }
 }

src/main/java/tombenpotter/sanguimancy/compat/waila/WailaBloodTank.java

@@ -4,8 +4,12 @@
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.api.IWailaRegistrar;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
 import tombenpotter.sanguimancy.blocks.BlockBloodTank;
 import tombenpotter.sanguimancy.tile.TileBloodTank;
 import tombenpotter.sanguimancy.util.RandomUtils;
@@ -45,4 +49,10 @@ public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, I
     public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
         return currenttip;
     }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
+        return tag;
+
+    }
 }

src/main/java/tombenpotter/sanguimancy/compat/waila/WailaCorruptionCrystallizer.java

@@ -4,8 +4,12 @@
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.api.IWailaRegistrar;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
 import tombenpotter.sanguimancy.blocks.BlockCorruptionCrystallizer;
 import tombenpotter.sanguimancy.tile.TileCorruptionCrystallizer;
 
@@ -43,4 +47,9 @@ public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, I
     public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
         return currenttip;
     }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
+        return tag;
+    }
 }

src/main/java/tombenpotter/sanguimancy/items/ItemBloodAmulet.java

@@ -48,7 +48,7 @@ public void onUpdate(ItemStack stack, World world, Entity entity, int par4, bool
             float health = livingBase.getHealth();
             RandomUtils.checkAndSetCompound(stack);
             if (health < 10F && stack.hasTagCompound() && getFluid(stack) != null) {
-                if (getFluid(stack).fluidID == new FluidStack(AlchemicalWizardry.lifeEssenceFluid, 1).fluidID && getFluid(stack).amount >= bloodLoss) {
+                if (getFluid(stack).getFluidID() == new FluidStack(AlchemicalWizardry.lifeEssenceFluid, 1).getFluidID() && getFluid(stack).amount >= bloodLoss) {
                     livingBase.heal(1F);
                     livingBase.motionX = 0;
                     livingBase.motionY = 0;
@@ -65,7 +65,7 @@ public void onUpdate(ItemStack stack, World world, Entity entity, int par4, bool
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) {
         if (world.getTileEntity(x, y, z) != null && world.getTileEntity(x, y, z) instanceof TileBloodTank) {
             TileBloodTank tile = (TileBloodTank) world.getTileEntity(x, y, z);
-            if (tile.tank.getFluid() != null && tile.tank.getFluid().fluidID == AlchemicalWizardry.lifeEssenceFluid.getID()) {
+            if (tile.tank.getFluid() != null && tile.tank.getFluid().getFluidID() == AlchemicalWizardry.lifeEssenceFluid.getID()) {
                 tile.drain(ForgeDirection.UNKNOWN, FluidContainerRegistry.BUCKET_VOLUME, true);
                 fill(stack, new FluidStack(AlchemicalWizardry.lifeEssenceFluid, FluidContainerRegistry.BUCKET_VOLUME), true);
                 return true;
@@ -107,7 +107,7 @@ public int getCapacity(ItemStack container) {
     @Override
     public int fill(ItemStack stack, FluidStack resource, boolean doFill) {
         if (resource == null || stack.stackSize != 1) return 0;
-        if (resource.fluidID != AlchemicalWizardry.lifeEssenceFluid.getID()) {
+        if (resource.getFluidID() != AlchemicalWizardry.lifeEssenceFluid.getID()) {
             return 0;
         }
         int fillAmount = 0, capacity = getCapacity(stack);

src/main/java/tombenpotter/sanguimancy/items/ItemSoulTransporter.java

@@ -35,12 +35,12 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla
                 TeleportingQueue.getInstance().teleportToDim(world, 0, chunkCoords.posX, chunkCoords.posY, chunkCoords.posZ, player, player.getCommandSenderName());
             } else {
                 int dimID = ConfigHandler.snDimID;
-                int x;
-                int z;
+                int x, z;
                 if (ClaimedChunks.getClaimedChunks().getLinkedChunks(player.getCommandSenderName()) == null || ClaimedChunks.getClaimedChunks().getLinkedChunks(player.getCommandSenderName()).isEmpty()) {
-                    return stack;
-                }
-                if (ClaimedChunks.getClaimedChunks().getLinkedChunks(player.getCommandSenderName()).get(0) != null) {
+                    ChunkCoordinates chunkCoords = MinecraftServer.getServer().worldServerForDimension(dimID).getSpawnPoint();
+                    x = chunkCoords.posX;
+                    z = chunkCoords.posZ;
+                } else if (ClaimedChunks.getClaimedChunks().getLinkedChunks(player.getCommandSenderName()).get(0) != null) {
                     x = ClaimedChunks.getClaimedChunks().getLinkedChunks(player.getCommandSenderName()).get(0).getCenterXPos();
                     z = ClaimedChunks.getClaimedChunks().getLinkedChunks(player.getCommandSenderName()).get(0).getCenterZPos();
                 } else {

src/main/java/tombenpotter/sanguimancy/registry/RecipesRegistry.java

@@ -55,7 +55,7 @@ public static void registerShapedRecipes() {
         corruptedAxe = GameRegistry.addShapedRecipe(SanguimancyItemStacks.corruptedAxe, "XX ", "XY ", " Y ", 'X', SanguimancyItemStacks.corruptedMineral, 'Y', SanguimancyItemStacks.imbuedStick);
         toggledEtherealBlock = GameRegistry.addShapedRecipe(new ItemStack(BlocksRegistry.etherealBoundBlock, 8), "XXX", "XYX", "XXX", 'Y', Blocks.redstone_block, 'X', SanguimancyItemStacks.etherealBlock);
         personalEtherealBlock = GameRegistry.addShapedRecipe(new ItemStack(BlocksRegistry.etherealPersonalBlock, 8), "XXX", "XYX", "XXX", 'X', SanguimancyItemStacks.etherealBoundBlock, 'Y', Items.name_tag);
-        bloodInterface = GameRegistry.addShapedRecipe(SanguimancyItemStacks.bloodInterface, "XYX", "XZX", "XXX", 'X', Blocks.stone, 'Y', new ItemStack(ModBlocks.bloodRune, 1, 0), 'Z', new ItemStack(Blocks.unpowered_comparator));
+        bloodInterface = GameRegistry.addShapedRecipe(SanguimancyItemStacks.bloodInterface, "XYX", "XZX", "XXX", 'X', Blocks.stone, 'Y', new ItemStack(ModBlocks.bloodRune, 1, 0), 'Z', new ItemStack(Items.comparator));
     }
 
     public static void registerAltarRecipes() {

src/main/java/tombenpotter/sanguimancy/tile/TileBloodCleaner.java

@@ -105,7 +105,7 @@ public void writeToNBT(NBTTagCompound tagCompound) {
 
     @Override
     public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
-        if (resource.fluidID == AlchemicalWizardry.lifeEssenceFluid.getID()) {
+        if (resource.getFluidID() == AlchemicalWizardry.lifeEssenceFluid.getID()) {
             worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
             return tank.fill(resource, doFill);
         }

src/main/java/tombenpotter/sanguimancy/util/RitualUtils.java

@@ -91,7 +91,7 @@ public static ArrayList<Int3> getPumpablesInArea(World world, FluidStack fluid,
             for (int j = -16 * multiplier; j <= 16 * multiplier; j++) {
                 for (int i = -16 * multiplier; i <= 16 * multiplier; i++) {
                     for (int k = -16 * multiplier; k <= 16 * multiplier; k++) {
-                        if (!world.isAirBlock(x + i, y + j, z + k) && world.getBlock(x + i, y + j, z + k) == FluidRegistry.getFluid(fluid.fluidID).getBlock() && world.getBlockMetadata(x + i, y + j, z + k) == 0) {
+                        if (!world.isAirBlock(x + i, y + j, z + k) && world.getBlock(x + i, y + j, z + k) == FluidRegistry.getFluid(fluid.getFluidID()).getBlock() && world.getBlockMetadata(x + i, y + j, z + k) == 0) {
                             blocks.add(new Int3(x + i, y + j, z + k));
                         }
                     }