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

Arcaratus and Vanilla are derps.

Browse source
This commit is contained in:
WayofTime 2015-07-16 18:29:53 -04:00
parent 1ca7795164
commit 9b7b419ec8
4 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.properties
View file

@ -1,3 +1,5 @@
#
#Thu Jul 16 09:50:10 EDT 2015
mod_name=BloodMagic mod_name=BloodMagic
forge_version=10.13.4.1448-1.7.10 forge_version=10.13.4.1448-1.7.10
ccc_version=1.0.4.29 ccc_version=1.0.4.29
@ -7,5 +9,5 @@ guideapi_version=1.0.1-20
package_group=com.wayoftime.bloodmagic package_group=com.wayoftime.bloodmagic
mod_version=1.3.3 mod_version=1.3.3
minetweaker_version=Dev-1.7.10-3.0.9B minetweaker_version=Dev-1.7.10-3.0.9B
build_number=6
mc_version=1.7.10 mc_version=1.7.10
build_number=5

23
src/main/java/WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java
View file

@ -7,7 +7,6 @@ import net.minecraft.block.Block;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -258,8 +257,8 @@ public class APISpellHelper
if (canSilk && silkTouch) if (canSilk && silkTouch)
{ {
ArrayList<ItemStack> items = new ArrayList<ItemStack>(); ArrayList<ItemStack> items = new ArrayList<ItemStack>();
ItemStack item = new ItemStack(block, 1, meta); ItemStack item = createStackedBlock(block, meta);
items.add(item); items.add(item);
return items; 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<ItemStack> items, World world, float x, float y, float z) public static void spawnItemListInWorld(List<ItemStack> items, World world, float x, float y, float z)
{ {
for (ItemStack stack : items) for (ItemStack stack : items)

2
src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java
View file

@ -66,7 +66,7 @@ public class ClientEventHandler
if (event.phase.equals(Phase.START)) if (event.phase.equals(Phase.START))
return; return;
// if (!RenderHelper.onTickInGame(mcClient)) if (!RenderHelper.onTickInGame(mcClient))
{ {
} }

4
src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java
View file

@ -7,13 +7,13 @@ import java.util.Random;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockLiquid;
import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentProtection; import net.minecraft.enchantment.EnchantmentProtection;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityList;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.monster.EntityZombie;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
@ -339,7 +339,7 @@ public class SpellHelper
public static boolean isBlockFluid(Block block) 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) public static void evaporateWaterBlock(World world, int posX, int posY, int posZ)