diff --git a/build.properties b/build.properties index 1f1fd8ea..2ca145b9 100644 --- a/build.properties +++ b/build.properties @@ -1,3 +1,5 @@ +# +#Thu Jul 16 09:50:10 EDT 2015 mod_name=BloodMagic forge_version=10.13.4.1448-1.7.10 ccc_version=1.0.4.29 @@ -7,5 +9,5 @@ guideapi_version=1.0.1-20 package_group=com.wayoftime.bloodmagic mod_version=1.3.3 minetweaker_version=Dev-1.7.10-3.0.9B +build_number=6 mc_version=1.7.10 -build_number=5 diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java index aff20eb5..ed3f65ad 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java @@ -7,7 +7,6 @@ import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -258,8 +257,8 @@ public class APISpellHelper if (canSilk && silkTouch) { ArrayList items = new ArrayList(); - ItemStack item = new ItemStack(block, 1, meta); - + ItemStack item = createStackedBlock(block, meta); + items.add(item); return items; @@ -269,6 +268,24 @@ public class APISpellHelper } } + public static ItemStack createStackedBlock(Block block, int meta) + { + int j = 0; + if(block == Blocks.lit_redstone_ore) + { + block = Blocks.redstone_ore; + } + + Item item = Item.getItemFromBlock(block); + + if (item != null && item.getHasSubtypes()) + { + j = meta; + } + + return new ItemStack(item, 1, j); + } + public static void spawnItemListInWorld(List items, World world, float x, float y, float z) { for (ItemStack stack : items) diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java index 740a7069..23984f27 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java @@ -66,7 +66,7 @@ public class ClientEventHandler if (event.phase.equals(Phase.START)) return; -// if (!RenderHelper.onTickInGame(mcClient)) + if (!RenderHelper.onTickInGame(mcClient)) { } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java index 7d6838e1..e11b898e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java @@ -7,13 +7,13 @@ import java.util.Random; import java.util.regex.Pattern; import net.minecraft.block.Block; +import net.minecraft.block.BlockLiquid; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentProtection; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; @@ -339,7 +339,7 @@ public class SpellHelper public static boolean isBlockFluid(Block block) { - return block instanceof IFluidBlock; + return block instanceof IFluidBlock || block instanceof BlockLiquid; } public static void evaporateWaterBlock(World world, int posX, int posY, int posZ)