lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Doing some minor tweaks for the release.

Browse source
This commit is contained in:
WayofTime 2015-02-27 16:10:16 -05:00
parent 39e3d6eb34
commit adc14d5f46
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.properties
View file

@ -1,5 +1,5 @@
# #
#Thu Feb 26 20:41:21 EST 2015 #Fri Feb 27 09:41:14 EST 2015
mod_name=BloodMagic mod_name=BloodMagic
forge_version=10.13.2.1232 forge_version=10.13.2.1232
ccc_version=1.0.4.29 ccc_version=1.0.4.29
@ -8,5 +8,5 @@ nei_version=1.0.3.64
package_group=com.wayoftime.bloodmagic package_group=com.wayoftime.bloodmagic
mod_version=1.3.1Beta1 mod_version=1.3.1Beta1
minetweaker_version=Dev-1.7.10-3.0.9B minetweaker_version=Dev-1.7.10-3.0.9B
build_number=10 build_number=12
mc_version=1.7.10 mc_version=1.7.10

5
src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipeRegistry.java
View file

@ -33,6 +33,11 @@ public class AltarRecipeRegistry
public static boolean isRequiredItemValid(ItemStack testItem, int currentTierAltar) public static boolean isRequiredItemValid(ItemStack testItem, int currentTierAltar)
{ {
if(testItem == null)
{
return false;
}
for (AltarRecipe recipe : altarRecipes) for (AltarRecipe recipe : altarRecipes)
{ {
if (recipe.doesRequiredItemMatch(testItem, currentTierAltar)) if (recipe.doesRequiredItemMatch(testItem, currentTierAltar))

16
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java
View file

@ -69,7 +69,7 @@ public class TEAltar extends TileEntity implements IInventory, IFluidTank, IFlui
private int lockdownDuration; private int lockdownDuration;
private int demonBloodDuration; private int demonBloodDuration;
private int cooldownAfterCrafting = 0; private int cooldownAfterCrafting = 500;
public TEAltar() public TEAltar()
{ {
@ -584,6 +584,11 @@ public class TEAltar extends TileEntity implements IInventory, IFluidTank, IFlui
this.lockdownDuration--; this.lockdownDuration--;
} }
if(worldObj.isRemote)
{
return;
}
if (!worldObj.isRemote && worldObj.getWorldTime() % 20 == 0) if (!worldObj.isRemote && worldObj.getWorldTime() % 20 == 0)
{ {
{ {
@ -647,8 +652,8 @@ public class TEAltar extends TileEntity implements IInventory, IFluidTank, IFlui
this.fluidOutput.amount += fluidOutputted; this.fluidOutput.amount += fluidOutputted;
this.fluid.amount -= fluidOutputted; this.fluid.amount -= fluidOutputted;
} }
if (worldObj.getWorldTime() % 100 == 0 && this.cooldownAfterCrafting <= 0) if (worldObj.getWorldTime() % 100 == 0 && (this.isActive || this.cooldownAfterCrafting <= 0))
{ {
startCycle(); startCycle();
} }
@ -866,11 +871,6 @@ public class TEAltar extends TileEntity implements IInventory, IFluidTank, IFlui
return; return;
} }
if (getStackInSlot(0) == null)
{
return;
}
if (!isActive) if (!isActive)
{ {
progress = 0; progress = 0;