diff --git a/build.properties b/build.properties index 9df8e75b..cb34ef24 100644 --- a/build.properties +++ b/build.properties @@ -1,12 +1,12 @@ -// Mod Information +# +#Sat Nov 01 19:24:52 EDT 2014 mod_name=BloodMagic -package_group=com.wayoftime.bloodmagic -mod_version=1.2.0 -build_number=1 - -// Dependency Information -mc_version=1.7.10 forge_version=10.13.2.1232 ccc_version=1.0.4.29 nei_version=1.0.3.64 +//=Dependency Information +package_group=com.wayoftime.bloodmagic +mod_version=1.2.0 minetweaker_version=Dev-1.7.10-3.0.9B +build_number=2 +mc_version=1.7.10 diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBelljar.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBelljar.java index 47f36a65..a529e45c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBelljar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBelljar.java @@ -1,17 +1,27 @@ package WayofTime.alchemicalWizardry.common.block; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - -import java.util.ArrayList; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.ModBlocks; +import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent; +import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainer; +import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry; +import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockBelljar extends BlockContainer { @@ -24,6 +34,44 @@ public class BlockBelljar extends BlockContainer this.setBlockName("crystalBelljar"); } + + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) + { + if (this.equals(ModBlocks.blockCrystalBelljar)) + { + par3List.add(new ItemStack(par1, 1, 0)); + + for(Reagent reagent : ReagentRegistry.reagentList.values()) + { + ItemStack stack = new ItemStack(par1, 1, 0); + NBTTagCompound tag = new NBTTagCompound(); + + ReagentContainer[] tanks = new ReagentContainer[1]; + tanks[0] = new ReagentContainer(reagent, 16000, 16000); + + NBTTagList tagList = new NBTTagList(); + + NBTTagCompound savedTag = new NBTTagCompound(); + if (tanks[0] != null) + { + tanks[0].writeToNBT(savedTag); + } + tagList.appendTag(savedTag); + + + tag.setTag("reagentTanks", tagList); + + stack.setTagCompound(tag); + + par3List.add(stack); + } + } else + { + super.getSubBlocks(par1, par2CreativeTabs, par3List); + } + } + @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entityLiving, ItemStack stack) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeDagger.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeDagger.java index 6aa59dc1..2b00c32a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeDagger.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/CreativeDagger.java @@ -1,16 +1,16 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import com.arc.bloodarsenal.BloodArsenal; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -public classCreativeDagger extends Item +public class CreativeDagger extends Item { public CreativeDagger() { @@ -103,3 +103,4 @@ public classCreativeDagger extends Item return null; } +} diff --git a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang index 33278a0a..4055c0bd 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang @@ -184,6 +184,7 @@ item.itemAttunedCrystal.name=Alchemic Router item.itemTankSegmenter.name=Alchemic Segmenter item.destinationClearer.name=Alchemic Cleanser item.demonPlacer.name=Demon Crystal +item.creativeDagger.name=Creative Sacrificial Knife #Creative Tab itemGroup.tabBloodMagic=Blood Magic